josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix a duplicated script: go_gilded_brazier.

Browse Source 
Remove it from one file and also merge the 2 scripts in one file.

The error message:
ScriptName: 'go_gilded_brazier' already assigned with the same ScriptName, so the script can't work.

--HG--
branch : trunk
This commit is contained in:
Anubisss
2010-05-13 14:29:06 +02:00
parent 5e48be89d5
commit 852254d258
2 changed files with 8 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/scripts/eastern_kingdoms/ghostlands.cpp
-20
View File
@@ -116,21 +116,6 @@ bool GossipSelect_npc_rathis_tomber(Player* pPlayer, Creature* pCreature, uint32
return true;
}
/*#####
## go_gilded_brazier (Paladin First Trail quest (9678))
#####*/
bool GOHello_gilded_brazier(Player* pPlayer, GameObject* /*pGo*/)
{
if (pPlayer->GetQuestStatus(9678) == QUEST_STATUS_INCOMPLETE)
{
Creature *Stillblade = pPlayer->SummonCreature(17716, 8106.11, -7542.06, 151.775, 3.02598, TEMPSUMMON_DEAD_DESPAWN, 60000);
if (Stillblade)
Stillblade->AI()->AttackStart(pPlayer);
}
return true;
};
/*######
## npc_ranger_lilatha
######*/
@@ -257,11 +242,6 @@ void AddSC_ghostlands()
newscript->pGossipSelect = &GossipSelect_npc_rathis_tomber;
newscript->RegisterSelf();
newscript = new Script;
newscript->Name = "go_gilded_brazier";
newscript->pGOHello = &GOHello_gilded_brazier;
newscript->RegisterSelf();
newscript = new Script;
newscript->Name = "npc_ranger_lilatha";
newscript->GetAI = &GetAI_npc_ranger_lilathaAI;
src/scripts/world/go_scripts.cpp
+8 -4
View File
@@ -138,7 +138,7 @@ bool GOHello_go_field_repair_bot_74A(Player *pPlayer, GameObject * /*pGO*/)
}
/*######
## go_gilded_brazier
## go_gilded_brazier (Paladin First Trail quest (9678))
######*/
enum eGildedBrazier
@@ -149,9 +149,13 @@ enum eGildedBrazier
bool GOHello_go_gilded_brazier(Player *pPlayer, GameObject *pGO)
{
if (pGO->GetGoType() == GAMEOBJECT_TYPE_GOOBER)
if (Creature* pCreature = pPlayer->SummonCreature(NPC_STILLBLADE, 8087.632, -7542.740, 151.568, 0.122, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000))
pCreature->AI()->AttackStart(pPlayer);
{
if (pPlayer->GetQuestStatus(9678) == QUEST_STATUS_INCOMPLETE)
{
if (Creature* Stillblade = pPlayer->SummonCreature(NPC_STILLBLADE, 8106.11, -7542.06, 151.775, 3.02598, TEMPSUMMON_DEAD_DESPAWN, 60000))
Stillblade->AI()->AttackStart(pPlayer);
}
}
return true;
}