Merge pull request #8 from jprzimba/swimming

Updated Swimming System

data/scripts/creaturescripts/player/swimming.lua

@@ -0,0 +1,12 @@
+local swimmingLogout = CreatureEvent("SwimmingLogout")
+
+function swimmingLogout.onLogout(player)
+	if player:getOutfit().lookType == 267 then
+		player:sendCancelMessage("You cannot logout while in the pool.")
+		return false
+	end
+
+	return true
+end
+
+swimmingLogout:register()

data/scripts/movements/swimming.lua

@@ -23,6 +23,12 @@ function swimming.onStepIn(creature, item, position, fromPosition)
 		return false
 	end
 
+	if player:isInGhostMode() then
+		player:sendCancelMessage("You cannot enter the water while in ghost mode.")
+		player:teleportTo(fromPosition, true)
+		return false
+	end
+
 	for i = 1, #conditions do
 		player:removeCondition(conditions[i])
 	end

data/scripts/talkactions/god/create_npc.lua

@@ -12,6 +12,11 @@ function createNpc.onSay(player, words, param)
 		return true
 	end
 
+	if player:getOutfit().lookType == 267 then
+		player:sendCancelMessage("You cannot execte this command while in the pool.")
+		return true
+	end
+
 	local split = param:split(",")
 	local name = split[1]
 	local permanentStr = split[2]

data/scripts/talkactions/god/create_summon.lua

@@ -9,6 +9,11 @@ function createSummon.onSay(player, words, param)
 		return true
 	end
 
+	if player:getOutfit().lookType == 267 then
+		player:sendCancelMessage("You cannot execte this command while in the pool.")
+		return true
+	end
+
 	local position = player:getPosition()
 	local summon = Game.createMonster(param, position, true, false, player)
 	if not summon then

data/scripts/talkactions/god/manage_monster.lua

@@ -58,6 +58,11 @@ function createMonster.onSay(player, words, param)
 		return true
 	end
 
+	if player:getOutfit().lookType == 267 then
+		player:sendCancelMessage("You cannot execte this command while in the pool.")
+		return true
+	end
+
 	local playerPosition = player:getPosition()
 	local splitParams = param:split(",")
 	local monsterName = splitParams[1]

data/scripts/talkactions/player/randomoutfit.lua

@@ -2,12 +2,12 @@ local randomOutfit = TalkAction("!randomoutfit")
 
 local config = {
 	changeInterval = 100,
-	showEffect = false
+	showEffect = false,
 }
 
 local validValues = {
 	"on",
-	"off"
+	"off",
 }
 
 local activePlayers = {}

markdowns/CHANGELOG.md

@@ -15,6 +15,8 @@
 
 - Add all files in data/migrations
 - data/scripts/talkactions/player/randomoutfit.lua
+- data/scripts/creaturescripts/player/swimming.lua
+- data-global/scripts/creaturescripts/customs/water_houses.lua
 
 ## Modified files
 
@@ -26,16 +28,16 @@
 - data/items/items.xml
 - data/scripts/creaturescripts/player/login.lua
 - data/scripts/movements/special_tiles.lua
+- data/scripts/movements/swimming.lua
 - data/scripts/talkactions/god/icons_functions.lua
 - data/scripts/talkactions/god/goto_house.lua
+- data/scripts/talkactions/god/manage_monster.lua
+- data/scripts/talkactions/god/create_summon.lua
+- data/scripts/talkactions/god/create_npc.lua
 - data-global/scripts/quests/ferumbras_ascension/actions_flower_puzzle_lever.lua
 - data-global/scripts/quests/ferumbras_ascension/movements_flower_puzzle.lua
 - data-global/scripts/lib/register_actions.lua
 
-## Added files
-
-- data-global/scripts/creaturescripts/customs/water_houses.lua
-
 ### Bug Fixes
 
 - Fixed influenced creatures not spawning. ([Tryller](https://github.com/jprzimba))
@@ -44,7 +46,11 @@
 - Fixed gotoHouse talkaction. ([Tryller](https://github.com/jprzimba))
 - Fixed Ferumbras' Ascendant Garden Flower Puzzle. ([Mckay666](https://github.com/Mckay666))
 - Fixed lava tiles in entrance of The Pits of Inferno Quest. ([jeansouzak](https://github.com/jeansouzak))
-- Fixed Items created using CreateMapItem are cleanable by /clean. ([#7](https://github.com/jprzimba/crystalserver/issues/7)) ([Tryller](https://github.com/jprzimba)).
+- Fixed Items created using CreateMapItem are cleanable by /clean. ([#7](https://github.com/jprzimba/crystalserver/issues/7)) ([Tryller](https://github.com/jprzimba))
+- Prevent players from entering the pool while in ghost mode. ([Tryller](https://github.com/jprzimba))
+- Prevent players from logging out while in the pool.
+- Prevent the use of `/n`, `/m`, and `/s` commands while in the pool. ([Tryller](https://github.com/jprzimba))
+
 
 ## Version 4.1