Fix missile behavior by adding can_rotate variable to mobs (#164)

* fix missile behavior by adding can_rotate variable to mobs, conditionally added locked axes component * match target_position for missile in outer match statement
thetawavegame · Mar 4, 2024 · 3bbcae1 · 3bbcae1
1 parent 66306c4
commit 3bbcae1
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/assets/data/mobs.ron b/assets/data/mobs.ron
@@ -635,6 +635,7 @@
 		mob_behaviors: [ExplodeOnImpact, DealDamageToPlayerOnImpact, ReceiveDamageOnImpact, DieAtZeroHealth],
 		acceleration: (12.0, 2.0),
 		deceleration: (5.0, 5.0),
+		can_rotate: true,
 		speed: (150.0, 150.0),
 		angular_acceleration: 0.5,
 		angular_speed: 1.8,

diff --git a/src/spawnable/behavior.rs b/src/spawnable/behavior.rs
@@ -52,15 +52,13 @@ pub fn spawnable_execute_behavior_system(
                 SpawnableBehavior::MoveLeft => {
                     move_left(&spawnable_component, &mut rb_vel);
                 }
-                SpawnableBehavior::RotateToTarget(target_position) => {
-                    if let Some(target_position) = target_position {
-                        rotate_to_target(
-                            spawnable_transform,
-                            target_position,
-                            &spawnable_component,
-                            &mut rb_vel,
-                        );
-                    }
+                SpawnableBehavior::RotateToTarget(Some(target_position)) => {
+                    rotate_to_target(
+                        spawnable_transform,
+                        target_position,
+                        &spawnable_component,
+                        &mut rb_vel,
+                    );
                 }
                 SpawnableBehavior::MoveForward => {
                     move_forward(spawnable_transform, &spawnable_component, &mut rb_vel);

diff --git a/src/spawnable/mob/mod.rs b/src/spawnable/mob/mod.rs
@@ -183,6 +183,9 @@ pub struct MobData {
     pub mob_segment_behaviors: Option<
         HashMap<MobSegmentControlBehavior, HashMap<MobSegmentType, Vec<MobSegmentBehavior>>>,
     >,
+    /// Whether the mob can rotate on its z axis
+    #[serde(default)]
+    pub can_rotate: bool,
     /// Acceleration stat
     #[serde(default)]
     pub acceleration: Vec2,
@@ -369,7 +372,6 @@ pub fn spawn_mob(
         direction: mob_data.animation.direction.clone(),
     })
     .insert(RigidBody::Dynamic)
-    .insert(LockedAxes::ROTATION_LOCKED)
     .insert(Velocity::from(mob_data.initial_motion.clone()))
     .insert(Collider::compound(
         mob_data
@@ -398,6 +400,10 @@ pub fn spawn_mob(
         mob.insert(BossComponent);
     }
 
+    if !mob_data.can_rotate {
+        mob.insert(LockedAxes::ROTATION_LOCKED);
+    }
+
     if let Some(weapon_component) = mob_data.get_weapon_component() {
         mob.insert(weapon_component);
     }