diff --git a/bloc_ids.lua b/bloc_ids.lua new file mode 100644 index 0000000000000000000000000000000000000000..ee0ee78c526b73473e0191c50be8427d9312707c --- /dev/null +++ b/bloc_ids.lua @@ -0,0 +1,12 @@ +-- bloc_ids.lua +-- Created on: 2020-10-16 +-- Author: Rétro +-- +-- Fichier de macros pour les ID des blocs +-- +-- Utilisation: __include 'bloc_ids' +-- + +ID_LOG = "log" +ID_STONE = "stone" +ID_COBBLE = "cobblestone" diff --git a/bucher.lua b/bucher.lua index 5695cbba9318ed8d33718e08bc73a776bb1e39ad..91a6a7abb6a342b351151e447684ad46ba7ad5c4 100644 --- a/bucher.lua +++ b/bucher.lua @@ -10,6 +10,7 @@ local RSI_Bucheron = {} RSI_Bucheron.__index = RSI_Bucheron rsiT = require("rsiTurtle") +require("bloc_ids") --- -- \brief Constructeur de RSI_Bucheron diff --git a/rsiTurtle.lua b/rsiTurtle.lua index 830349610fd7c488e97f044394613a60ca3a3dbe..aa0965c891dab31ff07f8145e863ec221631aee5 100644 --- a/rsiTurtle.lua +++ b/rsiTurtle.lua @@ -12,6 +12,7 @@ local RSI_Turtle = {} RSI_Turtle.__index = RSI_Turtle require("printf") +require("bloc_ids") --- -- \brief Affiche un hello world @@ -553,11 +554,15 @@ end --- --- \brief Vérifier l'ID du bloc en face --- \param Nom du bloc à vérifier --- \return bool Bloc en face identique à l'argument -function RSI_Turtle:facesBlock(block_id) - --TODO: Implementer +-- \brief Vérifier si l'ID du bloc en face contient la regex +-- \param string blockIdRegex Regex correspondant au bloc à vérifier +-- \return bool Bloc en face match la regex +function RSI_Turtle:facesBlock(blockIdRegex) + local isNotAir, blockData = turtle.inspect() + if (isNotAir) + then + return string.match(blockData.name, blockIdRegex) + end end return RSI_Turtle diff --git a/test.lua b/test.lua index 498543d9809b3560fed4a93cb9ceb5b7ffa2ba77..3870b88cfae58a206681058116b609f4ba37a3e1 100644 --- a/test.lua +++ b/test.lua @@ -8,6 +8,8 @@ rsiT = require("rsiTurtle") rsiB = require("bucher") rsiE = require("excaver") +require("bloc_ids") + rsiT.helloWorld() print("Test de RSI_Turtle") @@ -147,7 +149,10 @@ end -- assert(checkPos(4,0,4)) -- assert(t:goThroughArea(15, 15, true, nil)) -assert(t:goThroughAreaGrounded(3, 3, turtle.placeUp)) +-- assert(t:goThroughAreaGrounded(3, 3, turtle.placeUp)) + +print("Tests facesBlock") +assert(t:facesBlock(ID_LOG)) assert(t:moveToOrigin()) print(t:getPos())