Merge branch 'main-rel' of https://github.com/vasconcellosdevictor/ca…

…nary into main-rel
vllworldbuilding · Oct 21, 2024 · 5c4979e · 5c4979e
2 parents 39fb099 + 4517f6b
commit 5c4979e
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 24 deletions.
diff --git a/data-canary/scripts/actions/quests/rapier_test.lua b/data-canary/scripts/actions/quests/rapier_test.lua
@@ -13,4 +13,4 @@ function rapierQuest.onUse(player, item, fromPosition, target, toPosition, isHot
 end
 
 rapierQuest:uid(14777)
-rapierQuest:register()
+rapierQuest:register()
diff --git a/data-canary/scripts/actions/tools/teleport_cube.lua b/data-canary/scripts/actions/tools/teleport_cube.lua
@@ -1,17 +1,17 @@
 local config = {
-	{ name="Strongarm", position = Position(1943, 1346, 7) },
-	{ name="Montag", position = Position(5001, 5000, 7) },
-	{ name="Alexandria", position = Position(5521, 5124, 6) }
+	{ name = "Strongarm", position = Position(1943, 1346, 7) },
+	{ name = "Montag", position = Position(5001, 5000, 7) },
+	{ name = "Alexandria", position = Position(5521, 5124, 6) },
 }
 
 local teleportCube = Action()
 function teleportCube.onUse(player, item, fromPosition, target, toPosition, isHotkey)
-	local window = ModalWindow {
+	local window = ModalWindow({
 		title = "Teleport Modal",
-		message = "Locations"
-	}
+		message = "Locations",
+	})
 	for i, info in pairs(config) do
-		window:addChoice(string.format("%s", info.name), function (player, button, choice)
+		window:addChoice(string.format("%s", info.name), function(player, button, choice)
 			if button.name ~= "Select" then
 				return true
 			end

diff --git a/data-canary/scripts/movements/areadiscover.lua b/data-canary/scripts/movements/areadiscover.lua
@@ -131,6 +131,7 @@ function test.onStepIn(cid, item, position, fromPos)
         end
     end
 
-    return true]]--
+    return true]]
+--
 
-    print("Hello, World!") 
+print("Hello, World!")
diff --git a/data/libs/functions/monster.lua b/data/libs/functions/monster.lua
@@ -225,17 +225,17 @@ do
 	end
 end
 function RegisterPrimalPackBeast(template)
-    local name = template.name or template.description:gsub("an ", ""):gsub("a ", ""):titleCase()
-    local primal = Game.createMonsterType(name .. " (Primal)")
-    local primalMonster = table.copy(template)
-    primalMonster.experience = 0
-    primalMonster.loot = {}
-    primalMonster.name = "Primal Pack Beast"
-    primalMonster.description = "a primal pack beast"
-    primalMonster.maxHealth = primalMonster.maxHealth * 0.7
-    primalMonster.health = primalMonster.maxHealth
-    primalMonster.raceId = nil
-    primalMonster.Bestiary = nil
-    primalMonster.corpse = 0
-    primal:register(primalMonster)
-end
+	local name = template.name or template.description:gsub("an ", ""):gsub("a ", ""):titleCase()
+	local primal = Game.createMonsterType(name .. " (Primal)")
+	local primalMonster = table.copy(template)
+	primalMonster.experience = 0
+	primalMonster.loot = {}
+	primalMonster.name = "Primal Pack Beast"
+	primalMonster.description = "a primal pack beast"
+	primalMonster.maxHealth = primalMonster.maxHealth * 0.7
+	primalMonster.health = primalMonster.maxHealth
+	primalMonster.raceId = nil
+	primalMonster.Bestiary = nil
+	primalMonster.corpse = 0
+	primal:register(primalMonster)
+end