From 5aa20958460e60e307f0e64f73778ede2a22c3f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9tro?= <yann.roberge@polymtl.ca>
Date: Fri, 6 Nov 2020 22:24:34 -0500
Subject: [PATCH] Refactoring de excavateArea
---
excaver.lua | 40 ++++++----------------------------------
test.lua | 10 +++++++---
2 files changed, 13 insertions(+), 37 deletions(-)
diff --git a/excaver.lua b/excaver.lua
index 44aacc4..0a06640 100644
--- a/excaver.lua
+++ b/excaver.lua
@@ -56,41 +56,13 @@ end
-- \param int cols Nombre de colonnes (direction: droite)
-- \return bool Succès
function RSI_Excavatrice:excavateArea(lines, cols)
- local success = true
-
- assert(lines >= 1)
- assert(cols >= 1)
-
- -- La ligne de la case de départ compte comme 1
- lines = lines - 1
-
- action()
-
- success = self:moveForward(lines, grounded, action)
-
- for i=2,cols,1
- do
- print("Debut de colonne.")
-
- if ( (i%2) == 1 )
- then
- success = self:left(grounded)
- self:turnLeft()
- else
- success = self:right(grounded)
- self:turnRight()
- end
- action()
-
- success = self:moveForward(lines, grounded, action)
-
- if not success
- then
- return success
- end
-
+ action = function ()
+ self:maintainFuelLevels()
+ self:manageInventory()
+ turtle.select(SLOT_STORAGE_START)
+ self.base_:dig(nil, "down")
end
- return success
+ return self.base_:goThroughArea(lines, cols, action)
end
diff --git a/test.lua b/test.lua
index 0d22d00..9a2714a 100644
--- a/test.lua
+++ b/test.lua
@@ -186,11 +186,15 @@ end
--print("Test goThroughVolume")
--assert(t:goThroughVolume(4,3,3, turtle.digDown))
-print("Test excavateVolumeDown")
---assert(e:excavateVolumeDown(10,10,1))
-assert(e:excavateVolumeDown(10,10,30)) --Attention: prend des heures
+print("Test excavateArea")
+assert(e:excavateArea(4,4))
assert(e.base_:moveToOrigin())
+--print("Test excavateVolumeDown")
+--assert(e:excavateVolumeDown(10,10,1))
+--assert(e:excavateVolumeDown(10,10,30)) --Attention: prend des heures
+--assert(e.base_:moveToOrigin())
+
-- print("Test refuelUntil")
-- assert(e.base_:refuelUntil(FUEL_FULL, SLOT_ENDERCHEST_FUEL))
-- print("Fuel level after refueling:")
--
GitLab