From 5e2d32b43709919bee2b1a51479d4f7891f0feb0 Mon Sep 17 00:00:00 2001 From: Jonyrewind Date: Wed, 29 Jan 2025 21:18:04 +0100 Subject: [PATCH] fix: Grand Master Oberon Immunity and Butterfly's raceId It was setting him immune on the start immunity is already handled in his monster file. Butterfly's had the wrong raceId's and and the Bestiary Kills weren't assigned properly. --- .../quests/the_explorer_society/blue_butterfly.lua | 2 +- .../quests/the_explorer_society/yellow_butterfly.lua | 2 +- data-otservbr-global/monster/vermins/butterfly.lua | 4 ++-- .../the_secret_library_quest/creaturescripts_kill.lua | 10 ---------- 4 files changed, 4 insertions(+), 14 deletions(-) diff --git a/data-otservbr-global/monster/quests/the_explorer_society/blue_butterfly.lua b/data-otservbr-global/monster/quests/the_explorer_society/blue_butterfly.lua index 3893adff8c4..bf2e1f56136 100644 --- a/data-otservbr-global/monster/quests/the_explorer_society/blue_butterfly.lua +++ b/data-otservbr-global/monster/quests/the_explorer_society/blue_butterfly.lua @@ -14,7 +14,7 @@ monster.outfit = { lookMount = 0, } -monster.raceId = 213 +monster.raceId = 227 monster.Bestiary = { class = "Vermin", race = BESTY_RACE_VERMIN, diff --git a/data-otservbr-global/monster/quests/the_explorer_society/yellow_butterfly.lua b/data-otservbr-global/monster/quests/the_explorer_society/yellow_butterfly.lua index b5e88d7f102..834130574f3 100644 --- a/data-otservbr-global/monster/quests/the_explorer_society/yellow_butterfly.lua +++ b/data-otservbr-global/monster/quests/the_explorer_society/yellow_butterfly.lua @@ -14,7 +14,7 @@ monster.outfit = { lookMount = 0, } -monster.raceId = 227 +monster.raceId = 235 monster.Bestiary = { class = "Vermin", race = BESTY_RACE_VERMIN, diff --git a/data-otservbr-global/monster/vermins/butterfly.lua b/data-otservbr-global/monster/vermins/butterfly.lua index 9ea18cb070f..89bcbca5815 100644 --- a/data-otservbr-global/monster/vermins/butterfly.lua +++ b/data-otservbr-global/monster/vermins/butterfly.lua @@ -13,7 +13,7 @@ monster.outfit = { lookMount = 0, } -monster.raceId = 213 +monster.raceId = 227 monster.Bestiary = { class = "Vermin", race = BESTY_RACE_VERMIN, @@ -31,7 +31,7 @@ monster.Bestiary = { monster.health = 2 monster.maxHealth = 2 monster.race = "venom" -monster.corpse = 4378 +monster.corpse = 4993 monster.speed = 160 monster.manaCost = 0 diff --git a/data-otservbr-global/scripts/quests/the_secret_library_quest/creaturescripts_kill.lua b/data-otservbr-global/scripts/quests/the_secret_library_quest/creaturescripts_kill.lua index 5a3bde3b049..c7e88237022 100644 --- a/data-otservbr-global/scripts/quests/the_secret_library_quest/creaturescripts_kill.lua +++ b/data-otservbr-global/scripts/quests/the_secret_library_quest/creaturescripts_kill.lua @@ -45,13 +45,3 @@ function creaturescripts_library_bosses.onDeath(creature, corpse, killer, mostDa end creaturescripts_library_bosses:register() - -local creaturescripts_library_bosses_oberon = CreatureEvent("oberonImmune") - -function creaturescripts_library_bosses_oberon.onHealthChange(creature, attacker, primaryDamage, primaryType, secondaryDamage, secondaryType, origin) - primaryDamage = 0 - secondaryDamage = 0 - return primaryDamage, primaryType, secondaryDamage, secondaryType -end - -creaturescripts_library_bosses_oberon:register()