*Implement quest 11587, by manuel, with some cleanup. Closes #280

--HG--
branch : trunk

sql/FULL/world_scripts_full.sql

@@ -361,6 +361,7 @@ UPDATE `creature_template` SET `ScriptName`='npc_corastrasza' WHERE `entry`=3254
 UPDATE `creature_template` SET `ScriptName`='mob_nerubar_victim' WHERE `entry`=25284;
 UPDATE `creature_template` SET `ScriptName`='npc_scourge_prisoner' WHERE `entry`=25610;
 UPDATE `gameobject_template` SET `ScriptName`='go_scourge_cage' WHERE `entry` IN (187854, 187855, 187856, 187857, 187858, 187859, 187860, 187862, 187863, 187864, 187865, 187866, 187867, 187868, 187870, 187871, 187872, 187873, 187874, 187861, 190803);
+UPDATE `gameobject_template` SET `ScriptName`='go_arcane_prison' WHERE `entry`=187561;
 UPDATE `creature_template` SET `ScriptName`='npc_loklira_crone' WHERE `entry`=29975;
 UPDATE `creature_template` SET `ScriptName`='npc_victorious_challenger' WHERE `entry`=30012;
 UPDATE `creature_template` SET `ScriptName`='npc_mcgoyver' WHERE `entry`=24040;

sql/updates/6247_world_scripts.sql

@@ -0,0 +1,2 @@
+
+UPDATE `gameobject_template` SET `ScriptName`='go_arcane_prison' WHERE `entry`=187561;

src/bindings/scripts/scripts/world/go_scripts.cpp

@@ -54,7 +54,7 @@ enum eCatFigurine
     SPELL_SUMMON_GHOST_SABER    = 5968,
 };
 
