mv: moveable -> movable (#2067)

Just to achieve consistency in the codebase and use the same (more modern) spelling of the word "movable".
opentibiabr · Dec 30, 2023 · 2874951 · 2874951
1 parent df811d7
commit 2874951
Show file tree

Hide file tree

Showing 53 changed files with 270 additions and 271 deletions.
diff --git a/data-canary/lib/core/constants.lua b/data-canary/lib/core/constants.lua
@@ -6,7 +6,7 @@ STACKPOS_FOURTH_ITEM_ABOVE_GROUNDTILE = 4
 STACKPOS_FIFTH_ITEM_ABOVE_GROUNDTILE = 5
 STACKPOS_TOP_CREATURE = 253
 STACKPOS_TOP_FIELD = 254
-STACKPOS_TOP_MOVEABLE_ITEM_OR_CREATURE = 255
+STACKPOS_TOP_MOVABLE_ITEM_OR_CREATURE = 255
 
 THING_TYPE_PLAYER = CREATURETYPE_PLAYER + 1
 THING_TYPE_MONSTER = CREATURETYPE_MONSTER + 1

diff --git a/data-canary/lib/core/storages.lua b/data-canary/lib/core/storages.lua
@@ -8,7 +8,7 @@ Reserved player action storage key ranges (const.hpp)
 	[2001 - 2011]
 
 	Others reserved player action/storages
-	[100] = unmoveable/untrade/unusable items
+	[100] = unmovable/untrade/unusable items
 	[101] = use pick floor
 	[102] = well down action
 	[103-120] = others keys action

diff --git a/data-canary/scripts/runes/chameleon.lua b/data-canary/scripts/runes/chameleon.lua
@@ -16,7 +16,7 @@ function rune.onCastSpell(creature, variant, isHotkey)
 		item = Tile(position):getTopDownItem()
 	end
 
-	if not item or item.itemid == 0 or not isMoveable(item.uid) then
+	if not item or item.itemid == 0 or not isMovable(item.uid) then
 		creature:sendCancelMessage(RETURNVALUE_NOTPOSSIBLE)
 		creature:getPosition():sendMagicEffect(CONST_ME_POFF)
 		return false

diff --git a/data-otservbr-global/lib/compat/compat.lua b/data-otservbr-global/lib/compat/compat.lua
@@ -35,7 +35,7 @@ STACKPOS_FOURTH_ITEM_ABOVE_GROUNDTILE = 4
 STACKPOS_FIFTH_ITEM_ABOVE_GROUNDTILE = 5
 STACKPOS_TOP_CREATURE = 253
 STACKPOS_TOP_FIELD = 254
-STACKPOS_TOP_MOVEABLE_ITEM_OR_CREATURE = 255
+STACKPOS_TOP_MOVABLE_ITEM_OR_CREATURE = 255
 
 THING_TYPE_PLAYER = CREATURETYPE_PLAYER + 1
 THING_TYPE_MONSTER = CREATURETYPE_MONSTER + 1
@@ -1094,8 +1094,8 @@ function isCorpse(uid)
 	return i ~= nil and ItemType(i:getId()):isCorpse() or false
 end
 
-isItemMoveable = isItemMovable
-isMoveable = isMovable
+isItemMovable = isItemMovable
+isMovable = isMovable
 
 function getItemName(itemId)
 	return ItemType(itemId):getName()
@@ -1380,7 +1380,7 @@ function getThingfromPos(pos)
 
 	local thing
 	local stackpos = pos.stackpos or 0
-	if stackpos == STACKPOS_TOP_MOVEABLE_ITEM_OR_CREATURE then
+	if stackpos == STACKPOS_TOP_MOVABLE_ITEM_OR_CREATURE then
 		thing = tile:getTopCreature()
 		if thing == nil then
 			local item = tile:getTopDownItem()

diff --git a/data-otservbr-global/lib/core/storages.lua b/data-otservbr-global/lib/core/storages.lua
@@ -8,7 +8,7 @@ Reserved player action storage key ranges (const.h)
 	[2001 - 2011]
 
 	Others reserved player action/storages
-	[100] = unmoveable/untrade/unusable items
+	[100] = unmovable/untrade/unusable items
 	[101] = use pick floor
 	[102] = well down action
 	[103-120] = others keys action

diff --git a/data-otservbr-global/lib/quests/svargrond_arena.lua b/data-otservbr-global/lib/quests/svargrond_arena.lua
@@ -218,7 +218,7 @@ function SvargrondArena.resetPit(pitId)
 					if movableItem and movableItem:isItem() then
 						local itemType = ItemType(movableItem:getId())
 						if itemType and itemType:isMovable() and not table.contains(SvargrondArena.itemsNotErasable, movableItem:getId()) then
-							moveableItem:remove()
+							movableItem:remove()
 						end
 					end
 

diff --git a/data-otservbr-global/npc/inigo.lua b/data-otservbr-global/npc/inigo.lua
@@ -40,7 +40,7 @@ local hints = {
 	[8] = "Always eat as much {food} as possible. \z
 		This way, you'll regenerate health points for a longer period of time.",
 	[9] = "After you have killed a monster, you have 10 seconds in which the corpse \z
-		is not moveable and no one else but you can loot it.",
+		is not movable and no one else but you can loot it.",
 	[10] = "Be careful when you approach three or more {monsters} because you only can block the attacks of two! \z
 		In such a situation, even a few salamanders can do severe damage or even kill you.",
 	[11] = "There are many ways to gather {food}. Many creatures drop food but you can also pick blueberries or \z

diff --git a/data-otservbr-global/scripts/actions/quests/ferumbras_ascendant/habitat_corrupted.lua b/data-otservbr-global/scripts/actions/quests/ferumbras_ascendant/habitat_corrupted.lua
@@ -378,7 +378,7 @@ local ferumbrasAscendantHabitatCorrupted = Action()
 function ferumbrasAscendantHabitatCorrupted.onUse(player, item, fromPosition, target, toPosition, isHotkey)
 	if item.itemid == 9125 then
 		if Game.getStorageValue(GlobalStorage.FerumbrasAscendant.Habitats.Corrupted) >= 1 then
-			player:say("The lever are stuck, need some time to it can be moveable again.", TALKTYPE_MONSTER_SAY)
+			player:say("The lever are stuck, need some time to it can be movable again.", TALKTYPE_MONSTER_SAY)
 			return true
 		end
 		Game.createMonster("lovely yielothax", Position(33619, 32722, 12), true, true)

diff --git a/data-otservbr-global/scripts/actions/quests/ferumbras_ascendant/habitat_desert.lua b/data-otservbr-global/scripts/actions/quests/ferumbras_ascendant/habitat_desert.lua
@@ -358,7 +358,7 @@ local ferumbrasAscendantHabitatDesert = Action()
 function ferumbrasAscendantHabitatDesert.onUse(player, item, fromPosition, target, toPosition, isHotkey)
 	if item.itemid == 9125 then
 		if Game.getStorageValue(GlobalStorage.FerumbrasAscendant.Habitats.Desert) >= 1 then
-			player:say("The lever are stuck, need some time to it can be moveable again.", TALKTYPE_MONSTER_SAY)
+			player:say("The lever are stuck, need some time to it can be movable again.", TALKTYPE_MONSTER_SAY)
 			return true
 		end
 		Game.createMonster("lovely rotworm", Position(33641, 32684, 12), true, true)

diff --git a/data-otservbr-global/scripts/actions/quests/ferumbras_ascendant/habitat_dimension.lua b/data-otservbr-global/scripts/actions/quests/ferumbras_ascendant/habitat_dimension.lua
@@ -394,7 +394,7 @@ local ferumbrasAscendantHabitatDimension = Action()
 function ferumbrasAscendantHabitatDimension.onUse(player, item, fromPosition, target, toPosition, isHotkey)
 	if item.itemid == 9125 then
 		if Game.getStorageValue(GlobalStorage.FerumbrasAscendant.Habitats.Dimension) >= 1 then
-			player:say("The lever are stuck, need some time to it can be moveable again.", TALKTYPE_MONSTER_SAY)
+			player:say("The lever are stuck, need some time to it can be movable again.", TALKTYPE_MONSTER_SAY)
 			return true
 		end
 		Game.createMonster("lovely souleater", Position(33642, 32722, 12), true, true)

diff --git a/data-otservbr-global/scripts/actions/quests/ferumbras_ascendant/habitat_grass.lua b/data-otservbr-global/scripts/actions/quests/ferumbras_ascendant/habitat_grass.lua
@@ -426,7 +426,7 @@ local ferumbrasAscendantHabitatGlass = Action()
 function ferumbrasAscendantHabitatGlass.onUse(player, item, fromPosition, target, toPosition, isHotkey)
 	if item.itemid == 9125 then
 		if Game.getStorageValue(GlobalStorage.FerumbrasAscendant.Habitats.Grass) >= 1 then
-			player:say("The lever are stuck, need some time to it can be moveable again.", TALKTYPE_MONSTER_SAY)
+			player:say("The lever are stuck, need some time to it can be movable again.", TALKTYPE_MONSTER_SAY)
 			return true
 		end
 		Game.createMonster("lovely frazzlemaw", Position(33642, 32666, 12), true, true)

diff --git a/data-otservbr-global/scripts/actions/quests/ferumbras_ascendant/habitat_ice.lua b/data-otservbr-global/scripts/actions/quests/ferumbras_ascendant/habitat_ice.lua
@@ -441,7 +441,7 @@ local ferumbrasAscendantHabitatIce = Action()
 function ferumbrasAscendantHabitatIce.onUse(player, item, fromPosition, target, toPosition, isHotkey)
 	if item.itemid == 9125 then
 		if Game.getStorageValue(GlobalStorage.FerumbrasAscendant.Habitats.Ice) >= 1 then
-			player:say("The lever are stuck, need some time to it can be moveable again.", TALKTYPE_MONSTER_SAY)
+			player:say("The lever are stuck, need some time to it can be movable again.", TALKTYPE_MONSTER_SAY)
 			return true
 		end
 		Game.createMonster("lovely snake", Position(33642, 32702, 12), true, true)

diff --git a/data-otservbr-global/scripts/actions/quests/ferumbras_ascendant/habitat_mushroom.lua b/data-otservbr-global/scripts/actions/quests/ferumbras_ascendant/habitat_mushroom.lua
@@ -394,7 +394,7 @@ local ferumbrasAscendantHabitatMushroom = Action()
 function ferumbrasAscendantHabitatMushroom.onUse(player, item, fromPosition, target, toPosition, isHotkey)
 	if item.itemid == 9125 then
 		if Game.getStorageValue(GlobalStorage.FerumbrasAscendant.Habitats.Mushroom) >= 1 then
-			player:say("The lever are stuck, need some time to it can be moveable again.", TALKTYPE_MONSTER_SAY)
+			player:say("The lever are stuck, need some time to it can be movable again.", TALKTYPE_MONSTER_SAY)
 			return true
 		end
 		Game.createMonster("lovely scorpion", Position(33617, 32684, 12), true, true)

diff --git a/data-otservbr-global/scripts/actions/quests/ferumbras_ascendant/habitat_roshamuul.lua b/data-otservbr-global/scripts/actions/quests/ferumbras_ascendant/habitat_roshamuul.lua
@@ -467,7 +467,7 @@ local ferumbrasAscendantHabitatRoshamuul = Action()
 function ferumbrasAscendantHabitatRoshamuul.onUse(player, item, fromPosition, target, toPosition, isHotkey)
 	if item.itemid == 9125 then
 		if Game.getStorageValue(GlobalStorage.FerumbrasAscendant.Habitats.Roshamuul) >= 1 then
-			player:say("The lever are stuck, need some time to it can be moveable again.", TALKTYPE_MONSTER_SAY)
+			player:say("The lever are stuck, need some time to it can be movable again.", TALKTYPE_MONSTER_SAY)
 			return true
 		end
 		Game.createMonster("lovely deer", Position(33619, 32666, 12), true, true)

diff --git a/data-otservbr-global/scripts/actions/quests/ferumbras_ascendant/habitat_venom.lua b/data-otservbr-global/scripts/actions/quests/ferumbras_ascendant/habitat_venom.lua
@@ -449,7 +449,7 @@ local ferumbrasAscendantHabitatVenom = Action()
 function ferumbrasAscendantHabitatVenom.onUse(player, item, fromPosition, target, toPosition, isHotkey)
 	if item.itemid == 9125 then
 		if Game.getStorageValue(GlobalStorage.FerumbrasAscendant.Habitats.Venom) >= 1 then
-			player:say("The lever are stuck, need some time to it can be moveable again.", TALKTYPE_MONSTER_SAY)
+			player:say("The lever are stuck, need some time to it can be movable again.", TALKTYPE_MONSTER_SAY)
 			return true
 		end
 		Game.createMonster("lovely polar bear", Position(33617, 32702, 12), true, true)

diff --git a/data-otservbr-global/scripts/globalevents/others/startup.lua b/data-otservbr-global/scripts/globalevents/others/startup.lua
@@ -28,8 +28,8 @@ function serverstartup.onStartup()
 	loadLuaMapUnique(ItemUnique)
 	-- Item daily reward table
 	-- This is temporary disabled > loadLuaMapAction(DailyRewardAction)
-	-- Item unmoveable table
-	loadLuaMapAction(ItemUnmoveableAction)
+	-- Item unmovable table
+	loadLuaMapAction(ItemUnmovableAction)
 	-- Lever table
 	loadLuaMapAction(LeverAction)
 	loadLuaMapUnique(LeverUnique)

diff --git a/data-otservbr-global/scripts/spells/runes/chameleon.lua b/data-otservbr-global/scripts/spells/runes/chameleon.lua
@@ -16,7 +16,7 @@ function rune.onCastSpell(creature, variant, isHotkey)
 		item = Tile(position):getTopDownItem()
 	end
 
-	if not item or item.itemid == 0 or not isMoveable(item.uid) then
+	if not item or item.itemid == 0 or not isMovable(item.uid) then
 		creature:sendCancelMessage(RETURNVALUE_NOTPOSSIBLE)
 		creature:getPosition():sendMagicEffect(CONST_ME_POFF)
 		return false

diff --git a/data-otservbr-global/startup/README.md b/data-otservbr-global/startup/README.md
@@ -39,77 +39,77 @@ Item (unique) = 40001/42000
 This folder was created exclusively for tables and functions that are loaded at startup or that cannot be reloaded, thus maintaining greater organization in the files.
 
 Action IDS
-	Use actionID only if you need to create a function that is called multiple times in different locations.
-	The action is also used as storage, "x" storage is added in the player,
-	and the same action number gives access to a door, for example.
+Use actionID only if you need to create a function that is called multiple times in different locations.
+The action is also used as storage, "x" storage is added in the player,
+and the same action number gives access to a door, for example.
 
-	Reserved player action storage key ranges (const.h at the source)
-	[10000000 - 20000000]
-	[1000 - 1500]
-	[2001 - 2011]
+    Reserved player action storage key ranges (const.h at the source)
+    [10000000 - 20000000]
+    [1000 - 1500]
+    [2001 - 2011]
 
-	Others reserved player action/storages
-	[100] = unmoveable/untrade/unusable items
-	[101] = use pick floor
-	[102] = down floor action
-	[103] = key 0010
-	[103-120] = keys action
-	[104] = Parchment of the parchment room quest
-	[303] = key 0303
-	[1000] = level door. Here 1 must be used followed by the level. Example: 1010 = level 10, 1100 = level 100]
-	[3001-3008] = key 3001/3008
-	[3012] = key 3012
-	[3033] = key 3033
-	[3100] = key 3100
-	[3142] = key 3142
-	[3200] = key 3200
-	[3301] = key 3301
-	[3302] = key 3302
-	[3303] = key 3303
-	[3304] = key 3304
-	[3350] = key 3350
-	[3520] = key 3520
-	[3600] = key 3600
-	[3610] = key 3610
-	[3620] = key 3620
-	[3650] = key 3650
-	[3666] = key 3666
-	[3667] = key 3667
-	[3700] = key 3700
-	[3701/3703] = key 3701/3703
-	[3800/3802] = key 3800/3802
-	[3899] = key 3899
-	[3900] = key 3900
-	[3909/3917] = key 3909/3917
-	[3923] = key 3923
-	[3925] = key 3925
-	[3930] = key 3930
-	[3932] = key 3932
-	[3934] = key 3934
-	[3935] = key 3935
-	[3936] = key 3936
-	[3938] = key 3938
-	[3940] = key 3940
-	[3950] = key 3950
-	[3960] = key 3960
-	[3980] = key 3980
-	[3988] = key 3988
-	[4001] = key 4001
-	[4009] = key 4009
-	[4022] = key 4022
-	[4023] = key 4023
-	[4033] = key 4033
-	[4037] = key 4037
-	[4055] = key 4055
-	[4210] = key 4210
-	[4501] = key 4501
-	[4502] = key 4502
-	[4503] = key 4503
-	[4600] = key 4600
-	[4601] = key 4601
-	[4603] = key 4603
-	[5000] = key 5000
-	[5002] = key 5002
-	[5010] = key 5010
-	[5050] = key 5050
-	[6010] = key 6010
+    Others reserved player action/storages
+    [100] = unmovable/untrade/unusable items
+    [101] = use pick floor
+    [102] = down floor action
+    [103] = key 0010
+    [103-120] = keys action
+    [104] = Parchment of the parchment room quest
+    [303] = key 0303
+    [1000] = level door. Here 1 must be used followed by the level. Example: 1010 = level 10, 1100 = level 100]
+    [3001-3008] = key 3001/3008
+    [3012] = key 3012
+    [3033] = key 3033
+    [3100] = key 3100
+    [3142] = key 3142
+    [3200] = key 3200
+    [3301] = key 3301
+    [3302] = key 3302
+    [3303] = key 3303
+    [3304] = key 3304
+    [3350] = key 3350
+    [3520] = key 3520
+    [3600] = key 3600
+    [3610] = key 3610
+    [3620] = key 3620
+    [3650] = key 3650
+    [3666] = key 3666
+    [3667] = key 3667
+    [3700] = key 3700
+    [3701/3703] = key 3701/3703
+    [3800/3802] = key 3800/3802
+    [3899] = key 3899
+    [3900] = key 3900
+    [3909/3917] = key 3909/3917
+    [3923] = key 3923
+    [3925] = key 3925
+    [3930] = key 3930
+    [3932] = key 3932
+    [3934] = key 3934
+    [3935] = key 3935
+    [3936] = key 3936
+    [3938] = key 3938
+    [3940] = key 3940
+    [3950] = key 3950
+    [3960] = key 3960
+    [3980] = key 3980
+    [3988] = key 3988
+    [4001] = key 4001
+    [4009] = key 4009
+    [4022] = key 4022
+    [4023] = key 4023
+    [4033] = key 4033
+    [4037] = key 4037
+    [4055] = key 4055
+    [4210] = key 4210
+    [4501] = key 4501
+    [4502] = key 4502
+    [4503] = key 4503
+    [4600] = key 4600
+    [4601] = key 4601
+    [4603] = key 4603
+    [5000] = key 5000
+    [5002] = key 5002
+    [5010] = key 5010
+    [5050] = key 5050
+    [6010] = key 6010
diff --git a/...global/startup/tables/item_unmoveable.lua → ...-global/startup/tables/item_unmovable.lua b/...global/startup/tables/item_unmoveable.lua → ...-global/startup/tables/item_unmovable.lua
@@ -1,6 +1,6 @@
 -- Look README.md for see the reserved action/unique numbers
 
