ElderShell/EverWrath
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(Core): update getFaction to GetFaction and setFaction to SetFaction (#8708)

Browse source
This commit is contained in:
Malcrom 2021-11-01 13:04:32 -03:00 • committed by GitHub
parent 3396a9da87
commit f106de8788
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
129 changed files with 418 additions and 444 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/server/scripts/Commands/cs_misc.cpp
View file

@ -2932,7 +2932,7 @@ public:
creatureTarget->SetHealth(0); // just for nice GM-mode view
pet->SetGuidValue(UNIT_FIELD_CREATEDBY, player->GetGUID());
pet->SetUInt32Value(UNIT_FIELD_FACTIONTEMPLATE, player->getFaction());
pet->SetUInt32Value(UNIT_FIELD_FACTIONTEMPLATE, player->GetFaction());
if (!pet->InitStatsForLevel(creatureTarget->getLevel()))
{

4
src/server/scripts/Commands/cs_modify.cpp
View file

@ -333,7 +333,7 @@ public:
if (!pfactionid)
{
uint32 factionid = target->getFaction();
uint32 factionid = target->GetFaction();
uint32 flag = target->GetUInt32Value(UNIT_FIELD_FLAGS);
uint32 npcflag = target->GetUInt32Value(UNIT_NPC_FLAGS);
uint32 dyflag = target->GetUInt32Value(UNIT_DYNAMIC_FLAGS);
@ -375,7 +375,7 @@ public:
handler->PSendSysMessage(LANG_YOU_CHANGE_FACTION, target->GetGUID().GetCounter(), factionid, flag, npcflag, dyflag);
target->setFaction(factionid);
target->SetFaction(factionid);
target->SetUInt32Value(UNIT_FIELD_FLAGS, flag);
target->SetUInt32Value(UNIT_NPC_FLAGS, npcflag);
target->SetUInt32Value(UNIT_DYNAMIC_FLAGS, dyflag);

9
src/server/scripts/Commands/cs_npc.cpp
View file

@ -458,7 +458,7 @@ public:
return false;
}
creature->setFaction(factionId);
creature->SetFaction(factionId);
// Faction is set in creature_template - not inside creature
@ -491,7 +491,8 @@ public:
if (!creature)
return false;
creature->setFaction(tempfaction);
creature->SetFaction(tempfaction);
return true;
}
@ -589,7 +590,7 @@ public:
}
CreatureTemplate const* cInfo = target->GetCreatureTemplate();
uint32 faction = target->getFaction();
uint32 faction = target->GetFaction();
uint32 npcflags = target->GetUInt32Value(UNIT_NPC_FLAGS);
uint32 mechanicImmuneMask = cInfo->MechanicImmuneMask;
uint32 spellSchoolImmuneMask = cInfo->SpellSchoolImmuneMask;
@ -607,7 +608,7 @@ public:
handler->PSendSysMessage(LANG_NPCINFO_LEVEL, target->getLevel());
handler->PSendSysMessage(LANG_NPCINFO_EQUIPMENT, target->GetCurrentEquipmentId(), target->GetOriginalEquipmentId());
handler->PSendSysMessage(LANG_NPCINFO_HEALTH, target->GetCreateHealth(), target->GetMaxHealth(), target->GetHealth());
handler->PSendSysMessage(LANG_NPCINFO_FLAGS, target->GetUInt32Value(UNIT_FIELD_FLAGS), target->GetUInt32Value(UNIT_FIELD_FLAGS_2), target->GetUInt32Value(UNIT_DYNAMIC_FLAGS), target->getFaction());
handler->PSendSysMessage(LANG_NPCINFO_FLAGS, target->GetUInt32Value(UNIT_FIELD_FLAGS), target->GetUInt32Value(UNIT_FIELD_FLAGS_2), target->GetUInt32Value(UNIT_DYNAMIC_FLAGS), target->GetFaction());
handler->PSendSysMessage(LANG_COMMAND_RAWPAWNTIMES, defRespawnDelayStr.c_str(), curRespawnDelayStr.c_str());
handler->PSendSysMessage(LANG_NPCINFO_LOOT, cInfo->lootid, cInfo->pickpocketLootId, cInfo->SkinLootId);
handler->PSendSysMessage(LANG_NPCINFO_DUNGEON_ID, target->GetInstanceId());

2
src/server/scripts/Commands/cs_reset.cpp
View file

@ -106,7 +106,7 @@ public:
if (!player->HasAuraType(SPELL_AURA_MOD_SHAPESHIFT))
player->SetShapeshiftForm(FORM_NONE);
player->setFactionForRace(player->getRace());
player->SetFactionForRace(player->getRace());
player->SetUInt32Value(UNIT_FIELD_BYTES_0, ((player->getRace()) | (player->getClass() << 8) | (player->getGender() << 16) | (powerType << 24)));

2
src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp
View file

@ -139,7 +139,7 @@ public:
{
CAST_AI(npc_water_elemental::npc_water_elementalAI, summoned->AI())->balindaGUID = me->GetGUID();
summoned->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM, 0, 50, true));
summoned->setFaction(me->getFaction());
summoned->SetFaction(me->GetFaction());
summons.Summon(summoned);
}

2
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp
View file

@ -590,7 +590,7 @@ public:
//spell by trap has effect61, this indicate the bar go hostile
if (Unit* tmp = ObjectAccessor::GetUnit(*me, instance->GetGuidData(DATA_PHALANX)))
tmp->setFaction(14);
tmp->SetFaction(FACTION_MONSTER);
//for later, this event(s) has alot more to it.
//optionally, DONE can trigger bar to go hostile.

7
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.h
View file

@ -21,13 +21,6 @@
#include "CreatureAIImpl.h"
#define BRDScriptName "instance_blackrock_depths"
enum FactionIds
{
FACTION_NEUTRAL = 734,
FACTION_HOSTILE = 754,
FACTION_FRIEND = 35
};
enum BRDBosses
{
BOSS_AMBASSADOR_FLAMELASH = 0,

2
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
View file

@ -76,7 +76,7 @@ public:
if (Creature* Moira = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_MOIRA)))
{
Moira->AI()->EnterEvadeMode();
Moira->setFaction(35);
Moira->SetFaction(FACTION_FRIENDLY);
}
}

2
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp
View file

@ -178,7 +178,7 @@ public:
Voidwalkers = false;
// Reset his gossip menu
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_NPC_FLAG_GOSSIP);
me->setFaction(FACTION_FRIEND);
me->SetFaction(FACTION_FRIENDLY);
// was set before event start, so set again
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);

4
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp
View file

@ -580,7 +580,7 @@ public:
if (Creature* boss = instance->GetCreature(TombBossGUIDs[TombEventCounter]))
{
++TombEventCounter;
boss->setFaction(FACTION_HOSTILE);
boss->SetFaction(FACTION_DARK_IRON_DWARVES);
boss->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
// find suitable target here.
@ -614,7 +614,7 @@ public:
boss->GetMotionMaster()->MoveTargetedHome();
boss->SetLootRecipient(nullptr);
}
boss->setFaction(FACTION_FRIEND);
boss->SetFaction(FACTION_FRIENDLY);
boss->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); // think this is useless
if (i == 6) // doomrel needs explicit reset
{

6
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
View file

@ -190,7 +190,7 @@ public:
me->SetVisible(true);
me->SetPhaseMask(1, true);
me->SetUInt32Value(UNIT_NPC_FLAGS, 1);
me->setFaction(35);
me->SetFaction(FACTION_FRIENDLY);
me->SetStandState(UNIT_STAND_STATE_SIT_HIGH_CHAIR);
me->RemoveAura(SPELL_NEFARIANS_BARRIER);
}
@ -209,7 +209,7 @@ public:
Talk(SAY_GAMESBEGIN_2);
me->setFaction(103);
me->SetFaction(FACTION_DRAGONFLIGHT_BLACK);
me->SetUInt32Value(UNIT_NPC_FLAGS, 0);
DoCast(me, SPELL_NEFARIANS_BARRIER);
me->SetStandState(UNIT_STAND_STATE_STAND);
@ -345,7 +345,7 @@ public:
CreatureID = Entry[urand(0, 4)];
if (Creature* dragon = me->SummonCreature(CreatureID, DrakeSpawnLoc[i]))
{
dragon->setFaction(103);
dragon->SetFaction(FACTION_DRAGONFLIGHT_BLACK);
dragon->AI()->AttackStart(me->GetVictim());
}

4
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp
View file

@ -89,7 +89,7 @@ public:
HasYelled = false;
me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
me->setFaction(35);
me->SetFaction(FACTION_FRIENDLY);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
}
@ -182,7 +182,7 @@ public:
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
break;
case EVENT_SPEECH_7:
me->setFaction(103);
me->SetFaction(FACTION_DRAGONFLIGHT_BLACK);
if (PlayerGUID && ObjectAccessor::GetUnit(*me, PlayerGUID))
AttackStart(ObjectAccessor::GetUnit(*me, PlayerGUID));
break;

4
src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp
View file

@ -106,7 +106,7 @@ public:
if (!me->FindNearestCreature(NPC_FLAMEWAKER_HEALER, 100.0f) && !me->FindNearestCreature(NPC_FLAMEWAKER_ELITE, 100.0f))
{
me->GetMap()->UpdateEncounterState(ENCOUNTER_CREDIT_KILL_CREATURE, me->GetEntry(), me);
me->setFaction(35);
me->SetFaction(FACTION_FRIENDLY);
EnterEvadeMode();
Talk(SAY_DEFEAT);
_JustDied();
@ -184,7 +184,7 @@ public:
}
else if (action == ACTION_START_RAGNAROS_ALT)
{
me->setFaction(35);
me->SetFaction(FACTION_FRIENDLY);
me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
}
}

4
src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp
View file

@ -177,7 +177,7 @@ public:
{
//Become unbanished again
me->SetReactState(REACT_AGGRESSIVE);
me->setFaction(14);
me->SetFaction(FACTION_MONSTER);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
me->SetUInt32Value(UNIT_NPC_EMOTESTATE, 0);
me->HandleEmoteCommand(EMOTE_ONESHOT_EMERGE);
@ -246,7 +246,7 @@ public:
DoResetThreat();
me->SetReactState(REACT_PASSIVE);
me->InterruptNonMeleeSpells(false);
me->setFaction(35);
me->SetFaction(FACTION_FRIENDLY);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_SUBMERGED);
me->HandleEmoteCommand(EMOTE_ONESHOT_SUBMERGE);

2
src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp
View file

@ -314,7 +314,7 @@ public:
if (infernal)
{
infernal->SetDisplayId(INFERNAL_MODEL_INVISIBLE);
infernal->setFaction(me->getFaction());
infernal->SetFaction(me->GetFaction());
infernals.push_back(infernal->GetGUID());
infernal->SetControlled(true, UNIT_STATE_ROOT);
RELAY->AI()->DoCast(infernal, SPELL_INFERNAL_RELAY);

2
src/server/scripts/EasternKingdoms/Karazhan/boss_servant_quarters.cpp
View file

@ -62,7 +62,7 @@ public:
events.Reset();
me->SetVisible(false);
me->SetReactState(REACT_PASSIVE);
me->setFaction(35);
me->SetFaction(FACTION_FRIENDLY);
_events2.Reset();
_events2.ScheduleEvent(EVENT_CHECK_VISIBILITY, 5000);
if (me->GetEntry() == NPC_HYAKISS_THE_LURKER)

12
src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
View file

@ -390,7 +390,7 @@ public:
if (Creature* pSpawn = me->SummonCreature(CREATURE_ARAN_BLIZZARD, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 25000))
{
pSpawn->setFaction(me->getFaction());
pSpawn->SetFaction(me->GetFaction());
pSpawn->CastSpell(pSpawn, SPELL_CIRCULAR_BLIZZARD, false);
}
break;
@ -419,7 +419,7 @@ public:
DoStartNoMovement(target);
ElementalOne->SetInCombatWithZone();
ElementalOne->CombatStart(target);
ElementalOne->setFaction(me->getFaction());
ElementalOne->SetFaction(me->GetFaction());
ElementalOne->SetUnitMovementFlags(MOVEMENTFLAG_ROOT);
ElementalOne->SetModifierValue(UNIT_MOD_RESISTANCE_FROST, BASE_VALUE, 0);
}
@ -433,7 +433,7 @@ public:
DoStartNoMovement(target);
ElementalTwo->SetInCombatWithZone();
ElementalTwo->CombatStart(target);
ElementalTwo->setFaction(me->getFaction());
ElementalTwo->SetFaction(me->GetFaction());
ElementalTwo->SetUnitMovementFlags(MOVEMENTFLAG_ROOT);
ElementalTwo->SetModifierValue(UNIT_MOD_RESISTANCE_FROST, BASE_VALUE, 0);
}
@ -447,7 +447,7 @@ public:
DoStartNoMovement(target);
ElementalThree->SetInCombatWithZone();
ElementalThree->CombatStart(target);
ElementalThree->setFaction(me->getFaction());
ElementalThree->SetFaction(me->GetFaction());
ElementalThree->SetUnitMovementFlags(MOVEMENTFLAG_ROOT);
ElementalThree->SetModifierValue(UNIT_MOD_RESISTANCE_FROST, BASE_VALUE, 0);
}
@ -461,7 +461,7 @@ public:
DoStartNoMovement(target);
ElementalFour->SetInCombatWithZone();
ElementalFour->CombatStart(target);
ElementalFour->setFaction(me->getFaction());
ElementalFour->SetFaction(me->GetFaction());
ElementalFour->SetUnitMovementFlags(MOVEMENTFLAG_ROOT);
ElementalFour->SetModifierValue(UNIT_MOD_RESISTANCE_FROST, BASE_VALUE, 0);
}
@ -476,7 +476,7 @@ public:
if (Creature* unit = me->SummonCreature(CREATURE_SHADOW_OF_ARAN, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000))
{
unit->Attack(me->GetVictim(), true);
unit->setFaction(me->getFaction());
unit->SetFaction(me->GetFaction());
}
}

