diff --git a/server/src/depot.rs b/server/src/depot.rs index a0590f5..bd50fed 100644 --- a/server/src/depot.rs +++ b/server/src/depot.rs @@ -33,7 +33,7 @@ impl Depots { // dump inventory for i in 1..=16 { turtle.execute(Select(i)).await; - turtle.execute(DropFront(64)).await; + turtle.execute(DropDown(64)).await; } // refuel @@ -53,6 +53,12 @@ impl Depots { } } } + + // lava bucket fix + for i in 1..=16 { + turtle.execute(Select(i)).await; + turtle.execute(DropDown(64)).await; + } turtle.execute(Backward(1)).await; diff --git a/server/src/paths.rs b/server/src/paths.rs index 3589e99..ea0fa7e 100644 --- a/server/src/paths.rs +++ b/server/src/paths.rs @@ -79,7 +79,7 @@ pub const TRANSPARENT: [&str; 3] = [ ]; /// Blocks that are fine to tunnel through -const GARBAGE: [&str; 8] = [ +const GARBAGE: [&str; 11] = [ "minecraft:stone", "minecraft:dirt", "minecraft:andesite", @@ -88,10 +88,13 @@ const GARBAGE: [&str; 8] = [ "minecraft:sandstone", "minecraft:deepslate", "twigs:rhyolite", + "minecraft:spruce_leaves", + "minecraft:oak_leaves", + "traverse:fir_leaves", ]; /// time taken to go through uncharted territory (in turtle. calls) -const UNKNOWN: Option = Some(2); +const UNKNOWN: Option = Some(1); // time to go somewhere pub fn difficulty(name: &str) -> Option { @@ -101,5 +104,5 @@ pub fn difficulty(name: &str) -> Option { if GARBAGE.contains(&name) { return Some(2); }; - None + Some(140) // providing a value here means that tunneling through builds is possible (bad) } diff --git a/server/src/turtle_api.rs b/server/src/turtle_api.rs index 2c63479..176a32a 100644 --- a/server/src/turtle_api.rs +++ b/server/src/turtle_api.rs @@ -1,3 +1,4 @@ +use log::trace; use tokio; use blocks::Vec3; use crate::fell::TreeFarm; @@ -197,6 +198,7 @@ pub(crate) async fn command( State(state): State, Json(req): Json, ) -> Json { + trace!("reply from turtle {id}: {req:?}"); let mut state = &mut state.read().await; if id as usize > state.turtles.len() {