From ba7317c34bdce12b3015680a28d03841050758bf Mon Sep 17 00:00:00 2001 From: stormrage-project Date: Sat, 5 Sep 2015 09:35:21 +0200 Subject: [PATCH] [SD2] Improved Rune game objects a lot --- .../molten_core/molten_core.cpp | 31 ++----------------- 1 file changed, 3 insertions(+), 28 deletions(-) diff --git a/src/modules/SD2/scripts/eastern_kingdoms/blackrock_mountain/molten_core/molten_core.cpp b/src/modules/SD2/scripts/eastern_kingdoms/blackrock_mountain/molten_core/molten_core.cpp index b4f860ca..ac859ae7 100644 --- a/src/modules/SD2/scripts/eastern_kingdoms/blackrock_mountain/molten_core/molten_core.cpp +++ b/src/modules/SD2/scripts/eastern_kingdoms/blackrock_mountain/molten_core/molten_core.cpp @@ -41,22 +41,6 @@ #include "precompiled.h" #include "molten_core.h" -struct sRuneEncounters -{ - uint32 m_uiRuneEntry, m_uiType; -}; - -static const sRuneEncounters m_aMoltenCoreRunes[MAX_MOLTEN_RUNES] = -{ - { GO_RUNE_KRESS, TYPE_MAGMADAR }, - { GO_RUNE_MOHN, TYPE_GEHENNAS }, - { GO_RUNE_BLAZ, TYPE_GARR }, - { GO_RUNE_MAZJ, TYPE_SHAZZRAH }, - { GO_RUNE_ZETH, TYPE_GEDDON }, - { GO_RUNE_THERI, TYPE_GOLEMAGG }, - { GO_RUNE_KORO, TYPE_SULFURON } -}; - /*###### ## go_molten_core_rune ######*/ @@ -74,19 +58,10 @@ struct go_molten_core_rune : public GameObjectScript return true; } - for (uint8 i = 0; i < MAX_MOLTEN_RUNES; ++i) + if (pInstance->GetData(pGo->GetGOInfo()->button.linkedTrapId) == SPECIAL) { - if (pGo->GetEntry() == m_aMoltenCoreRunes[i].m_uiRuneEntry) - { - // check if boss is already dead - if not return true - if (pInstance->GetData(m_aMoltenCoreRunes[i].m_uiType) != DONE) - { - return true; - } - - pInstance->SetData(m_aMoltenCoreRunes[i].m_uiType, SPECIAL); - return false; - } + pInstance->SetData(TYPE_FLAME_DOSED, pGo->GetGOInfo()->button.linkedTrapId); + return false; // this path allows the spell to have effect } return true;