Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Scripts: Fixed build zone_* scripts

Browse Source
This commit is contained in:
Shauren
2014-09-15 23:57:03 +02:00
parent 48deb443f9
commit 5ac62d9ca3
33 changed files with 187 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
View File

@@ -197,13 +197,13 @@ public:
{
Phase = 0;
KillCount = 0;
PlayerGUID = 0;
PlayerGUID.Clear();
}
uint32 Phase;
int8 KillCount;
uint32 WaitTimer;
uint64 PlayerGUID;
ObjectGuid PlayerGUID;
SummonList Summons;
bool QuestInProgress;

4
src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
View File

@@ -243,13 +243,13 @@ public:
uiTimer = 0;
uiPhase = 0;
MarzonGUID = 0;
MarzonGUID.Clear();
}
uint32 uiTimer;
uint32 uiPhase;
uint64 MarzonGUID;
ObjectGuid MarzonGUID;
void Reset() override
{

3
src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp
View File

@@ -322,7 +322,6 @@ public:
npc_anchorite_truuenAI(Creature* creature) : npc_escortAI(creature)
{
Initialize();
UghostGUID = 0;
}
void Initialize()
@@ -332,7 +331,7 @@ public:
uint32 m_uiChatTimer;
uint64 UghostGUID;
ObjectGuid UghostGUID;
void Reset() override
{

2
src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
View File

@@ -588,7 +588,7 @@ public:
if (instance->GetData(TYPE_THRALL_EVENT) == IN_PROGRESS)
{
instance->SetData(TYPE_THRALL_PART4, IN_PROGRESS);
if (instance->GetGuidData(DATA_EPOCH))
if (instance->GetGuidData(DATA_EPOCH).IsEmpty())
creature->SummonCreature(ENTRY_EPOCH, 2639.13f, 698.55f, 65.43f, 4.59f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000);
if (Creature* thrall = (ObjectAccessor::GetCreature(*creature, instance->GetGuidData(DATA_THRALL))))

4
src/server/scripts/Kalimdor/zone_azshara.cpp
View File

@@ -314,7 +314,7 @@ public:
MustDieTimer = 3000;
CurrWP = 0;
PlayerGUID = 0;
PlayerGUID.Clear();
MustDie = false;
Escape = false;
@@ -453,7 +453,7 @@ public:
}
private:
uint64 PlayerGUID;
ObjectGuid PlayerGUID;
uint32 SpellEscapeTimer;
uint32 TeleportTimer;
uint32 CheckTimer;

14
src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp
View File

@@ -68,7 +68,7 @@ public:
void Initialize()
{
pCaster = 0;
pCaster.Clear();
SayThanksTimer = 0;
RunAwayTimer = 0;
@@ -77,7 +77,7 @@ public:
CanSayHelp = true;
}
uint64 pCaster;
ObjectGuid pCaster;
uint32 SayThanksTimer;
uint32 RunAwayTimer;
@@ -431,13 +431,13 @@ public:
void Initialize()
{
SparkGUID = 0;
SparkGUID.Clear();
Step = 0;
EventStarted = false;
SayTimer = 0;
}
uint64 SparkGUID;
ObjectGuid SparkGUID;
uint8 Step;
uint32 SayTimer;
@@ -528,7 +528,7 @@ public:
for (std::list<Player*>::const_iterator itr = players.begin(); itr != players.end(); ++itr)
if ((*itr)->GetQuestStatus(QUEST_TREES_COMPANY) == QUEST_STATUS_INCOMPLETE && (*itr)->HasAura(SPELL_TREE_DISGUISE))
(*itr)->KilledMonsterCredit(NPC_SPARK, 0);
(*itr)->KilledMonsterCredit(NPC_SPARK);
}
void DespawnNagaFlag(bool despawn)
@@ -687,7 +687,7 @@ class npc_stillpine_capitive : public CreatureScript
void Initialize()
{
_playerGUID = 0;
_playerGUID.Clear();
_movementComplete = false;
}
@@ -737,7 +737,7 @@ class npc_stillpine_capitive : public CreatureScript
}
private:
uint64 _playerGUID;
ObjectGuid _playerGUID;
EventMap _events;
bool _movementComplete;
};

2
src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp
View File

