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

Warning fixes and some random cleanup here and there

Browse Source
This commit is contained in:
Spp
2012-03-07 14:09:18 +01:00
parent e5d23103f3
commit f495e0efe4
123 changed files with 682 additions and 800 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp
+42 -43
View File
@@ -126,11 +126,11 @@ public:
InstanceScript* instance;
uint8 EventPhase;
uint8 EventPhase;
uint32 Event_Timer;
uint8 MobSpawnId;
uint8 MobCount;
uint8 MobSpawnId;
uint8 MobCount;
uint32 MobDeath_Timer;
uint64 RingMobGUID[4];
@@ -142,16 +142,16 @@ public:
{
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
EventPhase = 0;
Event_Timer = 1000;
EventPhase = 0;
Event_Timer = 1000;
MobCount = 0;
MobDeath_Timer = 0;
MobCount = 0;
MobDeath_Timer = 0;
for (uint8 i = 0; i < MAX_MOB_AMOUNT; ++i)
RingMobGUID[i] = 0;
RingBossGUID = 0;
RingBossGUID = 0;
CanWalk = false;
}
@@ -183,24 +183,24 @@ public:
{
case 0:
DoScriptText(SCRIPT_TEXT1, me);//2
CanWalk = false;
Event_Timer = 5000;
CanWalk = false;
Event_Timer = 5000;
break;
case 1:
DoScriptText(SCRIPT_TEXT2, me);//4
CanWalk = false;
Event_Timer = 5000;
CanWalk = false;
Event_Timer = 5000;
break;
case 2:
CanWalk = false;
CanWalk = false;
break;
case 3:
DoScriptText(SCRIPT_TEXT3, me);//5
break;
case 4:
DoScriptText(SCRIPT_TEXT4, me);//6
CanWalk = false;
Event_Timer = 5000;
CanWalk = false;
Event_Timer = 5000;
break;
case 5:
if (instance)
@@ -227,16 +227,16 @@ public:
{
if (MobDeath_Timer <= diff)
{
MobDeath_Timer = 2500;
MobDeath_Timer = 2500;
if (RingBossGUID)
{
Creature* boss = Unit::GetCreature(*me, RingBossGUID);
if (boss && !boss->isAlive() && boss->isDead())
{
RingBossGUID = 0;
Event_Timer = 5000;
MobDeath_Timer = 0;
RingBossGUID = 0;
Event_Timer = 5000;
MobDeath_Timer = 0;
return;
}
return;
@@ -247,7 +247,7 @@ public:
Creature* mob = Unit::GetCreature(*me, RingMobGUID[i]);
if (mob && !mob->isAlive() && mob->isDead())
{
RingMobGUID[i] = 0;
RingMobGUID[i] = 0;
--MobCount;
//seems all are gone, so set timer to continue and discontinue this
@@ -363,9 +363,9 @@ public:
void Reset()
{
ThunderClap_Timer = 12000;
FireballVolley_Timer = 0;
MightyBlow_Timer = 15000;
ThunderClap_Timer = 12000;
FireballVolley_Timer = 0;
MightyBlow_Timer = 15000;
}
void UpdateAI(const uint32 diff)
@@ -426,7 +426,7 @@ class npc_kharan_mighthammer : public CreatureScript
public:
npc_kharan_mighthammer() : CreatureScript("npc_kharan_mighthammer") { }
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*Sender*/, uint32 action)
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action)
{
player->PlayerTalkClass->ClearMenus();
switch (action)
@@ -520,7 +520,7 @@ class npc_lokhtos_darkbargainer : public CreatureScript
public:
npc_lokhtos_darkbargainer() : CreatureScript("npc_lokhtos_darkbargainer") { }
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*Sender*/, uint32 action)
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action)
{
player->PlayerTalkClass->ClearMenus();
if (action == GOSSIP_ACTION_INFO_DEF + 1)
@@ -564,7 +564,6 @@ enum DughalQuests
QUEST_JAIL_BREAK = 4322
};
// DELETE THIS IF IT IS NOT NEEDED!
#define SAY_DUGHAL_FREE "Thank you, $N! I'm free!!!"
#define GOSSIP_DUGHAL "You're free, Dughal! Get out of here!"
@@ -585,7 +584,7 @@ public:
return dughal_stormwingAI;
}
bool OnGossipSelect(Player* player, Creature* creature, uint32 Sender, uint32 action)
bool OnGossipSelect(Player* player, Creature* creature, uint32 sender, uint32 action)
{
player->PlayerTalkClass->ClearMenus();
if (action == GOSSIP_ACTION_INFO_DEF + 1)
@@ -619,7 +618,7 @@ public:
case 0:me->Say(SAY_DUGHAL_FREE, LANG_UNIVERSAL, PlayerGUID); break;
case 1:instance->SetData(DATA_DUGHAL, ENCOUNTER_STATE_OBJECTIVE_COMPLETED);break;
case 2:
me->SetVisibility(VISIBILITY_OFF);
me->SetVisible(false);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
instance->SetData(DATA_DUGHAL, ENCOUNTER_STATE_ENDED);
@@ -634,7 +633,7 @@ public:
{
if (IsBeingEscorted && killer == me)
{
me->SetVisibility(VISIBILITY_OFF);
me->SetVisible(false);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
instance->SetData(DATA_DUGHAL, ENCOUNTER_STATE_ENDED);
@@ -646,13 +645,13 @@ public:
if (instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_NOT_STARTED) return;
if ((instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS || instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_FAILED || instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_ENDED)&& instance->GetData(DATA_DUGHAL) == ENCOUNTER_STATE_ENDED)
{
me->SetVisibility(VISIBILITY_OFF);
me->SetVisible(false);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
}
else
{
me->SetVisibility(VISIBILITY_ON);
me->SetVisible(true);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
}
@@ -767,7 +766,7 @@ public:
instance->SetData(DATA_GATE_SC, 0);
break;
case 19:
me->SetVisibility(VISIBILITY_OFF);
me->SetVisible(false);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
me->SummonCreature(MOB_ENTRY_REGINALD_WINDSOR, 403.61f, -51.71f, -63.92f, 3.600434f, TEMPSUMMON_DEAD_DESPAWN, 0);
@@ -810,13 +809,13 @@ public:
}
if ((instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS || instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_FAILED || instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_ENDED)&& instance->GetData(DATA_SUPPLY_ROOM) == ENCOUNTER_STATE_ENDED)
{
me->SetVisibility(VISIBILITY_OFF);
me->SetVisible(false);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
}
else
{
me->SetVisibility(VISIBILITY_ON);
me->SetVisible(true);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
}
@@ -1065,7 +1064,7 @@ public:
return tobias_seecherAI;
}
bool OnGossipSelect(Player* player, Creature* creature, uint32 Sender, uint32 action)
bool OnGossipSelect(Player* player, Creature* creature, uint32 sender, uint32 action)
{
player->PlayerTalkClass->ClearMenus();
if (action == GOSSIP_ACTION_INFO_DEF + 1)
@@ -1099,7 +1098,7 @@ public:
{
if (IsBeingEscorted && killer == me)
{
me->SetVisibility(VISIBILITY_OFF);
me->SetVisible(false);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
instance->SetData(DATA_TOBIAS, ENCOUNTER_STATE_ENDED);
@@ -1114,7 +1113,7 @@ public:
case 2:
instance->SetData(DATA_TOBIAS, ENCOUNTER_STATE_OBJECTIVE_COMPLETED);break;
case 4:
me->SetVisibility(VISIBILITY_OFF);
me->SetVisible(false);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
instance->SetData(DATA_TOBIAS, ENCOUNTER_STATE_ENDED);
@@ -1127,13 +1126,13 @@ public:
if (instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_NOT_STARTED) return;
if ((instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS || instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_FAILED || instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_ENDED)&& instance->GetData(DATA_TOBIAS) == ENCOUNTER_STATE_ENDED)
{
me->SetVisibility(VISIBILITY_OFF);
me->SetVisible(false);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
}
else
{
me->SetVisibility(VISIBILITY_ON);
me->SetVisible(true);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
}
@@ -1217,8 +1216,8 @@ public:
if (HasEscortState(STATE_ESCORT_ESCORTING))
return;
BreakKeg_Timer = 0;
BreakDoor_Timer = 0;
BreakKeg_Timer = 0;
BreakDoor_Timer = 0;
}
void DoGo(uint32 id, uint32 state)
@@ -1263,8 +1262,8 @@ public:
if (BreakKeg_Timer <= diff)
{
DoGo(DATA_GO_BAR_KEG, 0);
BreakKeg_Timer = 0;
BreakDoor_Timer = 1000;
BreakKeg_Timer = 0;
BreakDoor_Timer = 1000;
} else BreakKeg_Timer -= diff;
}
src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp
+2 -2
View File
@@ -42,8 +42,8 @@ public:
void Reset()
{
FireBlast_Timer = 2000;
Spirit_Timer = 24000;
FireBlast_Timer = 2000;
Spirit_Timer = 24000;
}
void EnterCombat(Unit* /*who*/) {}
src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp
+5 -5
View File
@@ -49,11 +49,11 @@ public:
void Reset()
{
ShadowBolt_Timer = 7000;
CurseOfTongues_Timer = 24000;
CurseOfWeakness_Timer = 12000;
DemonArmor_Timer = 3000;
EnvelopingWeb_Timer = 16000;
ShadowBolt_Timer = 7000;
CurseOfTongues_Timer = 24000;
CurseOfWeakness_Timer = 12000;
DemonArmor_Timer = 3000;
EnvelopingWeb_Timer = 16000;
}
void EnterCombat(Unit* /*who*/) {}
src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
+4 -4
View File
@@ -55,9 +55,9 @@ public:
void Reset()
{
HandOfThaurissan_Timer = 4000;
AvatarOfFlame_Timer = 25000;
//Counter = 0;
HandOfThaurissan_Timer = 4000;
AvatarOfFlame_Timer = 25000;
//Counter= 0;
}
void EnterCombat(Unit* /*who*/)
@@ -100,7 +100,7 @@ public:
//else
//{
HandOfThaurissan_Timer = 5000;
//Counter = 0;
//Counter = 0;
//}
} else HandOfThaurissan_Timer -= diff;
src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp
+5 -5
View File
@@ -47,11 +47,11 @@ public:
void Reset()
{
MightyBlow_Timer = 8000;
HamString_Timer = 12000;
Cleave_Timer = 16000;
Adds_Timer = 0;
Medics = false;
MightyBlow_Timer = 8000;
HamString_Timer = 12000;
Cleave_Timer = 16000;
Adds_Timer = 0;
Medics = false;
}
void EnterCombat(Unit* /*who*/) {}
src/server/scripts/EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp
+2 -2
View File
@@ -43,8 +43,8 @@ public:
void Reset()
{
WhirlWind_Timer = 12000;
MortalStrike_Timer = 22000;
WhirlWind_Timer = 12000;
MortalStrike_Timer = 22000;
}
void EnterCombat(Unit* /*who*/)
src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp
+2 -2
View File
@@ -43,8 +43,8 @@ public:
void Reset()
{
GroundTremor_Timer = 12000;
Frenzy_Timer = 0;
GroundTremor_Timer = 12000;
Frenzy_Timer =0;
}
void EnterCombat(Unit* /*who*/) {}
src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp
+4 -4
View File
@@ -47,10 +47,10 @@ public:
void Reset()
{
ShadowWordPain_Timer = 4000;
ManaBurn_Timer = 14000;
PsychicScream_Timer = 32000;
ShadowShield_Timer = 8000;
ShadowWordPain_Timer = 4000;
ManaBurn_Timer = 14000;
PsychicScream_Timer = 32000;
ShadowShield_Timer = 8000;
}
void EnterCombat(Unit* /*who*/) {}
src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp
+2 -2
View File
@@ -48,8 +48,8 @@ public:
void Reset()
{
FieryBurst_Timer = 5000;
WarStomp_Timer = 0;
FieryBurst_Timer = 5000;
WarStomp_Timer =0;
}
void EnterCombat(Unit* /*who*/) {}
src/server/scripts/EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp
+4 -4
View File
@@ -49,10 +49,10 @@ public:
void Reset()
{
Heal_Timer = 12000; // These times are probably wrong
MindBlast_Timer = 16000;
ShadowWordPain_Timer = 2000;
Smite_Timer = 8000;
Heal_Timer = 12000; //These times are probably wrong
MindBlast_Timer = 16000;
ShadowWordPain_Timer = 2000;
Smite_Timer = 8000;
}
void EnterCombat(Unit* /*who*/) {}
src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp
+7 -7
View File
@@ -45,7 +45,7 @@ class boss_gloomrel : public CreatureScript
public:
boss_gloomrel() : CreatureScript("boss_gloomrel") { }
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*Sender*/, uint32 action)
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action)
{
player->PlayerTalkClass->ClearMenus();
switch (action)
@@ -104,7 +104,7 @@ class boss_doomrel : public CreatureScript
public:
boss_doomrel() : CreatureScript("boss_doomrel") { }
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*Sender*/, uint32 action)
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action)
{
player->PlayerTalkClass->ClearMenus();
switch (action)
@@ -156,11 +156,11 @@ public:
void Reset()
{
ShadowVolley_Timer = 10000;
Immolate_Timer = 18000;
CurseOfWeakness_Timer = 5000;
DemonArmor_Timer = 16000;
Voidwalkers = false;
ShadowVolley_Timer = 10000;
Immolate_Timer = 18000;
CurseOfWeakness_Timer = 5000;
DemonArmor_Timer = 16000;
Voidwalkers = false;
me->setFaction(FACTION_FRIEND);
src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp
+40 -40
View File
@@ -115,57 +115,57 @@ public:
{
memset(&encounter, 0, sizeof(encounter));
EmperorGUID = 0;
PhalanxGUID = 0;
MagmusGUID = 0;
MoiraGUID = 0;
EmperorGUID = 0;
PhalanxGUID = 0;
MagmusGUID = 0;
MoiraGUID = 0;
GoArena1GUID = 0;
GoArena2GUID = 0;
GoArena3GUID = 0;
GoArena4GUID = 0;
GoShadowLockGUID = 0;
GoShadowMechGUID = 0;
GoShadowGiantGUID = 0;
GoShadowDummyGUID = 0;
GoBarKegGUID = 0;
GoBarKegTrapGUID = 0;
GoBarDoorGUID = 0;
GoTombEnterGUID = 0;
GoTombExitGUID = 0;
GoLyceumGUID = 0;
GoSFSGUID = 0;
GoSFNGUID = 0;
GoGolemNGUID = 0;
GoGolemSGUID = 0;
GoThroneGUID = 0;
GoChestGUID = 0;
GoSpectralChaliceGUID = 0;
GoArena1GUID = 0;
GoArena2GUID = 0;
GoArena3GUID = 0;
GoArena4GUID = 0;
GoShadowLockGUID = 0;
GoShadowMechGUID = 0;
GoShadowGiantGUID = 0;
GoShadowDummyGUID = 0;
GoBarKegGUID = 0;
GoBarKegTrapGUID = 0;
GoBarDoorGUID = 0;
GoTombEnterGUID = 0;
GoTombExitGUID = 0;
GoLyceumGUID = 0;
GoSFSGUID = 0;
GoSFNGUID = 0;
GoGolemNGUID = 0;
GoGolemSGUID = 0;
GoThroneGUID = 0;
GoChestGUID = 0;
GoSpectralChaliceGUID = 0;
BarAleCount = 0;
GhostKillCount = 0;
TombEventStarterGUID = 0;
BarAleCount = 0;
GhostKillCount = 0;
TombEventStarterGUID = 0;
TombTimer = TIMER_TOMBOFTHESEVEN;
TombEventCounter = 0;
TombEventCounter = 0;
for (uint8 i = 0; i < 7; ++i)
TombBossGUIDs[i] = 0;
TombBossGUIDs[i] = 0;
}
void OnCreatureCreate(Creature* creature)
{
switch (creature->GetEntry())
{
case NPC_EMPEROR: EmperorGUID = creature->GetGUID(); break;
case NPC_PHALANX: PhalanxGUID = creature->GetGUID(); break;
case NPC_MOIRA: MoiraGUID = creature->GetGUID(); break;
case NPC_DOOMREL: TombBossGUIDs[0] = creature->GetGUID(); break;
case NPC_DOPEREL: TombBossGUIDs[1] = creature->GetGUID(); break;
case NPC_HATEREL: TombBossGUIDs[2] = creature->GetGUID(); break;
case NPC_VILEREL: TombBossGUIDs[3] = creature->GetGUID(); break;
case NPC_SEETHREL: TombBossGUIDs[4] = creature->GetGUID(); break;
case NPC_GLOOMREL: TombBossGUIDs[5] = creature->GetGUID(); break;
case NPC_ANGERREL: TombBossGUIDs[6] = creature->GetGUID(); break;
case NPC_EMPEROR: EmperorGUID = creature->GetGUID(); break;
case NPC_PHALANX: PhalanxGUID = creature->GetGUID(); break;
case NPC_MOIRA: MoiraGUID = creature->GetGUID(); break;
case NPC_DOOMREL: TombBossGUIDs[0] = creature->GetGUID(); break;
case NPC_DOPEREL: TombBossGUIDs[1] = creature->GetGUID(); break;
case NPC_HATEREL: TombBossGUIDs[2] = creature->GetGUID(); break;
case NPC_VILEREL: TombBossGUIDs[3] = creature->GetGUID(); break;
case NPC_SEETHREL: TombBossGUIDs[4] = creature->GetGUID(); break;
case NPC_GLOOMREL: TombBossGUIDs[5] = creature->GetGUID(); break;
case NPC_ANGERREL: TombBossGUIDs[6] = creature->GetGUID(); break;
case NPC_MAGMUS:
MagmusGUID = creature->GetGUID();
if (!creature->isAlive())
src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp
+4 -4
View File
@@ -59,10 +59,10 @@ public:
void Reset()
{
Cleave_Timer = 8000; // These times are probably wrong
BlastWave_Timer = 12000;
MortalStrike_Timer = 20000;
KnockBack_Timer = 30000;
Cleave_Timer = 8000; // These times are probably wrong
BlastWave_Timer = 12000;
MortalStrike_Timer = 20000;
KnockBack_Timer = 30000;
}
void EnterCombat(Unit* /*who*/)
src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp
+7 -7
View File
@@ -92,15 +92,15 @@ public:
void Reset()
{
ShadowFlame_Timer = 12000; // These times are probably wrong
BellowingRoar_Timer = 30000;
VeilOfShadow_Timer = 15000;
Cleave_Timer = 7000;
TailLash_Timer = 10000;
ClassCall_Timer = 35000; // 35-40 seconds
ShadowFlame_Timer = 12000; // These times are probably wrong
BellowingRoar_Timer = 30000;
VeilOfShadow_Timer = 15000;
Cleave_Timer = 7000;
TailLash_Timer = 10000;
ClassCall_Timer = 35000; // 35-40 seconds
Phase3 = false;
DespawnTimer = 5000;
DespawnTimer = 5000;
}
void KilledUnit(Unit* Victim)
src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp
+16 -16
View File
@@ -51,20 +51,20 @@ class boss_vaelastrasz : public CreatureScript
public:
boss_vaelastrasz() : CreatureScript("boss_vaelastrasz") { }
void SendDefaultMenu(Player* player, Creature* creature, uint32 Action)
void SendDefaultMenu(Player* player, Creature* creature, uint32 action)
{
if (Action == GOSSIP_ACTION_INFO_DEF + 1) //Fight time
if (action == GOSSIP_ACTION_INFO_DEF + 1) //Fight time
{
player->CLOSE_GOSSIP_MENU();
CAST_AI(boss_vaelastrasz::boss_vaelAI, creature->AI())->BeginSpeech(player);
}
}
bool OnGossipSelect(Player* player, Creature* creature, uint32 Sender, uint32 Action)
bool OnGossipSelect(Player* player, Creature* creature, uint32 sender, uint32 action)
{
player->PlayerTalkClass->ClearMenus();
if (Sender == GOSSIP_SENDER_MAIN)
SendDefaultMenu(player, creature, Action);
if (sender == GOSSIP_SENDER_MAIN)
SendDefaultMenu(player, creature, action);
return true;
}
@@ -108,17 +108,17 @@ public:
void Reset()
{
PlayerGUID = 0;
SpeechTimer = 0;
SpeechNum = 0;
Cleave_Timer = 8000; //These times are probably wrong
FlameBreath_Timer = 11000;
BurningAdrenalineCaster_Timer = 15000;
BurningAdrenalineTank_Timer = 45000;
FireNova_Timer = 5000;
TailSwipe_Timer = 20000;
HasYelled = false;
DoingSpeech = false;
PlayerGUID = 0;
SpeechTimer = 0;
SpeechNum = 0;
Cleave_Timer = 8000; // These times are probably wrong
FlameBreath_Timer = 11000;
BurningAdrenalineCaster_Timer = 15000;
BurningAdrenalineTank_Timer = 45000;
FireNova_Timer = 5000;
TailSwipe_Timer = 20000;
HasYelled = false;
DoingSpeech = false;
}
void BeginSpeech(Unit* target)
src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp
+9 -9
View File
@@ -83,10 +83,10 @@ class boss_victor_nefarius : public CreatureScript
public:
boss_victor_nefarius() : CreatureScript("boss_victor_nefarius") { }
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*Sender*/, uint32 Action)
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action)
{
player->PlayerTalkClass->ClearMenus();
switch (Action)
switch (action)
{
case GOSSIP_ACTION_INFO_DEF+1:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
@@ -220,13 +220,13 @@ public:
void Reset()
{
SpawnedAdds = 0;
AddSpawnTimer = 10000;
ShadowBoltTimer = 5000;
FearTimer = 8000;
ResetTimer = 900000; //On official it takes him 15 minutes(900 seconds) to reset. We are only doing 1 minute to make testing easier
NefarianGUID = 0;
NefCheckTime = 2000;
SpawnedAdds = 0;
AddSpawnTimer = 10000;
ShadowBoltTimer = 5000;
FearTimer = 8000;
ResetTimer = 900000; // On official it takes him 15 minutes(900 seconds) to reset. We are only doing 1 minute to make testing easier
NefarianGUID = 0;
NefCheckTime = 2000;
me->SetUInt32Value(UNIT_NPC_FLAGS, 1);
me->setFaction(35);
src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp
-3
View File
@@ -158,7 +158,6 @@ public:
me->GetMotionMaster()->MoveChase(me->getVictim(), me->m_CombatDistance);
uiPhase = 0;
break;
}
} else uiTimer -= uiDiff;
}
@@ -174,9 +173,7 @@ public:
uiTimer = 1500;
uiPhase = 1;
}
};
};
void AddSC_boss_mr_smite()
src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp
+1 -2
View File
@@ -45,7 +45,7 @@ public:
player->GetSession()->SendNotification("Instance script not initialized");
return true;
}
if (instance->GetData(EVENT_STATE)!= CANNON_NOT_USED)
if (instance->GetData(EVENT_STATE) != CANNON_NOT_USED)
return false;
if (targets.GetGOTarget() && targets.GetGOTarget()->GetEntry() == GO_DEFIAS_CANNON)
{
@@ -55,7 +55,6 @@ public:
player->DestroyItemCount(item->GetEntry(), 1, true);
return true;
}
};
void AddSC_deadmines()
src/server/scripts/EasternKingdoms/Deadmines/deadmines.h
-1
View File
@@ -47,4 +47,3 @@ enum GameObjects
GO_MR_SMITE_CHEST = 144111
};
#endif
src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp
+2 -2
View File
@@ -95,10 +95,10 @@ public:
return new npc_blastmaster_emi_shortfuseAI(creature);
}
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction)
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action)
{
player->PlayerTalkClass->ClearMenus();
if (uiAction == GOSSIP_ACTION_INFO_DEF+1)
if (action == GOSSIP_ACTION_INFO_DEF+1)
{
if (npc_escortAI* pEscortAI = CAST_AI(npc_blastmaster_emi_shortfuse::npc_blastmaster_emi_shortfuseAI, creature->AI()))
pEscortAI->Start(true, false, player->GetGUID());
src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
+2 -2
View File
@@ -769,10 +769,10 @@ class npc_grandmother : public CreatureScript
public:
npc_grandmother() : CreatureScript("npc_grandmother") { }
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction)
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action)
{
player->PlayerTalkClass->ClearMenus();
if (uiAction == GOSSIP_ACTION_INFO_DEF)
if (action == GOSSIP_ACTION_INFO_DEF)
{
if (Creature* pBigBadWolf = creature->SummonCreature(CREATURE_BIG_BAD_WOLF, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, HOUR*2*IN_MILLISECONDS))
pBigBadWolf->AI()->AttackStart(player);
src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
+4 -4
View File
@@ -324,12 +324,12 @@ public:
}
};
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction)
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action)
{
player->PlayerTalkClass->ClearMenus();
npc_barnesAI* pBarnesAI = CAST_AI(npc_barnes::npc_barnesAI, creature->AI());
switch (uiAction)
switch (action)
{
case GOSSIP_ACTION_INFO_DEF+1:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, OZ_GOSSIP2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
@@ -414,10 +414,10 @@ class npc_berthold : public CreatureScript
public:
npc_berthold() : CreatureScript("npc_berthold") { }
bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*uiSender*/, uint32 uiAction)
bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*sender*/, uint32 action)
{
player->PlayerTalkClass->ClearMenus();
if (uiAction == GOSSIP_ACTION_INFO_DEF + 1)
if (action == GOSSIP_ACTION_INFO_DEF + 1)
player->CastSpell(player, SPELL_TELEPORT, true);
player->CLOSE_GOSSIP_MENU();
src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp
+2 -2
View File
@@ -56,10 +56,10 @@ class npc_kalecgos : public CreatureScript
public:
npc_kalecgos() : CreatureScript("npc_kalecgos") { }
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction)
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action)
{
player->PlayerTalkClass->ClearMenus();
switch (uiAction)
switch (action)
{
case GOSSIP_ACTION_INFO_DEF:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAEL_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
src/server/scripts/EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp
+1 -1
View File
@@ -200,7 +200,7 @@ class boss_majordomo : public CreatureScript
return true;
}
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 /*uiAction*/)
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 /*action*/)
{
player->CLOSE_GOSSIP_MENU();
creature->AI()->DoAction(ACTION_START_RAGNAROS);
src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
+2 -2
View File
@@ -362,10 +362,10 @@ class npc_death_knight_initiate : public CreatureScript
public:
npc_death_knight_initiate() : CreatureScript("npc_death_knight_initiate") { }
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction)
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action)
{
player->PlayerTalkClass->ClearMenus();
if (uiAction == GOSSIP_ACTION_INFO_DEF)
if (action == GOSSIP_ACTION_INFO_DEF)
{
player->CLOSE_GOSSIP_MENU();
src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
+2 -2
View File
@@ -287,10 +287,10 @@ class npc_highlord_darion_mograine : public CreatureScript
public:
npc_highlord_darion_mograine() : CreatureScript("npc_highlord_darion_mograine") { }
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction)
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action)
{
player->PlayerTalkClass->ClearMenus();
switch (uiAction)
switch (action)
{
case GOSSIP_ACTION_INFO_DEF+1:
player->CLOSE_GOSSIP_MENU();
src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp
+1 -1
View File
@@ -83,7 +83,7 @@ public:
if (!instance)
return;
//Any other actions to do with vorrel? setStandState?
//Any other Actions to do with vorrel? setStandState?
if (Unit* vorrel = Unit::GetUnit(*me, instance->GetData64(DATA_VORREL)))
DoScriptText(SAY_TRIGGER_VORREL, vorrel);
}
src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
+2 -2
View File
@@ -63,10 +63,10 @@ public:
return new npc_shadowfang_prisonerAI(creature);
}
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction)
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action)
{
player->PlayerTalkClass->ClearMenus();
if (uiAction == GOSSIP_ACTION_INFO_DEF+1)
if (action == GOSSIP_ACTION_INFO_DEF+1)
{
player->CLOSE_GOSSIP_MENU();
src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
+3 -3
View File
@@ -226,7 +226,7 @@ class boss_janalai : public CreatureScript
BombCount = 0;
}
bool HatchAllEggs(uint32 uiAction) //1: reset, 2: isHatching all
bool HatchAllEggs(uint32 action) //1: reset, 2: isHatching all
{
std::list<Creature*> templist;
float x, y, z;
@@ -251,9 +251,9 @@ class boss_janalai : public CreatureScript
for (std::list<Creature*>::const_iterator i = templist.begin(); i != templist.end(); ++i)
{
if (uiAction == 1)
if (action == 1)
(*i)->SetDisplayId(10056);
else if (uiAction == 2 &&(*i)->GetDisplayId() != 11686)
else if (action == 2 &&(*i)->GetDisplayId() != 11686)
(*i)->CastSpell(*i, SPELL_HATCH_EGG, false);
}
return true;
src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
+2 -2
View File
@@ -157,10 +157,10 @@ class npc_zulaman_hostage : public CreatureScript
return true;
}
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction)
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action)
{
player->PlayerTalkClass->ClearMenus();
if (uiAction == GOSSIP_ACTION_INFO_DEF + 1)
if (action == GOSSIP_ACTION_INFO_DEF + 1)
player->CLOSE_GOSSIP_MENU();
if (!creature->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP))
src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
+2 -2
View File
@@ -186,7 +186,7 @@ class boss_venoxis : public CreatureScript
events.ScheduleEvent(EVENT_THRASH, urand(10000, 20000));
break;
// troll form spells and actions (first part)
// troll form spells and Actions (first part)
case EVENT_DISPEL_MAGIC:
DoCast(me, SPELL_DISPEL_MAGIC);
events.ScheduleEvent(EVENT_DISPEL_MAGIC, urand(15000, 20000), 0, PHASE_ONE);
@@ -224,7 +224,7 @@ class boss_venoxis : public CreatureScript
break;
//
// snake form spells and actions
// snake form spells and Actions
//
case EVENT_VENOM_SPIT:
src/server/scripts/EasternKingdoms/blasted_lands.cpp
+2 -3
View File
@@ -44,10 +44,10 @@ class npc_deathly_usher : public CreatureScript
public:
npc_deathly_usher() : CreatureScript("npc_deathly_usher") { }
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction)
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action)
{
player->PlayerTalkClass->ClearMenus();
if (uiAction == GOSSIP_ACTION_INFO_DEF)
if (action == GOSSIP_ACTION_INFO_DEF)
{
player->CLOSE_GOSSIP_MENU();
creature->CastSpell(player, SPELL_TELEPORT_SINGLE, true);
@@ -65,7 +65,6 @@ public:
return true;
}
};
void AddSC_blasted_lands()
src/server/scripts/EasternKingdoms/boss_kruul.cpp
-1
View File
@@ -151,7 +151,6 @@ public:
DoMeleeAttackIfReady();
}
};
};
void AddSC_boss_kruul()
src/server/scripts/EasternKingdoms/burning_steppes.cpp
+2 -3
View File
@@ -51,10 +51,10 @@ class npc_ragged_john : public CreatureScript
public:
npc_ragged_john() : CreatureScript("npc_ragged_john") { }
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction)
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action)
{
player->PlayerTalkClass->ClearMenus();
switch (uiAction)
switch (action)
{
case GOSSIP_ACTION_INFO_DEF:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
@@ -147,7 +147,6 @@ public:
void EnterCombat(Unit* /*who*/) {}
};
};
void AddSC_burning_steppes()
src/server/scripts/EasternKingdoms/duskwood.cpp
-2
View File
@@ -60,7 +60,6 @@ public:
}
return false;
};
};
/*######
@@ -133,7 +132,6 @@ public:
DoMeleeAttackIfReady();
};
};
};
void AddSC_duskwood()
src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp
+4 -9
View File
@@ -60,7 +60,6 @@ public:
me->SummonCreature(11064, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 60000);
}
};
};
/*######
@@ -72,10 +71,10 @@ class npc_augustus_the_touched : public CreatureScript
public:
npc_augustus_the_touched() : CreatureScript("npc_augustus_the_touched") { }
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction)
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action)
{
player->PlayerTalkClass->ClearMenus();
if (uiAction == GOSSIP_ACTION_TRADE)
if (action == GOSSIP_ACTION_TRADE)
player->GetSession()->SendListInventory(creature->GetGUID());
return true;
}
@@ -91,7 +90,6 @@ public:
player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
return true;
}
};
/*######
@@ -129,9 +127,7 @@ public:
}
void EnterCombat(Unit* /*who*/) {}
};
};
/*######
@@ -148,10 +144,10 @@ class npc_tirion_fordring : public CreatureScript
public:
npc_tirion_fordring() : CreatureScript("npc_tirion_fordring") { }
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction)
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action)
{
player->PlayerTalkClass->ClearMenus();
switch (uiAction)
switch (action)
{
case GOSSIP_ACTION_INFO_DEF+1:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
@@ -185,7 +181,6 @@ public:
return true;
}
};
void AddSC_eastern_plaguelands()
src/server/scripts/EasternKingdoms/eversong_woods.cpp
-6
View File
@@ -124,7 +124,6 @@ public:
void Reset()
{
timer = 2000;
questPhase = 0;
summonerGuid = 0;
@@ -366,10 +365,8 @@ public:
void StartEvent()
{
if (questPhase == 1)
{ // no player check, quest can be finished as group, so no complex PlayerGUID/group search code
for (uint8 i = 0; i < 4; ++i)
if (Creature* summoned = DoSpawnCreature(PaladinEntry[i], SpawnPosition[i].x, SpawnPosition[i].y, SpawnPosition[i].z, SpawnPosition[i].o, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 180000))
paladinGuid[i] = summoned->GetGUID();
@@ -428,7 +425,6 @@ public:
return true;
}
};
/*######
@@ -512,7 +508,6 @@ public:
}
}
};
};
/*######
@@ -621,7 +616,6 @@ public:
} else WaveTimer -= diff;
}
};
};
void AddSC_eversong_woods()
src/server/scripts/EasternKingdoms/ghostlands.cpp
+4 -6
View File
@@ -44,10 +44,10 @@ class npc_budd_nedreck : public CreatureScript
public:
npc_budd_nedreck() : CreatureScript("npc_budd_nedreck") { }
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction)
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action)
{
player->PlayerTalkClass->ClearMenus();
if (uiAction == GOSSIP_ACTION_INFO_DEF)
if (action == GOSSIP_ACTION_INFO_DEF)
{
player->CLOSE_GOSSIP_MENU();
creature->CastSpell(player, 42540, false);
@@ -66,7 +66,6 @@ public:
player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
return true;
}
};
/*######
@@ -78,10 +77,10 @@ class npc_rathis_tomber : public CreatureScript
public:
npc_rathis_tomber() : CreatureScript("npc_rathis_tomber") { }
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction)
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action)
{
player->PlayerTalkClass->ClearMenus();
if (uiAction == GOSSIP_ACTION_TRADE)
if (action == GOSSIP_ACTION_TRADE)
player->GetSession()->SendListInventory(creature->GetGUID());
return true;
}
@@ -100,7 +99,6 @@ public:
return true;
}
};
/*######
src/server/scripts/EasternKingdoms/hinterlands.cpp
-2
View File
@@ -146,7 +146,6 @@ public:
summoned->GetMotionMaster()->MovePoint(0, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ());
}
};
};
/*######
@@ -345,7 +344,6 @@ public:
DoMeleeAttackIfReady();
}
};
};
void AddSC_hinterlands()
src/server/scripts/EasternKingdoms/ironforge.cpp
+2 -3
View File
@@ -44,10 +44,10 @@ class npc_royal_historian_archesonus : public CreatureScript
public:
npc_royal_historian_archesonus() : CreatureScript("npc_royal_historian_archesonus") { }
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction)
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action)
{
player->PlayerTalkClass->ClearMenus();
switch (uiAction)
switch (action)
{
case GOSSIP_ACTION_INFO_DEF:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ROYAL_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
@@ -88,7 +88,6 @@ public:
return true;
}
};
void AddSC_ironforge()
src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp
-2
View File
@@ -85,7 +85,6 @@ public:
}
}
};
};
/*######
@@ -149,7 +148,6 @@ public:
DoMeleeAttackIfReady();
}
};
};
void AddSC_isle_of_queldanas()
src/server/scripts/EasternKingdoms/loch_modan.cpp
+2 -3
View File
@@ -47,10 +47,10 @@ class npc_mountaineer_pebblebitty : public CreatureScript
public:
npc_mountaineer_pebblebitty() : CreatureScript("npc_mountaineer_pebblebitty") { }
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction)
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action)
{
player->PlayerTalkClass->ClearMenus();
switch (uiAction)
switch (action)
{
case GOSSIP_ACTION_INFO_DEF+1:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
@@ -95,7 +95,6 @@ public:
return true;
}
};
void AddSC_loch_modan()
src/server/scripts/EasternKingdoms/redridge_mountains.cpp
-1
View File
@@ -164,7 +164,6 @@ public:
DoMeleeAttackIfReady();
}
};
};
void AddSC_redridge_mountains()
src/server/scripts/EasternKingdoms/silvermoon_city.cpp
-1
View File
@@ -100,7 +100,6 @@ public:
}
}
};
};
void AddSC_silvermoon_city()
src/server/scripts/EasternKingdoms/silverpine_forest.cpp
-3
View File
@@ -94,7 +94,6 @@ public:
DoScriptText(SAY_QUINN, Quinn);
break;}
case 26: DoScriptText(SAY_ON_BYE, me, NULL); break;
}
}
@@ -123,7 +122,6 @@ public:
{
return new npc_deathstalker_erlandAI(creature);
}
};
/*######
@@ -309,7 +307,6 @@ public:
++Phase; //prepare next phase
}
};
};
/*######
src/server/scripts/EasternKingdoms/stormwind_city.cpp
+4 -11
View File
@@ -47,10 +47,10 @@ class npc_archmage_malin : public CreatureScript
public:
npc_archmage_malin() : CreatureScript("npc_archmage_malin") { }
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction)
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action)
{
player->PlayerTalkClass->ClearMenus();
if (uiAction == GOSSIP_ACTION_INFO_DEF)
if (action == GOSSIP_ACTION_INFO_DEF)
{
player->CLOSE_GOSSIP_MENU();
creature->CastSpell(player, 42711, true);
@@ -71,7 +71,6 @@ public:
return true;
}
};
/*######
@@ -143,7 +142,6 @@ public:
}
}
};
};
/*######
@@ -160,10 +158,10 @@ class npc_lady_katrana_prestor : public CreatureScript
public:
npc_lady_katrana_prestor() : CreatureScript("npc_lady_katrana_prestor") { }
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction)
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action)
{
player->PlayerTalkClass->ClearMenus();
switch (uiAction)
switch (action)
{
case GOSSIP_ACTION_INFO_DEF:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAT_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
@@ -197,7 +195,6 @@ public:
return true;
}
};
/*######
@@ -370,7 +367,6 @@ public:
DoMeleeAttackIfReady();
}
};
};
/*######
@@ -457,7 +453,6 @@ public:
DoMeleeAttackIfReady();
}
};
};
/*######
@@ -606,7 +601,6 @@ public:
DoMeleeAttackIfReady();
}
};
};
/*######
@@ -636,7 +630,6 @@ public:
}
return false;
}
};
void AddSC_stormwind_city()
src/server/scripts/EasternKingdoms/stranglethorn_vale.cpp
-1
View File
@@ -114,7 +114,6 @@ public:
DoMeleeAttackIfReady();
}
};
};
/*######
src/server/scripts/EasternKingdoms/tirisfal_glades.cpp
-3
View File
@@ -150,7 +150,6 @@ public:
DoMeleeAttackIfReady();
}
};
};
/*######
@@ -185,7 +184,6 @@ public:
return false;
}
};
class go_mausoleum_trigger : public GameObjectScript
@@ -207,7 +205,6 @@ public:
return false;
}
};
void AddSC_tirisfal_glades()
src/server/scripts/EasternKingdoms/undercity.cpp
+3 -6
View File
@@ -143,7 +143,6 @@ public:
DoMeleeAttackIfReady();
}
};
};
/*######
@@ -201,7 +200,6 @@ public:
}
}
};
};
/*######
@@ -219,15 +217,15 @@ class npc_parqual_fintallas : public CreatureScript
public:
npc_parqual_fintallas() : CreatureScript("npc_parqual_fintallas") { }
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction)
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action)
{
player->PlayerTalkClass->ClearMenus();
if (uiAction == GOSSIP_ACTION_INFO_DEF+1)
if (action == GOSSIP_ACTION_INFO_DEF+1)
{
player->CLOSE_GOSSIP_MENU();
creature->CastSpell(player, SPELL_MARK_OF_SHAME, false);
}
if (uiAction == GOSSIP_ACTION_INFO_DEF+2)
if (action == GOSSIP_ACTION_INFO_DEF+2)
{
player->CLOSE_GOSSIP_MENU();
player->AreaExploredOrEventHappens(6628);
@@ -252,7 +250,6 @@ public:
return true;
}
};
/*######
src/server/scripts/EasternKingdoms/western_plaguelands.cpp
+4 -9
View File
@@ -49,10 +49,10 @@ class npcs_dithers_and_arbington : public CreatureScript
public:
npcs_dithers_and_arbington() : CreatureScript("npcs_dithers_and_arbington") { }
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction)
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action)
{
player->PlayerTalkClass->ClearMenus();
switch (uiAction)
switch (action)
{
case GOSSIP_ACTION_TRADE:
player->GetSession()->SendListInventory(creature->GetGUID());
@@ -100,7 +100,6 @@ public:
return true;
}
};
/*######
@@ -121,10 +120,10 @@ class npc_myranda_the_hag : public CreatureScript
public:
npc_myranda_the_hag() : CreatureScript("npc_myranda_the_hag") { }
bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*uiSender*/, uint32 uiAction)
bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*sender*/, uint32 action)
{
player->PlayerTalkClass->ClearMenus();
if (uiAction == GOSSIP_ACTION_INFO_DEF + 1)
if (action == GOSSIP_ACTION_INFO_DEF + 1)
{
player->CLOSE_GOSSIP_MENU();
player->CastSpell(player, SPELL_SCARLET_ILLUSION, false);
@@ -149,7 +148,6 @@ public:
return true;
}
};
/*######
@@ -229,7 +227,6 @@ public:
}
}
};
};
/*######
@@ -264,7 +261,6 @@ public:
CAST_PLR(who)->KilledMonsterCredit(me->GetEntry(), me->GetGUID());
}
};
};
/*######
@@ -395,7 +391,6 @@ public:
m_uiChatTimer = 6000;
}
};
};
/*######
src/server/scripts/EasternKingdoms/westfall.cpp
-2
View File
@@ -185,7 +185,6 @@ public:
} else uiShootTimer -= diff;
}
};
};
/*######
@@ -258,7 +257,6 @@ public:
void Reset() {}
};
};
void AddSC_westfall()
src/server/scripts/EasternKingdoms/wetlands.cpp
-2
View File
@@ -132,7 +132,6 @@ public:
}
}
};
};
/*######
@@ -161,7 +160,6 @@ public:
}
return false;
}
};
/*######