4
src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
View file

@ -1384,7 +1384,7 @@ void boss_julianne::boss_julianneAI::UpdateAI(uint32 diff)
{
Talk(SAY_JULIANNE_AGGRO);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
me->setFaction(16);
me->SetFaction(FACTION_MONSTER_2);
AggroYellTimer = 0;
}
else
@ -1416,7 +1416,7 @@ void boss_julianne::boss_julianneAI::UpdateAI(uint32 diff)
CAST_AI(boss_romulo::boss_romuloAI, pRomulo->AI())->Phase = PHASE_ROMULO;
DoZoneInCombat(pRomulo);
pRomulo->setFaction(16);
pRomulo->SetFaction(FACTION_MONSTER_2);
}
SummonedRomulo = true;
}

13
src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
View file

@ -173,7 +173,6 @@ enum deathsChallenge
SAY_DUEL = 0,
QUEST_DEATH_CHALLENGE = 12733,
FACTION_HOSTILE = 2068,
DATA_IN_PROGRESS = 0,
@ -337,7 +336,7 @@ public:
Talk(SAY_DUEL + 4, ObjectAccessor::GetPlayer(*me, _duelGUID));
break;
case EVENT_SPEAK+5:
me->setFaction(FACTION_HOSTILE);
me->SetFaction(FACTION_UNDEAD_SCOURGE_2);
if (Player* player = ObjectAccessor::GetPlayer(*me, _duelGUID))
AttackStart(player);
return;
@ -723,7 +722,7 @@ public:
anchorGUID.Clear();
phase = PHASE_CHAINED;
events.Reset();
me->setFaction(7);
me->SetFaction(FACTION_CREATURE);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
me->SetUInt32Value(UNIT_FIELD_BYTES_1, 8);
me->LoadEquipment(0, true);
@ -825,7 +824,7 @@ public:
wait_timer -= diff;
else
{
me->setFaction(14);
me->SetFaction(FACTION_MONSTER);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
phase = PHASE_ATTACKING;
@ -947,7 +946,7 @@ public:
npc_scarlet_miner_cartAI(Creature* creature) : PassiveAI(creature)
{
me->SetUInt32Value(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC);
me->setFaction(35);
me->SetFaction(FACTION_FRIENDLY);
me->SetDisplayId(me->GetCreatureTemplate()->Modelid1); // Modelid2 is a horse.
}
@ -970,7 +969,7 @@ public:
me->GetMotionMaster()->MoveFollow(miner, 1.0f, 0);
me->SetUInt32Value(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC);
me->setFaction(35);
me->SetFaction(FACTION_FRIENDLY);
}
}
@ -1080,7 +1079,7 @@ public:
me->SetFacingToObject(car);
// xinef: add some flags
car->SetUInt32Value(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC);
car->setFaction(35);
car->SetFaction(FACTION_FRIENDLY);
}
Talk(SAY_SCARLET_MINER_0);
SetRun(true);

2
src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
View file

@ -86,7 +86,7 @@ public:
playerGUID = player->GetGUID();
speechTimer = 1000;
speechCounter = 1;
me->setFaction(player->getFaction());
me->SetFaction(player->GetFaction());
me->CombatStop(true);
me->GetMotionMaster()->MoveIdle();
me->SetReactState(REACT_PASSIVE);

2
src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
View file

@ -1054,7 +1054,7 @@ public:
float o = me->GetAngle(tirion);
tirion->GetMotionMaster()->MovePoint(4, me->GetPositionX() + 2.0f * cos(o), me->GetPositionY() + 2.0f * sin(o), me->GetPositionZ(), false);
tirion->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE);
tirion->setFaction(35);
tirion->SetFaction(FACTION_FRIENDLY);
}
break;
case EVENT_OUTRO_SCENE_48:

15
src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
View file

@ -36,7 +36,6 @@ enum AshbringerEventMisc
NPC_FAIRBANKS = 4542,
NPC_COMMANDER_MOGRAINE = 3976,
NPC_INQUISITOR_WHITEMANE = 3977,
FACTION_FRIENDLY_TO_ALL = 35,
DOOR_HIGH_INQUISITOR_ID = 104600,
};
@ -86,8 +85,7 @@ public:
player->GetCreatureListWithEntryInGrid(ScarletList, NPC_COMMANDER_MOGRAINE, 4000.0f);
player->GetCreatureListWithEntryInGrid(ScarletList, NPC_FAIRBANKS, 4000.0f);
if (!ScarletList.empty())
for (std::list<Creature*>::iterator itr = ScarletList.begin(); itr != ScarletList.end(); itr++)
(*itr)->setFaction(FACTION_FRIENDLY_TO_ALL);
for (std::list<Creature*>::iterator itr = ScarletList.begin(); itr != ScarletList.end(); itr++) (*itr)->SetFaction(FACTION_FRIENDLY);
}
}
@ -108,8 +106,7 @@ public:
player->GetCreatureListWithEntryInGrid(ScarletList, NPC_COMMANDER_MOGRAINE, 4000.0f);
player->GetCreatureListWithEntryInGrid(ScarletList, NPC_FAIRBANKS, 4000.0f);
if (!ScarletList.empty())
for (std::list<Creature*>::iterator itr = ScarletList.begin(); itr != ScarletList.end(); itr++)
(*itr)->setFaction(FACTION_FRIENDLY_TO_ALL);
for (std::list<Creature*>::iterator itr = ScarletList.begin(); itr != ScarletList.end(); itr++) (*itr)->SetFaction(FACTION_FRIENDLY);
}
}
@ -221,7 +218,7 @@ public:
if (player->HasAura(AURA_ASHBRINGER) && !SayAshbringer)
{
Talk(SAY_WELCOME);
me->setFaction(FACTION_FRIENDLY_TO_ALL);
me->SetFaction(FACTION_FRIENDLY);
me->SetSheath(SHEATH_STATE_UNARMED);
me->SetFacingToObject(player);
me->SetStandState(UNIT_STAND_STATE_KNEEL);
@ -318,7 +315,7 @@ public:
return 10 * IN_MILLISECONDS;
case 4:
me->SummonCreature(NPC_HIGHLORD_MOGRAINE, 1065.130737f, 1399.350586f, 30.763723f, 6.282961f, TEMPSUMMON_TIMED_DESPAWN, 400000)->SetName("Highlord Mograine");
me->FindNearestCreature(NPC_HIGHLORD_MOGRAINE, 200.0f)->setFaction(FACTION_FRIENDLY_TO_ALL);
me->FindNearestCreature(NPC_HIGHLORD_MOGRAINE, 200.0f)->SetFaction(FACTION_FRIENDLY);
return 30 * IN_MILLISECONDS;
case 5:
mograine->StopMovingOnCurrentPos();
@ -381,7 +378,7 @@ public:
if (Player* player = who->ToPlayer())
if (player->HasAura(AURA_ASHBRINGER) && !SayAshbringer)
{
me->setFaction(FACTION_FRIENDLY_TO_ALL);
me->SetFaction(FACTION_FRIENDLY);
me->SetSheath(SHEATH_STATE_UNARMED);
me->SetStandState(UNIT_STAND_STATE_KNEEL);
me->SetFacingToObject(player);
@ -783,7 +780,7 @@ public:
if (Player* player = who->ToPlayer())
if (player->HasAura(AURA_ASHBRINGER) && !SayAshbringer)
{
me->setFaction(FACTION_FRIENDLY_TO_ALL);
me->SetFaction(FACTION_FRIENDLY);
me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
me->SetSheath(SHEATH_STATE_UNARMED);
me->CastSpell(me, 57767, true);

4
src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp
View file

@ -243,12 +243,12 @@ public:
if (instance->GetData(DATA_MINI_BOSSES) != 6)
{
me->SetVisible(false);
me->setFaction(35);
me->SetFaction(35);
}
else
{
me->SetVisible(true);
me->setFaction(21);
me->SetFaction(21);
}
OpenAllGates();
summons.DespawnAll();

2
src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp
View file

@ -371,7 +371,7 @@ public:
break;
case EVENT_MAD_20:
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
me->setFaction(35);
me->SetFaction(FACTION_FRIENDLY);
if (Creature* brutallus = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_BRUTALLUS)))
{
brutallus->AI()->Talk(YELL_INTRO_TAUNT);

2
src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
View file

@ -241,7 +241,7 @@ public:
me->SetReactState(REACT_PASSIVE);
me->CombatStop();
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
me->setFaction(35);
me->SetFaction(FACTION_FRIENDLY);
events2.ScheduleEvent(EVENT_TALK_GOOD_2, 1000);
break;
case EVENT_TALK_GOOD_2:

6
src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
View file

@ -1,4 +1,4 @@
/*
/*
* This file is part of the AzerothCore Project. See AUTHORS file for Copyright information
*
* This program is free software; you can redistribute it and/or modify it
@ -186,7 +186,7 @@ public:
y = 1380.0f + rand() % 60;
if (Unit* trigger = me->SummonTrigger(x, y, z, 0, 2000))
{
trigger->setFaction(35);
trigger->SetFaction(FACTION_FRIENDLY);
trigger->SetMaxHealth(100000);
trigger->SetHealth(100000);
trigger->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
@ -281,7 +281,7 @@ public:
Cloud->SetDisableGravity(true);
Cloud->StopMoving();
Cloud->SetObjectScale(1.0f);
Cloud->setFaction(35);
Cloud->SetFaction(FACTION_FRIENDLY);
Cloud->SetMaxHealth(9999999);
Cloud->SetHealth(9999999);
Cloud->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);

16
src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
View file

@ -174,7 +174,7 @@ public:
if (Unit* pLorKhan = ObjectAccessor::GetUnit(*me, instance->GetGuidData(DATA_LORKHAN)))
{
pLorKhan->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
pLorKhan->setFaction(14);
pLorKhan->SetFaction(FACTION_MONSTER);
pLorKhan->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
pLorKhan->SetFullHealth();
instance->SetData(DATA_LORKHAN, DONE);
@ -187,7 +187,7 @@ public:
if (Unit* pZath = ObjectAccessor::GetUnit(*me, instance->GetGuidData(DATA_ZATH)))
{
pZath->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
pZath->setFaction(14);
pZath->SetFaction(FACTION_MONSTER);
pZath->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
pZath->SetFullHealth();
instance->SetBossState(DATA_ZATH, DONE);
@ -361,7 +361,7 @@ public:
{
pThekal->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
pThekal->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
pThekal->setFaction(14);
pThekal->SetFaction(FACTION_MONSTER);
pThekal->SetFullHealth();
}
}
@ -373,7 +373,7 @@ public:
{
pZath->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
pZath->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
pZath->setFaction(14);
pZath->SetFaction(FACTION_MONSTER);
pZath->SetFullHealth();
}
}
@ -389,7 +389,7 @@ public:
me->RemoveAurasByType(SPELL_AURA_PERIODIC_LEECH);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
me->SetStandState(UNIT_STAND_STATE_SLEEP);
me->setFaction(35);
me->SetFaction(FACTION_FRIENDLY);
me->AttackStop();
instance->SetBossState(DATA_LORKHAN, SPECIAL);
@ -514,7 +514,7 @@ public:
{
pLorKhan->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
pLorKhan->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
pLorKhan->setFaction(14);
pLorKhan->SetFaction(FACTION_MONSTER);
pLorKhan->SetFullHealth();
}
}
@ -526,7 +526,7 @@ public:
{
pThekal->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
pThekal->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
pThekal->setFaction(14);
pThekal->SetFaction(FACTION_MONSTER);
pThekal->SetFullHealth();
}
}
@ -542,7 +542,7 @@ public:
me->RemoveAurasByType(SPELL_AURA_PERIODIC_LEECH);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
me->SetStandState(UNIT_STAND_STATE_SLEEP);
me->setFaction(35);
me->SetFaction(FACTION_FRIENDLY);
me->AttackStop();
instance->SetBossState(DATA_ZATH, SPECIAL);

5
src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp
View file

@ -51,8 +51,7 @@ enum ProfessorPhizzlethorpe
// Quests
QUEST_SUNKEN_TREASURE = 665,
// Creatures
NPC_VENGEFUL_SURGE = 2776,
FACTION_SUNKEN_TREASURE = 113
NPC_VENGEFUL_SURGE = 2776
};
class npc_professor_phizzlethorpe : public CreatureScript
@ -119,7 +118,7 @@ public:
{
Talk(SAY_PROGRESS_1, player);
npc_escortAI::Start(false, false, player->GetGUID(), quest);
me->setFaction(FACTION_SUNKEN_TREASURE);
me->SetFaction(FACTION_ESCORTEE_N_NEUTRAL_PASSIVE);
}
}

5
src/server/scripts/EasternKingdoms/zone_duskwood.cpp
View file

@ -38,8 +38,7 @@ enum TwilightCorrupter
SPELL_LEVEL_UP = 24312,
EVENT_SOUL_CORRUPTION = 1,
EVENT_CREATURE_OF_NIGHTMARE = 2,
FACTION_HOSTILE = 14
EVENT_CREATURE_OF_NIGHTMARE = 2
};
/*######
@ -83,7 +82,7 @@ public:
{
_introSpoken = true;
Talk(YELL_TWILIGHTCORRUPTOR_RESPAWN, who);
me->setFaction(FACTION_HOSTILE);
me->SetFaction(FACTION_MONSTER);
}
ScriptedAI::MoveInLineOfSight(who);
}

4
src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp
View file

@ -72,7 +72,7 @@ public:
{
if (quest->GetQuestId() == QUEST_BALANCE_OF_LIGHT_AND_SHADOW)
{
creature->AI()->SetData(player->getFaction(), 0);
creature->AI()->SetData(player->GetFaction(), 0);
creature->AI()->SetGUID(player->GetGUID());
}
@ -160,7 +160,7 @@ public:
summons.Summon(creature);
if (creature->GetEntry() == NPC_INJURED_PEASANT || creature->GetEntry() == NPC_PLAGUED_PEASANT)
{
creature->setFaction(_faction);
creature->SetFaction(_faction);
if (!_spoken)
{
_spoken = true;

5
src/server/scripts/EasternKingdoms/zone_ghostlands.cpp
View file

@ -49,8 +49,7 @@ enum RangerLilatha
GO_CAGE = 181152,
NPC_CAPTAIN_HELIOS = 16220,
NPC_MUMMIFIED_HEADHUNTER = 16342,
NPC_SHADOWPINE_ORACLE = 16343,
FACTION_QUEST_ESCAPE = 113
NPC_SHADOWPINE_ORACLE = 16343
};
class npc_ranger_lilatha : public CreatureScript
@ -130,7 +129,7 @@ public:
{
if (quest->GetQuestId() == QUEST_ESCAPE_FROM_THE_CATACOMBS)
{
creature->setFaction(FACTION_QUEST_ESCAPE);
creature->SetFaction(FACTION_ESCORTEE_N_NEUTRAL_PASSIVE);
if (npc_escortAI* pEscortAI = CAST_AI(npc_ranger_lilatha::npc_ranger_lilathaAI, creature->AI()))
pEscortAI->Start(true, false, player->GetGUID());

2
src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
View file

@ -63,7 +63,7 @@ public:
Talk(SAY_CORPORAL_1, player);
npc_escortAI::Start(true, false, player->GetGUID(), quest);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_NPC);
me->setFaction(250);
me->SetFaction(FACTION_ESCORTEE_N_NEUTRAL_ACTIVE);
}
}

2
src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
View file

@ -240,7 +240,7 @@ public:
if (!target)
target = me;
summoned->setFaction(123);
summoned->SetFaction(FACTION_STORMWIND);
summoned->AddThreat(target, 32.0f);
summoned->AI()->AttackStart(target);
}

13
src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
View file

@ -43,7 +43,6 @@ EndContentData */
enum Bartleby
{
FACTION_ENEMY = 168,
QUEST_BEAT = 1640
};
@ -56,7 +55,7 @@ public:
{
if (quest->GetQuestId() == QUEST_BEAT)
{
creature->setFaction(FACTION_ENEMY);
creature->SetFaction(FACTION_ENEMY);
creature->AI()->AttackStart(player);
}
return true;
@ -71,15 +70,15 @@ public:
{
npc_bartlebyAI(Creature* creature) : ScriptedAI(creature)
{
m_uiNormalFaction = creature->getFaction();
m_uiNormalFaction = creature->GetFaction();
}
uint32 m_uiNormalFaction;
void Reset() override
{
if (me->getFaction() != m_uiNormalFaction)
me->setFaction(m_uiNormalFaction);
if (me->GetFaction() != m_uiNormalFaction)
me->SetFaction(m_uiNormalFaction);
}
void AttackedBy(Unit* pAttacker) override
@ -259,8 +258,8 @@ public:
if (Creature* pTyrion = me->FindNearestCreature(NPC_TYRION, 20.0f, true))
pTyrion->AI()->Talk(SAY_TYRION_2);
if (Creature* pMarzon = ObjectAccessor::GetCreature(*me, MarzonGUID))
pMarzon->setFaction(14);
me->setFaction(14);
pMarzon->SetFaction(FACTION_MONSTER);
me->SetFaction(FACTION_MONSTER);
uiTimer = 0;
uiPhase = 0;
break;

4
src/server/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp
View file

@ -73,7 +73,7 @@ public:
me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_STUN);
me->CombatStop(); //stop combat
me->DeleteThreatList(); //unsure of this
me->setFaction(83); //horde generic
me->SetFaction(FACTION_HORDE_GENERIC);
bReset = true;
Reset_Timer = 60000;
@ -91,7 +91,7 @@ public:
{
EnterEvadeMode();
bReset = false;
me->setFaction(28); //troll, bloodscalp
me->SetFaction(FACTION_TROLL_BLOODSCALP);
return;
}

5
src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
View file

@ -40,8 +40,7 @@ enum Calvin
{
SAY_COMPLETE = 0,
SPELL_DRINK = 2639, // possibly not correct spell (but iconId is correct)
QUEST_590 = 590,
FACTION_HOSTILE = 168
QUEST_590 = 590
};
class npc_calvin_montague : public CreatureScript
@ -53,7 +52,7 @@ public:
{
if (quest->GetQuestId() == QUEST_590)
{
creature->setFaction(FACTION_HOSTILE);
creature->SetFaction(FACTION_ENEMY);
creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
CAST_AI(npc_calvin_montague::npc_calvin_montagueAI, creature->AI())->AttackStart(player);
}

15
src/server/scripts/EasternKingdoms/zone_undercity.cpp
View file

@ -354,12 +354,6 @@ public:
}
};
enum Factions
{
FACTION_HOSTILE = 14,
FACTION_FRIENDLY_TO_ALL = 35
};
/*######
## ALLIANCE
#######*/
@ -1616,7 +1610,7 @@ public:
{
jaina->GetMotionMaster()->MoveFollow(me, 5, PET_FOLLOW_ANGLE);
jaina->SetReactState(REACT_AGGRESSIVE);
jaina->setFaction(FACTION_ESCORT_N_NEUTRAL_ACTIVE);
jaina->SetFaction(FACTION_ESCORT_N_NEUTRAL_ACTIVE);
}
bStepping = false;
JumpToNextStep(0);
@ -2464,7 +2458,7 @@ public:
summoned->ApplySpellImmune(0, IMMUNITY_ID, SPELL_THRALL_BUFF, true);
summoned->ApplySpellImmune(0, IMMUNITY_ID, SPELL_SYLVANAS_BUFF, true);
if (!EnableAttack)
summoned->setFaction(FACTION_FRIENDLY_TO_ALL);
summoned->SetFaction(FACTION_FRIENDLY);
summoned->AddThreat(me, 100.0f);
me->AddThreat(summoned, 100.0f);
summoned->AI()->AttackStart(me);
@ -2568,7 +2562,7 @@ public:
sylvanas->GetMotionMaster()->Clear();
sylvanas->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_NPC | UNIT_FLAG_IMMUNE_TO_PC);
sylvanas->SetReactState(REACT_AGGRESSIVE);
sylvanas->setFaction(FACTION_ESCORT_N_NEUTRAL_ACTIVE);
sylvanas->SetFaction(FACTION_ESCORT_N_NEUTRAL_ACTIVE);
sylvanas->GetMotionMaster()->MoveFollow(me, 1, M_PI * 0.1f);
}
}
@ -3141,8 +3135,7 @@ public:
me->GetCreatureListWithEntryInGrid(HostileEndList, NPC_DOCTOR_H, 1000.0f);
me->GetCreatureListWithEntryInGrid(HostileEndList, NPC_CHEMIST_H, 1000.0f);
if (!HostileEndList.empty())
for (std::list<Creature*>::iterator itr = HostileEndList.begin(); itr != HostileEndList.end(); itr++)
(*itr)->setFaction(FACTION_HOSTILE);
for (std::list<Creature*>::iterator itr = HostileEndList.begin(); itr != HostileEndList.end(); itr++) (*itr)->SetFaction(FACTION_MONSTER);
SpawnWave(4);
JumpToNextStep(10 * IN_MILLISECONDS);
break;

