ank/avarus
1
Fork 0
Code Issues Activity

don't rear-dump

Browse source
This commit is contained in:
Andy Killorin 2023-12-24 10:43:19 -06:00
parent 551c472f53
commit 8419f1654e
Signed by: ank
GPG key ID: B6241CA3B552BCA4
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
server/src/mine.rs
View file

@ -43,6 +43,11 @@ pub async fn mine_chunk_and_sweep(turtle: TurtleCommander, pos: Vec3, chunk: Vec
}
}
if dump_filter(turtle.clone(), |i| USELESS.iter().any(|u| **u == i.name)).await > 12 {
info!("storage rtb");
turtle.dock().await;
}
refuel_needed(&turtle, volume).await;
mine_chunk(turtle.clone(), pos, chunk).await?;
@ -50,6 +55,8 @@ pub async fn mine_chunk_and_sweep(turtle: TurtleCommander, pos: Vec3, chunk: Vec
valuables.append(&mut near_valuables(&turtle, pos, chunk).await);
while let Some(block) = valuables.pop() {
refuel_needed(&turtle, volume).await;
if turtle.world().get(block).await.is_none() {
continue;
}
@ -57,13 +64,6 @@ pub async fn mine_chunk_and_sweep(turtle: TurtleCommander, pos: Vec3, chunk: Vec
turtle.execute(near.dig(block)?).await;
observe(turtle.clone(), block).await;
valuables.append(&mut near_valuables(&turtle, near.pos, Vec3::new(2,2,2)).await);
refuel_needed(&turtle, volume).await;
}
if dump_filter(turtle.clone(), |i| USELESS.iter().any(|u| **u == i.name)).await > 12 {
info!("storage rtb");
turtle.dock().await;
}
Some(())
@ -269,6 +269,13 @@ impl Task for Quarry {
}
fn poll(&mut self) -> TaskState {
let max_chunk = Vec3::new(4,4,4);
let chunks = self.size.component_div(&max_chunk);
if self.chunk.load(Ordering::SeqCst) >= chunks.product() {
return TaskState::Complete;
}
let only = self.miners.fetch_update(Ordering::AcqRel, Ordering::Acquire, |n| {
if n < 1 {
Some(n+1)