Merge branch 'creatures-revision-project' of https://github.com/pudim…

…tibia/canary into creatures-revision-project
pudimtibia · Jan 22, 2025 · 19c290b · 19c290b
2 parents 00a5e5c + 31951f6
commit 19c290b
Showing 1 changed file with 34 additions and 35 deletions.
diff --git a/data-otservbr-global/monster/demons/demon.lua b/data-otservbr-global/monster/demons/demon.lua
@@ -63,7 +63,7 @@ monster.flags = {
 	canWalkOnEnergy = true,
 	canWalkOnFire = true,
 	canWalkOnPoison = true,
-    hasGroupedSpells = true,
+	hasGroupedSpells = true,
 }
 
 monster.light = {
@@ -91,49 +91,48 @@ monster.voices = {
 monster.loot = {
 	{ name = "gold coin", chance = 60000, maxCount = 100 },
 	{ name = "gold coin", chance = 60000, maxCount = 100 },
-    { name = "platinum coin", chance = 99580, maxCount = 8 },
-    { name = "great mana potion", chance = 25150, maxCount = 3 },
-    { name = "great spirit potion", chance = 24650, maxCount = 3 },
-    { name = "ultimate health potion", chance = 20010, maxCount = 3 },
-    { name = "demon horn", chance = 20000 },
-    { name = "fire mushroom", chance = 19840, maxCount = 6 },
-    { name = "demonic essence", chance = 19650 },
-    { name = "assassin star", chance = 15340, maxCount = 10 },
-    { name = "small topaz", chance = 10110, maxCount = 5 },
-    { name = "small ruby", chance = 10040, maxCount = 5 },
-    { name = "small emerald", chance = 9930, maxCount = 5 },
-    { name = "small amethyst", chance = 9790, maxCount = 5 },
-    { name = "fire axe", chance = 4070 },
-    { name = "talon", chance = 3440 },
-    { id = 3039, chance = 2950 }, -- red gem
-    { name = "orb", chance = 2850 },
-    { id = 3098, chance = 2610 }, -- ring of healing
-    { name = "might ring", chance = 2450 },
-    { id = 3049, chance = 2370 }, -- stealth ring
-    { name = "giant sword", chance = 1960 },
-    { name = "ice rapier", chance = 1940 },
-    { name = "golden sickle", chance = 1360 },
-    { name = "purple tome", chance = 1270 },
-    { name = "devil helmet", chance = 1240 },
-    { name = "gold ring", chance = 1040 },
-    { name = "demon shield", chance = 730 },
-    { name = "platinum amulet", chance = 700 },
-    { name = "mastermind shield", chance = 500 },
-    { name = "golden legs", chance = 380 },
-    { id = 7393, chance = 90 }, -- demon trophy
-    { name = "magic plate armor", chance = 80 },
-    { name = "demonrage sword", chance = 60 },
+	{ name = "platinum coin", chance = 99580, maxCount = 8 },
+	{ name = "great mana potion", chance = 25150, maxCount = 3 },
+	{ name = "great spirit potion", chance = 24650, maxCount = 3 },
+	{ name = "ultimate health potion", chance = 20010, maxCount = 3 },
+	{ name = "demon horn", chance = 20000 },
+	{ name = "fire mushroom", chance = 19840, maxCount = 6 },
+	{ name = "demonic essence", chance = 19650 },
+	{ name = "assassin star", chance = 15340, maxCount = 10 },
+	{ name = "small topaz", chance = 10110, maxCount = 5 },
+	{ name = "small ruby", chance = 10040, maxCount = 5 },
+	{ name = "small emerald", chance = 9930, maxCount = 5 },
+	{ name = "small amethyst", chance = 9790, maxCount = 5 },
+	{ name = "fire axe", chance = 4070 },
+	{ name = "talon", chance = 3440 },
+	{ id = 3039, chance = 2950 }, -- red gem
+	{ name = "orb", chance = 2850 },
+	{ id = 3098, chance = 2610 }, -- ring of healing
+	{ name = "might ring", chance = 2450 },
+	{ id = 3049, chance = 2370 }, -- stealth ring
+	{ name = "giant sword", chance = 1960 },
+	{ name = "ice rapier", chance = 1940 },
+	{ name = "golden sickle", chance = 1360 },
+	{ name = "purple tome", chance = 1270 },
+	{ name = "devil helmet", chance = 1240 },
+	{ name = "gold ring", chance = 1040 },
+	{ name = "demon shield", chance = 730 },
+	{ name = "platinum amulet", chance = 700 },
+	{ name = "mastermind shield", chance = 500 },
+	{ name = "golden legs", chance = 380 },
+	{ id = 7393, chance = 90 }, -- demon trophy
+	{ name = "magic plate armor", chance = 80 },
+	{ name = "demonrage sword", chance = 60 },
 }
 
-
 monster.attacks = {
 	{ name = "melee", group = MONSTER_SPELL_GROUP_BASIC, chance = 100, minDamage = 0, maxDamage = -520 },
 	{ name = "combat", group = MONSTER_SPELL_GROUP_ATTACK, chance = 75, type = COMBAT_FIREDAMAGE, minDamage = -150, maxDamage = -250, range = 7, radius = 7, shootEffect = CONST_ANI_FIRE, effect = CONST_ME_FIREAREA, target = true },
 	{ name = "combat", group = MONSTER_SPELL_GROUP_ATTACK, chance = 25, type = COMBAT_LIFEDRAIN, minDamage = -300, maxDamage = -480, length = 8, spread = 0, effect = CONST_ME_PURPLEENERGY, target = false },
 	{ name = "combat", group = MONSTER_SPELL_GROUP_ATTACK, chance = 25, type = COMBAT_ENERGYDAMAGE, minDamage = -210, maxDamage = -300, range = 1, shootEffect = CONST_ANI_ENERGY, target = true },
 	{ name = "firefield", group = MONSTER_SPELL_GROUP_ATTACK, chance = 25, range = 7, radius = 1, shootEffect = CONST_ANI_FIRE, target = true },
 	{ name = "combat", group = MONSTER_SPELL_GROUP_DRAIN, chance = 20, type = COMBAT_MANADRAIN, minDamage = -30, maxDamage = -120, range = 7, shootEffect = CONST_ANI_DEATH, effect = CONST_ANI_SMALLEARTH, target = true },
-	{ name = "speed", group = MONSTER_SPELL_GROUP_STATUS, chance = 15, speedChange = -700, radius = 1, effect = CONST_ME_MAGIC_RED, target = true, duration = 30000 },  
+	{ name = "speed", group = MONSTER_SPELL_GROUP_STATUS, chance = 15, speedChange = -700, radius = 1, effect = CONST_ME_MAGIC_RED, target = true, duration = 30000 },
 }
 
 monster.defenses = {