3
src/server/scripts/EasternKingdoms/zone_wetlands.cpp
View file

@ -39,7 +39,6 @@ EndContentData */
enum TapokeSlim
{
QUEST_MISSING_DIPLO_PT11 = 1249,
FACTION_ENEMY = 168,
SPELL_STEALTH = 1785,
SPELL_CALL_FRIENDS = 16457, //summons 1x friend
NPC_SLIMS_FRIEND = 4971,
@ -76,7 +75,7 @@ public:
if (me->HasStealthAura())
me->RemoveAurasByType(SPELL_AURA_MOD_STEALTH);
SetRun();
me->setFaction(FACTION_ENEMY);
me->SetFaction(FACTION_ENEMY);
break;
}
}

12
src/server/scripts/Events/brewfest.cpp
View file

@ -1545,7 +1545,6 @@ enum BrewfestRevelerEnum
{
FACTION_ALLIANCE = 1934,
FACTION_HORDE = 1935,
FACTION_FRIENDLY = 35,
SPELL_BREWFEST_REVELER_TRANSFORM_GOBLIN_MALE = 44003,
SPELL_BREWFEST_REVELER_TRANSFORM_GOBLIN_FEMALE = 44004,
@ -1585,7 +1584,7 @@ public:
break;
}
GetTarget()->setFaction(factionId);
GetTarget()->SetFaction(factionId);
}
void Register() override
@ -1714,7 +1713,6 @@ enum DirebrewMisc
GOSSIP_OPTION_APOLOGIZE = 1,
DATA_TARGET_GUID = 1,
MAX_ANTAGONISTS = 3,
FACTION_GOBLIN_DARK_IRON_BAR_PATRON = 736,
DATA_COREN = 33,
GO_MACHINE_SUMMONER = 188508
};
@ -1769,7 +1767,7 @@ public:
_events.Reset();
_summons.DespawnAll();
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
me->setFaction(FACTION_FRIENDLY);
me->SetFaction(FACTION_FRIENDLY);
_events.SetPhase(PHASE_ALL);
for (uint8 i = 0; i < MAX_ANTAGONISTS; ++i)
@ -1808,7 +1806,7 @@ public:
{
_events.SetPhase(PHASE_ONE);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
me->setFaction(FACTION_GOBLIN_DARK_IRON_BAR_PATRON);
me->SetFaction(FACTION_GOBLIN_DARK_IRON_BAR_PATRON);
DoZoneInCombat();
EntryCheckPredicate pred(NPC_ANTAGONIST);
@ -2032,7 +2030,7 @@ public:
void Reset() override
{
me->setFaction(FACTION_GOBLIN_DARK_IRON_BAR_PATRON);
me->SetFaction(FACTION_GOBLIN_DARK_IRON_BAR_PATRON);
DoZoneInCombat();
}
@ -2075,7 +2073,7 @@ public:
break;
case ACTION_ANTAGONIST_HOSTILE:
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
me->setFaction(FACTION_GOBLIN_DARK_IRON_BAR_PATRON);
me->SetFaction(FACTION_GOBLIN_DARK_IRON_BAR_PATRON);
DoZoneInCombat();
break;
default:

8
src/server/scripts/Events/love_in_air.cpp
View file

@ -359,7 +359,7 @@ public:
void Reset() override
{
speachTimer = 0;
me->setFaction(35);
me->SetFaction(FACTION_FRIENDLY);
summons.DespawnAll();
events.Reset();
me->SummonCreature(NPC_APOTHECARY_FRYE, -205.449f, 2219.56f, 79.7633f, 0.7f);
@ -383,7 +383,7 @@ public:
void JustSummoned(Creature* cr) override
{
summons.Summon(cr);
cr->setFaction(35);
cr->SetFaction(FACTION_FRIENDLY);
cr->SetControlled(true, UNIT_STATE_STUNNED);
cr->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
}
@ -407,7 +407,7 @@ public:
{
me->AI()->Talk(SAY_HUMMEL_2);
speachTimer = 0;
me->setFaction(16);
me->SetFaction(FACTION_MONSTER_2);
me->SetInCombatWithZone();
if (Unit* target = SelectTargetFromPlayerList(40.0f))
{
@ -513,7 +513,7 @@ public:
{
me->SetControlled(false, UNIT_STATE_STUNNED);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
me->setFaction(16);
me->SetFaction(FACTION_MONSTER_2);
me->SetInCombatWithZone();
if (Unit* target = SelectTargetFromPlayerList(40.0f))
AttackStart(target);

2
src/server/scripts/Events/midsummer.cpp
View file

@ -240,7 +240,7 @@ public:
if (Unit* caster = GetCaster())
{
caster->CastSpell(caster, SPELL_APPLY_DIGUISE, true);
caster->setFaction(88);
caster->SetFaction(FACTION_BLACKFATHOM);
}
}

10
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
View file

@ -464,7 +464,7 @@ public:
summoned->AI()->AttackStart(me);
else
{
summoned->setFaction(me->getFaction());
summoned->SetFaction(me->GetFaction());
summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
}
@ -553,15 +553,15 @@ public:
if (!me->IsInCombat())
{
// Do not let the raid skip straight to Archimonde. Visible and hostile ONLY if Azagalor is finished.
if ((instance->GetData(DATA_AZGALOREVENT) < DONE) && (me->IsVisible() || (me->getFaction() != 35)))
if ((instance->GetData(DATA_AZGALOREVENT) < DONE) && (me->IsVisible() || (me->GetFaction() != FACTION_FRIENDLY)))
{
me->SetVisible(false);
me->setFaction(35);
me->SetFaction(FACTION_FRIENDLY);
}
if ((instance->GetData(DATA_AZGALOREVENT) >= DONE) && (!me->IsVisible() || (me->getFaction() == 35)))
if ((instance->GetData(DATA_AZGALOREVENT) >= DONE) && (!me->IsVisible() || (me->GetFaction() == FACTION_FRIENDLY)))
{
me->setFaction(1720);
me->SetFaction(FACTION_DRAGONKIN);
me->SetVisible(true);
}

4
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
View file

@ -910,7 +910,7 @@ void hyjalAI::HideNearPos(float x, float y)
for (std::list<Creature*>::const_iterator itr = creatures.begin(); itr != creatures.end(); ++itr)
{
(*itr)->SetVisible(false);
(*itr)->setFaction(35);//make them friendly so mobs won't attack them
(*itr)->SetFaction(FACTION_FRIENDLY); // make them friendly so mobs won't attack them
}
}
}
@ -988,7 +988,7 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff)
if ((*itr) && (*itr)->IsAlive())
{
(*itr)->CastSpell(*itr, SPELL_TELEPORT_VISUAL, true);
(*itr)->setFaction(35);//make them friendly so mobs won't attack them
(*itr)->SetFaction(FACTION_FRIENDLY); // make them friendly so mobs won't attack them
(*itr)->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
}
}

2
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp
View file

@ -471,7 +471,7 @@ public:
if (trigger)
{
trigger->SetVisible(false);
trigger->setFaction(me->getFaction());
trigger->SetFaction(me->GetFaction());
trigger->SetDisableGravity(true);
trigger->CastSpell(me, SPELL_METEOR, true);
}

4
src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp
View file

@ -45,8 +45,6 @@ enum Belnistrasz
EVENT_FIREBALL = 5,
EVENT_FROST_NOVA = 6,
FACTION_ESCORT = 250,
PATH_ESCORT = 871710,
POINT_REACH_IDOL = 17,
@ -122,7 +120,7 @@ public:
eventInProgress = true;
Talk(SAY_QUEST_ACCEPTED);
me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
me->setFaction(FACTION_ESCORT);
me->SetFaction(FACTION_ESCORTEE_N_NEUTRAL_ACTIVE);
me->GetMotionMaster()->MovePath(PATH_ESCORT, false);
}
}