-ItemUnmoveableAction = {
+ItemUnmovableAction = {
 	-- Unmovable action, add new position and it create in-game
 	[100] = {
 		itemId = false,

diff --git a/data-otservbr-global/startup/tables/load.lua b/data-otservbr-global/startup/tables/load.lua
@@ -6,7 +6,7 @@ dofile(DATA_DIRECTORY .. "/startup/tables/door_level.lua")
 dofile(DATA_DIRECTORY .. "/startup/tables/door_quest.lua")
 dofile(DATA_DIRECTORY .. "/startup/tables/item.lua")
 dofile(DATA_DIRECTORY .. "/startup/tables/item_daily_reward.lua")
-dofile(DATA_DIRECTORY .. "/startup/tables/item_unmoveable.lua")
+dofile(DATA_DIRECTORY .. "/startup/tables/item_unmovable.lua")
 dofile(DATA_DIRECTORY .. "/startup/tables/lever.lua")
 dofile(DATA_DIRECTORY .. "/startup/tables/teleport.lua")
 dofile(DATA_DIRECTORY .. "/startup/tables/teleport_item.lua")

diff --git a/data/events/scripts/player.lua b/data/events/scripts/player.lua
@@ -1,6 +1,6 @@
 local storeItemID = {
 	-- registered item ids here are not tradable with players
-	-- these items can be set to moveable at items.xml
+	-- these items can be set to movable at items.xml
 	-- 500 charges exercise weapons
 	28552, -- exercise sword
 	28553, -- exercise axe

diff --git a/data/items/items.xml b/data/items/items.xml
@@ -11607,7 +11607,7 @@
 		<attribute key="weight" value="700"/>
 	</item>
 	<item id="4285" article="a" name="pile of bones">
-		<attribute key="moveable" value="0"/>
+		<attribute key="movable" value="0"/>
 		<attribute key="containersize" value="5"/>
 	</item>
 	<item id="4286" article="a" name="dead dragon">
@@ -35642,7 +35642,7 @@
 	<item id="19201" article="an" name="ornate door with a keyhole"/>
 	<item id="19202" article="a" name="reward container">
 		<attribute key="primarytype" value="utilities"/>
-		<attribute key="moveable" value="0"/>
+		<attribute key="movable" value="0"/>
 		<attribute key="allowpickUpAble" value="0"/>
 		<attribute key="containersize" value="32"/>
 	</item>
@@ -35742,7 +35742,7 @@
 		<attribute key="primarytype" value="utilities"/>
 		<attribute key="type" value="rewardchest"/>
 		<attribute key="description" value="This chest contains your rewards earned in battles."/>
-		<attribute key="moveable" value="0"/>
+		<attribute key="movable" value="0"/>
 		<attribute key="allowpickUpAble" value="0"/>
 		<attribute key="containersize" value="32"/>
 	</item>
@@ -42625,7 +42625,7 @@
 	<item id="23721" article="a" name="gold pouch">
 		<attribute key="description" value="A infinity bag where you can hold coins."/>
 		<attribute key="containersize" value="20"/>
-		<attribute key="moveable" value="0"/>
+		<attribute key="movable" value="0"/>
 	</item>
 	<item id="23722" article="a" name="gold converter">
 		<attribute key="primarytype" value="tools"/>
@@ -50372,7 +50372,7 @@
 		<attribute key="primarytype" value="tools"/>
 		<attribute key="weight" value="1000"/>
 		<attribute key="description" value="This mysterious lamp summons your very own personal hireling."/>
-		<attribute key="moveable" value="0"/>
+		<attribute key="movable" value="0"/>
 	</item>
 	<item id="29433" article="a" name="chest">
 		<attribute key="primarytype" value="containers"/>