nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-02-01 01:53:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Scripts/VioletHold): Remove hardcoded text and add some of the missing gossips. (#15058)

Browse Source 
* Remove hardcode and add some of the missing gossip.

* cs

* {}

* ///
This commit is contained in:
avarishd
2023-04-02 21:37:21 +03:00
committed by GitHub
parent 5a55cb9522
commit a8a3c4ed10
2 changed files with 38 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
View File

@@ -23,7 +23,9 @@
enum vYells enum vYells
{ {
CYANIGOSA_SAY_SPAWN = 3, CYANIGOSA_SAY_SPAWN = 3,
SAY_SINCLARI_1 = 0 SAY_SINCLARI_LEAVING = 0,
SAY_SINCLARI_DOOR_LOCK = 1,
SAY_SINCLARI_COMPLETE = 2,
}; };
class instance_violet_hold : public InstanceMapScript class instance_violet_hold : public InstanceMapScript
@@ -214,7 +216,7 @@ public:
{ {
EncounterStatus = IN_PROGRESS; EncounterStatus = IN_PROGRESS;
if (Creature* c = instance->GetCreature(NPC_SinclariGUID)) if (Creature* c = instance->GetCreature(NPC_SinclariGUID))
c->AI()->Talk(SAY_SINCLARI_1); c->AI()->Talk(SAY_SINCLARI_LEAVING);
events.RescheduleEvent(EVENT_GUARDS_FALL_BACK, 4s); events.RescheduleEvent(EVENT_GUARDS_FALL_BACK, 4s);
} }
break; break;
@@ -251,7 +253,12 @@ public:
EncounterStatus = DONE; EncounterStatus = DONE;
HandleGameObject(GO_MainGateGUID, true); HandleGameObject(GO_MainGateGUID, true);
DoUpdateWorldState(WORLD_STATE_VH_SHOW, 0); DoUpdateWorldState(WORLD_STATE_VH_SHOW, 0);
if (Creature* c = instance->GetCreature(NPC_SinclariGUID)) { c->DespawnOrUnsummon(); c->SetRespawnTime(3); } if (Creature* c = instance->GetCreature(NPC_SinclariGUID))
{
c->AI()->Talk(SAY_SINCLARI_COMPLETE);
c->DespawnOrUnsummon();
c->SetRespawnTime(3);
}
} }
SaveToDB(); SaveToDB();
if (WaveCount < 18) if (WaveCount < 18)
@@ -440,8 +447,14 @@ public:
break; break;
case EVENT_START_ENCOUNTER: case EVENT_START_ENCOUNTER:
{ {
if (Creature* c = instance->GetCreature(NPC_SinclariGUID))
{
c->AI()->Talk(SAY_SINCLARI_DOOR_LOCK);
}
if (Creature* c = instance->GetCreature(NPC_DoorSealGUID)) if (Creature* c = instance->GetCreature(NPC_DoorSealGUID))
{
c->RemoveAllAuras(); // just to be sure... c->RemoveAllAuras(); // just to be sure...
}
GateHealth = 100; GateHealth = 100;
HandleGameObject(GO_MainGateGUID, false); HandleGameObject(GO_MainGateGUID, false);
DoUpdateWorldState(WORLD_STATE_VH_SHOW, 1); DoUpdateWorldState(WORLD_STATE_VH_SHOW, 1);

33
src/server/scripts/Northrend/VioletHold/violet_hold.cpp
View File

@@ -24,6 +24,21 @@
#include "ScriptedGossip.h" #include "ScriptedGossip.h"
#include "SpellScript.h" #include "SpellScript.h"
/// @todo: Missing Sinclari Trigger announcements (32204) Look at its creature_text for more info.
/// @todo: Activation Crystals (go_vh_activation_crystal) (193611) are spammable, should be a 1 time use per crystal.
enum Texts
{
GOSSIP_MENU_START_EVENT = 9998,
GOSSIP_MENU_ITEM = 9997,
GOSSIP_MENU_LATE_JOIN = 10275,
NPC_TEXT_SINCLARI_IN = 13853,
NPC_TEXT_SINCLARI_ITEM = 13854,
NPC_TEXT_SINCLARI_DONE = 13910,
NPC_TEXT_SINCLARI_LATE_JOIN = 14271,
};
/*********** /***********
** DEFENSE SYSTEM CRYSTAL ** DEFENSE SYSTEM CRYSTAL
***********/ ***********/
@@ -45,10 +60,6 @@ public:
** SINCLARI ** SINCLARI
***********/ ***********/
#define GOSSIP_START_EVENT "Get your people to safety, we'll keep the Blue Dragonflight's forces at bay."
#define GOSSIP_ITEM_1 "Activate the crystals when we get in trouble, right."
#define GOSSIP_I_WANT_IN "Sorry, I'm late! Can I get in to help my friends?"
class npc_vh_sinclari : public CreatureScript class npc_vh_sinclari : public CreatureScript
{ {
public: public:
@@ -60,16 +71,16 @@ public:
switch (pInstance->GetData(DATA_ENCOUNTER_STATUS)) switch (pInstance->GetData(DATA_ENCOUNTER_STATUS))
{ {
case NOT_STARTED: case NOT_STARTED:
AddGossipItemFor(player, GOSSIP_ICON_CHAT, GOSSIP_ITEM_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); AddGossipItemFor(player, GOSSIP_MENU_ITEM, 0, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
AddGossipItemFor(player, GOSSIP_ICON_CHAT, GOSSIP_START_EVENT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); AddGossipItemFor(player, GOSSIP_MENU_START_EVENT, 0, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
SendGossipMenuFor(player, 13853, creature->GetGUID()); SendGossipMenuFor(player, NPC_TEXT_SINCLARI_IN, creature->GetGUID());
break; break;
case IN_PROGRESS: case IN_PROGRESS:
AddGossipItemFor(player, GOSSIP_ICON_CHAT, GOSSIP_I_WANT_IN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); AddGossipItemFor(player, GOSSIP_MENU_LATE_JOIN, 0, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
SendGossipMenuFor(player, 13853, creature->GetGUID()); SendGossipMenuFor(player, NPC_TEXT_SINCLARI_LATE_JOIN, creature->GetGUID());
break; break;
default: // DONE or invalid default: // DONE or invalid
SendGossipMenuFor(player, 13910, creature->GetGUID()); SendGossipMenuFor(player, NPC_TEXT_SINCLARI_DONE, creature->GetGUID());
} }
return true; return true;
} }
@@ -86,7 +97,7 @@ public:
pInstance->SetData(DATA_START_INSTANCE, 1); pInstance->SetData(DATA_START_INSTANCE, 1);
break; break;
case GOSSIP_ACTION_INFO_DEF+2: case GOSSIP_ACTION_INFO_DEF+2:
SendGossipMenuFor(player, 13854, creature->GetGUID()); SendGossipMenuFor(player, NPC_TEXT_SINCLARI_ITEM, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+3: case GOSSIP_ACTION_INFO_DEF+3:
player->NearTeleportTo(playerTeleportPosition.GetPositionX(), playerTeleportPosition.GetPositionY(), playerTeleportPosition.GetPositionZ(), playerTeleportPosition.GetOrientation(), true); player->NearTeleportTo(playerTeleportPosition.GetPositionX(), playerTeleportPosition.GetPositionY(), playerTeleportPosition.GetPositionZ(), playerTeleportPosition.GetOrientation(), true);