diff --git a/data/movements/movements.xml b/data/movements/movements.xml index 6f254bc..d3b494b 100644 --- a/data/movements/movements.xml +++ b/data/movements/movements.xml @@ -676,11 +676,6 @@ - - - - - diff --git a/data/movements/scripts/misc/step_trainers.lua b/data/movements/scripts/misc/step_trainers.lua deleted file mode 100644 index ec6c0ca..0000000 --- a/data/movements/scripts/misc/step_trainers.lua +++ /dev/null @@ -1,70 +0,0 @@ -local trainingRoomExit = {x = 32231, y = 32200, z = 7} - -function checkTrainingTile(playerId, pos, movementId) - local player = Player(playerId) - if not player then - return true - end - - if getTopCreature(pos).uid ~= playerId then - return true - end - - if player:getStorageValue(17709) >= 10800000 then - player:teleportTo(trainingRoomExit) - Position(pos):sendMagicEffect(CONST_ME_TELEPORT) - player:sendTextMessage(MESSAGE_INFO_DESCR, "Your training time have expired. Come back tomorrow.") - Position(player:getPosition()):sendMagicEffect(CONST_ME_TELEPORT) - return true - end - - local trainingTime = player:getStorageValue(17709) - player:setStorageValue(17709, trainingTime + 60000) - player:sendTextMessage(MESSAGE_STATUS_SMALL, "You have " .. math.modf((10800000 - trainingTime) / 1000 / 60) .. " minutes of remaining training time in the Thais training chamber.") - addEvent(checkTrainingTile, 60000, playerId, pos, movementId) - return true -end - -function onStepIn(creature, item, position, fromPosition) - local player = creature:getPlayer() - if not player then - return true - end - - local dayOfYear = tonumber(os.date("%j")) - - -- Reset counting storage value if it does not match the last time saved day - if player:getStorageValue(17711) ~= dayOfYear then - player:setStorageValue(17709, 0) - end - - if player:getStorageValue(17711) == dayOfYear and player:getStorageValue(17709) >= 10800000 then - player:sendTextMessage(MESSAGE_EVENT_ADVANCE, "You are not allowed to train today anymore. Come back tomorrow.") - if position == fromPosition then - player:teleportTo(trainingRoomExit) - else - player:teleportTo(fromPosition) - end - return true - end - - if player:getStorageValue(17710) > os.time() then - player:sendTextMessage(MESSAGE_EVENT_ADVANCE, "You have 1 minute training monk chamber step in timeout.") - if position == fromPosition then - player:teleportTo(trainingRoomExit) - else - player:teleportTo(fromPosition) - end - return true - end - - local playerId = player:getId() - local pos = player:getPosition() - - local trainingTime = player:getStorageValue(17709) - player:setStorageValue(17709, trainingTime + 60000) - player:sendTextMessage(MESSAGE_STATUS_SMALL, "You have " .. math.modf((10800000 - trainingTime) / 1000 / 60) .. " minutes of remaining training time in the Thais training chamber.") - player:setStorageValue(17710, os.time() + 1 * 60) - player:setStorageValue(17711, dayOfYear) - addEvent(checkTrainingTile, 60000, playerId, pos, item:getMovementId()) -end \ No newline at end of file diff --git a/data/movements/scripts/misc/thais_trainers.lua b/data/movements/scripts/misc/thais_trainers.lua deleted file mode 100644 index 830a919..0000000 --- a/data/movements/scripts/misc/thais_trainers.lua +++ /dev/null @@ -1,15 +0,0 @@ -function onStepIn(creature, item, position, fromPosition) - local player = creature:getPlayer() - if not player then - return true - end - - doRelocate(item:getPosition(),{x = 32231, y = 32200, z = 7}) - Game.sendMagicEffect({x = 32231, y = 32200, z = 7}, 11) -end - -function onAddItem(item, tileitem, position) - doRelocate(item:getPosition(),{x = 32231, y = 32200, z = 7}) - item:getPosition():sendMagicEffect(11) - Game.sendMagicEffect({x = 32231, y = 32200, z = 7}, 11) -end diff --git a/data/movements/scripts/misc/thais_trainers_back.lua b/data/movements/scripts/misc/thais_trainers_back.lua deleted file mode 100644 index 57d49ba..0000000 --- a/data/movements/scripts/misc/thais_trainers_back.lua +++ /dev/null @@ -1,15 +0,0 @@ -function onStepIn(creature, item, position, fromPosition) - local player = creature:getPlayer() - if not player then - return true - end - - doRelocate(item:getPosition(),{x = 32350, y = 32222, z = 7}) - Game.sendMagicEffect({x = 32350, y = 32222, z = 7}, 11) -end - -function onAddItem(item, tileitem, position) - doRelocate(item:getPosition(),{x = 32350, y = 32222, z = 7}) - item:getPosition():sendMagicEffect(11) - Game.sendMagicEffect({x = 32350, y = 32222, z = 7}, 11) -end diff --git a/data/world792/map.otbm b/data/world792/map.otbm index f3c589a..db1d512 100644 Binary files a/data/world792/map.otbm and b/data/world792/map.otbm differ diff --git a/data/world792/spawns.xml b/data/world792/spawns.xml index 624c973..e316470 100644 --- a/data/world792/spawns.xml +++ b/data/world792/spawns.xml @@ -6973,48 +6973,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -7055,28 +7018,6 @@ - - - - - - - - - - - - - - - - - - - - - - @@ -7097,12 +7038,6 @@ - - - - - - @@ -7147,40 +7082,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -7190,16 +7095,6 @@ - - - - - - - - - - @@ -7217,14 +7112,6 @@ - - - - - - - - @@ -7239,29 +7126,15 @@ - - - - - - - - - - - - - -