4
src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp
View file

@ -105,7 +105,7 @@ public:
//Cast
me->HandleEmoteCommand(EMOTE_ONESHOT_SUBMERGE);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
me->setFaction(35);
me->SetFaction(FACTION_FRIENDLY);
DoCast(me, SPELL_DIRTMOUND_PASSIVE);
Submerged = true;
@ -129,7 +129,7 @@ public:
if (Submerged && Back_Timer <= diff)
{
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
me->setFaction(14);
me->SetFaction(FACTION_MONSTER);
DoCastVictim(SPELL_GROUND_RUPTURE);

6
src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
View file

@ -319,7 +319,7 @@ struct boss_twinemperorsAI : public ScriptedAI
if (c->isDead())
{
c->Respawn();
c->setFaction(7);
c->SetFaction(FACTION_CREATURE);
c->RemoveAllAuras();
}
if (c->IsWithinDistInMap(me, ABUSE_BUG_RANGE))
@ -414,7 +414,7 @@ public:
void CastSpellOnBug(Creature* target) override
{
target->setFaction(14);
target->SetFaction(FACTION_MONSTER);
target->AI()->AttackStart(me->getThreatMgr().getHostilTarget());
target->AddAura(SPELL_MUTATE_BUG, target);
target->SetFullHealth();
@ -503,7 +503,7 @@ public:
void CastSpellOnBug(Creature* target) override
{
target->setFaction(14);
target->SetFaction(FACTION_MONSTER);
target->AddAura(SPELL_EXPLODEBUG, target);
target->SetFullHealth();
}

10
src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp
View file

@ -65,7 +65,7 @@ public:
void InitializeAI() override
{
startedFight = false;
me->setFaction(35);
me->SetFaction(FACTION_FRIENDLY);
postGossipStep = 0;
Text_Timer = 0;
me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
@ -125,7 +125,7 @@ public:
Text_Timer = 5000;
break;
case 3:
me->setFaction(14);
me->SetFaction(FACTION_MONSTER);
Player* target = ObjectAccessor::GetPlayer(*me, PlayerGUID);
switchFactionIfAlive(NPC_RAVEN, target);
@ -186,7 +186,7 @@ public:
{
if (crew->IsAlive())
{
crew->setFaction(14);
crew->SetFaction(FACTION_MONSTER);
if (target)
{
@ -279,7 +279,7 @@ public:
crew->SetWalk(true);
crew->SetHomePosition(x, y, z, 4.78f);
crew->GetMotionMaster()->MovePoint(1, { x, y, z, 4.78f });
crew->setFaction(FACTION_ESCORT_N_NEUTRAL_ACTIVE);
crew->SetFaction(FACTION_ESCORT_N_NEUTRAL_ACTIVE);
switch (entry)
{
@ -470,7 +470,7 @@ public:
{
if (me->IsAlive())
{
me->setFaction(35);
me->SetFaction(FACTION_FRIENDLY);
me->SetWalk(false);
me->GetMotionMaster()->MovePoint(0, { 1858.57f, 1146.35f, 14.745f, 3.85f });
me->SetHomePosition(1858.57f, 1146.35f, 14.745f, 3.85f);

3
src/server/scripts/Kalimdor/zone_ashenvale.cpp
View file

@ -29,7 +29,6 @@ EndScriptData */
enum Muglash
{
FACTION_QUEST = 113,
SAY_MUG_START1 = 0,
SAY_MUG_START2 = 1,
SAY_MUG_BRAZIER = 2,
@ -117,7 +116,7 @@ public:
if (quest->GetQuestId() == QUEST_VORSHA)
{
Talk(SAY_MUG_START1);
me->setFaction(FACTION_QUEST);
me->SetFaction(FACTION_ESCORTEE_N_NEUTRAL_PASSIVE);
npc_escortAI::Start(true, false, player->GetGUID());
}
}

2
src/server/scripts/Kalimdor/zone_azshara.cpp
View file

@ -356,7 +356,7 @@ public:
{
Talk(SAY_RIZZLE_FINAL);
me->SetUInt32Value(UNIT_NPC_FLAGS, 1);
me->setFaction(35);
me->SetFaction(FACTION_FRIENDLY);
me->GetMotionMaster()->MoveIdle();
me->RemoveAurasDueToSpell(SPELL_PERIODIC_DEPTH_CHARGE);
Reached = true;

5
src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp
View file

@ -228,8 +228,7 @@ enum Magwin
EVENT_STAND = 3,
EVENT_TALK_END = 4,
EVENT_COWLEN_TALK = 5,
QUEST_A_CRY_FOR_HELP = 9528,
FACTION_QUEST = 113
QUEST_A_CRY_FOR_HELP = 9528
};
class npc_magwin : public CreatureScript
@ -297,7 +296,7 @@ public:
{
Talk(SAY_START, player);
}
me->setFaction(FACTION_QUEST);
me->SetFaction(FACTION_ESCORTEE_N_NEUTRAL_PASSIVE);
_events.ScheduleEvent(EVENT_START_ESCORT, 1000);
break;
case EVENT_START_ESCORT:

8
src/server/scripts/Kalimdor/zone_darkshore.cpp
View file

@ -176,8 +176,7 @@ enum Kerlonian
SPELL_SLEEP_VISUAL = 25148,
SPELL_AWAKEN = 17536,
QUEST_SLEEPER_AWAKENED = 5321,
NPC_LILADRIS = 11219, //attackers entries unknown
FACTION_KER_ESCORTEE = 113
NPC_LILADRIS = 11219 //attackers entries unknown
};
/// @todo make concept similar as "ringo" -escort. Find a way to run the scripted attacks, _if_ player are choosing road.
@ -280,7 +279,7 @@ public:
{
creature->SetStandState(UNIT_STAND_STATE_STAND);
creature->AI()->Talk(SAY_KER_START, player);
pKerlonianAI->StartFollow(player, FACTION_KER_ESCORTEE, quest);
pKerlonianAI->StartFollow(player, FACTION_ESCORTEE_N_NEUTRAL_PASSIVE, quest);
}
}
@ -313,7 +312,6 @@ enum Remtravel
SAY_REM_REMEMBER = 11,
EMOTE_REM_END = 12,
FACTION_ESCORTEE = 10,
QUEST_ABSENT_MINDED_PT2 = 731,
NPC_GRAVEL_SCOUT = 2158,
NPC_GRAVEL_BONE = 2159,
@ -412,7 +410,7 @@ public:
if (npc_escortAI* pEscortAI = CAST_AI(npc_prospector_remtravel::npc_prospector_remtravelAI, creature->AI()))
pEscortAI->Start(false, false, player->GetGUID());
creature->setFaction(FACTION_ESCORTEE);
creature->SetFaction(FACTION_ESCORTEE_A_NEUTRAL_PASSIVE);
}
return true;

8
src/server/scripts/Kalimdor/zone_desolace.cpp
View file

@ -73,7 +73,7 @@ public:
bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override
{
if (quest->GetQuestId() == QUEST_BODYGUARD_FOR_HIRE)
creature->AI()->SetGUID(player->GetGUID(), player->getFaction());
creature->AI()->SetGUID(player->GetGUID(), player->GetFaction());
return true;
}
@ -155,7 +155,7 @@ public:
{
if (field == 1 && data == 1)
if (Player* player = me->SelectNearestPlayer(50.0f))
SetGUID(player->GetGUID(), player->getFaction());
SetGUID(player->GetGUID(), player->GetFaction());
}
bool CheckCaravan()
@ -256,7 +256,7 @@ public:
for (uint8 i = 0; i < MAX_CARAVAN_SUMMONS; ++i)
if (Creature* summon = ObjectAccessor::GetCreature(*me, summons[i]))
{
summon->setFaction(faction);
summon->SetFaction(faction);
if (remove)
summon->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_NPC);
else
@ -266,7 +266,7 @@ public:
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_NPC);
else
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_NPC);
me->setFaction(faction);
me->SetFaction(faction);
}
void WaypointReached(uint32 waypointId) override

2
src/server/scripts/Kalimdor/zone_feralas.cpp
View file

@ -204,7 +204,7 @@ public:
me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC);
me->setFaction(FACTION_ESCORT_N_NEUTRAL_ACTIVE);
me->SetFaction(FACTION_ESCORT_N_NEUTRAL_ACTIVE);
me->GetMotionMaster()->MoveFollow(player, 3.f, M_PI);
_events.ScheduleEvent(EVENT_WANDERING_START, urand(40 * IN_MILLISECONDS, 70 * IN_MILLISECONDS));

9
src/server/scripts/Kalimdor/zone_silithus.cpp
View file

@ -44,9 +44,6 @@ enum EternalBoard
{
QUEST_A_PAWN_ON_THE_ETERNAL_BOARD = 8519,
FACTION_HOSTILE = 14,
FACTION_FRIENDLY = 35,
C_ANACHRONOS = 15381,
C_FANDRAL_STAGHELM = 15382,
C_ARYGOS = 15380,
@ -919,7 +916,7 @@ public:
Merithra->SetUInt32Value(UNIT_NPC_FLAGS, 0);
Merithra->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
Merithra->SetUInt32Value(UNIT_FIELD_DISPLAYID, 15420);
Merithra->setFaction(35);
Merithra->SetFaction(FACTION_FRIENDLY);
}
if (Caelestrasz)
@ -927,7 +924,7 @@ public:
Caelestrasz->SetUInt32Value(UNIT_NPC_FLAGS, 0);
Caelestrasz->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
Caelestrasz->SetUInt32Value(UNIT_FIELD_DISPLAYID, 15419);
Caelestrasz->setFaction(35);
Caelestrasz->SetFaction(FACTION_FRIENDLY);
}
if (Arygos)
@ -935,7 +932,7 @@ public:
Arygos->SetUInt32Value(UNIT_NPC_FLAGS, 0);
Arygos->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
Arygos->SetUInt32Value(UNIT_FIELD_DISPLAYID, 15418);
Arygos->setFaction(35);
Arygos->SetFaction(FACTION_FRIENDLY);
}
if (Anachronos)

2
src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
View file

@ -152,7 +152,7 @@ public:
pEscortAI->Start(true, false, player->GetGUID());
creature->AI()->Talk(SAY_START);
creature->setFaction(113);
creature->SetFaction(FACTION_ESCORTEE_N_NEUTRAL_PASSIVE);
creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
}
return true;

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

