diff --git a/src/entities/livestock/pig.rs b/src/entities/livestock/pig.rs index 714a975..d5304ab 100644 --- a/src/entities/livestock/pig.rs +++ b/src/entities/livestock/pig.rs @@ -30,7 +30,6 @@ impl Pig { path_index: 0, step_recovery: 0, validation_cooldown: 0, - collision_delay: 0, }, sprite: Sprite { image: asset_server.load("pig.png"), diff --git a/src/entities/livestock/rabbit.rs b/src/entities/livestock/rabbit.rs index 9e8326a..e044043 100644 --- a/src/entities/livestock/rabbit.rs +++ b/src/entities/livestock/rabbit.rs @@ -27,7 +27,6 @@ impl Rabbit { path_index: 0, step_recovery: 0, validation_cooldown: 0, - collision_delay: 0, }, sprite: Sprite { image: asset_server.load("rabbit.png"), diff --git a/src/entities/sentient/dorf.rs b/src/entities/sentient/dorf.rs index 96a66fe..02210c0 100644 --- a/src/entities/sentient/dorf.rs +++ b/src/entities/sentient/dorf.rs @@ -27,7 +27,6 @@ impl Dorf { path_index: 0, step_recovery: 0, validation_cooldown: 0, - collision_delay: 0, }, sprite: Sprite { image: asset_server.load("dorf.png"), diff --git a/src/entities/shared_components/ambulatory.rs b/src/entities/shared_components/ambulatory.rs index a969ed4..e2f4b8d 100644 --- a/src/entities/shared_components/ambulatory.rs +++ b/src/entities/shared_components/ambulatory.rs @@ -10,7 +10,6 @@ pub struct Ambulatory { pub target: Option, pub step_recovery: u32, pub validation_cooldown: u8, - pub collision_delay: u8, } impl Default for Ambulatory { @@ -23,7 +22,6 @@ impl Default for Ambulatory { target: None, step_recovery: 0, validation_cooldown: 0, - collision_delay: 0, } } } diff --git a/src/entities/shared_systems/pathfinding.rs b/src/entities/shared_systems/pathfinding.rs index f62fe46..835b89b 100644 --- a/src/entities/shared_systems/pathfinding.rs +++ b/src/entities/shared_systems/pathfinding.rs @@ -592,11 +592,6 @@ pub fn movement( } } - if ambulatory.collision_delay > 0 { - ambulatory.collision_delay -= 1; - return; - } - if let Some(path) = &ambulatory.current_path { if ambulatory.path_index < path.len() { let next_point = path[ambulatory.path_index]; @@ -624,24 +619,21 @@ pub fn movement( transform.scale.x = -PIXEL_RATIO; } transform.translation = left_point; - return; } } - ambulatory.collision_delay = 1; - return; - } + } else { + let direction = (next_point - transform.translation).normalize(); + transform.translation = next_point; - let direction = (next_point - transform.translation).normalize(); - transform.translation = next_point; + if direction.x > 0.0 { + transform.scale.x = PIXEL_RATIO; + } else if direction.x < 0.0 { + transform.scale.x = -PIXEL_RATIO; + } - if direction.x > 0.0 { - transform.scale.x = PIXEL_RATIO; - } else if direction.x < 0.0 { - transform.scale.x = -PIXEL_RATIO; - } - - if transform.translation.distance(next_point) < TILE_SIZE { - ambulatory.path_index += 1; + if transform.translation.distance(next_point) < TILE_SIZE { + ambulatory.path_index += 1; + } } } else { ambulatory.current_path = None;