Merge pull request #16 from SecretPocketCat/tweaks

Tweaks
SecretPocketCat · Apr 10, 2023 · 98c12c6 · 98c12c6
2 parents 286c61e + 592f17e
commit 98c12c6
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 27 deletions.
diff --git a/src/enemy/mod.rs b/src/enemy/mod.rs
@@ -103,18 +103,18 @@ fn spawn_enemy(mut ev_r: EventReader<SpawnEnemyEv>, mut cmd: Commands, tex: Res<
                 EnemyType::FollowPing => {
                     let half_width = 15.;
                     let height = 30.;
-                    let btm = 5.;
+                    let offset = 15.;
                     sprite_bundle.texture = tex.charge.clone();
                     sprite_bundle.sprite.custom_size =
                         Some(Vec2::new(half_width * 2.25, height * 1.125));
-                    sprite_bundle.sprite.anchor = Anchor::BottomCenter;
-                    sprite_bundle.transform.translation.y -= height / 2.;
+                    // sprite_bundle.sprite.anchor = Anchor::BottomCenter;
+                    sprite_bundle.transform.translation.y -= height / 2. + offset;
 
                     let verts = vec![
-                        (-half_width, btm),
-                        (half_width, btm),
-                        (0., height),
-                        (-half_width, btm),
+                        (-half_width, -offset),
+                        (half_width, -offset),
+                        (0., height - offset),
+                        (-half_width, -offset),
                     ]
                     .iter()
                     .map(|(x, y)| Vec2::new(*x, *y))
@@ -127,6 +127,7 @@ fn spawn_enemy(mut ev_r: EventReader<SpawnEnemyEv>, mut cmd: Commands, tex: Res<
                         .insert(EcholocationHitColor(Color::CRIMSON))
                         .insert(FollowEchoOnHit)
                         .insert(Killable)
+                        .insert(Killer)
                         .insert(StopOnCollision::<Wall>::new())
                         .insert(Speed(220.))
                         .insert(MovementDirection::default())
@@ -198,22 +199,31 @@ pub(super) fn enemy_hit(
         .iter()
         .filter_map(|ev| check_collision_start_pair(ev, &killable_q, &killer_q))
     {
-        enemy_ev_w.send(EnemyEv::Killed);
+        let mut killable = vec![coll.0];
 
-        cmd.entity(coll.0)
-            .try_insert(ColliderDisabled)
-            .try_insert(get_relative_scale_anim(
-                Vec2::ZERO.extend(1.),
-                300,
-                TweenDoneAction::DespawnSelfRecursive,
-            ));
+        if killer_q.contains(coll.0) && killer_q.contains(coll.1) {
+            // both are killable
+            killable.push(coll.1);
+        }
 
-        if let Ok((t, color, dir)) = wave_data_q.get(coll.0) {
-            cmd.spawn(Wave {
-                position: t.translation() + dir.map_or(Vec2::ZERO, |d| d.0 * 50.).extend(0.),
-                radius: 80.,
-                color: color.map_or(COL_ENEMY, |c| c.0),
-            });
+        enemy_ev_w.send(EnemyEv::Killed);
+
+        for e in killable.iter() {
+            cmd.entity(*e)
+                .try_insert(ColliderDisabled)
+                .try_insert(get_relative_scale_anim(
+                    Vec2::ZERO.extend(1.),
+                    300,
+                    TweenDoneAction::DespawnSelfRecursive,
+                ));
+
+            if let Ok((t, color, dir)) = wave_data_q.get(*e) {
+                cmd.spawn(Wave {
+                    position: t.translation() + dir.map_or(Vec2::ZERO, |d| d.0 * 50.).extend(0.),
+                    radius: 80.,
+                    color: color.map_or(COL_ENEMY, |c| c.0),
+                });
+            }
         }
     }
 }
diff --git a/src/level/map.rs b/src/level/map.rs
@@ -1,4 +1,4 @@
-use bevy::prelude::{IVec2, Resource};
+use bevy::prelude::{warn, IVec2, Resource};
 use bracket_algorithm_traits::prelude::{BaseMap, SmallVec};
 use bracket_geometry::prelude::{DistanceAlg, Point};
 use bracket_pathfinding::prelude::DijkstraMap;
@@ -183,13 +183,13 @@ pub fn generate(width: i32, height: i32, difficulty: usize) -> Option<Map> {
                 && ADJACENTS
                     .iter()
                     .all(|[dx, dy]| map.xy(x + dx, y + dy) == &TileType::Floor)
-                && rand::random::<f32>() > 0.5
+                && rand::random::<f32>() > 0.3
             {
                 *map.xy_mut(x, y) = TileType::Enemy(EnemyType::Spiky);
             }
 
-            // Next, have a 5% chance of spawning following ones.
-            if map.xy(x, y) == &TileType::Floor && rand::random::<f32>() > 0.95 {
+            // Next, have a 3% chance of spawning following ones.
+            if map.xy(x, y) == &TileType::Floor && rand::random::<f32>() > 0.97 {
                 let idx = map.xy_idx(x, y);
                 if map.get_pathing_distance(idx, start_idx) > 2.0 {
                     *map.xy_mut(x, y) = TileType::Enemy(EnemyType::FollowPing);
@@ -199,7 +199,7 @@ pub fn generate(width: i32, height: i32, difficulty: usize) -> Option<Map> {
         }
     }
     // Remove followers if there's too many
-    let max_follow_spawns: usize = difficulty.pow(2);
+    let max_follow_spawns = (difficulty as f32).powf(1.3) as usize;
     while follow_spawns.len() > max_follow_spawns {
         let (x, y) = follow_spawns.swap_remove(rand::random::<usize>() % follow_spawns.len());
         *map.xy_mut(x, y) = TileType::Floor;

diff --git a/src/player/player.rs b/src/player/player.rs
@@ -34,7 +34,7 @@ pub(super) fn spawn_player(
     textures: Res<TextureAssets>,
     entry_q: Query<&Transform, Added<LevelEntry>>,
 ) {
-    let radius = 20.;
+    let radius = 12.;
 
     if let Some(transform) = entry_q.iter().next() {
         bevy::log::info!("Spawning player");