From 5b8cf01e9fc5a25cb51d4757b6ee927d57eddc4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9tro?= <yann.roberge@polymtl.ca>
Date: Tue, 20 Oct 2020 21:51:02 -0400
Subject: [PATCH] =?UTF-8?q?Supprim=C3=A9=20le=20faux=20turtle.lua=20pour?=
 =?UTF-8?q?=20rouler=20sur=20une=20vraie=20tortue.=20Impl=C3=A9mentation?=
 =?UTF-8?q?=20de=20ground()?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 rsiTurtle.lua |   9 +++--
 test.lua      |   7 +++-
 turtle.lua    | 110 --------------------------------------------------
 3 files changed, 10 insertions(+), 116 deletions(-)
 delete mode 100644 turtle.lua

diff --git a/rsiTurtle.lua b/rsiTurtle.lua
index d8e4f85..1ffa933 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 2362f53..566f606 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 33e4106..0000000
--- 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
-- 
GitLab