From aba06f929874b399fa45fa6bb81f648388e06d79 Mon Sep 17 00:00:00 2001 From: ErikasKontenis Date: Tue, 26 Nov 2019 18:30:18 +0200 Subject: [PATCH] fix dice to not use while in depot tile --- data/actions/scripts/misc/dice.lua | 16 ++++++++++++++++ data/world/map.otbm | Bin 79783698 -> 79783858 bytes 2 files changed, 16 insertions(+) diff --git a/data/actions/scripts/misc/dice.lua b/data/actions/scripts/misc/dice.lua index f237519..0dcc278 100644 --- a/data/actions/scripts/misc/dice.lua +++ b/data/actions/scripts/misc/dice.lua @@ -1,4 +1,20 @@ function onUse(player, item, fromPosition, target, toPosition, isHotkey) + local playerPosition = player:getPosition() + local afrompos = {x=playerPosition.x - 1, y=playerPosition.y - 1, z=playerPosition.z} + local atopos = {x=playerPosition.x + 1, y=playerPosition.y + 1, z=playerPosition.z} + for xa = afrompos.x,atopos.x do + for ya = afrompos.y,atopos.y do + for za = afrompos.z,atopos.z do + local npos = {x = xa,y = ya,z = za} + local depotItem = Tile(npos):getItemByType(ITEM_TYPE_DEPOT) + if depotItem ~= nil then + player:sendCancelMessage("You cannot use this object.") + return true + end + end + end + end + local dicePosition = item:getPosition() local value = math.random(6) local isInGhostMode = player:isInGhostMode() diff --git a/data/world/map.otbm b/data/world/map.otbm index 6b5f3df8838b7338c8db791c6a394a84ce9ad68b..80da02eb09939bb3067af97408a1d0e8de49778d 100644 GIT binary patch delta 4261 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