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

Scripts/Oculus: Fixed issues in scripts after recent changes in Oculus.

Browse Source 
Signed-off-by: Manuel <[email protected]>
This commit is contained in:
Manuel
2011-01-30 15:22:36 -03:00
parent 59448fddc4
commit fad1acfbcf
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp
+2 -2
View File
@@ -70,7 +70,7 @@ public:
void OnPlayerEnter(Player* player) void OnPlayerEnter(Player* player)
{ {
if (GetData(DATA_DRAKOS_EVENT) == DONE && GetData(DATA_VAROS_EVENT) != DONE) if (GetBossState(DATA_DRAKOS_EVENT) == DONE && GetBossState(DATA_VAROS_EVENT) != DONE)
{ {
player->SendUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_SHOW,1); player->SendUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_SHOW,1);
player->SendUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_AMOUNT,centrifugueConstructCounter); player->SendUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_AMOUNT,centrifugueConstructCounter);
@@ -122,7 +122,7 @@ public:
{ {
if (go->GetEntry() == GO_DRAGON_CAGE_DOOR) if (go->GetEntry() == GO_DRAGON_CAGE_DOOR)
{ {
if (GetData(DATA_DRAKOS_EVENT) == DONE) if (GetBossState(DATA_DRAKOS_EVENT) == DONE)
go->SetGoState(GO_STATE_ACTIVE); go->SetGoState(GO_STATE_ACTIVE);
else else
go->SetGoState(GO_STATE_READY); go->SetGoState(GO_STATE_READY);
src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp
+9 -6
View File
@@ -155,15 +155,18 @@ public:
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* pCreature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (pCreature->isQuestGiver()) if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(pCreature->GetGUID()); player->PrepareQuestMenu(creature->GetGUID());
if (pCreature->GetInstanceScript()->GetData(DATA_DRAKOS_EVENT) == DONE) if (InstanceScript* instance = creature->GetInstanceScript())
{ {
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_DRAKES, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); if (instance->GetBossState(DATA_DRAKOS_EVENT) == DONE)
pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_DRAKES, pCreature->GetGUID()); {
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_DRAKES, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
player->SEND_GOSSIP_MENU(GOSSIP_TEXTID_DRAKES, creature->GetGUID());
}
} }
return true; return true;