diff --git a/rsiTurtle.lua b/rsiTurtle.lua index d8e4f85b224165d782375e3085ec87de01358548..1ffa9330f986ed5edcf7ed7e3654a9b158d72754 100644 --- a/rsiTurtle.lua +++ b/rsiTurtle.lua @@ -12,7 +12,6 @@ local RSI_Turtle = {} RSI_Turtle.__index = RSI_Turtle require("printf") -turtle = require("turtle") --- -- \brief Affiche un hello world @@ -181,7 +180,7 @@ end -- \brief Déplacement arrière -- \return bool Succès function RSI_Turtle:backward() - result = turtle.backward() + result = turtle.back() if result then if self.facing_ == 0 then @@ -263,9 +262,11 @@ end --- -- \brief Descendre jusqu'à rencontrer le sol --- \return bool Succès +-- \return bool Succès si a descendu d'au moins un bloc function RSI_Turtle:ground() - --TODO: Implementer + succes = self:down() + while self:down() do end + return succes end diff --git a/test.lua b/test.lua index 2362f53e5e8613e76f439ba979b489654f607ba0..566f6064a60f60dae365ba2cfd5a2728fd4fea7c 100644 --- a/test.lua +++ b/test.lua @@ -7,7 +7,6 @@ rsiT = require("rsiTurtle") rsiB = require("bucher") rsiE = require("excaver") -turtle = require("turtle") rsiT.helloWorld() @@ -54,4 +53,8 @@ t:up() t:print() t:backward() t:down() -t:print() \ No newline at end of file +t:print() + +print("Test ground();") +t:ground() + diff --git a/turtle.lua b/turtle.lua deleted file mode 100644 index 33e4106814c7671088525ffc225806816bdb42fb..0000000000000000000000000000000000000000 --- a/turtle.lua +++ /dev/null @@ -1,110 +0,0 @@ --- turtle.lua --- Created on: 2020-10-18 --- Author: Rétro --- --- Rétro Stonks Industries - Tout droits réservés --- --- Fausse API "turtle" de computercraft, permettant de tester le code --- en-dehors d'une vraie tortue - ---- --- \class Tortue RSI -local turtle = {} -turtle.__index = turtle - -require("printf") - -function turtle.craft(quantity) - printf("Crafting %d", quantity) - return true -end - - -function turtle.forward() - print("Moving forward") - return true -end - - -function turtle.backward() - print("Moving backwards") - return true -end - - -function turtle.up() - print("Moving up") - return true -end - - -function turtle.down() - print("Moving down") - return true -end - - -function turtle.turnLeft() - print("Turning left") -end - - -function turtle.turnRight() - print("Turning right") -end - - -function turtle.select() - return true -end - - -function turtle.inspect() - local ret = {}; - ret.name = "BLOCK_NAME" - ret.metadata = 0; - ret.state = "STATE" - return true, ret -end - - -function turtle.dig() - return true -end - - -function turtle.digUp() - return turtle.dig() -end - - -function turtle.digDown() - return turtle.dig() -end - - --- Ne prend pas en compte l'argument optionel string signText de la vraie API --- turtle -function turtle.place() - return true -end - - -function turtle.placeUp() - return turtle.place() -end - - -function turtle.placeDown() - return turtle.place() -end - -function turtle.inspectUp() - return turtle.inspect() -end - -function turtle.inspectDown() - return turtle.inspect() -end - -return turtle