Sync

InfinityDevTech · Oct 8, 2024 · f1602c7 · f1602c7
1 parent 3c344a4
commit f1602c7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/movement/move_target.rs b/src/movement/move_target.rs
@@ -292,7 +292,7 @@ pub fn route_call(room_name: RoomName, from_room: RoomName, memory: &mut Screeps
         let room_type = room_type(&from_room);
 
         let return_type = match room_type {
-            crate::traits::room::RoomType::Normal => 2.0,
+            crate::traits::room::RoomType::Normal => 1.5,
             crate::traits::room::RoomType::Highway => 1.0,
             crate::traits::room::RoomType::Intersection => 1.0,
             crate::traits::room::RoomType::SourceKeeper => 3.0,

diff --git a/src/room/creeps/global/claimer.rs b/src/room/creeps/global/claimer.rs
@@ -28,7 +28,7 @@ pub fn run_claimer(creep: &Creep, memory: &mut ScreepsMemory, cache: &mut RoomCa
         }, creep_memory.target_room.unwrap());
 
         if let Some(flag) = game::flags().get("forceClaimerPath".to_string()) {
-            creep.better_move_to(memory, room_cache, flag.pos(), 1, MoveOptions::default().visualize_path(true).ignore_cache(true).path_age(15));
+            creep.better_move_to(memory, room_cache, flag.pos(), 1, MoveOptions::default().visualize_path(true).avoid_enemies(true).ignore_cache(true).path_age(15));
 
             return;
         }
@@ -37,13 +37,13 @@ pub fn run_claimer(creep: &Creep, memory: &mut ScreepsMemory, cache: &mut RoomCa
             if scouting_data.controller.is_some() && creep_memory.scout_target.is_some() {
                 let pos = Position::new(scouting_data.controller.unwrap().x, scouting_data.controller.unwrap().y, creep_memory.scout_target.unwrap());
 
-                creep.better_move_to(memory, room_cache, pos, 1, MoveOptions::default().visualize_path(true).ignore_cache(true).path_age(15));
+                creep.better_move_to(memory, room_cache, pos, 1, MoveOptions::default().visualize_path(true).avoid_enemies(true).ignore_cache(true).path_age(15));
 
                 return;
             }
         }
 
-        creep.better_move_to(memory, room_cache, pos, 23, MoveOptions::default().visualize_path(true).ignore_cache(true).path_age(15));
+        creep.better_move_to(memory, room_cache, pos, 23, MoveOptions::default().visualize_path(true).avoid_enemies(true).ignore_cache(true).path_age(15));
     } else {
         let controller = current_room.controller().unwrap();