diff options
| -rw-r--r-- | sql/updates/1312_world.sql | 2 | ||||
| -rw-r--r-- | src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_keleseth.cpp | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sql/updates/1312_world.sql b/sql/updates/1312_world.sql index f865914dd85..3a0b5a6777a 100644 --- a/sql/updates/1312_world.sql +++ b/sql/updates/1312_world.sql @@ -11,7 +11,7 @@ INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`, -- DB Data for testing -- REPLACE INTO `creature_template` (`entry`, `heroic_entry`, `modelid_A`, `modelid_A2`, `modelid_H`, `modelid_H2`, `name`, `subname`, `IconName`, `minlevel`, `maxlevel`, `minhealth`, `maxhealth`, `minmana`, `maxmana`, `armor`, `faction_A`, `faction_H`, `npcflag`, `speed`, `scale`, `rank`, `mindmg`, `maxdmg`, `dmgschool`, `attackpower`, `baseattacktime`, `rangeattacktime`, `unit_flags`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `class`, `race`, `minrangedmg`, `maxrangedmg`, `rangedattackpower`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `resistance1`, `resistance2`, `resistance3`, `resistance4`, `resistance5`, `resistance6`, `spell1`, `spell2`, `spell3`, `spell4`, `PetSpellDataId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `InhabitType`, `RacialLeader`, `RegenHealth`, `equipment_id`, `mechanic_immune_mask`, `flags_extra`, `ScriptName`) VALUES --- (23953, 0, 25338, 0, 25338, 0, 'Prinz Keleseth', NULL, NULL, 70, 80, 192200, 417056, 0, 0, 6700, 16, 16, 2, 1, 1, 0, 445, 1200, 0, 58, 2000, 2200, 0, 0, 0, 0, 0, 0, 0, 1, 2, 100, 6, 76, 23953, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '0', 0, 3, 3, 0, 0, 0, 0, 'boss_keleseth'), +-- (23953, 0, 25338, 0, 25338, 0, 'Prince Keleseth', NULL, NULL, 70, 80, 192200, 417056, 0, 0, 6700, 16, 16, 2, 1, 1, 0, 445, 1200, 0, 58, 2000, 2200, 0, 0, 0, 0, 0, 0, 0, 1, 2, 100, 6, 76, 23953, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '0', 0, 3, 3, 0, 0, 0, 0, 'boss_keleseth'), -- (23965, 0, 25865, 0, 25865, 0, 'Frost Tomb', NULL, NULL, 70, 80, 7345, 10465, 0, 0, 6700, 16, 16, 0, 1, 1, 0, 445, 1200, 0, 58, 2000, 2200, 0, 0, 0, 0, 0, 0, 0, 1, 2, 100, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '0', 0, 3, 3, 0, 0, 0, 0, 'mob_frost_tomb'), -- (23970, 0, 27651, 0, 27651, 0, 'Vrykul Skeleton', NULL, NULL, 70, 80, 7345, 10465, 0, 0, 6700, 16, 16, 0, 1, 1, 0, 445, 1200, 0, 58, 2000, 2200, 0, 0, 0, 0, 0, 0, 0, 1, 2, 100, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '0', 0, 3, 3, 0, 716, 0, 0, '0'); diff --git a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_keleseth.cpp b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_keleseth.cpp index 460581eff57..3497472ea0a 100644 --- a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_keleseth.cpp +++ b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_keleseth.cpp @@ -57,11 +57,11 @@ struct TRINITY_DLL_DECL mob_frost_tombAI : public ScriptedAI Reset(); } - uint64 SacrificeGUID; + uint64 FrostTombGUID; void Reset() { - SacrificeGUID = 0; + FrostTombGUID = 0; } void Aggro(Unit* who) {} @@ -70,11 +70,11 @@ struct TRINITY_DLL_DECL mob_frost_tombAI : public ScriptedAI void JustDied(Unit *killer) { - if(SacrificeGUID) + if(FrostTombGUID) { - Unit* Sacrifice = Unit::GetUnit((*m_creature),SacrificeGUID); - if(Sacrifice) - Sacrifice->RemoveAurasDueToSpell(SPELL_FROST_TOMB); + Unit* FrostTomb = Unit::GetUnit((*m_creature),FrostTombGUID); + if(FrostTomb) + FrostTomb->RemoveAurasDueToSpell(SPELL_FROST_TOMB); } } }; @@ -170,7 +170,7 @@ struct TRINITY_DLL_DECL boss_kelesethAI : public ScriptedAI Creature* Chains = m_creature->SummonCreature(CREATURE_FROSTTOMB, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 20000); if(Chains) { - ((mob_frost_tombAI*)Chains->AI())->SacrificeGUID = target->GetGUID(); + ((mob_frost_tombAI*)Chains->AI())->FrostTombGUID = target->GetGUID(); Chains->CastSpell(target, SPELL_FROST_TOMB, true); DoScriptText(SAY_FROST_TOMB, m_creature); |