@ -75,7 +75,7 @@ public:
{
SendItemTimer = 0;
SwitchFactionTimer = 10000;
me->setFaction(35);
me->SetFaction(FACTION_FRIENDLY);
isFriendly = true;
AquaJetTimer = 5000;
@ -109,7 +109,7 @@ public:
{
if (SwitchFactionTimer <= diff)
{
me->setFaction(91);
me->SetFaction(FACTION_ELEMENTAL);
isFriendly = false;
}
else SwitchFactionTimer -= diff;

22
src/server/scripts/Kalimdor/zone_the_barrens.cpp
View file

@ -91,8 +91,7 @@ enum Gilthares
SAY_GIL_FREED = 7,
QUEST_FREE_FROM_HOLD = 898,
AREA_MERCHANT_COAST = 391,
FACTION_ESCORTEE = 232 //guessed, possible not needed for this quest
AREA_MERCHANT_COAST = 391
};
class npc_gilthares : public CreatureScript
@ -104,7 +103,7 @@ public:
{
if (quest->GetQuestId() == QUEST_FREE_FROM_HOLD)
{
creature->setFaction(FACTION_ESCORTEE);
creature->SetFaction(FACTION_ESCORTEE_H_NEUTRAL_ACTIVE); //guessed, possible not needed for this quest
creature->SetStandState(UNIT_STAND_STATE_STAND);
creature->AI()->Talk(SAY_GIL_START, player);
@ -197,7 +196,7 @@ public:
{
npc_taskmaster_fizzuleAI(Creature* creature) : ScriptedAI(creature)
{
factionNorm = creature->getFaction();
factionNorm = creature->GetFaction();
}
uint32 factionNorm;
@ -210,7 +209,7 @@ public:
IsFriend = false;
ResetTimer = 120000;
FlareCount = 0;
me->setFaction(factionNorm);
me->SetFaction(factionNorm);
}
void DoFriend()
@ -222,7 +221,7 @@ public:
me->StopMoving();
me->GetMotionMaster()->MoveIdle();
me->setFaction(FACTION_FRIENDLY_F);
me->SetFaction(FACTION_FRIENDLY);
me->HandleEmoteCommand(EMOTE_ONESHOT_SALUTE);
}
@ -263,7 +262,7 @@ public:
{
if (FlareCount >= 2)
{
if (me->getFaction() == FACTION_FRIENDLY_F)
if (me->GetFaction() == FACTION_FRIENDLY_F)
return;
DoFriend();
@ -408,7 +407,7 @@ public:
Creature* creature = me->SummonCreature(NPC_AFFRAY_CHALLENGER, AffrayChallengerLoc[i], TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000);
if (!creature)
continue;
creature->setFaction(35);
creature->SetFaction(FACTION_FRIENDLY);
creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
creature->HandleEmoteCommand(EMOTE_ONESHOT_ROAR);
@ -450,7 +449,7 @@ public:
creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
creature->HandleEmoteCommand(EMOTE_ONESHOT_ROAR);
creature->setFaction(14);
creature->SetFaction(FACTION_MONSTER);
creature->AI()->AttackStart(pWarrior);
}
++Wave;
@ -481,7 +480,7 @@ public:
creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
creature->HandleEmoteCommand(EMOTE_ONESHOT_ROAR);
creature->setFaction(14);
creature->SetFaction(FACTION_MONSTER);
creature->AI()->AttackStart(pWarrior);
}
WaveTimer = 2000;
@ -511,7 +510,6 @@ enum Wizzlecrank
SAY_END = 6,
QUEST_ESCAPE = 863,
FACTION_RATCHET = 637,
NPC_PILOT_WIZZ = 3451,
NPC_MERCENARY = 3282,
};
@ -644,7 +642,7 @@ public:
{
if (quest->GetQuestId() == QUEST_ESCAPE)
{
creature->setFaction(FACTION_RATCHET);
creature->SetFaction(FACTION_RATCHET);
creature->AI()->Talk(SAY_START);
if (npc_escortAI* pEscortAI = CAST_AI(npc_wizzlecrank_shredder::npc_wizzlecrank_shredderAI, creature->AI()))
pEscortAI->Start(true, false, player->GetGUID());

19
src/server/scripts/Kalimdor/zone_thousand_needles.cpp
View file

@ -50,7 +50,6 @@ enum Lakota
QUEST_FREE_AT_LAST = 4904,
NPC_GRIM_BANDIT = 10758,
FACTION_ESCORTEE_LAKO = 232, //guessed
ID_AMBUSH_1 = 0,
ID_AMBUSH_2 = 2,
@ -77,7 +76,7 @@ public:
if (quest->GetQuestId() == QUEST_FREE_AT_LAST)
{
creature->AI()->Talk(SAY_LAKO_START, player);
creature->setFaction(FACTION_ESCORTEE_LAKO);
creature->SetFaction(FACTION_ESCORTEE_H_NEUTRAL_ACTIVE); //guessed
if (npc_lakota_windsongAI* pEscortAI = CAST_AI(npc_lakota_windsong::npc_lakota_windsongAI, creature->AI()))
pEscortAI->Start(false, false, player->GetGUID(), quest);
@ -138,8 +137,7 @@ enum Packa
SAY_COMPLETE = 2,
QUEST_HOMEWARD = 4770,
NPC_WYVERN = 4107,
FACTION_ESCORTEE = 232 //guessed
NPC_WYVERN = 4107
};
Position const WyvernLoc[3] =
@ -159,7 +157,7 @@ public:
if (quest->GetQuestId() == QUEST_HOMEWARD)
{
creature->AI()->Talk(SAY_START, player);
creature->setFaction(FACTION_ESCORTEE);
creature->SetFaction(FACTION_ESCORTEE_H_NEUTRAL_ACTIVE); // guessed
if (npc_paoka_swiftmountainAI* pEscortAI = CAST_AI(npc_paoka_swiftmountain::npc_paoka_swiftmountainAI, creature->AI()))
pEscortAI->Start(false, false, player->GetGUID(), quest);
@ -212,7 +210,6 @@ public:
enum Plucky
{
FACTION_FRIENDLY = 35,
QUEST_SCOOP = 1950,
SPELL_PLUCKY_HUMAN = 9192,
SPELL_PLUCKY_CHICKEN = 9220
@ -253,7 +250,7 @@ public:
struct npc_pluckyAI : public ScriptedAI
{
npc_pluckyAI(Creature* creature) : ScriptedAI(creature) { NormFaction = creature->getFaction(); }
npc_pluckyAI(Creature* creature) : ScriptedAI(creature) { NormFaction = creature->GetFaction(); }
uint32 NormFaction;
uint32 ResetTimer;
@ -262,8 +259,8 @@ public:
{
ResetTimer = 120000;
if (me->getFaction() != NormFaction)
me->setFaction(NormFaction);
if (me->GetFaction() != NormFaction)
me->SetFaction(NormFaction);
if (me->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP))
me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
@ -277,7 +274,7 @@ public:
{
if (TextEmote == TEXT_EMOTE_BECKON)
{
me->setFaction(FACTION_FRIENDLY);
me->SetFaction(FACTION_FRIENDLY);
me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
DoCast(me, SPELL_PLUCKY_HUMAN, false);
}
@ -289,7 +286,7 @@ public:
return;
else
{
me->setFaction(FACTION_FRIENDLY);
me->SetFaction(FACTION_FRIENDLY);
me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
DoCast(me, SPELL_PLUCKY_HUMAN, false);
me->HandleEmoteCommand(EMOTE_ONESHOT_WAVE);

7
src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
View file

@ -64,7 +64,7 @@ public:
creature->AI()->Talk(SAY_READY, player);
creature->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
// Change faction so mobs attack
creature->setFaction(113);
creature->SetFaction(FACTION_ESCORTEE_N_NEUTRAL_PASSIVE);
}
return true;
}
@ -164,8 +164,7 @@ enum Ringo
SPELL_REVIVE_RINGO = 15591,
QUEST_A_LITTLE_HELP = 4491,
NPC_SPRAGGLE = 9997,
FACTION_ESCORTEE = 113
NPC_SPRAGGLE = 9997
};
class npc_ringo : public CreatureScript
@ -180,7 +179,7 @@ public:
if (npc_ringoAI* ringoAI = CAST_AI(npc_ringo::npc_ringoAI, creature->AI()))
{
creature->SetStandState(UNIT_STAND_STATE_STAND);
ringoAI->StartFollow(player, FACTION_ESCORTEE, quest);
ringoAI->StartFollow(player, FACTION_ESCORTEE_N_NEUTRAL_PASSIVE, quest);
}
}

2
src/server/scripts/Kalimdor/zone_winterspring.cpp
View file

@ -297,7 +297,7 @@ public:
if (quest->GetQuestId() == QUEST_GUARDIANS_ALTAR)
{
creature->AI()->Talk(SAY_QUEST_START);
creature->setFaction(FACTION_ESCORT_A_NEUTRAL_PASSIVE);
creature->SetFaction(FACTION_ESCORT_A_NEUTRAL_PASSIVE);
if (npc_ranshallaAI* escortAI = dynamic_cast<npc_ranshallaAI*>(creature->AI()))
escortAI->Start(false, false, player->GetGUID(), quest);

8
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
View file

@ -148,11 +148,11 @@ public:
if( damage >= me->GetHealth() )
{
damage = me->GetHealth() - 1;
if( me->getFaction() != 35 )
if (me->GetFaction() != FACTION_FRIENDLY)
{
me->CastSpell((Unit*)nullptr, 68575, true); // achievements
me->GetMap()->UpdateEncounterState(ENCOUNTER_CREDIT_CAST_SPELL, 68574, me); // paletress' spell credits encounter, but shouldn't credit achievements
me->setFaction(35);
me->SetFaction(FACTION_FRIENDLY);
events.Reset();
Talk(TEXT_EADRIC_DEATH);
me->getThreatMgr().clearReferences();
@ -296,10 +296,10 @@ public:
{
damage = me->GetHealth() - 1;
if( me->getFaction() != 35 )
if (me->GetFaction() != FACTION_FRIENDLY)
{
me->CastSpell((Unit*)nullptr, 68574, true); // achievements
me->setFaction(35);
me->SetFaction(FACTION_FRIENDLY);
events.Reset();
Talk(TEXT_PALETRESS_DEATH);
me->getThreatMgr().clearReferences();

4
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
View file

@ -184,7 +184,7 @@ public:
float dist = rand_norm() * 40.0f;
if( Creature* c = me->SummonCreature(NPC_SCARAB, AnubLocs[0].GetPositionX() + cos(angle) * dist, AnubLocs[0].GetPositionY() + sin(angle) * dist, AnubLocs[0].GetPositionZ(), 0.0f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 5000) )
{
c->setFaction(31);
c->SetFaction(FACTION_PREY);
c->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
c->GetMotionMaster()->MoveRandom(15.0f);
}
@ -452,7 +452,7 @@ public:
me->CastSpell(me, SPELL_ACID_MANDIBLE, true);
determinationTimer = urand(10000, 50000);
despawnTimer = 0;
if( me->getFaction() == 16 ) // hostile - it's phase 2
if (me->GetFaction() == FACTION_MONSTER_2) // hostile - it's phase 2
if( Unit* target = me->SelectNearestTarget(250.0f) )
{
AttackStart(target);

4
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
View file

@ -318,7 +318,7 @@ public:
{
trigger->SetDisplayId(11686);
trigger->SetUInt32Value(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
trigger->setFaction(14);
trigger->SetFaction(FACTION_MONSTER);
trigger->SetInCombatWithZone();
}
@ -340,7 +340,7 @@ public:
{
trigger->SetDisplayId(11686);
trigger->SetUInt32Value(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
trigger->setFaction(14);
trigger->SetFaction(FACTION_MONSTER);
trigger->SetInCombatWithZone();
}

2
src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
View file

@ -514,7 +514,7 @@ public:
if (darnavan->IsAlive())
{
darnavan->RemoveAllAuras();
darnavan->setFaction(35);
darnavan->SetFaction(FACTION_FRIENDLY);
darnavan->DeleteThreatList();
darnavan->CombatStop(true);
darnavan->GetMotionMaster()->MoveIdle();

2
src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp
View file

@ -211,7 +211,7 @@ public:
sizeTimer = 0;
auraVisualTimer = 1;
me->SetFloatValue(UNIT_FIELD_COMBATREACH, 2.0f);
me->setFaction(21);
me->SetFaction(FACTION_BOOTY_BAY);
}
void KilledUnit(Unit* who) override

4
src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
View file

@ -698,7 +698,7 @@ public:
case EVENT_DESTROY_PLATFORM_0:
if (Creature* c = me->SummonCreature(NPC_WORLD_TRIGGER_LAOI, CenterPos, TEMPSUMMON_TIMED_DESPAWN, 3000))
{
c->setFaction(me->getFaction());
c->SetFaction(me->GetFaction());
c->CastSpell(c, SPELL_DESTROY_PLATFORM_VISUAL, true);
c->CastSpell(c, SPELL_DESTROY_PLATFORM_EFFECT, false);
}
@ -726,7 +726,7 @@ public:
if (Creature* c = me->SummonCreature(NPC_WYRMREST_SKYTALON, pPlayer->GetPositionX(), pPlayer->GetPositionY(), pPlayer->GetPositionZ() - 20.0f, 0.0f, TEMPSUMMON_MANUAL_DESPAWN, 0))
{
c->setFaction(pPlayer->getFaction());
c->SetFaction(pPlayer->GetFaction());
//pPlayer->CastCustomSpell(60683, SPELLVALUE_BASE_POINT0, 1, c, true);
c->m_Events.AddEvent(new EoEDrakeEnterVehicleEvent(*c, pPlayer->GetGUID()), c->m_Events.CalculateTime(500));
AttackStart(c);

2
src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
View file

@ -87,7 +87,7 @@ public:
if (Creature* c = pPlayer->SummonCreature(NPC_WYRMREST_SKYTALON, pPlayer->GetPositionX(), pPlayer->GetPositionY(), pPlayer->GetPositionZ() - 20.0f, 0.0f, TEMPSUMMON_MANUAL_DESPAWN, 0))
{
c->SetCanFly(true);
c->setFaction(pPlayer->getFaction());
c->SetFaction(pPlayer->GetFaction());
//pPlayer->CastCustomSpell(60683, SPELLVALUE_BASE_POINT0, 1, c, true);
c->m_Events.AddEvent(new EoEDrakeEnterVehicleEvent(*c, pPlayer->GetGUID()), c->m_Events.CalculateTime(500));
}

10
src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp
View file

@ -58,27 +58,27 @@ public:
switch (creature->GetEntry())
{
case NPC_ALLIANCE_RANGER:
creature->setFaction(16);
creature->SetFaction(FACTION_MONSTER_2);
if (TeamIdInInstance == TEAM_ALLIANCE)
creature->UpdateEntry(NPC_HORDE_RANGER);
break;
case NPC_ALLIANCE_BERSERKER:
creature->setFaction(16);
creature->SetFaction(FACTION_MONSTER_2);
if (TeamIdInInstance == TEAM_ALLIANCE)
creature->UpdateEntry(NPC_HORDE_BERSERKER);
break;
case NPC_ALLIANCE_COMMANDER:
creature->setFaction(16);
creature->SetFaction(FACTION_MONSTER_2);
if (TeamIdInInstance == TEAM_ALLIANCE)
creature->UpdateEntry(NPC_HORDE_COMMANDER);
break;
case NPC_ALLIANCE_CLERIC:
creature->setFaction(16);
creature->SetFaction(FACTION_MONSTER_2);
if (TeamIdInInstance == TEAM_ALLIANCE)
creature->UpdateEntry(NPC_HORDE_CLERIC);
break;
case NPC_COMMANDER_STOUTBEARD:
creature->setFaction(16);
creature->SetFaction(FACTION_MONSTER_2);
if (TeamIdInInstance == TEAM_ALLIANCE)
creature->UpdateEntry(NPC_COMMANDER_KOLURG);
break;

2
src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp
View file

@ -203,7 +203,7 @@ public:
summons.Summon(summon);
if (summon->GetEntry() == NPC_MOLTEN_GOLEM)
{
summon->setFaction(me->getFaction());
summon->SetFaction(me->GetFaction());
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM))
summon->AI()->AttackStart(target);

2
src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp
View file

@ -360,7 +360,7 @@ public:
if (Creature* dwarf = me->SummonCreature(NPC_DWARFES_FRIENDLY, RoomPosition[Pos].GetPositionX(), RoomPosition[Pos].GetPositionY(), RoomPosition[Pos].GetPositionZ(), 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000))
{
if (Player* plr = SelectTargetFromPlayerList(100.0f))
dwarf->setFaction(plr->getFaction());
dwarf->SetFaction(plr->GetFaction());
ActivatePipe(Pos);
dwarf->AI()->AttackStart(me);

6
src/server/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp
View file

@ -314,7 +314,7 @@ public:
SetDespawnAtEnd(false);
ResetEvent();
me->setFaction(35);
me->SetFaction(FACTION_FRIENDLY);
me->SetReactState(REACT_PASSIVE);
me->SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP | UNIT_NPC_FLAG_QUESTGIVER);
@ -341,7 +341,7 @@ public:
if (!PlayerList.isEmpty())
for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
{
me->setFaction(i->GetSource()->getFaction());
me->SetFaction(i->GetSource()->GetFaction());
break;
}
@ -356,7 +356,7 @@ public:
me->SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_NONE);
break;
case ACTION_START_SJONNIR_FIGHT:
me->setFaction(35);
me->SetFaction(FACTION_FRIENDLY);
me->Yell("Don't worry! Ol' Brann's got yer back! Keep that metal monstrosity busy, and I'll see if I can't sweet talk this machine into helping ye!", LANG_UNIVERSAL);
me->PlayDirectSound(14274);
SetEscortPaused(false);

8
src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp
View file

@ -379,7 +379,7 @@ public:
me->SetReactState(REACT_PASSIVE);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
me->SetSheath(SHEATH_STATE_UNARMED);
me->setFaction(190);
me->SetFaction(190);
me->CastSpell(me, SPELL_DUAL_WIELD, true);
_phaseTwo = false;
@ -437,7 +437,7 @@ public:
me->SetReactState(REACT_PASSIVE);
me->AttackStop();
me->setFaction(35);
me->SetFaction(FACTION_FRIENDLY);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
me->InterruptNonMeleeSpells(false);
if (m_pInstance)
@ -602,7 +602,7 @@ public:
damage = 0;
me->SetReactState(REACT_PASSIVE);
me->AttackStop();
me->setFaction(35);
me->SetFaction(FACTION_FRIENDLY);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
events.Reset();
summons.DespawnAll();
@ -666,7 +666,7 @@ public:
me->CastSpell((Unit*)nullptr, SPELL_SUPERMASSIVE_FAIL, true);
// Hack: _IsValidTarget failed earlier due to flags, call AttackStart again
me->SetReactState(REACT_AGGRESSIVE);
me->setFaction(14);
me->SetFaction(FACTION_MONSTER);
if (Player* target = SelectTargetFromPlayerList(150.0f))
AttackStart(target);
me->SetInCombatWithZone();

2
src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp
View file

@ -344,7 +344,7 @@ public:
damage = 0;
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
me->setFaction(35);
me->SetFaction(FACTION_FRIENDLY);
me->SetHealth(me->GetMaxHealth());
me->CombatStop();
me->RemoveAllAuras();

4
src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
View file

@ -347,7 +347,7 @@ public:
}
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
me->setFaction(35);
me->SetFaction(FACTION_FRIENDLY);
me->GetMotionMaster()->Clear();
me->AttackStop();
me->CombatStop();
@ -522,7 +522,7 @@ public:
if( Creature* h_p = me->SummonCreature(hhd[k][i].id, hhd[k][i].x, hhd[k][i].y, 432.69f, M_PI / 2) )
{
h_p->setFaction(1665);
h_p->SetFaction(1665);
if( cnt < 8 )
Helpers[cnt++] = h_p->GetGUID();

2
src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp
View file

@ -570,7 +570,7 @@ public:
{
_encounterFinished = true;
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
me->setFaction(35);
me->SetFaction(FACTION_FRIENDLY);
me->SetHealth(me->GetMaxHealth());
me->CombatStop();
me->RemoveAllAuras();

10
src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp
View file

@ -267,7 +267,7 @@ public:
void PassengerBoarded(Unit* p, int8 /*seat*/, bool /*apply*/) override
{
me->setFaction(p->getFaction());
me->SetFaction(p->GetFaction());
me->SetReactState(REACT_PASSIVE);
}
@ -282,7 +282,7 @@ public:
me->CombatStop(true);
me->SetReactState(REACT_PASSIVE);
me->SetRegeneratingHealth(false);
me->setFaction(31);
me->SetFaction(FACTION_PREY);
me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_SPELLCLICK);
me->CastSpell(me, 64770, true);
}
@ -290,13 +290,13 @@ public:
void AttackStart(Unit* who) override
{
if (me->getFaction() == 16)
if (me->GetFaction() == FACTION_MONSTER_2)
ScriptedAI::AttackStart(who);
}
void EnterEvadeMode() override
{
if (me->getFaction() == 16)
if (me->GetFaction() == FACTION_MONSTER_2)
ScriptedAI::EnterEvadeMode();
}
@ -304,7 +304,7 @@ public:
void UpdateAI(uint32 diff) override
{
if (me->getFaction() != 16)
if (me->GetFaction() != FACTION_MONSTER_2)
{
if (me->IsAlive() && (me->GetExactDist2dSq(2058.0f, 42.0f) < 25.0f * 25.0f || me->GetExactDist2dSq(2203.0f, 292.0f) < 25.0f * 25.0f || me->GetExactDist2dSq(2125.0f, 170.0f) > 160.0f * 160.0f))
Unit::Kill(me, me, false);

4
src/server/scripts/Northrend/isle_of_conquest.cpp
View file

@ -45,7 +45,7 @@ public:
{
if (me->GetEntry() == NPC_KEEP_CANNON)
{
faction = me->getFaction();
faction = me->GetFaction();
me->Respawn();
me->UpdateEntry(NPC_BROKEN_KEEP_CANNON, nullptr, false);
me->RemoveVehicleKit();
@ -59,7 +59,7 @@ public:
{
me->UpdateEntry(NPC_KEEP_CANNON, nullptr, false);
if (faction)
me->setFaction(faction);
me->SetFaction(faction);
me->CreateVehicleKit(510, NPC_KEEP_CANNON);
me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_SPELLCLICK);
events.ScheduleEvent(EVENT_RESTORE_FLAG, 4000);

25
src/server/scripts/Northrend/zone_borean_tundra.cpp
View file

@ -80,7 +80,7 @@ public:
owner->GetMotionMaster()->MoveFollow(GetCaster(), 4.0f, M_PI, MOTION_SLOT_ACTIVE);
owner->CastSpell(owner, SPELL_SUBDUED, true);
GetCaster()->CastSpell(GetCaster(), SPELL_DRAKE_HATCHLING_SUBDUED, true);
owner->setFaction(35);
owner->SetFaction(FACTION_FRIENDLY);
owner->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC);
owner->DespawnOrUnsummon(3 * MINUTE * IN_MILLISECONDS);
}
@ -375,12 +375,7 @@ public:
enum Lurgglbr
{
QUEST_ESCAPE_WINTERFIN_CAVERNS = 11570,
GO_CAGE = 187369,
FACTION_ESCORTEE_A = 774,
FACTION_ESCORTEE_H = 775,
SAY_START_1 = 0,
SAY_START_2 = 1,
SAY_END_1 = 2,
@ -497,7 +492,7 @@ public:
if (npc_escortAI* pEscortAI = CAST_AI(npc_lurgglbr::npc_lurgglbrAI, creature->AI()))
pEscortAI->Start(true, false, player->GetGUID());
creature->setFaction(player->GetTeamId() == TEAM_ALLIANCE ? FACTION_ESCORTEE_A : FACTION_ESCORTEE_H);
creature->SetFaction(player->GetTeamId() == TEAM_ALLIANCE ? FACTION_ESCORTEE_A_PASSIVE : FACTION_ESCORTEE_H_PASSIVE);
return true;
}
return false;
@ -855,7 +850,7 @@ public:
{
if (quest->GetQuestId() == QUEST_ESCAPING_THE_MIST)
{
creature->setFaction(player->GetTeamId() == TEAM_ALLIANCE ? FACTION_ESCORTEE_A : FACTION_ESCORTEE_H);
creature->SetFaction(player->GetTeamId() == TEAM_ALLIANCE ? FACTION_ESCORTEE_A_PASSIVE : FACTION_ESCORTEE_H_PASSIVE);
creature->SetStandState(UNIT_STAND_STATE_STAND);
creature->AI()->Talk(SAY_1, player);
CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, player->GetGUID());
@ -1173,8 +1168,7 @@ enum HiddenCultist
SAY_HIDDEN_CULTIST_4 = 3,
EVENT_CULTIST_SCRIPT_1 = 1,
EVENT_CULTIST_SCRIPT_2 = 2,
EVENT_CULTIST_SCRIPT_3 = 3,
FACTION_MONSTER = 14
EVENT_CULTIST_SCRIPT_3 = 3
};
class npc_hidden_cultist : public CreatureScript
@ -1227,7 +1221,7 @@ public:
void AttackPlayer()
{
me->setFaction(FACTION_MONSTER);
me->SetFaction(FACTION_MONSTER);
if (Player* player = ObjectAccessor::GetPlayer(*me, _playerGUID))
{
AttackStart(player);
@ -1465,9 +1459,6 @@ enum Thassarian
EVENT_THASSARIAN_SCRIPT_28 = 28,
EVENT_THASSARIAN_SCRIPT_29 = 29,
EVENT_THASSARIAN_CAST = 30,
FACTION_UNDEAD_SCOURGE = 974,
FACTION_VALIANCE_EXPEDITION_7 = 1974,
FACTION_UNDEAD_SCOURGE_9 = 1988,
NPC_IMAGE_LICH_KING = 26203,
NPC_COUNSELOR_TALBOT = 25301,
NPC_PRINCE_VALANAR = 28189,
@ -1569,7 +1560,7 @@ public:
void Reset() override
{
me->setFaction(FACTION_VALIANCE_EXPEDITION_7);
me->SetFaction(FACTION_VALIANCE_EXPEDITION_7);
me->SetStandState(UNIT_STAND_STATE_STAND);
me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE);
me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
@ -1662,7 +1653,7 @@ public:
talbot->CastSpell(talbot, SPELL_TRANSFORM_VALANAR);
talbot->UpdateEntry(NPC_PRINCE_VALANAR);
talbot->SetFullHealth();
talbot->setFaction(FACTION_UNDEAD_SCOURGE);
talbot->SetFaction(FACTION_UNDEAD_SCOURGE);
talbot->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
talbot->SetReactState(REACT_PASSIVE);
talbot->SetStandState(UNIT_STAND_STATE_KNEEL);
@ -1785,7 +1776,7 @@ public:
if (Creature* talbot = ObjectAccessor::GetCreature(*me, _talbotGUID))
{
talbot->AI()->Talk(SAY_TALBOT_4);
talbot->setFaction(FACTION_UNDEAD_SCOURGE_9);
talbot->SetFaction(FACTION_UNDEAD_SCOURGE_9);
talbot->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
talbot->SetReactState(REACT_AGGRESSIVE);
talbot->Attack(me, false);

10
src/server/scripts/Northrend/zone_dragonblight.cpp
View file

@ -330,7 +330,7 @@ public:
{
futureGUID = cr->GetGUID();
summoner->CastSpell(cr, SPELL_CLONE_CASTER, true);
cr->setFaction(summoner->getFaction());
cr->SetFaction(summoner->GetFaction());
cr->SetReactState(REACT_AGGRESSIVE);
}
}
@ -490,7 +490,7 @@ public:
void Reset() override
{
if (me->ToTempSummon() && me->ToTempSummon()->GetSummonerUnit())
me->setFaction(me->ToTempSummon()->GetSummonerUnit()->getFaction());
me->SetFaction(me->ToTempSummon()->GetSummonerUnit()->GetFaction());
}
void MoveInLineOfSight(Unit* who) override
@ -1768,9 +1768,7 @@ enum StrengthenAncientsMisc
SPELL_CREATE_ITEM_BARK = 47550,
SPELL_CONFUSED = 47044,
NPC_LOTHALOR = 26321,
FACTION_WALKER_ENEMY = 14,
NPC_LOTHALOR = 26321
};
class spell_q12096_q12092_dummy : public SpellScriptLoader // Strengthen the Ancients: On Interact Dummy to Woodlands Walker
@ -1803,7 +1801,7 @@ public:
else if (roll == 0) // enemy version
{
tree->AI()->Talk(SAY_WALKER_ENEMY, player);
tree->setFaction(FACTION_WALKER_ENEMY);
tree->SetFaction(FACTION_MONSTER);
tree->Attack(player, true);
}
}

6
src/server/scripts/Northrend/zone_howling_fjord.cpp
View file

@ -130,7 +130,7 @@ public:
case 4:
me->Whisper("NOOOOOOOoooooooooo!", LANG_UNIVERSAL, summoner->ToPlayer());
me->SetLevel(summoner->getLevel());
me->setFaction(14);
me->SetFaction(FACTION_MONSTER);
if (me->GetExactDist(summoner) < 50.0f)
{
me->UpdatePosition(summoner->GetPositionX(), summoner->GetPositionY(), summoner->GetPositionZ(), 0.0f, true);
@ -154,8 +154,6 @@ public:
enum Entries
{
NPC_APOTHECARY_HANES = 23784,
FACTION_ESCORTEE_A = 774,
FACTION_ESCORTEE_H = 775,
NPC_HANES_FIRE_TRIGGER = 23968,
QUEST_TRAIL_OF_FIRE = 11241,
SPELL_COSMETIC_LOW_POLY_FIRE = 56274,
@ -171,7 +169,7 @@ public:
{
if (quest->GetQuestId() == QUEST_TRAIL_OF_FIRE)
{
creature->setFaction(player->GetTeamId() == TEAM_ALLIANCE ? FACTION_ESCORTEE_A : FACTION_ESCORTEE_H);
creature->SetFaction(player->GetTeamId() == TEAM_ALLIANCE ? FACTION_ESCORTEE_A_PASSIVE : FACTION_ESCORTEE_H_PASSIVE);
CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, player->GetGUID());
}
return true;

2
src/server/scripts/Northrend/zone_icecrown.cpp
View file

@ -1304,7 +1304,7 @@ public:
me->SetCanFly(true);
me->AddUnitMovementFlag(MOVEMENTFLAG_FLYING);
me->SetSpeed(MOVE_FLIGHT, 0.1f);
me->setFaction(summoner->getFaction());
me->SetFaction(summoner->GetFaction());
}
void DamageTaken(Unit* who, uint32&, DamageEffectType, SpellSchoolMask) override

8
src/server/scripts/Northrend/zone_sholazar_basin.cpp
View file

@ -136,13 +136,13 @@ public:
{
summons.Summon(cr);
cr->CastSpell(cr, SPELL_TOMB_OF_THE_HEARTLESS, true);
cr->setFaction(me->getFaction());
cr->SetFaction(me->GetFaction());
}
if ((cr = me->SummonCreature(NPC_ZEPIK, 5631.63f, 3794.36f, -92.24f, 3.45f)))
{
summons.Summon(cr);
cr->CastSpell(cr, SPELL_TOMB_OF_THE_HEARTLESS, true);
cr->setFaction(me->getFaction());
cr->SetFaction(me->GetFaction());
}
}
@ -202,7 +202,7 @@ public:
{
minion->Say("Now you not catch us with back turned! Now we hurt you bad undead. BAD!", LANG_UNIVERSAL);
minion->RemoveAurasDueToSpell(SPELL_ARTRUIS_BINDING);
minion->setFaction(me->GetVictim()->getFaction());
minion->SetFaction(me->GetVictim()->GetFaction());
minion->AddThreat(me, 100000.0f);
minion->AI()->AttackStart(me);
minion->DespawnOrUnsummon(900000);
@ -827,7 +827,7 @@ public:
if (npc_engineer_heliceAI* pEscortAI = CAST_AI(npc_engineer_helice::npc_engineer_heliceAI, creature->AI()))
{
creature->GetMotionMaster()->MoveJumpTo(0, 0.4f, 0.4f);
creature->setFaction(113);
creature->SetFaction(FACTION_ESCORTEE_N_NEUTRAL_PASSIVE);
pEscortAI->Start(false, false, player->GetGUID());
creature->AI()->Talk(SAY_WP_1);

4
src/server/scripts/Northrend/zone_storm_peaks.cpp
View file

@ -53,7 +53,7 @@ public:
{
if (apply)
{
me->setFaction(who->getFaction());
me->SetFaction(who->GetFaction());
me->CastSpell(me, SPELL_SUMMON_PURSUERS_PERIODIC, true);
Start(false, true, who->GetGUID());
}
@ -483,7 +483,7 @@ public:
if (Player* charmer = GetValidPlayer())
{
me->setFaction(16);
me->SetFaction(FACTION_MONSTER_2);
charmer->SetClientControl(me, 0, true);
me->SetSpeed(MOVE_RUN, 2.0f, true);

12
src/server/scripts/Northrend/zone_zuldrak.cpp
View file

@ -396,7 +396,7 @@ public:
if (Player* player = ObjectAccessor::GetPlayer(*me, playerGUID))
if (player->IsWithinDistInMap(me, 80))
return;
me->setFaction(974);
me->SetFaction(FACTION_UNDEAD_SCOURGE);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
ScriptedAI::EnterEvadeMode();
}
@ -407,7 +407,7 @@ public:
summons.DespawnAll();
playerGUID.Clear();
lichGUID.Clear();
me->setFaction(974);
me->SetFaction(FACTION_UNDEAD_SCOURGE);
me->SetVisible(false);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
}
@ -473,7 +473,7 @@ public:
me->RemoveAllAuras();
me->CombatStop();
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
me->setFaction(35);
me->SetFaction(FACTION_FRIENDLY);
events.Reset();
events.ScheduleEvent(EVENT_BETRAYAL_4, 1000);
}
@ -579,7 +579,7 @@ public:
break;
}
if (me->getFaction() == 35 || me->HasUnitState(UNIT_STATE_CASTING | UNIT_STATE_STUNNED))
if (me->GetFaction() == FACTION_FRIENDLY || me->HasUnitState(UNIT_STATE_CASTING | UNIT_STATE_STUNNED))
return;
if (!UpdateVictim())
@ -726,7 +726,7 @@ public:
void Reset() override
{
me->setFaction(35);
me->SetFaction(FACTION_FRIENDLY);
DoCast(me, SPELL_KNEEL, true); // Little Hack for kneel - Thanks Illy :P
}
@ -737,7 +737,7 @@ public:
me->RemoveAurasDueToSpell(SPELL_LEFT_CHAIN);
me->RemoveAurasDueToSpell(SPELL_RIGHT_CHAIN);
me->RemoveAurasDueToSpell(SPELL_KNEEL);
me->setFaction(me->GetCreatureTemplate()->faction);
me->SetFaction(me->GetCreatureTemplate()->faction);
DoCast(me, SPELL_UNSHACKLED, true);
Talk(SAY_RAGECLAW);
me->GetMotionMaster()->MoveRandom(10);

4
src/server/scripts/Outland/BlackTemple/black_temple.h
View file

@ -94,9 +94,7 @@ enum MiscIds
SPELL_SHADOW_INFERNO_DAMAGE = 39646,
SPELL_CHAOTIC_CHARGE = 41033,
SPELL_DEMENTIA1 = 41406,
SPELL_DEMENTIA2 = 41409,
FACTION_ASHTONGUE = 1820
SPELL_DEMENTIA2 = 41409
};
template <class AI, class T>

4
src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
View file

@ -118,7 +118,7 @@ public:
{
ashtongueGUIDs.push_back(creature->GetGUID());
if (GetBossState(DATA_SHADE_OF_AKAMA) == DONE)
creature->setFaction(FACTION_ASHTONGUE);
creature->SetFaction(FACTION_ASHTONGUE_DEATHSWORN);
}
}
@ -202,7 +202,7 @@ public:
{
for (ObjectGuid const& guid : ashtongueGUIDs)
if (Creature* ashtongue = instance->GetCreature(guid))
ashtongue->setFaction(FACTION_ASHTONGUE);
ashtongue->SetFaction(FACTION_ASHTONGUE_DEATHSWORN);
}
else if (type == DATA_ILLIDARI_COUNCIL && state == DONE)
{

6
src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
View file

@ -326,7 +326,7 @@ public:
void Reset()
{
me->SetDisableGravity(true);
me->setFaction(14);
me->SetFaction(FACTION_MONSTER);
MovementTimer = 0;
ToxicSporeTimer = 5000;
BoltTimer = 5500;
@ -364,7 +364,7 @@ public:
{
if (Creature* trig = me->SummonCreature(TOXIC_SPORES_TRIGGER, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 30000))
{
trig->setFaction(14);
trig->SetFaction(FACTION_MONSTER);
trig->CastSpell(trig, SPELL_TOXIC_SPORES, true);
}
}
@ -382,7 +382,7 @@ public:
// remove
me->setDeathState(DEAD);
me->RemoveCorpse();
me->setFaction(35);
me->SetFaction(FACTION_FRIENDLY);
}
CheckTimer = 1000;

2
src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
View file

@ -72,7 +72,7 @@ public:
void JustSummoned(Creature* summoned) override
{
summoned->setFaction(16);
summoned->SetFaction(FACTION_MONSTER_2);
summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
summoned->CastSpell(summoned, SPELL_POISON, false, 0, 0, me->GetGUID());

13
src/server/scripts/Outland/zone_hellfire_peninsula.cpp
View file

@ -82,8 +82,6 @@ enum Aeranas
{
SAY_SUMMON = 0,
SAY_FREE = 1,
FACTION_HOSTILE = 16,
FACTION_FRIENDLY = 35,
SPELL_ENVELOPING_WINDS = 15535,
SPELL_SHOCK = 12553
};
@ -104,7 +102,7 @@ public:
shock_Timer = 5000;
me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
me->setFaction(FACTION_FRIENDLY);
me->SetFaction(FACTION_FRIENDLY);
Talk(SAY_SUMMON);
}
@ -115,7 +113,7 @@ public:
{
if (faction_Timer <= diff)
{
me->setFaction(FACTION_HOSTILE);
me->SetFaction(FACTION_MONSTER_2);
faction_Timer = 0;
}
else faction_Timer -= diff;
@ -126,7 +124,7 @@ public:
if (HealthBelowPct(30))
{
me->setFaction(FACTION_FRIENDLY);
me->SetFaction(FACTION_FRIENDLY);
me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
me->RemoveAllAuras();
me->DeleteThreatList();
@ -249,8 +247,7 @@ enum WoundedBloodElf
SAY_ELF_AGGRO = 5,
QUEST_ROAD_TO_FALCON_WATCH = 9375,
NPC_HAALESHI_WINDWALKER = 16966,
NPC_HAALESHI_TALONGUARD = 16967,
FACTION_FALCON_WATCH_QUEST = 775
NPC_HAALESHI_TALONGUARD = 16967
};
class npc_wounded_blood_elf : public CreatureScript
@ -279,7 +276,7 @@ public:
{
if (quest->GetQuestId() == QUEST_ROAD_TO_FALCON_WATCH)
{
me->setFaction(FACTION_FALCON_WATCH_QUEST);
me->SetFaction(FACTION_ESCORTEE_H_PASSIVE);
npc_escortAI::Start(true, false, player->GetGUID());
}
}

2
src/server/scripts/Outland/zone_nagrand.cpp
View file

@ -76,7 +76,7 @@ public:
if (npc_maghar_captiveAI* EscortAI = dynamic_cast<npc_maghar_captiveAI*>(creature->AI()))
{
creature->SetStandState(UNIT_STAND_STATE_STAND);
creature->setFaction(232);
creature->SetFaction(FACTION_ESCORTEE_H_NEUTRAL_ACTIVE);
EscortAI->Start(true, false, player->GetGUID(), quest);
creature->AI()->Talk(SAY_MAG_START);

23
src/server/scripts/Outland/zone_netherstorm.cpp
View file

@ -54,10 +54,7 @@ enum DeathblowToTheLegion
DEATHBLOW_TO_THE_LEGION = 10409, // Quest ID
TURNING_POINT = 10507, // Quest ID
SOCRETHAR_QUEST_CREDIT = 35762, // Quest spell
SOCRETHAR_TP_STONE = 29796,
EXODAR_FACTION = 1806,
EXODAR_ENEMY_FACTION = 90
SOCRETHAR_TP_STONE = 29796
};
enum RoleplayActions
@ -606,7 +603,7 @@ public:
void Reset() override
{
me->SetReactState(REACT_PASSIVE);
me->setFaction(EXODAR_ENEMY_FACTION);
me->SetFaction(FACTION_DEMON);
adyen = nullptr;
orelis = nullptr;
karja = nullptr;
@ -750,7 +747,7 @@ public:
case EVENT_FIGHT_ALDOR:
if (GetCreature(KAYLAAN_THE_LOST))
{
kaylaan->setFaction(EXODAR_ENEMY_FACTION);
kaylaan->SetFaction(FACTION_DEMON);
if (GetCreature(ADYEN_THE_LIGHTBRINGER))
kaylaan->AI()->AttackStart(adyen);
}
@ -758,7 +755,7 @@ public:
case EVENT_END_ALDOR_FIGHT:
if (GetCreature(KAYLAAN_THE_LOST))
{
kaylaan->setFaction(EXODAR_FACTION);
kaylaan->SetFaction(FACTION_DEMON);
kaylaan->GetMotionMaster()->MoveTargetedHome();
kaylaan->CombatStop();
kaylaan->ClearInCombat();
@ -876,7 +873,7 @@ public:
break;
case EVENT_FINAL_FIGHT:
// Prepare Socrethar for encounter
me->setFaction(EXODAR_ENEMY_FACTION);
me->SetFaction(FACTION_DEMON);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_DISABLE_MOVE);
me->SetReactState(REACT_AGGRESSIVE);
@ -1150,7 +1147,7 @@ public:
{
summons.Summon(*itr);
(*itr)->HandleEmoteCommand(EMOTE_ONESHOT_ROAR);
(*itr)->setFaction(250);
(*itr)->SetFaction(FACTION_ESCORTEE_N_NEUTRAL_ACTIVE);
}
cl.clear();
me->GetCreaturesWithEntryInRange(cl, 20.0f, NPC_PROTECTORATE_DEFENDER);
@ -1158,10 +1155,10 @@ public:
{
summons.Summon(*itr);
(*itr)->HandleEmoteCommand(EMOTE_ONESHOT_ROAR);
(*itr)->setFaction(250);
(*itr)->SetFaction(FACTION_ESCORTEE_N_NEUTRAL_ACTIVE);
}
me->setFaction(250);
me->SetFaction(FACTION_ESCORTEE_N_NEUTRAL_ACTIVE);
Talk(SAY_SAEED_0);
events.ScheduleEvent(EVENT_START_WALK, 3000);
}
@ -1824,7 +1821,7 @@ public:
{
if (quest->GetQuestId() == Q_ALMABTRIEB)
{
creature->setFaction(113);
creature->SetFaction(FACTION_ESCORTEE_N_NEUTRAL_PASSIVE);
creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
creature->AI()->Talk(SAY_BESSY_0);
CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, player->GetGUID());
@ -1992,7 +1989,7 @@ public:
{
if (npc_maxx_a_million_escortAI* pEscortAI = CAST_AI(npc_maxx_a_million_escort::npc_maxx_a_million_escortAI, creature->AI()))
{
creature->setFaction(113);
creature->SetFaction(FACTION_ESCORTEE_N_NEUTRAL_PASSIVE);
pEscortAI->Start(false, false, player->GetGUID());
}
}

23
src/server/scripts/Outland/zone_shadowmoon_valley.cpp
View file

@ -75,7 +75,7 @@ public:
Creature* cr2 = go->SummonTrigger(go->GetPositionX(), go->GetPositionY(), go->GetPositionZ() + 2.0f, 0.0f, 100);
if (cr2)
{
cr2->setFaction(14);
cr2->SetFaction(FACTION_MONSTER);
cr2->SetUInt32Value(UNIT_FIELD_FLAGS, 0);
GetCaster()->CastSpell(cr2, 38083, true);
}
@ -428,10 +428,6 @@ public:
enum EnshlavedNetherwingDrake
{
// Factions
FACTION_DEFAULT = 62,
FACTION_FRIENDLY = 1840, // Not sure if this is correct, it was taken off of Mordenai.
// Spells
SPELL_HIT_FORCE_OF_NELTHARAKU = 38762,
SPELL_FORCE_OF_NELTHARAKU = 38775,
@ -467,7 +463,7 @@ public:
void Reset() override
{
if (!Tapped)
me->setFaction(FACTION_DEFAULT);
me->SetFaction(FACTION_ORC_DRAGONMAW);
FlyTimer = 1000;
me->SetDisableGravity(false);
@ -484,7 +480,7 @@ public:
Tapped = true;
PlayerGUID = caster->GetGUID();
me->setFaction(FACTION_FRIENDLY);
me->SetFaction(FACTION_FLAYER_HUNTER); // Not sure if this is correct, it was taken off of Mordenai.
Unit* Dragonmaw = me->FindNearestCreature(NPC_DRAGONMAW_SUBJUGATOR, 50);
if (Dragonmaw)
@ -835,8 +831,7 @@ enum Earthmender
SPELL_HEALING_WAVE = 12491,
QUEST_ESCAPE_COILSCAR = 10451,
NPC_COILSKAR_ASSASSIN = 21044,
FACTION_EARTHEN = 1726 //guessed
NPC_COILSKAR_ASSASSIN = 21044
};
class npc_earthmender_wilda : public CreatureScript
@ -849,7 +844,7 @@ public:
if (quest->GetQuestId() == QUEST_ESCAPE_COILSCAR)
{
creature->AI()->Talk(SAY_WIL_START, player);
creature->setFaction(FACTION_EARTHEN);
creature->SetFaction(FACTION_EARTHEN_RING); //guessed
if (npc_earthmender_wildaAI* pEscortAI = CAST_AI(npc_earthmender_wilda::npc_earthmender_wildaAI, creature->AI()))
pEscortAI->Start(false, false, player->GetGUID(), quest);
@ -1640,11 +1635,7 @@ enum Enraged_Dpirits
NPC_CREDIT_EARTH = 21092,
// Captured Spell / Buff
SPELL_SOUL_CAPTURED = 36115,
// Factions
FACTION_ENRAGED_SOUL_FRIENDLY = 35,
FACTION_ENRAGED_SOUL_HOSTILE = 14
SPELL_SOUL_CAPTURED = 36115
};
class npc_enraged_spirit : public CreatureScript
@ -1712,7 +1703,7 @@ public:
totemOspirits = me->FindNearestCreature(ENTRY_TOTEM_OF_SPIRITS, RADIUS_TOTEM_OF_SPIRITS);
if (totemOspirits)
{
Summoned->setFaction(FACTION_ENRAGED_SOUL_FRIENDLY);
Summoned->SetFaction(FACTION_FRIENDLY);
Summoned->GetMotionMaster()->MovePoint(0, totemOspirits->GetPositionX(), totemOspirits->GetPositionY(), Summoned->GetPositionZ());
if (Unit* owner = totemOspirits->GetOwner())

13
src/server/scripts/Outland/zone_shattrath_city.cpp
View file

@ -47,8 +47,7 @@ EndContentData */
enum Raliq
{
SPELL_UPPERCUT = 10966,
QUEST_CRACK_SKULLS = 10009,
FACTION_HOSTILE_RD = 45
QUEST_CRACK_SKULLS = 10009
};
class npc_raliq_the_drunk : public CreatureScript
@ -62,7 +61,7 @@ public:
if (action == GOSSIP_ACTION_INFO_DEF + 1)
{
CloseGossipMenuFor(player);
creature->setFaction(FACTION_HOSTILE_RD);
creature->SetFaction(FACTION_OGRE);
creature->AI()->AttackStart(player);
}
return true;
@ -86,7 +85,7 @@ public:
{
npc_raliq_the_drunkAI(Creature* creature) : ScriptedAI(creature)
{
m_uiNormFaction = creature->getFaction();
m_uiNormFaction = creature->GetFaction();
}
uint32 m_uiNormFaction;
@ -121,10 +120,6 @@ public:
enum Salsalabim
{
// Factions
FACTION_HOSTILE_SA = 90,
FACTION_FRIENDLY_SA = 35,
// Quests
QUEST_10004 = 10004,
@ -141,7 +136,7 @@ public:
{
if (player->GetQuestStatus(QUEST_10004) == QUEST_STATUS_INCOMPLETE)
{
creature->setFaction(FACTION_HOSTILE_SA);
creature->SetFaction(FACTION_DEMON);
creature->AI()->AttackStart(player);
}
else

16
src/server/scripts/Outland/zone_terokkar_forest.cpp
View file

@ -335,7 +335,6 @@ enum UnkorTheRuthless
SAY_SUBMIT = 0,
FACTION_HOSTILE = 45,
FACTION_FRIENDLY = 35,
QUEST_DONTKILLTHEFATONE = 9889,
SPELL_PULVERIZE = 2676
@ -365,7 +364,7 @@ public:
UnkorUnfriendly_Timer = 0;
Pulverize_Timer = 3000;
me->SetStandState(UNIT_STAND_STATE_STAND);
me->setFaction(FACTION_HOSTILE);
me->SetFaction(FACTION_HOSTILE);
}
void EnterCombat(Unit* /*who*/) override { }
@ -373,7 +372,7 @@ public:
void DoNice()
{
Talk(SAY_SUBMIT);
me->setFaction(FACTION_FRIENDLY);
me->SetFaction(FACTION_FRIENDLY);
me->SetStandState(UNIT_STAND_STATE_SIT);
me->RemoveAllAuras();
me->DeleteThreatList();
@ -527,7 +526,6 @@ enum Floon
SPELL_FROSTBOLT = 9672,
SPELL_FROST_NOVA = 11831,
FACTION_HOSTILE_FL = 1738,
QUEST_CRACK_SKULLS = 10009
};
@ -547,7 +545,7 @@ public:
if (action == GOSSIP_ACTION_INFO_DEF + 1)
{
CloseGossipMenuFor(player);
creature->setFaction(FACTION_HOSTILE_FL);
creature->SetFaction(FACTION_ARAKKOA);
creature->AI()->Talk(SAY_FLOON_ATTACK, player);
creature->AI()->AttackStart(player);
}
@ -572,7 +570,7 @@ public:
{
npc_floonAI(Creature* creature) : ScriptedAI(creature)
{
m_uiNormFaction = creature->getFaction();
m_uiNormFaction = creature->GetFaction();
}
uint32 m_uiNormFaction;
@ -585,8 +583,8 @@ public:
Silence_Timer = 2000;
Frostbolt_Timer = 4000;
FrostNova_Timer = 9000;
if (me->getFaction() != m_uiNormFaction)
me->setFaction(m_uiNormFaction);
if (me->GetFaction() != m_uiNormFaction)
me->SetFaction(m_uiNormFaction);
}
void EnterCombat(Unit* /*who*/) override { }
@ -754,7 +752,7 @@ public:
if (quest->GetQuestId() == QUEST_EFTW_H || quest->GetQuestId() == QUEST_EFTW_A)
{
CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, player->GetGUID());
creature->setFaction(250);
creature->SetFaction(FACTION_ESCORTEE_N_NEUTRAL_ACTIVE);
}
return true;
}

11
src/server/scripts/Outland/zone_zangarmarsh.cpp
View file

@ -250,8 +250,7 @@ public:
enum Cooshhooosh
{
SPELL_LIGHTNING_BOLT = 9532,
QUEST_CRACK_SKULLS = 10009,
FACTION_HOSTILE_CO = 45
QUEST_CRACK_SKULLS = 10009
};
class npc_cooshcoosh : public CreatureScript
@ -263,7 +262,7 @@ public:
{
npc_cooshcooshAI(Creature* creature) : ScriptedAI(creature)
{
m_uiNormFaction = creature->getFaction();
m_uiNormFaction = creature->GetFaction();
}
uint32 m_uiNormFaction;
@ -272,8 +271,8 @@ public:
void Reset() override
{
LightningBolt_Timer = 2000;
if (me->getFaction() != m_uiNormFaction)
me->setFaction(m_uiNormFaction);
if (me->GetFaction() != m_uiNormFaction)
me->SetFaction(m_uiNormFaction);
}
void EnterCombat(Unit* /*who*/) override { }
@ -314,7 +313,7 @@ public:
if (action == GOSSIP_ACTION_INFO_DEF)
{
CloseGossipMenuFor(player);
creature->setFaction(FACTION_HOSTILE_CO);
creature->SetFaction(FACTION_OGRE);
creature->AI()->AttackStart(player);
}
return true;

2
src/server/scripts/Spells/spell_item.cpp
View file

@ -1467,7 +1467,7 @@ public:
continue;
summon->SetOwnerGUID(GetCaster()->GetGUID());
summon->setFaction(GetCaster()->getFaction());
summon->SetFaction(GetCaster()->GetFaction());
summon->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC);
summon->SetReactState(REACT_PASSIVE);
summon->GetMotionMaster()->MoveFollow(GetCaster(), PET_FOLLOW_DIST, GetCaster()->GetAngle(summon), MOTION_SLOT_CONTROLLED);

2
src/server/scripts/Spells/spell_quest.cpp
View file

@ -1006,7 +1006,7 @@ public:
bool CheckProc(ProcEventInfo& eventInfo)
{
Unit* target = eventInfo.GetActionTarget();
return target && target->getFaction() == 1843; // Xinef: Illidari demons faction
return target && target->GetFaction() == 1843; // Xinef: Illidari demons faction
}
void Register() override

10
src/server/scripts/World/npcs_special.cpp
View file

@ -650,9 +650,7 @@ enum ChickenCluck
EMOTE_HELLO = 0,
EMOTE_CLUCK_TEXT = 2,
QUEST_CLUCK = 3861,
FACTION_FRIENDLY = 35,
FACTION_CHICKEN = 31
QUEST_CLUCK = 3861
};
class npc_chicken_cluck : public CreatureScript
@ -669,7 +667,7 @@ public:
void Reset() override
{
ResetFlagTimer = 120000;
me->setFaction(FACTION_CHICKEN);
me->SetFaction(FACTION_PREY);
me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
}
@ -701,7 +699,7 @@ public:
if (player->GetQuestStatus(QUEST_CLUCK) == QUEST_STATUS_NONE && rand() % 30 == 1)
{
me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
me->setFaction(FACTION_FRIENDLY);
me->SetFaction(FACTION_FRIENDLY);
Talk(EMOTE_HELLO);
}
break;
@ -709,7 +707,7 @@ public:
if (player->GetQuestStatus(QUEST_CLUCK) == QUEST_STATUS_COMPLETE)
{
me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
me->setFaction(FACTION_FRIENDLY);
me->SetFaction(FACTION_FRIENDLY);
Talk(EMOTE_CLUCK_TEXT);
}
break;