-bool GOHello_go_cat_figurine(Player* pPlayer, GameObject* pGo)
+bool GOHello_go_cat_figurine(Player *pPlayer, GameObject *pGO)
 {
     pPlayer->CastSpell(pPlayer,SPELL_SUMMON_GHOST_SABER,true);
     return false;
@@ -64,12 +64,12 @@ bool GOHello_go_cat_figurine(Player* pPlayer, GameObject* pGo)
 ## go_crystal_pylons (3x)
 ######*/
 
-bool GOHello_go_northern_crystal_pylon(Player* pPlayer, GameObject* pGo)
+bool GOHello_go_northern_crystal_pylon(Player *pPlayer, GameObject *pGO)
 {
-    if (pGo->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER)
+    if (pGO->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER)
     {
-        pPlayer->PrepareQuestMenu(pGo->GetGUID());
+        pPlayer->PrepareQuestMenu(pGO->GetGUID());
-        pPlayer->SendPreparedQuest(pGo->GetGUID());
+        pPlayer->SendPreparedQuest(pGO->GetGUID());
     }
 
     if (pPlayer->GetQuestStatus(4285) == QUEST_STATUS_INCOMPLETE)
@@ -78,12 +78,12 @@ bool GOHello_go_northern_crystal_pylon(Player* pPlayer, GameObject* pGo)
     return true;
 }
 
-bool GOHello_go_eastern_crystal_pylon(Player* pPlayer, GameObject* pGo)
+bool GOHello_go_eastern_crystal_pylon(Player *pPlayer, GameObject *pGO)
 {
-    if (pGo->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER)
+    if (pGO->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER)
     {
-        pPlayer->PrepareQuestMenu(pGo->GetGUID());
+        pPlayer->PrepareQuestMenu(pGO->GetGUID());
-        pPlayer->SendPreparedQuest(pGo->GetGUID());
+        pPlayer->SendPreparedQuest(pGO->GetGUID());
     }
 
     if (pPlayer->GetQuestStatus(4287) == QUEST_STATUS_INCOMPLETE)
@@ -92,12 +92,12 @@ bool GOHello_go_eastern_crystal_pylon(Player* pPlayer, GameObject* pGo)
     return true;
 }
 
-bool GOHello_go_western_crystal_pylon(Player* pPlayer, GameObject* pGo)
+bool GOHello_go_western_crystal_pylon(Player *pPlayer, GameObject *pGO)
 {
-    if (pGo->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER)
+    if (pGO->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER)
     {
-        pPlayer->PrepareQuestMenu(pGo->GetGUID());
+        pPlayer->PrepareQuestMenu(pGO->GetGUID());
-        pPlayer->SendPreparedQuest(pGo->GetGUID());
+        pPlayer->SendPreparedQuest(pGO->GetGUID());
     }
 
     if (pPlayer->GetQuestStatus(4288) == QUEST_STATUS_INCOMPLETE)
@@ -110,7 +110,7 @@ bool GOHello_go_western_crystal_pylon(Player* pPlayer, GameObject* pGo)
 ## go_barov_journal
 ######*/
 
-bool GOHello_go_barov_journal(Player* pPlayer, GameObject* pGo)
+bool GOHello_go_barov_journal(Player *pPlayer, GameObject *pGO)
 {
     if (pPlayer->HasSkill(SKILL_TAILORING) && pPlayer->GetBaseSkillValue(SKILL_TAILORING) >= 280 && !pPlayer->HasSpell(26086))
     {
@@ -123,7 +123,7 @@ bool GOHello_go_barov_journal(Player* pPlayer, GameObject* pGo)
 ## go_field_repair_bot_74A
 ######*/
 
-bool GOHello_go_field_repair_bot_74A(Player* pPlayer, GameObject* pGo)
+bool GOHello_go_field_repair_bot_74A(Player *pPlayer, GameObject *pGO)
 {
     if (pPlayer->HasSkill(SKILL_ENGINERING) && pPlayer->GetBaseSkillValue(SKILL_ENGINERING) >= 300 && !pPlayer->HasSpell(22704))
     {
@@ -154,7 +154,7 @@ bool GOHello_go_gilded_brazier(Player* pPlayer, GameObject* pGO)
 ## go_orb_of_command
 ######*/
 
-bool GOHello_go_orb_of_command(Player* pPlayer, GameObject* pGo)
+bool GOHello_go_orb_of_command(Player *pPlayer, GameObject *pGO)
 {
     if (pPlayer->GetQuestRewardStatus(7761))
         pPlayer->CastSpell(pPlayer,23460,true);
@@ -166,7 +166,7 @@ bool GOHello_go_orb_of_command(Player* pPlayer, GameObject* pGo)
 ## go_tablet_of_madness
 ######*/
 
-bool GOHello_go_tablet_of_madness(Player* pPlayer, GameObject* pGo)
+bool GOHello_go_tablet_of_madness(Player *pPlayer, GameObject *pGO)
 {
     if (pPlayer->HasSkill(SKILL_ALCHEMY) && pPlayer->GetSkillValue(SKILL_ALCHEMY) >= 300 && !pPlayer->HasSpell(24266))
     {
@@ -180,9 +180,9 @@ bool GOHello_go_tablet_of_madness(Player* pPlayer, GameObject* pGo)
 ######*/
 
 //TODO: use gossip option ("Transcript the Tablet") instead, if Trinity adds support.
-bool GOHello_go_tablet_of_the_seven(Player* pPlayer, GameObject* pGo)
+bool GOHello_go_tablet_of_the_seven(Player *pPlayer, GameObject *pGO)
 {
-    if (pGo->GetGoType() != GAMEOBJECT_TYPE_QUESTGIVER)
+    if (pGO->GetGoType() != GAMEOBJECT_TYPE_QUESTGIVER)
         return true;
 
     if (pPlayer->GetQuestStatus(4296) == QUEST_STATUS_INCOMPLETE)
@@ -195,7 +195,7 @@ bool GOHello_go_tablet_of_the_seven(Player* pPlayer, GameObject* pGo)
 ## go_jump_a_tron
 ######*/
 
-bool GOHello_go_jump_a_tron(Player* pPlayer, GameObject* pGo)
+bool GOHello_go_jump_a_tron(Player *pPlayer, GameObject *pGO)
 {
     if (pPlayer->GetQuestStatus(10111) == QUEST_STATUS_INCOMPLETE)
      pPlayer->CastSpell(pPlayer,33382,true);
@@ -223,12 +223,12 @@ const uint32 NpcPrisonEntry[] =
     20783, 20784, 20785, 20786, 20788, 20789, 20790         //bad guys
 };
 
-bool GOHello_go_ethereum_prison(Player* pPlayer, GameObject* pGo)
+bool GOHello_go_ethereum_prison(Player *pPlayer, GameObject *pGO)
 {
     int Random = rand() % (sizeof(NpcPrisonEntry) / sizeof(uint32));
 
     if (Creature* pCreature = pPlayer->SummonCreature(NpcPrisonEntry[Random],
-        pGo->GetPositionX(), pGo->GetPositionY(), pGo->GetPositionZ(), pGo->GetAngle(pPlayer),
+        pGO->GetPositionX(), pGO->GetPositionY(), pGO->GetPositionZ(), pGO->GetAngle(pPlayer),
         TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000))
     {
         if (!pCreature->IsHostileTo(pPlayer))
@@ -267,12 +267,12 @@ const uint32 NpcStasisEntry[] =
     22825, 20888, 22827, 22826, 22828
 };
 
-bool GOHello_go_ethereum_stasis(Player* pPlayer, GameObject* pGo)
+bool GOHello_go_ethereum_stasis(Player *pPlayer, GameObject *pGO)
 {
     int Random = rand() % (sizeof(NpcStasisEntry) / sizeof(uint32));
 
     pPlayer->SummonCreature(NpcStasisEntry[Random],
-        pGo->GetPositionX(), pGo->GetPositionY(), pGo->GetPositionZ(), pGo->GetAngle(pPlayer),
+        pGO->GetPositionX(), pGO->GetPositionY(), pGO->GetPositionZ(), pGO->GetAngle(pPlayer),
         TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
 
     return false;
@@ -323,14 +323,14 @@ enum eShrineOfTheBirds
     GO_SHRINE_FALCON    = 185553
 };
 
-bool GOHello_go_shrine_of_the_birds(Player* pPlayer, GameObject* pGo)
+bool GOHello_go_shrine_of_the_birds(Player *pPlayer, GameObject *pGO)
 {
     uint32 BirdEntry = 0;
 
     float fX, fY, fZ;
-    pGo->GetClosePoint(fX, fY, fZ, pGo->GetObjectSize(), INTERACTION_DISTANCE);
+    pGO->GetClosePoint(fX, fY, fZ, pGO->GetObjectSize(), INTERACTION_DISTANCE);
 
-    switch(pGo->GetEntry())
+    switch(pGO->GetEntry())
     {
         case GO_SHRINE_HAWK:
             BirdEntry = NPC_HAWK_GUARD;
@@ -344,7 +344,7 @@ bool GOHello_go_shrine_of_the_birds(Player* pPlayer, GameObject* pGo)
     }
 
     if (BirdEntry)
-        pPlayer->SummonCreature(BirdEntry, fX, fY, fZ, pGo->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 60000);
+        pPlayer->SummonCreature(BirdEntry, fX, fY, fZ, pGO->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 60000);
 
     return false;
 }
@@ -361,7 +361,7 @@ enum eSouthfury
 
 };
 
-bool GOHello_go_southfury_moonstone(Player* pPlayer, GameObject* pGo)
+bool GOHello_go_southfury_moonstone(Player *pPlayer, GameObject *pGO)
 {
     //implicitTarget=48 not implemented as of writing this code, and manual summon may be just ok for our purpose
     //pPlayer->CastSpell(pPlayer,SPELL_SUMMON_RIZZLE,false);
@@ -382,7 +382,7 @@ enum eDalaranCrystal
     QUEST_TELE_CRYSTAL_FLAG     = 12845
 };
 
-bool GOHello_go_tele_to_dalaran_crystal(Player* pPlayer, GameObject* pGo)
+bool GOHello_go_tele_to_dalaran_crystal(Player *pPlayer, GameObject *pGO)
 {
     if (pPlayer->GetQuestRewardStatus(QUEST_TELE_CRYSTAL_FLAG))
         return false;
@@ -395,7 +395,7 @@ bool GOHello_go_tele_to_dalaran_crystal(Player* pPlayer, GameObject* pGo)
 ## go_tele_to_violet_stand
 ######*/
 
-bool GOHello_go_tele_to_violet_stand(Player* pPlayer, GameObject* pGo)
+bool GOHello_go_tele_to_violet_stand(Player *pPlayer, GameObject *pGO)
 {
     if (pPlayer->GetQuestRewardStatus(QUEST_LEARN_LEAVE_RETURN) || pPlayer->GetQuestStatus(QUEST_LEARN_LEAVE_RETURN) == QUEST_STATUS_INCOMPLETE)
         return false;
@@ -492,9 +492,9 @@ enum eMatrixPunchograph
     MATRIX_PUNCHOGRAPH_3005_D = 142696,
 };
 
-bool GOHello_go_matrix_punchograph(Player* pPlayer, GameObject* pGo)
+bool GOHello_go_matrix_punchograph(Player *pPlayer, GameObject *pGO)
 {
-    switch(pGo->GetEntry())
+    switch(pGO->GetEntry())
     {
         case MATRIX_PUNCHOGRAPH_3005_A:
             if(pPlayer->HasItemCount(ITEM_WHITE_PUNCH_CARD, 1))
@@ -537,12 +537,11 @@ enum eRustyCage
 
 bool GOHello_go_rusty_cage(Player *pPlayer, GameObject *pGO)
 {
-    if(Creature* m_creature = pGO->FindNearestCreature(NPC_GOBLIN_PRISIONER,5.0f,true))
+    if(Creature *pGoblinPrisoner = pGO->FindNearestCreature(NPC_GOBLIN_PRISIONER, 5.0f, true))
     {
         pGO->SetGoState(GO_STATE_ACTIVE);
-        pPlayer->KilledMonsterCredit(NPC_GOBLIN_PRISIONER,m_creature->GetGUID());
+        pPlayer->KilledMonsterCredit(NPC_GOBLIN_PRISIONER, pGoblinPrisoner->GetGUID());
-        m_creature->DisappearAndDie();
+        pGoblinPrisoner->DisappearAndDie();
-        m_creature->RemoveCorpse();
     }
 
     return true;
@@ -555,17 +554,33 @@ enum eScourgeCage
 
 bool GOHello_go_scourge_cage(Player *pPlayer, GameObject *pGO)
 {
-    if(Creature* m_creature = pGO->FindNearestCreature(NPC_SCOURGE_PRISONER,5.0f,true))
+    if (Creature *pNearestPrisoner = pGO->FindNearestCreature(NPC_SCOURGE_PRISONER, 5.0f, true))
     {
         pGO->SetGoState(GO_STATE_ACTIVE);
-        pPlayer->KilledMonsterCredit(NPC_SCOURGE_PRISONER,m_creature->GetGUID());
+        pPlayer->KilledMonsterCredit(NPC_SCOURGE_PRISONER, pNearestPrisoner->GetGUID());
-        m_creature->DisappearAndDie();
+        pNearestPrisoner->DisappearAndDie();
-        m_creature->RemoveCorpse();
     }
     
     return true;
 }
 
+enum eArcanePrison
+{
+    QUEST_PRISON_BREAK                  = 11587,
+    SPELL_ARCANE_PRISONER_KILL_CREDIT   = 45456
+};
+
+bool GOHello_go_arcane_prison(Player *pPlayer, GameObject *pGO)
+{
+    if (pPlayer->GetQuestStatus(QUEST_PRISON_BREAK) == QUEST_STATUS_INCOMPLETE)
+    {
+        pGO->SummonCreature(25318, 3485.089844, 6115.7422188, 70.966812, 0, TEMPSUMMON_TIMED_DESPAWN, 60000);
+        pPlayer->CastSpell(pPlayer, SPELL_ARCANE_PRISONER_KILL_CREDIT, true);
+        return true;
+    } else
+        return false;
+}
+
 void AddSC_go_scripts()
 {
     Script *newscript;
@@ -690,5 +705,10 @@ void AddSC_go_scripts()
     newscript->Name = "go_scourge_cage";
     newscript->pGOHello =           &GOHello_go_scourge_cage;
     newscript->RegisterSelf();
+
+    newscript = new Script;
+    newscript->Name = "go_arcane_prison";
+    newscript->pGOHello =           &GOHello_go_arcane_prison;
+    newscript->RegisterSelf();
 }