made Turtle a static class

This commit is contained in:
2023-08-01 13:19:01 +02:00
parent 3c59e045de
commit b8f5ffb93a
6 changed files with 60 additions and 73 deletions

View File

@@ -71,25 +71,25 @@ class TurtleExecuter {
private function executeInst(instruction:TurtleInstruction):Outcome<Noise, String> {
switch instruction {
case Forward:
return Turtle.instance.forward();
return Turtle.forward();
case Back:
return Turtle.instance.back();
return Turtle.back();
case Up:
return Turtle.instance.up();
return Turtle.up();
case Down:
return Turtle.instance.down();
return Turtle.down();
case TurnLeft:
return Turtle.instance.turnLeft();
return Turtle.turnLeft();
case TurnRight:
return Turtle.instance.turnRight();
return Turtle.turnRight();
case Dig(dir):
return Turtle.instance.dig(dir);
return Turtle.dig(dir);
case Place(dir):
return Turtle.instance.place(dir);
return Turtle.place(dir);
case PlacseSign(dir, text):
return Turtle.instance.placeSign(dir, text);
return Turtle.placeSign(dir, text);
case Select(slot):
var r = Turtle.instance.selectSlot(slot);
var r = Turtle.selectSlot(slot);
if (r.isSuccess()) {
return Outcome.Success(null);
} else {

View File

@@ -37,9 +37,9 @@ class TurtleExt {
var ret:Int = 0;
for (i in 0...Turtle.MAX_SLOTS) {
var slotItem = Turtle.instance.getItemDetail(i).orNull();
var slotItem = Turtle.getItemDetail(i).orNull();
if (slotItem != null && slotItem.name == item) {
ret += Turtle.instance.getItemSpace(i);
ret += Turtle.getItemSpace(i);
}
}