@@ -64,7 +64,7 @@ public:
{
case 0:
if (Player* player = killer->ToPlayer())
player->KilledMonsterCredit(NPC_EXPEDITION_RESEARCHER, 0);
player->KilledMonsterCredit(NPC_EXPEDITION_RESEARCHER);
break;
case 1:
case 2:

2
src/server/scripts/Kalimdor/zone_desolace.cpp
View File

@@ -103,7 +103,7 @@ public:
{
if (player->HasAura(SPELL_KODO_KOMBO_PLAYER_BUFF) && creature->HasAura(SPELL_KODO_KOMBO_DESPAWN_BUFF))
{
player->TalkedToCreature(creature->GetEntry(), 0);
player->TalkedToCreature(creature->GetEntry(), ObjectGuid::Empty);
player->RemoveAurasDueToSpell(SPELL_KODO_KOMBO_PLAYER_BUFF);
}

5
src/server/scripts/Kalimdor/zone_durotar.cpp
View File

@@ -242,8 +242,7 @@ class npc_tiger_matriarch : public CreatureScript
struct npc_tiger_matriarchAI : public ScriptedAI
{
npc_tiger_matriarchAI(Creature* creature) : ScriptedAI(creature),
_tigerGuid(0)
npc_tiger_matriarchAI(Creature* creature) : ScriptedAI(creature)
{
}
@@ -343,7 +342,7 @@ class npc_tiger_matriarch : public CreatureScript
private:
EventMap _events;
uint64 _tigerGuid;
ObjectGuid _tigerGuid;
};
CreatureAI* GetAI(Creature* creature) const override

2
src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp
View File

@@ -655,7 +655,7 @@ public:
if (Creature* prisoner = go->FindNearestCreature(NPC_THERAMORE_PRISONER, 1.0f))
{
if (player)
player->KilledMonsterCredit(NPC_THERAMORE_PRISONER, 0);
player->KilledMonsterCredit(NPC_THERAMORE_PRISONER);
prisoner->AI()->Talk(SAY_FREE); // We also emote cry here (handled in creature_text.emote)
prisoner->DespawnOrUnsummon(6000);

10
src/server/scripts/Kalimdor/zone_moonglade.cpp
View File

@@ -299,7 +299,7 @@ public:
npc_clintar_spiritAI(Creature* creature) : npc_escortAI(creature)
{
Initialize();
PlayerGUID = 0;
PlayerGUID.Clear();
}
void Initialize()
@@ -307,7 +307,7 @@ public:
Step = 0;
CurrWP = 0;
EventTimer = 0;
PlayerGUID = 0;
PlayerGUID.Clear();
checkPlayerTimer = 1000;
EventOnWait = false;
}
@@ -317,7 +317,7 @@ public:
uint32 EventTimer;
uint32 checkPlayerTimer;
uint64 PlayerGUID;
ObjectGuid PlayerGUID;
bool EventOnWait;
@@ -358,7 +358,7 @@ public:
if (player && player->GetQuestStatus(10965) == QUEST_STATUS_INCOMPLETE)
{
player->FailQuest(10965);
PlayerGUID = 0;
PlayerGUID.Clear();
Reset();
}
}
@@ -536,7 +536,7 @@ public:
break;
case 2:
player->TalkedToCreature(me->GetEntry(), me->GetGUID());
PlayerGUID = 0;
PlayerGUID.Clear();
Reset();
me->setDeathState(JUST_DIED);
break;

4
src/server/scripts/Kalimdor/zone_mulgore.cpp
View File

@@ -71,14 +71,14 @@ public:
{
EventActive = false;
IsMovingToLunch = false;
PlayerGUID = 0;
PlayerGUID.Clear();
EventTimer = 5000;
EventPhase = 0;
}
bool EventActive;
bool IsMovingToLunch;
uint64 PlayerGUID;
ObjectGuid PlayerGUID;
uint32 EventTimer;
uint8 EventPhase;

4
src/server/scripts/Kalimdor/zone_orgrimmar.cpp
View File

@@ -75,14 +75,14 @@ public:
CanEmote = false;
SaluteTimer = 6000;
ResetTimer = 0;
PlayerGUID = 0;
PlayerGUID.Clear();
}
bool CanTalk;
bool CanEmote;
uint32 SaluteTimer;
uint32 ResetTimer;
uint64 PlayerGUID;
ObjectGuid PlayerGUID;
void Reset() override
{

44
src/server/scripts/Kalimdor/zone_silithus.cpp
View File

@@ -97,7 +97,7 @@ public:
case GOSSIP_ACTION_INFO_DEF + 6:
player->SEND_GOSSIP_MENU(7761, creature->GetGUID());
//'kill' our trigger to update quest status
player->KilledMonsterCredit(TRIGGER_RUTGAR, 0);
player->KilledMonsterCredit(TRIGGER_RUTGAR);
break;
case GOSSIP_ACTION_INFO_DEF + 9:
@@ -123,7 +123,7 @@ public:
case GOSSIP_ACTION_INFO_DEF + 14:
player->SEND_GOSSIP_MENU(7767, creature->GetGUID());
//'kill' our trigger to update quest status
player->KilledMonsterCredit(TRIGGER_FRANKAL, 0);
player->KilledMonsterCredit(TRIGGER_FRANKAL);
break;
}
return true;
@@ -431,24 +431,24 @@ public:
{
AnimationTimer = 1500;
AnimationCount = 0;
AnachronosQuestTriggerGUID = 0;
MerithraGUID = 0;
ArygosGUID = 0;
CaelestraszGUID = 0;
FandralGUID = 0;
PlayerGUID = 0;
AnachronosQuestTriggerGUID.Clear();
MerithraGUID.Clear();
ArygosGUID.Clear();
CaelestraszGUID.Clear();
FandralGUID.Clear();
PlayerGUID.Clear();
eventEnd = false;
}
uint32 AnimationTimer;
uint8 AnimationCount;
uint64 AnachronosQuestTriggerGUID;
uint64 MerithraGUID;
uint64 ArygosGUID;
uint64 CaelestraszGUID;
uint64 FandralGUID;
uint64 PlayerGUID;
ObjectGuid AnachronosQuestTriggerGUID;
ObjectGuid MerithraGUID;
ObjectGuid ArygosGUID;
ObjectGuid CaelestraszGUID;
ObjectGuid FandralGUID;
ObjectGuid PlayerGUID;
bool eventEnd;
void Reset() override
@@ -485,7 +485,7 @@ public:
Fandral->AI()->Talk(FANDRAL_SAY_1, me);
break;
case 2:
Fandral->SetTarget(0);
Fandral->SetTarget(ObjectGuid::Empty);
Merithra->AI()->Talk(MERITHRA_EMOTE_1);
break;
case 3:
@@ -502,7 +502,7 @@ public:
Merithra->AI()->Talk(MERITHRA_SAY_2);
break;
case 7:
Caelestrasz->SetTarget(0);
Caelestrasz->SetTarget(ObjectGuid::Empty);
Merithra->GetMotionMaster()->MoveCharge(-8065, 1530, 2.61f, 10);
break;
case 8:
@@ -769,14 +769,14 @@ public:
void Initialize()
{
MobGUID = 0;
PlayerGUID = 0;
MobGUID.Clear();
PlayerGUID.Clear();
Timers = false;
hasTarget = false;
}
uint64 MobGUID;
uint64 PlayerGUID;
ObjectGuid MobGUID;
ObjectGuid PlayerGUID;
uint32 SpellTimer1, SpellTimer2, SpellTimer3, SpellTimer4;
bool Timers;
bool hasTarget;
@@ -890,7 +890,7 @@ public:
void Initialize()
{
PlayerGUID = 0;
PlayerGUID.Clear();
WaveTimer = 2000;
AnnounceTimer = 1000;
@@ -902,7 +902,7 @@ public:
Failed = false;
}
uint64 PlayerGUID;
ObjectGuid PlayerGUID;
uint32 WaveTimer;
uint32 AnnounceTimer;

