ank/avarus
1
Fork 0
Code Issues Activity

goto more robust

Browse source
This commit is contained in:
Andy Killorin 2023-12-20 02:09:31 -06:00
parent 292fa13c14
commit f95c9cea35
Signed by: ank
GPG key ID: B6241CA3B552BCA4
1 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
server/src/turtle.rs
View file

@ -213,13 +213,26 @@ impl TurtleCommander {
if world.occupied(next_position.pos).await { if world.occupied(next_position.pos).await {
if world.garbage(next_position.pos).await { if world.garbage(next_position.pos).await {
self.execute(dbg!(recent.dig(next_position.pos))?).await; match recent.dig(next_position.pos) {
Some(command) => self.execute(command).await,
None => break 'route,
};
} else { } else {
break 'route; break 'route;
} }
} }
let state = self.execute(command).await; let state = self.execute(command.clone()).await;
if let TurtleCommandResponse::Failure = state.ret {
if let TurtleCommand::Backward(_) = command {
// turn around if you bump your rear on something
self.execute(TurtleCommand::Left).await;
recent = self.execute(TurtleCommand::Left).await.pos;
}
break 'route;
}
recent = state.pos; recent = state.pos;
} }
} }
@ -246,7 +259,11 @@ impl TurtleCommander {
'route: for (next_position, command) in route.into_iter().skip(1).zip(steps) { 'route: for (next_position, command) in route.into_iter().skip(1).zip(steps) {
if world.occupied(next_position.pos).await { if world.occupied(next_position.pos).await {
if world.garbage(next_position.pos).await { if world.garbage(next_position.pos).await {
self.execute(dbg!(recent.dig(next_position.pos))?).await; let command = dbg!(recent.dig(next_position.pos));
match command {
Some(command) => self.execute(command).await,
None => break 'route,
};
} else { } else {
break 'route; break 'route;
} }