4
src/server/scripts/Kalimdor/zone_tanaris.cpp
View File

@@ -546,14 +546,14 @@ public:
PostEventTimer = 1000;
PhasePostEvent = 0;
TortaGUID = 0;
TortaGUID.Clear();
}
uint32 CheckSpeechTimer;
uint32 PostEventTimer;
uint32 PhasePostEvent;
uint64 TortaGUID;
ObjectGuid TortaGUID;
void Reset() override
{

12
src/server/scripts/Kalimdor/zone_the_barrens.cpp
View File

@@ -333,14 +333,14 @@ public:
WaveTimer = 600000;
ChallengerChecker = 0;
Wave = 0;
PlayerGUID = 0;
PlayerGUID.Clear();
for (uint8 i = 0; i < 6; ++i)
{
AffrayChallenger[i] = 0;
AffrayChallenger[i].Clear();
ChallengerDown[i] = false;
}
BigWill = 0;
BigWill.Clear();
}
bool EventInProgress;
@@ -350,9 +350,9 @@ public:
uint8 Wave;
uint32 WaveTimer;
uint32 ChallengerChecker;
uint64 PlayerGUID;
uint64 AffrayChallenger[6];
uint64 BigWill;
ObjectGuid PlayerGUID;
ObjectGuid AffrayChallenger[6];
ObjectGuid BigWill;
void Reset() override
{

4
src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
View File

@@ -212,14 +212,14 @@ public:
FaintTimer = urand(30000, 60000);
EndEventProgress = 0;
EndEventTimer = 1000;
SpraggleGUID = 0;
SpraggleGUID.Clear();
}
uint32 FaintTimer;
uint32 EndEventProgress;
uint32 EndEventTimer;
uint64 SpraggleGUID;
ObjectGuid SpraggleGUID;
void Reset() override
{

15
src/server/scripts/Kalimdor/zone_winterspring.cpp
View File

@@ -318,11 +318,6 @@ public:
DialogueHelper(introDialogue)
{
Initialize();
_firstPriestessGUID = 0;
_secondPriestessGUID = 0;
_guardEluneGUID = 0;
_voiceEluneGUID = 0;
_altarGUID = 0;
}
void Initialize()
@@ -332,11 +327,11 @@ public:
uint32 _delayTimer;
uint64 _firstPriestessGUID;
uint64 _secondPriestessGUID;
uint64 _guardEluneGUID;
uint64 _voiceEluneGUID;
uint64 _altarGUID;
ObjectGuid _firstPriestessGUID;
ObjectGuid _secondPriestessGUID;
ObjectGuid _guardEluneGUID;
ObjectGuid _voiceEluneGUID;
ObjectGuid _altarGUID;
void Reset() override
{

59
src/server/scripts/Northrend/zone_borean_tundra.cpp
View File

@@ -71,13 +71,13 @@ public:
uint32 phaseTimer;
uint8 phase;
uint64 casterGuid;
ObjectGuid casterGuid;
void Reset() override
{
phaseTimer = 500;
phase = 0;
casterGuid = 0;
casterGuid.Clear();
}
void SpellHit(Unit* caster, const SpellInfo* spell) override
@@ -391,7 +391,7 @@ public:
if (uiRand < 25)
{
player->CastSpell(me, SPELL_FREED_WARSONG_PEON, true);
player->KilledMonsterCredit(NPC_WARSONG_PEON, 0);
player->KilledMonsterCredit(NPC_WARSONG_PEON);
}
else if (uiRand < 75)
player->CastSpell(me, nerubarVictims[urand(0, 2)], true);
@@ -449,7 +449,7 @@ public:
{
npc_nesingwary_trapperAI(Creature* creature) : ScriptedAI(creature) { creature->SetVisible(false); }
uint64 go_caribouGUID;
ObjectGuid go_caribouGUID;
uint8 phase;
uint32 phaseTimer;
@@ -458,7 +458,7 @@ public:
me->SetVisible(false);
phaseTimer = 2500;
phase = 1;
go_caribouGUID = 0;
go_caribouGUID.Clear();
}
void EnterCombat(Unit* /*who*/) override { }
@@ -474,7 +474,7 @@ public:
if (summon->IsSummon())
if (Unit* temp = summon->GetSummoner())
if (Player* player = temp->ToPlayer())
player->KilledMonsterCredit(me->GetEntry(), 0);
player->KilledMonsterCredit(me->GetEntry());
if (GameObject* go_caribou = me->GetMap()->GetGameObject(go_caribouGUID))
go_caribou->SetGoState(GO_STATE_READY);
@@ -723,10 +723,9 @@ public:
{
npc_nexus_drake_hatchlingAI(Creature* creature) : FollowerAI(creature)
{
HarpoonerGUID = 0;
}
uint64 HarpoonerGUID;
ObjectGuid HarpoonerGUID;
bool WithRedDragonBlood;
void Reset() override
@@ -764,10 +763,10 @@ public:
{
if (Player* pHarpooner = ObjectAccessor::GetPlayer(*me, HarpoonerGUID))
{
pHarpooner->KilledMonsterCredit(26175, 0);
pHarpooner->KilledMonsterCredit(26175);
pHarpooner->RemoveAura(SPELL_DRAKE_HATCHLING_SUBDUED);
SetFollowComplete();
HarpoonerGUID = 0;
HarpoonerGUID.Clear();
me->DisappearAndDie();
}
}
@@ -793,7 +792,7 @@ public:
if ((me->getFaction() == 35) && (!me->HasAura(SPELL_SUBDUED)))
{
HarpoonerGUID = 0;
HarpoonerGUID.Clear();
me->DisappearAndDie();
}
@@ -865,10 +864,10 @@ public:
{
npc_thassarianAI(Creature* creature) : npc_escortAI(creature) { }
uint64 arthasGUID;
uint64 talbotGUID;
uint64 leryssaGUID;
uint64 arlosGUID;
ObjectGuid arthasGUID;
ObjectGuid talbotGUID;
ObjectGuid leryssaGUID;
ObjectGuid arlosGUID;
bool arthasInPosition;
bool arlosInPosition;
@@ -883,10 +882,10 @@ public:
me->RestoreFaction();
me->RemoveStandFlags(UNIT_STAND_STATE_SIT);
arthasGUID = 0;
talbotGUID = 0;
leryssaGUID = 0;
arlosGUID = 0;
arthasGUID.Clear();
talbotGUID.Clear();
leryssaGUID.Clear();
arlosGUID.Clear();
arthasInPosition = false;
arlosInPosition = false;
@@ -1242,8 +1241,8 @@ public:
{
npc_counselor_talbotAI(Creature* creature) : ScriptedAI(creature) { }
uint64 leryssaGUID;
uint64 arlosGUID;
ObjectGuid leryssaGUID;
ObjectGuid arlosGUID;
bool bCheck;
@@ -1253,8 +1252,8 @@ public:
void Reset() override
{
leryssaGUID = 0;
arlosGUID = 0;
leryssaGUID.Clear();
arlosGUID.Clear();
bCheck = false;
shadowBoltTimer = urand(5000, 12000);
deflectionTimer = urand(20000, 25000);
@@ -1609,15 +1608,11 @@ public:
void SpellHit(Unit* unit, const SpellInfo* spell) override
{
if (spell->Id == SPELL_NEURAL_NEEDLE && unit->GetTypeId() == TYPEID_PLAYER)
{
if (Player* player = unit->ToPlayer())
{
GotStinged(player->GetGUID());
}
}
}
void GotStinged(uint64 casterGUID)
void GotStinged(ObjectGuid casterGUID)
{
if (Player* caster = ObjectAccessor::GetPlayer(*me, casterGUID))
{
@@ -1644,7 +1639,7 @@ public:
break;
case 7:
Talk(SAY_IMPRISIONED_BERYL_7);
caster->KilledMonsterCredit(NPC_IMPRISONED_BERYL_SORCERER, 0);
caster->KilledMonsterCredit(NPC_IMPRISONED_BERYL_SORCERER);
break;
}
}
@@ -1980,7 +1975,7 @@ public:
{
Quest const* qInfo = sObjectMgr->GetQuestTemplate(QUEST_YOU_RE_NOT_SO_BIG_NOW);
if (qInfo)
player->KilledMonsterCredit(qInfo->RequiredNpcOrGo[0], 0);
player->KilledMonsterCredit(qInfo->RequiredNpcOrGo[0]);
}
}
};
@@ -2195,7 +2190,7 @@ public:
uint32 uiEventTimer;
uint8 uiEventPhase;
uint64 uiPlayerGUID;
ObjectGuid uiPlayerGUID;
void Reset() override
{
@@ -2208,7 +2203,7 @@ public:
uiEventTimer = 0;
uiEventPhase = 0;
uiPlayerGUID = 0;
uiPlayerGUID.Clear();
DoCast(SPELL_SHROUD_OF_THE_DEATH_CULTIST);

4
src/server/scripts/Northrend/zone_crystalsong_forest.cpp
View File

@@ -56,11 +56,11 @@ public:
SetCombatMovement(false);
}
uint64 targetGUID;
ObjectGuid targetGUID;
void Reset() override
{
targetGUID = 0;
targetGUID.Clear();
}
void UpdateAI(uint32 /*diff*/) override

19
src/server/scripts/Northrend/zone_dragonblight.cpp
View File

@@ -158,8 +158,12 @@ class npc_commander_eligor_dawnbringer : public CreatureScript
void Reset() override
{
talkWing = 0;
memset(audienceList, 0, sizeof(audienceList));
memset(imageList, 0, sizeof(imageList));
for (ObjectGuid& guid : audienceList)
guid.Clear();
for (ObjectGuid& guid : imageList)
guid.Clear();
_events.ScheduleEvent(EVENT_GET_TARGETS, 5000);
_events.ScheduleEvent(EVENT_START_RANDOM, 20000);
}
@@ -351,8 +355,8 @@ class npc_commander_eligor_dawnbringer : public CreatureScript
}
private:
EventMap _events;
uint64 audienceList[10];
uint64 imageList[5];
ObjectGuid audienceList[10];
ObjectGuid imageList[5];
uint8 talkWing;
};
@@ -652,13 +656,12 @@ class npc_torturer_lecraft : public CreatureScript
npc_torturer_lecraftAI(Creature* creature) : ScriptedAI(creature)
{
_textCounter = 1;
_playerGUID = 0;
}
void Reset() override
{
_textCounter = 1;
_playerGUID = 0;
_playerGUID.Clear();
}
void EnterCombat(Unit* who) override
@@ -686,7 +689,7 @@ class npc_torturer_lecraft : public CreatureScript
Talk(_textCounter, player);
if (_textCounter == 5)
player->KilledMonsterCredit(NPC_TORTURER_LECRAFT, 0);
player->KilledMonsterCredit(NPC_TORTURER_LECRAFT);
++_textCounter;
@@ -723,7 +726,7 @@ class npc_torturer_lecraft : public CreatureScript
private:
EventMap _events;
uint8 _textCounter;
uint64 _playerGUID;
ObjectGuid _playerGUID;
};
CreatureAI* GetAI(Creature* creature) const

14
src/server/scripts/Northrend/zone_grizzly_hills.cpp
View File

@@ -116,7 +116,7 @@ public:
case 19:
if (Creature* Mrfloppy = ObjectAccessor::GetCreature(*me, _mrfloppyGUID))
{
if (Mrfloppy->HasAura(SPELL_MRFLOPPY, 0))
if (Mrfloppy->HasAura(SPELL_MRFLOPPY))
{
if (Creature* RWORG = ObjectAccessor::GetCreature(*me, _RavenousworgGUID))
Mrfloppy->EnterVehicle(RWORG);
@@ -180,13 +180,13 @@ public:
void Reset() override
{
_mrfloppyGUID = 0;
_RavenousworgGUID = 0;
_mrfloppyGUID.Clear();
_RavenousworgGUID.Clear();
}
private:
uint64 _RavenousworgGUID;
uint64 _mrfloppyGUID;
ObjectGuid _RavenousworgGUID;
ObjectGuid _mrfloppyGUID;
};
bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override
@@ -542,7 +542,7 @@ public:
void Reset() override
{
_playerGUID = 0;
_playerGUID.Clear();
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_IMMUNE_TO_PC);
me->SetReactState(REACT_AGGRESSIVE);
@@ -604,7 +604,7 @@ public:
private:
EventMap _events;
uint64 _playerGUID;
ObjectGuid _playerGUID;
};
CreatureAI* GetAI(Creature* creature) const override

8
src/server/scripts/Northrend/zone_howling_fjord.cpp
View File

@@ -179,7 +179,7 @@ public:
void Reset() override
{
uint64 summonerGUID = 0;
ObjectGuid summonerGUID;
if (me->IsSummon())
if (Unit* summoner = me->ToTempSummon()->GetSummoner())
@@ -321,15 +321,15 @@ public:
npc_daegarnAI(Creature* creature) : ScriptedAI(creature) { }
bool bEventInProgress;
uint64 uiPlayerGUID;
ObjectGuid uiPlayerGUID;
void Reset() override
{
bEventInProgress = false;
uiPlayerGUID = 0;
uiPlayerGUID.Clear();
}
void StartEvent(uint64 uiGUID)
void StartEvent(ObjectGuid uiGUID)
{
if (bEventInProgress)
return;

15
src/server/scripts/Northrend/zone_icecrown.cpp
View File

@@ -234,7 +234,7 @@ public:
{
if (who->HasAura(SPELL_SUBDUED_LITHE_STALKER))
{
owner->ToPlayer()->KilledMonsterCredit(NPC_GEIST_RETURN_BUNNY_KC, 0);
owner->ToPlayer()->KilledMonsterCredit(NPC_GEIST_RETURN_BUNNY_KC);
who->ToCreature()->DisappearAndDie();
}
@@ -505,7 +505,6 @@ public:
{
HalofSpawned = false;
PhaseCount = 0;
Summons.DespawnAll();
SetCombatMovement(false);
}
@@ -518,10 +517,10 @@ public:
SummonList Summons;
uint64 guidDalfors;
uint64 guidPriest[3];
uint64 guidMason[3];
uint64 guidHalof;
ObjectGuid guidDalfors;
ObjectGuid guidPriest[3];
ObjectGuid guidMason[3];
ObjectGuid guidHalof;
void Reset() override
{
@@ -912,7 +911,7 @@ class npc_margrave_dhakar : public CreatureScript
struct npc_margrave_dhakarAI : public ScriptedAI
{
npc_margrave_dhakarAI(Creature* creature) : ScriptedAI(creature) , _summons(me), _lichKingGuid(0) { }
npc_margrave_dhakarAI(Creature* creature) : ScriptedAI(creature) , _summons(me) { }
void Reset() override
{
@@ -1026,7 +1025,7 @@ class npc_margrave_dhakar : public CreatureScript
private:
EventMap _events;
SummonList _summons;
uint64 _lichKingGuid;
ObjectGuid _lichKingGuid;
};
CreatureAI* GetAI(Creature* creature) const override

12
src/server/scripts/Northrend/zone_sholazar_basin.cpp
View File

@@ -374,8 +374,8 @@ public:
sayStep = 0;
timer = 0;
phase = 0;
playerGUID = 0;
orphanGUID = 0;
playerGUID.Clear();
orphanGUID.Clear();
}
void MoveInLineOfSight(Unit* who) override
@@ -489,7 +489,7 @@ public:
if (itr->second.CreatureOrGOCount[i] != 0)
continue;
player->KilledMonsterCredit(me->GetEntry(), 0);
player->KilledMonsterCredit(me->GetEntry());
player->Say(SAY_OFFER, LANG_UNIVERSAL);
sayStep = 1;
break;
@@ -501,8 +501,8 @@ public:
uint8 sayStep;
uint32 timer;
int8 phase;
uint64 playerGUID;
uint64 orphanGUID;
ObjectGuid playerGUID;
ObjectGuid orphanGUID;
};
CreatureAI* GetAI(Creature* creature) const override
@@ -783,7 +783,7 @@ public:
apple->CastSpell(apple, SPELL_APPLE_FALL);
wilhelm->AI()->Talk(SAY_WILHELM_HIT);
if (Player* player = shooter->ToPlayer())
player->KilledMonsterCredit(NPC_APPLE, 0);
player->KilledMonsterCredit(NPC_APPLE);
apple->DespawnOrUnsummon();
break;

22
src/server/scripts/Northrend/zone_storm_peaks.cpp
View File

@@ -454,17 +454,16 @@ public:
{
npc_brann_bronzebeard_keystoneAI(Creature* creature) : ScriptedAI(creature)
{
memset(&objectGUID, 0, sizeof(objectGUID));
playerGUID = 0;
voiceGUID = 0;
objectCounter = 0;
}
void Reset() override
{
memset(&objectGUID, 0, sizeof(objectGUID));
playerGUID = 0;
voiceGUID = 0;
for (ObjectGuid& guid : objectGUID)
guid.Clear();
playerGUID.Clear();
voiceGUID.Clear();
objectCounter = 0;
}
@@ -583,9 +582,9 @@ public:
private:
EventMap events;
uint64 playerGUID;
uint64 objectGUID[5];
uint64 voiceGUID;
ObjectGuid playerGUID;
ObjectGuid objectGUID[5];
ObjectGuid voiceGUID;
uint8 objectCounter;
};
@@ -643,13 +642,12 @@ public:
{
npc_king_jokkum_vehicleAI(Creature* creature) : VehicleAI(creature)
{
playerGUID = 0;
pathEnd = false;
}
void Reset() override
{
playerGUID = 0;
playerGUID.Clear();
pathEnd = false;
}
@@ -715,7 +713,7 @@ public:
private:
EventMap events;
uint64 playerGUID;
ObjectGuid playerGUID;
bool pathEnd;
};

9
src/server/scripts/Northrend/zone_zuldrak.cpp
View File

@@ -51,7 +51,7 @@ public:
void Reset() override
{
_rageclawGUID = 0;
_rageclawGUID.Clear();
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
float x, y, z;
@@ -104,7 +104,7 @@ public:
}
private:
uint64 _rageclawGUID;
ObjectGuid _rageclawGUID;
};
CreatureAI* GetAI(Creature* creature) const override
@@ -455,13 +455,12 @@ public:
{
npc_alchemist_finklesteinAI(Creature* creature) : ScriptedAI(creature)
{
_playerGUID = 0;
_getingredienttry = 0;
}
void Reset() override
{
_playerGUID = 0;
_playerGUID.Clear();
_getingredienttry = 0;
_events.ScheduleEvent(EVENT_TURN_TO_POT, urand(15000, 26000));
}
@@ -556,7 +555,7 @@ public:
private:
EventMap _events;
uint64 _playerGUID;
ObjectGuid _playerGUID;
uint8 _getingredienttry;
};

8
src/server/scripts/Outland/zone_blades_edge_mountains.cpp
View File

@@ -115,13 +115,12 @@ public:
{
npc_bloodmaul_bruteAI(Creature* creature) : ScriptedAI(creature)
{
PlayerGUID = 0;
hp30 = false;
}
void Reset() override
{
PlayerGUID = 0;
PlayerGUID.Clear();
hp30 = false;
}
@@ -207,7 +206,7 @@ public:
private:
EventMap events;
uint64 PlayerGUID;
ObjectGuid PlayerGUID;
bool hp30;
};
@@ -1131,7 +1130,6 @@ public:
{
npc_oscillating_frequency_scanner_master_bunnyAI(Creature* creature) : ScriptedAI(creature)
{
playerGuid = 0;
timer = 500;
}
@@ -1170,7 +1168,7 @@ public:
}
private:
uint64 playerGuid;
ObjectGuid playerGuid;
uint32 timer;
};

4
src/server/scripts/Outland/zone_hellfire_peninsula.cpp
View File

@@ -310,7 +310,7 @@ public:
void Reset() override
{
checkTimer = 5000; //check for creature every 5 sec
helboarGUID = 0;
helboarGUID.Clear();
}
void MovementInform(uint32 type, uint32 id) override
@@ -352,7 +352,7 @@ public:
private:
uint32 checkTimer;
uint64 helboarGUID;
ObjectGuid helboarGUID;
};
CreatureAI* GetAI(Creature* creature) const override

8
src/server/scripts/Outland/zone_nagrand.cpp
View File

@@ -299,7 +299,7 @@ public:
{
corki->GetMotionMaster()->MovePoint(1, go->GetPositionX()+5, go->GetPositionY(), go->GetPositionZ());
if (player)
player->KilledMonsterCredit(NPC_CORKI_CREDIT_1, 0);
player->KilledMonsterCredit(NPC_CORKI_CREDIT_1);
}
}
@@ -309,7 +309,7 @@ public:
{
corki->GetMotionMaster()->MovePoint(1, go->GetPositionX()-5, go->GetPositionY(), go->GetPositionZ());
if (player)
player->KilledMonsterCredit(NPC_CORKI_2, 0);
player->KilledMonsterCredit(NPC_CORKI_2);
}
}
@@ -319,7 +319,7 @@ public:
{
corki->GetMotionMaster()->MovePoint(1, go->GetPositionX()+4, go->GetPositionY(), go->GetPositionZ());
if (player)
player->KilledMonsterCredit(NPC_CORKI_CREDIT_3, 0);
player->KilledMonsterCredit(NPC_CORKI_CREDIT_3);
}
}
return true;
@@ -594,7 +594,7 @@ class go_warmaul_prison : public GameObjectScript
if (Creature* prisoner = go->FindNearestCreature(NPC_MAGHAR_PRISONER, 5.0f))
{
player->KilledMonsterCredit(NPC_MAGHAR_PRISONER, 0);
player->KilledMonsterCredit(NPC_MAGHAR_PRISONER);
prisoner->AI()->Talk(SAY_FREE, player);
prisoner->DespawnOrUnsummon(6000);

19
src/server/scripts/Outland/zone_netherstorm.cpp
View File

@@ -83,9 +83,9 @@ public:
{
npc_commander_dawnforgeAI(Creature* creature) : ScriptedAI(creature) { }
uint64 PlayerGUID;
uint64 ardonisGUID;
uint64 pathaleonGUID;
ObjectGuid PlayerGUID;
ObjectGuid ardonisGUID;
ObjectGuid pathaleonGUID;
uint32 Phase;
uint32 PhaseSubphase;
@@ -94,9 +94,9 @@ public:
void Reset() override
{
PlayerGUID = 0;
ardonisGUID = 0;
pathaleonGUID = 0;
PlayerGUID.Clear();
ardonisGUID.Clear();
pathaleonGUID.Clear();
Phase = 1;
PhaseSubphase = 0;
@@ -415,7 +415,6 @@ public:
Materialize = false;
Drained = false;
WeakPercent = 25;
PlayerGUID = 0;
ManaBurnTimer = 5000;
}
@@ -424,7 +423,7 @@ public:
bool Drained;
uint8 WeakPercent;
uint64 PlayerGUID;
ObjectGuid PlayerGUID;
uint32 ManaBurnTimer;
@@ -435,7 +434,7 @@ public:
Drained = false;
WeakPercent = 25 + (rand32() % 16); // 25-40
PlayerGUID = 0;
PlayerGUID.Clear();
ManaBurnTimer = 5000 + (rand32() % 3 * 1000); // 5-8 sec cd
@@ -725,7 +724,7 @@ class go_captain_tyralius_prison : public GameObjectScript
go->UseDoorOrButton();
if (Creature* tyralius = go->FindNearestCreature(NPC_CAPTAIN_TYRALIUS, 1.0f))
{
player->KilledMonsterCredit(NPC_CAPTAIN_TYRALIUS, 0);
player->KilledMonsterCredit(NPC_CAPTAIN_TYRALIUS);
tyralius->AI()->Talk(SAY_FREE);
tyralius->DespawnOrUnsummon(8000);
}

49
src/server/scripts/Outland/zone_shadowmoon_valley.cpp
View File

@@ -80,7 +80,7 @@ public:
{
npc_mature_netherwing_drakeAI(Creature* creature) : ScriptedAI(creature) { }
uint64 uiPlayerGUID;
ObjectGuid uiPlayerGUID;
bool bCanEat;
bool bIsEating;
@@ -90,7 +90,7 @@ public:
void Reset() override
{
uiPlayerGUID = 0;
uiPlayerGUID.Clear();
bCanEat = false;
bIsEating = false;
@@ -154,7 +154,7 @@ public:
if (Player* player = ObjectAccessor::GetPlayer(*me, uiPlayerGUID))
{
player->KilledMonsterCredit(NPC_EVENT_PINGER, 0);
player->KilledMonsterCredit(NPC_EVENT_PINGER);
if (GameObject* go = player->FindNearestGameObject(GO_CARCASS, 10))
go->Delete();
@@ -218,12 +218,11 @@ public:
{
npc_enslaved_netherwing_drakeAI(Creature* creature) : ScriptedAI(creature)
{
PlayerGUID = 0;
Tapped = false;
Reset();
}
uint64 PlayerGUID;
ObjectGuid PlayerGUID;
uint32 FlyTimer;
bool Tapped;
@@ -276,7 +275,7 @@ public:
if (player)
DoCast(player, SPELL_FORCE_OF_NELTHARAKU, true);
PlayerGUID = 0;
PlayerGUID.Clear();
}
me->SetVisible(false);
me->SetDisableGravity(false);
@@ -349,13 +348,13 @@ public:
{
npc_dragonmaw_peonAI(Creature* creature) : ScriptedAI(creature) { }
uint64 PlayerGUID;
ObjectGuid PlayerGUID;
bool Tapped;
uint32 PoisonTimer;
void Reset() override
{
PlayerGUID = 0;
PlayerGUID.Clear();
Tapped = false;
PoisonTimer = 0;
}
@@ -400,7 +399,7 @@ public:
{
Player* player = ObjectAccessor::GetPlayer(*me, PlayerGUID);
if (player && player->GetQuestStatus(11020) == QUEST_STATUS_INCOMPLETE)
player->KilledMonsterCredit(23209, 0);
player->KilledMonsterCredit(23209);
}
PoisonTimer = 0;
me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
@@ -583,8 +582,8 @@ public:
{
npc_overlord_morghorAI(Creature* creature) : ScriptedAI(creature) { }
uint64 PlayerGUID;
uint64 IllidanGUID;
ObjectGuid PlayerGUID;
ObjectGuid IllidanGUID;
uint32 ConversationTimer;
uint32 Step;
@@ -593,8 +592,8 @@ public:
void Reset() override
{
PlayerGUID = 0;
IllidanGUID = 0;
PlayerGUID.Clear();
IllidanGUID.Clear();
ConversationTimer = 0;
Step = 0;
@@ -798,7 +797,7 @@ public:
case 30:
{
if (Creature* Yarzill = me->FindNearestCreature(C_YARZILL, 50.0f))
Yarzill->SetTarget(0);
Yarzill->SetTarget(ObjectGuid::Empty);
return 5000;
}
break;
@@ -814,7 +813,7 @@ public:
return 5000;
break;
case 33:
me->SetTarget(0);
me->SetTarget(ObjectGuid::Empty);
Reset();
return 100;
break;
@@ -1123,8 +1122,8 @@ public:
uint8 AnimationCount;
uint64 LordIllidanGUID;
uint64 AggroTargetGUID;
ObjectGuid LordIllidanGUID;
ObjectGuid AggroTargetGUID;
bool Timers;
@@ -1132,13 +1131,13 @@ public:
{
AnimationTimer = 4000;
AnimationCount = 0;
LordIllidanGUID = 0;
AggroTargetGUID = 0;
LordIllidanGUID.Clear();
AggroTargetGUID.Clear();
Timers = false;
me->AddUnitState(UNIT_STATE_ROOT);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
me->SetTarget(0);
me->SetTarget(ObjectGuid::Empty);
}
void EnterCombat(Unit* /*who*/) override { }
@@ -1274,7 +1273,7 @@ public:
{
npc_lord_illidan_stormrageAI(Creature* creature) : ScriptedAI(creature) { }
uint64 PlayerGUID;
ObjectGuid PlayerGUID;
uint32 WaveTimer;
uint32 AnnounceTimer;
@@ -1288,7 +1287,7 @@ public:
void Reset() override
{
PlayerGUID = 0;
PlayerGUID.Clear();
WaveTimer = 10000;
AnnounceTimer = 7000;
@@ -1416,13 +1415,13 @@ public:
{
npc_illidari_spawnAI(Creature* creature) : ScriptedAI(creature) { }
uint64 LordIllidanGUID;
ObjectGuid LordIllidanGUID;
uint32 SpellTimer1, SpellTimer2, SpellTimer3;
bool Timers;
void Reset() override
{
LordIllidanGUID = 0;
LordIllidanGUID.Clear();
Timers = false;
}
@@ -1727,7 +1726,7 @@ public:
if (Unit* owner = totemOspirits->GetOwner())
if (Player* player = owner->ToPlayer())
player->KilledMonsterCredit(credit, 0);
player->KilledMonsterCredit(credit);
DoCast(totemOspirits, SPELL_SOUL_CAPTURED);
}
}

2
src/server/scripts/Outland/zone_terokkar_forest.cpp
View File

@@ -323,7 +323,7 @@ public:
if (rand32() % 100 < 25)
{
me->SummonCreature(QUEST_TARGET, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 60000);
player->KilledMonsterCredit(QUEST_TARGET, 0);
player->KilledMonsterCredit(QUEST_TARGET);
}
else
me->SummonCreature(netherwebVictims[rand32() % 6], 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 60000);