Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4
This commit is contained in:
commit
1442984686
142 files changed
+6493
-978
No files matched your search
+1
-1
@@ -595,7 +595,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.
|
||||
|
||||
+4
-6
@@ -95,8 +95,6 @@ enum DirebrewEvents
|
||||
|
||||
enum DirebrewMisc
|
||||
{
|
||||
COREN_DIREBREW_FACTION_HOSTILE = 736,
|
||||
COREN_DIREBREW_FACTION_FRIEND = 35,
|
||||
GOSSIP_ID = 11388,
|
||||
GO_MOLE_MACHINE_TRAP = 188509,
|
||||
GOSSIP_OPTION_FIGHT = 0,
|
||||
@@ -139,7 +137,7 @@ public:
|
||||
{
|
||||
_Reset();
|
||||
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
|
||||
me->SetFaction(COREN_DIREBREW_FACTION_FRIEND);
|
||||
me->SetFaction(FACTION_FRIENDLY);
|
||||
events.SetPhase(PHASE_ALL);
|
||||
|
||||
for (uint8 i = 0; i < MAX_ANTAGONISTS; ++i)
|
||||
@@ -162,7 +160,7 @@ public:
|
||||
{
|
||||
events.SetPhase(PHASE_ONE);
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
|
||||
me->SetFaction(COREN_DIREBREW_FACTION_HOSTILE);
|
||||
me->SetFaction(FACTION_GOBLIN_DARK_IRON_BAR_PATRON);
|
||||
me->SetInCombatWithZone();
|
||||
|
||||
EntryCheckPredicate pred(NPC_ANTAGONIST);
|
||||
@@ -353,7 +351,7 @@ public:
|
||||
|
||||
void Reset() override
|
||||
{
|
||||
me->SetFaction(COREN_DIREBREW_FACTION_HOSTILE);
|
||||
me->SetFaction(FACTION_GOBLIN_DARK_IRON_BAR_PATRON);
|
||||
DoCastAOE(SPELL_MOLE_MACHINE_EMERGE, true);
|
||||
me->SetInCombatWithZone();
|
||||
}
|
||||
@@ -395,7 +393,7 @@ public:
|
||||
break;
|
||||
case ACTION_ANTAGONIST_HOSTILE:
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
|
||||
me->SetFaction(COREN_DIREBREW_FACTION_HOSTILE);
|
||||
me->SetFaction(FACTION_GOBLIN_DARK_IRON_BAR_PATRON);
|
||||
me->SetInCombatWithZone();
|
||||
break;
|
||||
default:
|
||||
|
||||
+1
-1
@@ -73,7 +73,7 @@ class boss_emperor_dagran_thaurissan : public CreatureScript
|
||||
if (Creature* moira = ObjectAccessor::GetCreature(*me, _instance->GetGuidData(DATA_MOIRA)))
|
||||
{
|
||||
moira->AI()->EnterEvadeMode();
|
||||
moira->SetFaction(35);
|
||||
moira->SetFaction(FACTION_FRIENDLY);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+2
-2
@@ -134,7 +134,7 @@ class boss_doomrel : public CreatureScript
|
||||
case GOSSIP_ACTION_INFO_DEF+2:
|
||||
CloseGossipMenuFor(player);
|
||||
//start event here
|
||||
creature->SetFaction(FACTION_HOSTILE);
|
||||
creature->SetFaction(FACTION_DARK_IRON_DWARVES);
|
||||
creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
|
||||
creature->AI()->AttackStart(player);
|
||||
InstanceScript* instance = creature->GetInstanceScript();
|
||||
@@ -170,7 +170,7 @@ class boss_doomrel : public CreatureScript
|
||||
{
|
||||
Initialize();
|
||||
|
||||
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);
|
||||
|
||||
+2
-2
@@ -351,7 +351,7 @@ public:
|
||||
{
|
||||
if (Creature* boss = instance->GetCreature(TombBossGUIDs[TombEventCounter]))
|
||||
{
|
||||
boss->SetFaction(FACTION_HOSTILE);
|
||||
boss->SetFaction(FACTION_DARK_IRON_DWARVES);
|
||||
boss->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
|
||||
if (Unit* target = boss->SelectNearestTarget(500))
|
||||
boss->AI()->AttackStart(target);
|
||||
@@ -377,7 +377,7 @@ public:
|
||||
boss->GetMotionMaster()->MoveTargetedHome();
|
||||
boss->SetLootRecipient(NULL);
|
||||
}
|
||||
boss->SetFaction(FACTION_FRIEND);
|
||||
boss->SetFaction(FACTION_FRIENDLY);
|
||||
}
|
||||
}
|
||||
GhostKillCount = 0;
|
||||
|
||||
+3
-3
@@ -187,7 +187,7 @@ public:
|
||||
|
||||
me->SetVisible(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);
|
||||
}
|
||||
@@ -204,7 +204,7 @@ public:
|
||||
|
||||
Talk(SAY_GAMESBEGIN_2);
|
||||
|
||||
me->SetFaction(103);
|
||||
me->SetFaction(FACTION_DRAGONFLIGHT_BLACK);
|
||||
me->SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_NONE);
|
||||
DoCast(me, SPELL_NEFARIANS_BARRIER);
|
||||
me->SetStandState(UNIT_STAND_STATE_STAND);
|
||||
@@ -339,7 +339,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());
|
||||
}
|
||||
|
||||
|
||||
+2
-2
@@ -75,7 +75,7 @@ public:
|
||||
{
|
||||
Initialize();
|
||||
creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
|
||||
creature->SetFaction(35);
|
||||
creature->SetFaction(FACTION_FRIENDLY);
|
||||
creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
|
||||
}
|
||||
|
||||
@@ -153,7 +153,7 @@ public:
|
||||
events.ScheduleEvent(EVENT_SPEECH_4, 16000);
|
||||
break;
|
||||
case EVENT_SPEECH_4:
|
||||
me->SetFaction(103);
|
||||
me->SetFaction(FACTION_DRAGONFLIGHT_BLACK);
|
||||
if (Player* player = ObjectAccessor::GetPlayer(*me, PlayerGUID))
|
||||
AttackStart(player);
|
||||
break;
|
||||
|
||||
-1
@@ -55,7 +55,6 @@ enum Spells
|
||||
enum Extras
|
||||
{
|
||||
OPTION_ID_YOU_CHALLENGED_US = 0,
|
||||
FACTION_FRIENDLY = 35,
|
||||
MENU_OPTION_YOU_CHALLENGED_US = 4108
|
||||
};
|
||||
|
||||
|
||||
@@ -173,7 +173,7 @@ class boss_ragnaros : public CreatureScript
|
||||
{
|
||||
//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);
|
||||
@@ -251,7 +251,7 @@ class boss_ragnaros : public CreatureScript
|
||||
me->InterruptNonMeleeSpells(false);
|
||||
//Root self
|
||||
//DoCast(me, 23973);
|
||||
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);
|
||||
|
||||
@@ -1378,7 +1378,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 AggroYellTimer -= diff;
|
||||
}
|
||||
@@ -1406,7 +1406,7 @@ void boss_julianne::boss_julianneAI::UpdateAI(uint32 diff)
|
||||
ENSURE_AI(boss_romulo::boss_romuloAI, pRomulo->AI())->Phase = PHASE_ROMULO;
|
||||
DoZoneInCombat(pRomulo);
|
||||
|
||||
pRomulo->SetFaction(16);
|
||||
pRomulo->SetFaction(FACTION_MONSTER_2);
|
||||
}
|
||||
SummonedRomulo = true;
|
||||
} else SummonRomuloTimer -= diff;
|
||||
|
||||
@@ -460,7 +460,7 @@ public:
|
||||
Initialize();
|
||||
|
||||
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
|
||||
me->SetFaction(14);
|
||||
me->SetFaction(FACTION_MONSTER);
|
||||
|
||||
DoCast(me, SPELL_FLAMESTRIKE2, true);
|
||||
}
|
||||
@@ -666,7 +666,7 @@ public:
|
||||
|
||||
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
|
||||
me->SetDisableGravity(true);
|
||||
me->SetFaction(14);
|
||||
me->SetFaction(FACTION_MONSTER);
|
||||
DoCast(me, SPELL_ARCANE_SPHERE_PASSIVE, true);
|
||||
}
|
||||
|
||||
|
||||
@@ -125,7 +125,7 @@ public:
|
||||
{
|
||||
Initialize();
|
||||
events.Reset();
|
||||
me->SetFaction(7);
|
||||
me->SetFaction(FACTION_CREATURE);
|
||||
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
|
||||
me->SetStandState(UNIT_STAND_STATE_KNEEL);
|
||||
me->LoadEquipment(0, true);
|
||||
@@ -231,7 +231,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;
|
||||
|
||||
@@ -465,8 +465,7 @@ enum Says_VBM
|
||||
|
||||
enum Misc_VBN
|
||||
{
|
||||
QUEST_DEATH_CHALLENGE = 12733,
|
||||
FACTION_HOSTILE = 2068
|
||||
QUEST_DEATH_CHALLENGE = 12733
|
||||
};
|
||||
|
||||
class npc_death_knight_initiate : public CreatureScript
|
||||
@@ -585,7 +584,7 @@ public:
|
||||
{
|
||||
if (m_uiDuelTimer <= uiDiff)
|
||||
{
|
||||
me->SetFaction(FACTION_HOSTILE);
|
||||
me->SetFaction(FACTION_UNDEAD_SCOURGE_2);
|
||||
|
||||
if (Unit* unit = ObjectAccessor::GetUnit(*me, m_uiDuelerGUID))
|
||||
AttackStart(unit);
|
||||
@@ -771,7 +770,7 @@ public:
|
||||
{
|
||||
charmer->RemoveAurasDueToSpell(SPELL_EFFECT_STOLEN_HORSE);
|
||||
caster->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_SPELLCLICK);
|
||||
caster->SetFaction(35);
|
||||
caster->SetFaction(FACTION_FRIENDLY);
|
||||
DoCast(caster, SPELL_CALL_DARK_RIDER, true);
|
||||
if (Creature* Dark_Rider = me->FindNearestCreature(NPC_DARK_RIDER_OF_ACHERUS, 15))
|
||||
ENSURE_AI(npc_dark_rider_of_acherus::npc_dark_rider_of_acherusAI, Dark_Rider->AI())->InitDespawnHorse(caster);
|
||||
|
||||
@@ -649,7 +649,7 @@ public:
|
||||
{
|
||||
Unit* temp = me->SummonCreature(NPC_ACHERUS_GHOUL, (me->GetPositionX() - 20) + rand32() % 40, (me->GetPositionY() - 20) + rand32() % 40, me->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000);
|
||||
temp->SetWalk(false);
|
||||
temp->SetFaction(2084);
|
||||
temp->SetFaction(FACTION_UNDEAD_SCOURGE_3);
|
||||
uiGhoulGUID[uiSummon_counter] = temp->GetGUID();
|
||||
++uiSummon_counter;
|
||||
}
|
||||
@@ -667,7 +667,7 @@ public:
|
||||
{
|
||||
Unit* temp = me->SummonCreature(NPC_RAMPAGING_ABOMINATION, (me->GetPositionX() - 20) + rand32() % 40, (me->GetPositionY() - 20) + rand32() % 40, me->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000);
|
||||
temp->SetWalk(false);
|
||||
temp->SetFaction(2084);
|
||||
temp->SetFaction(FACTION_UNDEAD_SCOURGE_3);
|
||||
uiAbominationGUID[uiSummon_counter] = temp->GetGUID();
|
||||
++uiSummon_counter;
|
||||
}
|
||||
@@ -685,7 +685,7 @@ public:
|
||||
{
|
||||
Unit* temp = me->SummonCreature(NPC_WARRIOR_OF_THE_FROZEN_WASTES, (me->GetPositionX() - 20) + rand32() % 40, (me->GetPositionY() - 20) + rand32() % 40, me->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000);
|
||||
temp->SetWalk(false);
|
||||
temp->SetFaction(2084);
|
||||
temp->SetFaction(FACTION_UNDEAD_SCOURGE_3);
|
||||
uiWarriorGUID[uiSummon_counter] = temp->GetGUID();
|
||||
++uiSummon_counter;
|
||||
}
|
||||
@@ -703,7 +703,7 @@ public:
|
||||
{
|
||||
Unit* temp = me->SummonCreature(NPC_FLESH_BEHEMOTH, (me->GetPositionX() - 20) + rand32() % 40, (me->GetPositionY() - 20) + rand32() % 40, me->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000);
|
||||
temp->SetWalk(false);
|
||||
temp->SetFaction(2084);
|
||||
temp->SetFaction(FACTION_UNDEAD_SCOURGE_3);
|
||||
uiBehemothGUID[uiSummon_counter] = temp->GetGUID();
|
||||
++uiSummon_counter;
|
||||
}
|
||||
@@ -1535,7 +1535,7 @@ public:
|
||||
if (!temp)
|
||||
{
|
||||
temp = me->SummonCreature(NPC_ACHERUS_GHOUL, LightofDawnLoc[0].GetPositionWithOffset({ float(rand32() % 30), float(rand32() % 30), 0.0f, 0.0f }), TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000);
|
||||
temp->SetFaction(2084);
|
||||
temp->SetFaction(FACTION_UNDEAD_SCOURGE_3);
|
||||
uiGhoulGUID[i] = temp->GetGUID();
|
||||
}
|
||||
}
|
||||
@@ -1545,7 +1545,7 @@ public:
|
||||
if (!temp)
|
||||
{
|
||||
temp = me->SummonCreature(NPC_WARRIOR_OF_THE_FROZEN_WASTES, LightofDawnLoc[0].GetPositionWithOffset({ float(rand32() % 30), float(rand32() % 30), 0.0f, 0.0f }), TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000);
|
||||
temp->SetFaction(2084);
|
||||
temp->SetFaction(FACTION_UNDEAD_SCOURGE_3);
|
||||
uiAbominationGUID[i] = temp->GetGUID();
|
||||
}
|
||||
}
|
||||
@@ -1555,7 +1555,7 @@ public:
|
||||
if (!temp)
|
||||
{
|
||||
temp = me->SummonCreature(NPC_RAMPAGING_ABOMINATION, LightofDawnLoc[0].GetPositionWithOffset({ float(rand32() % 30), float(rand32() % 30), 0.0f, 0.0f }), TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000);
|
||||
temp->SetFaction(2084);
|
||||
temp->SetFaction(FACTION_UNDEAD_SCOURGE_3);
|
||||
uiWarriorGUID[i] = temp->GetGUID();
|
||||
}
|
||||
}
|
||||
@@ -1565,7 +1565,7 @@ public:
|
||||
if (!temp)
|
||||
{
|
||||
temp = me->SummonCreature(NPC_FLESH_BEHEMOTH, LightofDawnLoc[0].GetPositionWithOffset({ float(rand32() % 30), float(rand32() % 30), 0.0f, 0.0f }), TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000);
|
||||
temp->SetFaction(2084);
|
||||
temp->SetFaction(FACTION_UNDEAD_SCOURGE_3);
|
||||
uiBehemothGUID[i] = temp->GetGUID();
|
||||
}
|
||||
}
|
||||
@@ -1577,7 +1577,7 @@ public:
|
||||
if (!temp)
|
||||
{
|
||||
temp = me->SummonCreature(NPC_DEFENDER_OF_THE_LIGHT, LightofDawnLoc[0].GetPositionWithOffset({ float(rand32() % 30), float(rand32() % 30), 0.0f, 0.0f }), TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000);
|
||||
temp->SetFaction(2089);
|
||||
temp->SetFaction(FACTION_SCARLET_CRUSADE);
|
||||
me->AddThreat(temp, 0.0f);
|
||||
uiDefenderGUID[i] = temp->GetGUID();
|
||||
}
|
||||
@@ -1588,7 +1588,7 @@ public:
|
||||
if (!temp)
|
||||
{
|
||||
temp = me->SummonCreature(NPC_RIMBLAT_EARTHSHATTER, LightofDawnLoc[0].GetPositionWithOffset({ float(rand32() % 30), float(rand32() % 30), 0.0f, 0.0f }), TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000);
|
||||
temp->SetFaction(2089);
|
||||
temp->SetFaction(FACTION_SCARLET_CRUSADE);
|
||||
me->AddThreat(temp, 0.0f);
|
||||
uiEarthshatterGUID[i] = temp->GetGUID();
|
||||
}
|
||||
@@ -1597,7 +1597,7 @@ public:
|
||||
if (!temp)
|
||||
{
|
||||
temp = me->SummonCreature(NPC_KORFAX_CHAMPION_OF_THE_LIGHT, LightofDawnLoc[0].GetPositionWithOffset({ float(rand32() % 30), float(rand32() % 30), 0.0f, 0.0f }), TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 600000);
|
||||
temp->SetFaction(2089);
|
||||
temp->SetFaction(FACTION_SCARLET_CRUSADE);
|
||||
me->AddThreat(temp, 0.0f);
|
||||
uiKorfaxGUID = temp->GetGUID();
|
||||
}
|
||||
@@ -1605,7 +1605,7 @@ public:
|
||||
if (!temp)
|
||||
{
|
||||
temp = me->SummonCreature(NPC_LORD_MAXWELL_TYROSUS, LightofDawnLoc[0].GetPositionWithOffset({ float(rand32() % 30), float(rand32() % 30), 0.0f, 0.0f }), TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 600000);
|
||||
temp->SetFaction(2089);
|
||||
temp->SetFaction(FACTION_SCARLET_CRUSADE);
|
||||
me->AddThreat(temp, 0.0f);
|
||||
uiMaxwellGUID = temp->GetGUID();
|
||||
}
|
||||
@@ -1613,7 +1613,7 @@ public:
|
||||
if (!temp)
|
||||
{
|
||||
temp = me->SummonCreature(NPC_COMMANDER_ELIGOR_DAWNBRINGER, LightofDawnLoc[0].GetPositionWithOffset({ float(rand32() % 30), float(rand32() % 30), 0.0f, 0.0f }), TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 600000);
|
||||
temp->SetFaction(2089);
|
||||
temp->SetFaction(FACTION_SCARLET_CRUSADE);
|
||||
me->AddThreat(temp, 0.0f);
|
||||
uiEligorGUID = temp->GetGUID();
|
||||
}
|
||||
@@ -1621,7 +1621,7 @@ public:
|
||||
if (!temp)
|
||||
{
|
||||
temp = me->SummonCreature(NPC_RAYNE, LightofDawnLoc[0].GetPositionWithOffset({ float(rand32() % 30), float(rand32() % 30), 0.0f, 0.0f }), TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000);
|
||||
temp->SetFaction(2089);
|
||||
temp->SetFaction(FACTION_SCARLET_CRUSADE);
|
||||
me->AddThreat(temp, 0.0f);
|
||||
uiRayneGUID = temp->GetGUID();
|
||||
}
|
||||
|
||||
@@ -74,8 +74,6 @@ enum ApothecaryMisc
|
||||
{
|
||||
ACTION_START_EVENT = 1,
|
||||
ACTION_START_FIGHT = 2,
|
||||
FACTION_APOTHECARY_HOSTILE = 14,
|
||||
FACTION_APOTHECARY_FRIENDLY = 35,
|
||||
GOSSIP_OPTION_START = 0,
|
||||
GOSSIP_MENU_HUMMEL = 10847,
|
||||
QUEST_YOUVE_BEEN_SERVED = 14488,
|
||||
@@ -115,7 +113,7 @@ class boss_apothecary_hummel : public CreatureScript
|
||||
_deadCount = 0;
|
||||
_isDead = false;
|
||||
events.SetPhase(PHASE_ALL);
|
||||
me->SetFaction(FACTION_APOTHECARY_FRIENDLY);
|
||||
me->SetFaction(FACTION_FRIENDLY);
|
||||
me->SummonCreatureGroup(1);
|
||||
}
|
||||
|
||||
@@ -134,7 +132,7 @@ class boss_apothecary_hummel : public CreatureScript
|
||||
events.ScheduleEvent(EVENT_HUMMEL_SAY_0, Milliseconds(1));
|
||||
|
||||
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
|
||||
me->SetFaction(FACTION_APOTHECARY_HOSTILE);
|
||||
me->SetFaction(FACTION_MONSTER);
|
||||
DummyEntryCheckPredicate pred;
|
||||
summons.DoAction(ACTION_START_EVENT, pred);
|
||||
}
|
||||
@@ -289,7 +287,7 @@ struct npc_apothecary_genericAI : public ScriptedAI
|
||||
if (action == ACTION_START_EVENT)
|
||||
{
|
||||
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
|
||||
me->SetFaction(FACTION_APOTHECARY_HOSTILE);
|
||||
me->SetFaction(FACTION_MONSTER);
|
||||
me->GetMotionMaster()->MovePoint(1, _movePos);
|
||||
}
|
||||
else if (action == ACTION_START_FIGHT)
|
||||
|
||||
@@ -155,7 +155,7 @@ public:
|
||||
if (Creature* Sath = ObjectAccessor::GetCreature(*me, SathGUID))
|
||||
Sath->AI()->EnterEvadeMode();
|
||||
|
||||
me->SetFaction(14);
|
||||
me->SetFaction(FACTION_MONSTER);
|
||||
if (!bJustReset) //first reset at create
|
||||
{
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE + UNIT_FLAG_NOT_SELECTABLE);
|
||||
@@ -379,7 +379,7 @@ public:
|
||||
switch (TalkSequence)
|
||||
{
|
||||
case 1:
|
||||
me->SetFaction(35);
|
||||
me->SetFaction(FACTION_FRIENDLY);
|
||||
TalkTimer = 1000;
|
||||
break;
|
||||
case 2:
|
||||
|
||||
@@ -287,7 +287,7 @@ public:
|
||||
me->RemoveDynObject(SPELL_RING_OF_BLUE_FLAMES);
|
||||
for (uint8 i = 0; i < 4; ++i)
|
||||
if (GameObject* pOrb = GetOrb(i))
|
||||
pOrb->SetFaction(0);
|
||||
pOrb->SetFaction(FACTION_NONE);
|
||||
}
|
||||
|
||||
void EmpowerOrb(bool all)
|
||||
@@ -304,7 +304,7 @@ public:
|
||||
if (GameObject* pOrb = GetOrb(i))
|
||||
{
|
||||
pOrb->CastSpell(me, SPELL_RING_OF_BLUE_FLAMES);
|
||||
pOrb->SetFaction(35);
|
||||
pOrb->SetFaction(FACTION_FRIENDLY);
|
||||
pOrb->setActive(true);
|
||||
pOrb->Refresh();
|
||||
}
|
||||
@@ -316,7 +316,7 @@ public:
|
||||
if (GameObject* pOrb = GetOrb(urand(0, 3)))
|
||||
{
|
||||
pOrb->CastSpell(me, SPELL_RING_OF_BLUE_FLAMES);
|
||||
pOrb->SetFaction(35);
|
||||
pOrb->SetFaction(FACTION_FRIENDLY);
|
||||
pOrb->setActive(true);
|
||||
pOrb->Refresh();
|
||||
|
||||
@@ -369,7 +369,7 @@ public:
|
||||
InstanceScript* instance = go->GetInstanceScript();
|
||||
player->SummonCreature(NPC_POWER_OF_THE_BLUE_DRAGONFLIGHT, player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN, 121000);
|
||||
player->CastSpell(player, SPELL_VENGEANCE_OF_THE_BLUE_FLIGHT, false);
|
||||
go->SetFaction(0);
|
||||
go->SetFaction(FACTION_NONE);
|
||||
|
||||
if (Creature* pKalec = ObjectAccessor::GetCreature(*player, instance->GetGuidData(DATA_KALECGOS_KJ)))
|
||||
ENSURE_AI(boss_kalecgos_kj::boss_kalecgos_kjAI, pKalec->AI())->SetRingOfBlueFlames();
|
||||
|
||||
@@ -96,7 +96,7 @@ class boss_archaedas : public CreatureScript
|
||||
Initialize();
|
||||
|
||||
instance->SetData(0, 5); // respawn any dead minions
|
||||
me->SetFaction(35);
|
||||
me->SetFaction(FACTION_FRIENDLY);
|
||||
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
|
||||
me->SetControlled(true, UNIT_STATE_ROOT);
|
||||
me->AddAura(SPELL_FREEZE_ANIM, me);
|
||||
@@ -112,14 +112,14 @@ class boss_archaedas : public CreatureScript
|
||||
minion->CastSpell(minion, SPELL_ARCHAEDAS_AWAKEN, true);
|
||||
minion->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
|
||||
minion->SetControlled(false, UNIT_STATE_ROOT);
|
||||
minion->SetFaction(14);
|
||||
minion->SetFaction(FACTION_MONSTER);
|
||||
minion->RemoveAura(SPELL_MINION_FREEZE_ANIM);
|
||||
}
|
||||
}
|
||||
|
||||
void EnterCombat(Unit* /*who*/) override
|
||||
{
|
||||
me->SetFaction(14);
|
||||
me->SetFaction(FACTION_MONSTER);
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
|
||||
me->SetControlled(false, UNIT_STATE_ROOT);
|
||||
}
|
||||
@@ -259,7 +259,7 @@ class npc_archaedas_minions : public CreatureScript
|
||||
{
|
||||
Initialize();
|
||||
|
||||
me->SetFaction(35);
|
||||
me->SetFaction(FACTION_FRIENDLY);
|
||||
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
|
||||
me->SetControlled(true, UNIT_STATE_ROOT);
|
||||
me->RemoveAllAuras();
|
||||
@@ -268,7 +268,7 @@ class npc_archaedas_minions : public CreatureScript
|
||||
|
||||
void EnterCombat(Unit* /*who*/) override
|
||||
{
|
||||
me->SetFaction (14);
|
||||
me->SetFaction (FACTION_MONSTER);
|
||||
me->RemoveAllAuras();
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
|
||||
me->SetControlled(false, UNIT_STATE_ROOT);
|
||||
@@ -348,7 +348,7 @@ class npc_stonekeepers : public CreatureScript
|
||||
|
||||
void Reset() override
|
||||
{
|
||||
me->SetFaction(35);
|
||||
me->SetFaction(FACTION_FRIENDLY);
|
||||
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
|
||||
me->SetControlled(true, UNIT_STATE_ROOT);
|
||||
me->RemoveAllAuras();
|
||||
@@ -357,7 +357,7 @@ class npc_stonekeepers : public CreatureScript
|
||||
|
||||
void EnterCombat(Unit* /*who*/) override
|
||||
{
|
||||
me->SetFaction(14);
|
||||
me->SetFaction(FACTION_MONSTER);
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
|
||||
me->SetControlled(false, UNIT_STATE_ROOT);
|
||||
}
|
||||
|
||||
@@ -144,7 +144,7 @@ class instance_uldaman : public InstanceMapScript
|
||||
|
||||
void SetFrozenState(Creature* creature)
|
||||
{
|
||||
creature->SetFaction(35);
|
||||
creature->SetFaction(FACTION_FRIENDLY);
|
||||
creature->RemoveAllAuras();
|
||||
creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
|
||||
creature->SetControlled(true, UNIT_STATE_ROOT);
|
||||
@@ -179,7 +179,7 @@ class instance_uldaman : public InstanceMapScript
|
||||
if (!target || !target->IsAlive())
|
||||
continue;
|
||||
target->SetControlled(false, UNIT_STATE_ROOT);
|
||||
target->SetFaction(14);
|
||||
target->SetFaction(FACTION_MONSTER);
|
||||
target->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
|
||||
target->RemoveAura(SPELL_MINION_FREEZE_ANIM);
|
||||
|
||||
@@ -200,11 +200,11 @@ class instance_uldaman : public InstanceMapScript
|
||||
for (GuidVector::const_iterator i = archaedasWallMinions.begin(); i != archaedasWallMinions.end(); ++i)
|
||||
{
|
||||
Creature* target = instance->GetCreature(*i);
|
||||
if (!target || !target->IsAlive() || target->GetFaction() == 14)
|
||||
if (!target || !target->IsAlive() || target->GetFaction() == FACTION_MONSTER)
|
||||
continue;
|
||||
target->SetControlled(false, UNIT_STATE_ROOT);
|
||||
target->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
|
||||
target->SetFaction(14);
|
||||
target->SetFaction(FACTION_MONSTER);
|
||||
target->RemoveAura(SPELL_MINION_FREEZE_ANIM);
|
||||
archaedas->CastSpell(target, SPELL_AWAKEN_VAULT_WALKER, true);
|
||||
target->CastSpell(target, SPELL_ARCHAEDAS_AWAKEN, true);
|
||||
@@ -267,7 +267,7 @@ class instance_uldaman : public InstanceMapScript
|
||||
if (!ironaya)
|
||||
return;
|
||||
|
||||
ironaya->SetFaction(415);
|
||||
ironaya->SetFaction(FACTION_TITAN);
|
||||
ironaya->SetControlled(false, UNIT_STATE_ROOT);
|
||||
ironaya->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
|
||||
|
||||
|
||||
@@ -196,7 +196,7 @@ class boss_akilzon : public CreatureScript
|
||||
y = 1380.0f + rand32() % 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);
|
||||
@@ -291,7 +291,7 @@ class boss_akilzon : public CreatureScript
|
||||
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);
|
||||
|
||||
@@ -89,9 +89,7 @@ enum Misc
|
||||
{
|
||||
POINT_START_REVIVE = 1,
|
||||
|
||||
DATA_OHGANOT_SO_FAST = 5762,
|
||||
|
||||
FACTION_NONE = 1665
|
||||
DATA_OHGANOT_SO_FAST = 5762
|
||||
};
|
||||
|
||||
enum SummonGroups
|
||||
|
||||
@@ -57,8 +57,7 @@ enum ProfessorPhizzlethorpe
|
||||
QUEST_SUNKEN_TREASURE = 665,
|
||||
QUEST_GOGGLE_BOGGLE = 26050,
|
||||
// Creatures
|
||||
NPC_VENGEFUL_SURGE = 2776,
|
||||
FACTION_SUNKEN_TREASURE = 113
|
||||
NPC_VENGEFUL_SURGE = 2776
|
||||
};
|
||||
|
||||
class npc_professor_phizzlethorpe : public CreatureScript
|
||||
@@ -114,7 +113,7 @@ class npc_professor_phizzlethorpe : public CreatureScript
|
||||
{
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -52,8 +52,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
|
||||
@@ -133,7 +132,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());
|
||||
|
||||
@@ -45,9 +45,7 @@ enum eOOX
|
||||
SAY_OOX_END = 4,
|
||||
QUEST_RESQUE_OOX_09 = 836,
|
||||
NPC_MARAUDING_OWL = 7808,
|
||||
NPC_VILE_AMBUSHER = 7809,
|
||||
FACTION_ESCORTEE_A = 774,
|
||||
FACTION_ESCORTEE_H = 775
|
||||
NPC_VILE_AMBUSHER = 7809
|
||||
};
|
||||
|
||||
class npc_oox09hl : public CreatureScript
|
||||
@@ -79,7 +77,7 @@ public:
|
||||
if (quest->GetQuestId() == QUEST_RESQUE_OOX_09)
|
||||
{
|
||||
me->SetStandState(UNIT_STAND_STATE_STAND);
|
||||
me->SetFaction(player->GetTeam() == ALLIANCE ? FACTION_ESCORTEE_A : FACTION_ESCORTEE_H);
|
||||
me->SetFaction(player->GetTeam() == ALLIANCE ? FACTION_ESCORTEE_A_PASSIVE : FACTION_ESCORTEE_H_PASSIVE);
|
||||
Talk(SAY_OOX_START, player);
|
||||
npc_escortAI::Start(false, false, player->GetGUID(), quest);
|
||||
}
|
||||
|
||||
@@ -80,7 +80,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;
|
||||
@@ -98,7 +98,7 @@ public:
|
||||
{
|
||||
EnterEvadeMode();
|
||||
bReset = false;
|
||||
me->SetFaction(28); //troll, bloodscalp
|
||||
me->SetFaction(FACTION_TROLL_BLOODSCALP);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -40,7 +40,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,
|
||||
|
||||
@@ -923,7 +923,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
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1022,7 +1022,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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -82,7 +82,7 @@ public:
|
||||
if (Invisible && InvisibleTimer <= diff)
|
||||
{
|
||||
//Become visible again
|
||||
me->SetFaction(14);
|
||||
me->SetFaction(FACTION_MONSTER);
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
|
||||
//Noxxion model
|
||||
me->SetDisplayId(11172);
|
||||
@@ -122,7 +122,7 @@ public:
|
||||
//Interrupt any spell casting
|
||||
//me->m_canMove = true;
|
||||
me->InterruptNonMeleeSpells(false);
|
||||
me->SetFaction(35);
|
||||
me->SetFaction(FACTION_FRIENDLY);
|
||||
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
|
||||
// Invisible Model
|
||||
me->SetDisplayId(11686);
|
||||
|
||||
@@ -57,8 +57,6 @@ enum Belnistrasz
|
||||
EVENT_FIREBALL = 5,
|
||||
EVENT_FROST_NOVA = 6,
|
||||
|
||||
FACTION_ESCORT = 250,
|
||||
|
||||
PATH_ESCORT = 871710,
|
||||
POINT_REACH_IDOL = 17,
|
||||
|
||||
@@ -136,7 +134,7 @@ public:
|
||||
eventInProgress = true;
|
||||
Talk(SAY_QUEST_ACCEPTED);
|
||||
me->RemoveFlag(UNIT_NPC_FLAGS, GOSSIP_OPTION_QUESTGIVER);
|
||||
me->SetFaction(FACTION_ESCORT);
|
||||
me->SetFaction(FACTION_ESCORTEE_N_NEUTRAL_ACTIVE);
|
||||
me->GetMotionMaster()->MovePath(PATH_ESCORT, false);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -68,7 +68,7 @@ public:
|
||||
switch (go->GetEntry())
|
||||
{
|
||||
case 21099: DoorWardGUID = go->GetGUID(); break;
|
||||
case 20920: go->SetFaction(0); break; // big fat fugly hack
|
||||
case 20920: go->SetFaction(FACTION_NONE); break; // big fat fugly hack
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -57,7 +57,7 @@ public:
|
||||
{
|
||||
Start(true, false, player->GetGUID());
|
||||
Talk(SAY_READY, player);
|
||||
me->SetFaction(113);
|
||||
me->SetFaction(FACTION_ESCORTEE_N_NEUTRAL_PASSIVE);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -112,7 +112,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;
|
||||
@@ -135,7 +135,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);
|
||||
|
||||
|
||||
@@ -332,7 +332,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))
|
||||
@@ -427,7 +427,7 @@ public:
|
||||
|
||||
void CastSpellOnBug(Creature* target) override
|
||||
{
|
||||
target->SetFaction(14);
|
||||
target->SetFaction(FACTION_MONSTER);
|
||||
target->AI()->AttackStart(me->getThreatManager().getHostilTarget());
|
||||
target->AddAura(SPELL_MUTATE_BUG, target);
|
||||
target->SetFullHealth();
|
||||
@@ -518,7 +518,7 @@ public:
|
||||
|
||||
void CastSpellOnBug(Creature* target) override
|
||||
{
|
||||
target->SetFaction(14);
|
||||
target->SetFaction(FACTION_MONSTER);
|
||||
target->AddAura(SPELL_EXPLODEBUG, target);
|
||||
target->SetFullHealth();
|
||||
}
|
||||
|
||||
@@ -96,7 +96,7 @@ public:
|
||||
|
||||
creature->AI()->Talk(SAY_MAKE_PREPARATIONS);
|
||||
|
||||
creature->SetFaction(250);
|
||||
creature->SetFaction(FACTION_ESCORTEE_N_NEUTRAL_ACTIVE);
|
||||
creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
|
||||
|
||||
ENSURE_AI(npc_escortAI, (creature->AI()))->Start(false, false, player->GetGUID());
|
||||
|
||||
@@ -47,11 +47,6 @@ enum Events
|
||||
EVENT_HEALING_WAVE = 4
|
||||
};
|
||||
|
||||
enum Faction
|
||||
{
|
||||
ZUMRAH_FRIENDLY_FACTION = 35
|
||||
};
|
||||
|
||||
class boss_zum_rah : public CreatureScript
|
||||
{
|
||||
public:
|
||||
@@ -73,7 +68,7 @@ public:
|
||||
|
||||
void Reset() override
|
||||
{
|
||||
me->SetFaction(ZUMRAH_FRIENDLY_FACTION); // areatrigger sets faction to enemy
|
||||
me->SetFaction(FACTION_FRIENDLY); // areatrigger sets faction to enemy
|
||||
Initialize();
|
||||
}
|
||||
|
||||
|
||||
@@ -38,13 +38,6 @@ EndContentData */
|
||||
## npc_sergeant_bly
|
||||
######*/
|
||||
|
||||
enum blyAndCrewFactions
|
||||
{
|
||||
FACTION_HOSTILE = 14,
|
||||
FACTION_FRIENDLY = 35, //while in cages (so the trolls won't attack them while they're caged)
|
||||
FACTION_FREED = 250 //after release (so they'll be hostile towards trolls)
|
||||
};
|
||||
|
||||
enum blySays
|
||||
{
|
||||
SAY_1 = 0,
|
||||
@@ -151,7 +144,7 @@ public:
|
||||
Text_Timer = 5000;
|
||||
break;
|
||||
case 3:
|
||||
me->SetFaction(FACTION_HOSTILE);
|
||||
me->SetFaction(FACTION_MONSTER);
|
||||
if (Player* target = ObjectAccessor::GetPlayer(*me, PlayerGUID))
|
||||
AttackStart(target);
|
||||
|
||||
@@ -196,7 +189,7 @@ public:
|
||||
{
|
||||
if (Creature* crew = ObjectAccessor::GetCreature(*me, instance->GetGuidData(entry)))
|
||||
if (crew->IsAlive())
|
||||
crew->SetFaction(FACTION_HOSTILE);
|
||||
crew->SetFaction(FACTION_MONSTER);
|
||||
}
|
||||
};
|
||||
|
||||
@@ -235,7 +228,7 @@ private:
|
||||
crew->SetWalk(true);
|
||||
crew->SetHomePosition(x, y, z, 0);
|
||||
crew->GetMotionMaster()->MovePoint(1, x, y, z);
|
||||
crew->SetFaction(FACTION_FREED);
|
||||
crew->SetFaction(FACTION_ESCORTEE_N_NEUTRAL_ACTIVE);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
@@ -43,7 +43,6 @@ enum RuulSnowhoof
|
||||
NPC_THISTLEFUR_TOTEMIC = 3922,
|
||||
NPC_THISTLEFUR_PATHFINDER = 3926,
|
||||
QUEST_FREEDOM_TO_RUUL = 6482,
|
||||
FACTION_QUEST = 113,
|
||||
GO_CAGE = 178147
|
||||
};
|
||||
|
||||
@@ -83,7 +82,7 @@ public:
|
||||
{
|
||||
if (quest->GetQuestId() == QUEST_FREEDOM_TO_RUUL)
|
||||
{
|
||||
me->SetFaction(FACTION_QUEST);
|
||||
me->SetFaction(FACTION_ESCORTEE_N_NEUTRAL_PASSIVE);
|
||||
npc_escortAI::Start(true, false, player->GetGUID());
|
||||
}
|
||||
}
|
||||
@@ -226,7 +225,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());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -187,7 +187,6 @@ enum Overgrind
|
||||
AREA_COVE = 3579,
|
||||
AREA_ISLE = 3639,
|
||||
QUEST_GNOMERCY = 9537,
|
||||
FACTION_HOSTILE = 14,
|
||||
SPELL_DYNAMITE = 7978
|
||||
};
|
||||
|
||||
@@ -232,7 +231,7 @@ public:
|
||||
void sGossipSelect(Player* player, uint32 /*menuId*/, uint32 /*gossipListId*/) override
|
||||
{
|
||||
CloseGossipMenuFor(player);
|
||||
me->SetFaction(FACTION_HOSTILE);
|
||||
me->SetFaction(FACTION_MONSTER);
|
||||
me->Attack(player, true);
|
||||
}
|
||||
|
||||
@@ -337,8 +336,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
|
||||
@@ -403,7 +401,7 @@ public:
|
||||
case EVENT_ACCEPT_QUEST:
|
||||
if (Player* player = ObjectAccessor::GetPlayer(*me, _player))
|
||||
Talk(SAY_START, player);
|
||||
me->SetFaction(FACTION_QUEST);
|
||||
me->SetFaction(FACTION_ESCORTEE_N_NEUTRAL_PASSIVE);
|
||||
_events.ScheduleEvent(EVENT_START_ESCORT, Seconds(1));
|
||||
break;
|
||||
case EVENT_START_ESCORT:
|
||||
|
||||
@@ -42,9 +42,6 @@ enum EternalBoard
|
||||
{
|
||||
QUEST_A_PAWN_ON_THE_ETERNAL_BOARD = 8519,
|
||||
|
||||
FACTION_HOSTILE = 14,
|
||||
FACTION_FRIENDLY = 35,
|
||||
|
||||
EVENT_AREA_RADIUS = 65, // 65yds
|
||||
EVENT_COOLDOWN = 500000, // in ms. appears after event completed or failed (should be = Adds despawn time)
|
||||
|
||||
@@ -970,7 +967,7 @@ public:
|
||||
Merithra->SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_NONE);
|
||||
Merithra->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
|
||||
Merithra->SetUInt32Value(UNIT_FIELD_DISPLAYID, MERITHRA_NIGHT_ELF_FORM);
|
||||
Merithra->SetFaction(35);
|
||||
Merithra->SetFaction(FACTION_FRIENDLY);
|
||||
}
|
||||
|
||||
if (Caelestrasz)
|
||||
@@ -978,7 +975,7 @@ public:
|
||||
Caelestrasz->SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_NONE);
|
||||
Caelestrasz->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
|
||||
Caelestrasz->SetUInt32Value(UNIT_FIELD_DISPLAYID, CAELESTRASZ_NIGHT_ELF_FORM);
|
||||
Caelestrasz->SetFaction(35);
|
||||
Caelestrasz->SetFaction(FACTION_FRIENDLY);
|
||||
}
|
||||
|
||||
if (Arygos)
|
||||
@@ -986,7 +983,7 @@ public:
|
||||
Arygos->SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_NONE);
|
||||
Arygos->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
|
||||
Arygos->SetUInt32Value(UNIT_FIELD_DISPLAYID, ARYGOS_GNOME_FORM);
|
||||
Arygos->SetFaction(35);
|
||||
Arygos->SetFaction(FACTION_FRIENDLY);
|
||||
}
|
||||
|
||||
if (Anachronos)
|
||||
|
||||
@@ -91,7 +91,7 @@ public:
|
||||
void Reset() override
|
||||
{
|
||||
Initialize();
|
||||
me->SetFaction(35);
|
||||
me->SetFaction(FACTION_FRIENDLY);
|
||||
}
|
||||
|
||||
void SendItem(Unit* receiver)
|
||||
@@ -121,7 +121,7 @@ public:
|
||||
{
|
||||
if (SwitchFactionTimer <= diff)
|
||||
{
|
||||
me->SetFaction(91);
|
||||
me->SetFaction(FACTION_ELEMENTAL);
|
||||
isFriendly = false;
|
||||
} else SwitchFactionTimer -= diff;
|
||||
}
|
||||
@@ -319,7 +319,7 @@ public:
|
||||
{
|
||||
if (quest->GetQuestId() == Q_OOX17)
|
||||
{
|
||||
creature->SetFaction(113);
|
||||
creature->SetFaction(FACTION_ESCORTEE_N_NEUTRAL_PASSIVE);
|
||||
creature->SetFullHealth();
|
||||
creature->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
|
||||
creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
|
||||
|
||||
@@ -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_ESCORTEE_A_NEUTRAL_PASSIVE);
|
||||
|
||||
if (npc_ranshallaAI* escortAI = dynamic_cast<npc_ranshallaAI*>(creature->AI()))
|
||||
escortAI->Start(false, false, player->GetGUID(), quest);
|
||||
|
||||
+2
-2
@@ -192,7 +192,7 @@ public:
|
||||
{
|
||||
damage = 0;
|
||||
EnterEvadeMode();
|
||||
me->SetFaction(35);
|
||||
me->SetFaction(FACTION_FRIENDLY);
|
||||
bDone = true;
|
||||
}
|
||||
}
|
||||
@@ -320,7 +320,7 @@ public:
|
||||
{
|
||||
damage = 0;
|
||||
EnterEvadeMode();
|
||||
me->SetFaction(35);
|
||||
me->SetFaction(FACTION_FRIENDLY);
|
||||
bDone = true;
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -224,7 +224,7 @@ class boss_anubarak_trial : public CreatureScript
|
||||
for (int i = 0; i < 10; i++)
|
||||
if (Creature* scarab = me->SummonCreature(NPC_SCARAB, AnubarakLoc[1].GetPositionX()+urand(0, 50)-25, AnubarakLoc[1].GetPositionY()+urand(0, 50)-25, AnubarakLoc[1].GetPositionZ()))
|
||||
{
|
||||
scarab->SetFaction(31);
|
||||
scarab->SetFaction(FACTION_PREY);
|
||||
scarab->GetMotionMaster()->MoveRandom(10);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -202,7 +202,6 @@ enum Actions
|
||||
enum Misc
|
||||
{
|
||||
DATA_MADE_A_MESS = 45374613, // 4537, 4613 are achievement IDs
|
||||
FACTION_SCOURGE = 974,
|
||||
|
||||
GOSSIP_MENU_MURADIN_BRONZEBEARD = 10934,
|
||||
GOSSIP_MENU_HIGH_OVERLORD_SAURFANG = 10952
|
||||
@@ -461,7 +460,7 @@ class boss_deathbringer_saurfang : public CreatureScript
|
||||
{
|
||||
case EVENT_INTRO_ALLIANCE_2:
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
|
||||
me->SetFaction(FACTION_SCOURGE);
|
||||
me->SetFaction(FACTION_UNDEAD_SCOURGE);
|
||||
Talk(SAY_INTRO_ALLIANCE_2);
|
||||
break;
|
||||
case EVENT_INTRO_ALLIANCE_3:
|
||||
@@ -474,7 +473,7 @@ class boss_deathbringer_saurfang : public CreatureScript
|
||||
break;
|
||||
case EVENT_INTRO_HORDE_2:
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
|
||||
me->SetFaction(FACTION_SCOURGE);
|
||||
me->SetFaction(FACTION_UNDEAD_SCOURGE);
|
||||
Talk(SAY_INTRO_HORDE_2);
|
||||
break;
|
||||
case EVENT_INTRO_HORDE_4:
|
||||
|
||||
@@ -53,62 +53,68 @@ enum ScriptTexts
|
||||
enum Spells
|
||||
{
|
||||
// Lady Deathwhisper
|
||||
SPELL_MANA_BARRIER = 70842,
|
||||
SPELL_SHADOW_BOLT = 71254,
|
||||
SPELL_DEATH_AND_DECAY = 71001,
|
||||
SPELL_DOMINATE_MIND = 71289,
|
||||
SPELL_DOMINATE_MIND_SCALE = 71290,
|
||||
SPELL_FROSTBOLT = 71420,
|
||||
SPELL_FROSTBOLT_VOLLEY = 72905,
|
||||
SPELL_TOUCH_OF_INSIGNIFICANCE = 71204,
|
||||
SPELL_SUMMON_SHADE = 71363,
|
||||
SPELL_SHADOW_CHANNELING = 43897,
|
||||
SPELL_DARK_TRANSFORMATION_T = 70895,
|
||||
SPELL_DARK_EMPOWERMENT_T = 70896,
|
||||
SPELL_DARK_MARTYRDOM_T = 70897,
|
||||
SPELL_SUMMON_SPIRITS = 72478,
|
||||
SPELL_MANA_BARRIER = 70842,
|
||||
SPELL_SHADOW_BOLT = 71254,
|
||||
SPELL_DEATH_AND_DECAY = 71001,
|
||||
SPELL_DOMINATE_MIND = 71289,
|
||||
SPELL_DOMINATE_MIND_SCALE = 71290,
|
||||
SPELL_FROSTBOLT = 71420,
|
||||
SPELL_FROSTBOLT_VOLLEY = 72905,
|
||||
SPELL_TOUCH_OF_INSIGNIFICANCE = 71204,
|
||||
SPELL_SUMMON_SHADE = 71363,
|
||||
SPELL_SHADOW_CHANNELING = 43897,
|
||||
SPELL_DARK_TRANSFORMATION_T = 70895,
|
||||
SPELL_DARK_EMPOWERMENT_T = 70896,
|
||||
SPELL_DARK_MARTYRDOM_T = 70897,
|
||||
SPELL_SUMMON_SPIRITS = 72478,
|
||||
|
||||
// Achievement
|
||||
SPELL_FULL_HOUSE = 72827, // does not exist in dbc but still can be used for criteria check
|
||||
SPELL_FULL_HOUSE = 72827, // does not exist in dbc but still can be used for criteria check
|
||||
|
||||
// Both Adds
|
||||
SPELL_TELEPORT_VISUAL = 41236,
|
||||
SPELL_CLEAR_ALL_DEBUFFS = 34098,
|
||||
SPELL_FULL_HEAL = 17683,
|
||||
SPELL_PERMANENT_FEIGN_DEATH = 70628,
|
||||
SPELL_TELEPORT_VISUAL = 41236,
|
||||
SPELL_CLEAR_ALL_DEBUFFS = 34098,
|
||||
SPELL_FULL_HEAL = 17683,
|
||||
SPELL_PERMANENT_FEIGN_DEATH = 70628,
|
||||
|
||||
// Fanatics
|
||||
SPELL_DARK_TRANSFORMATION = 70900,
|
||||
SPELL_NECROTIC_STRIKE = 70659,
|
||||
SPELL_SHADOW_CLEAVE = 70670,
|
||||
SPELL_VAMPIRIC_MIGHT = 70674,
|
||||
SPELL_FANATIC_S_DETERMINATION = 71235,
|
||||
SPELL_DARK_MARTYRDOM_FANATIC = 71236,
|
||||
SPELL_DARK_TRANSFORMATION = 70900,
|
||||
SPELL_NECROTIC_STRIKE = 70659,
|
||||
SPELL_SHADOW_CLEAVE = 70670,
|
||||
SPELL_VAMPIRIC_MIGHT = 70674,
|
||||
SPELL_FANATIC_S_DETERMINATION = 71235,
|
||||
SPELL_DARK_MARTYRDOM_FANATIC = 71236,
|
||||
SPELL_DARK_MARTYRDOM_FANATIC_25N = 72495,
|
||||
SPELL_DARK_MARTYRDOM_FANATIC_10H = 72496,
|
||||
SPELL_DARK_MARTYRDOM_FANATIC_25H = 72497,
|
||||
|
||||
// Adherents
|
||||
SPELL_DARK_EMPOWERMENT = 70901,
|
||||
SPELL_FROST_FEVER = 67767,
|
||||
SPELL_DEATHCHILL_BOLT = 70594,
|
||||
SPELL_DEATHCHILL_BLAST = 70906,
|
||||
SPELL_CURSE_OF_TORPOR = 71237,
|
||||
SPELL_SHROUD_OF_THE_OCCULT = 70768,
|
||||
SPELL_ADHERENT_S_DETERMINATION = 71234,
|
||||
SPELL_DARK_MARTYRDOM_ADHERENT = 70903,
|
||||
SPELL_DARK_EMPOWERMENT = 70901,
|
||||
SPELL_FROST_FEVER = 67767,
|
||||
SPELL_DEATHCHILL_BOLT = 70594,
|
||||
SPELL_DEATHCHILL_BLAST = 70906,
|
||||
SPELL_CURSE_OF_TORPOR = 71237,
|
||||
SPELL_SHROUD_OF_THE_OCCULT = 70768,
|
||||
SPELL_ADHERENT_S_DETERMINATION = 71234,
|
||||
SPELL_DARK_MARTYRDOM_ADHERENT = 70903,
|
||||
SPELL_DARK_MARTYRDOM_ADHERENT_25N = 72498,
|
||||
SPELL_DARK_MARTYRDOM_ADHERENT_10H = 72499,
|
||||
SPELL_DARK_MARTYRDOM_ADHERENT_25H = 72500,
|
||||
|
||||
// Vengeful Shade
|
||||
SPELL_VENGEFUL_BLAST = 71544,
|
||||
SPELL_VENGEFUL_BLAST_PASSIVE = 71494,
|
||||
SPELL_VENGEFUL_BLAST_25N = 72010,
|
||||
SPELL_VENGEFUL_BLAST_10H = 72011,
|
||||
SPELL_VENGEFUL_BLAST_25H = 72012,
|
||||
SPELL_VENGEFUL_BLAST = 71544,
|
||||
SPELL_VENGEFUL_BLAST_PASSIVE = 71494,
|
||||
SPELL_VENGEFUL_BLAST_25N = 72010,
|
||||
SPELL_VENGEFUL_BLAST_10H = 72011,
|
||||
SPELL_VENGEFUL_BLAST_25H = 72012,
|
||||
|
||||
// Darnavan
|
||||
SPELL_BLADESTORM = 65947,
|
||||
SPELL_CHARGE = 65927,
|
||||
SPELL_INTIMIDATING_SHOUT = 65930,
|
||||
SPELL_MORTAL_STRIKE = 65926,
|
||||
SPELL_SHATTERING_THROW = 65940,
|
||||
SPELL_SUNDER_ARMOR = 65936,
|
||||
SPELL_BLADESTORM = 65947,
|
||||
SPELL_CHARGE = 65927,
|
||||
SPELL_INTIMIDATING_SHOUT = 65930,
|
||||
SPELL_MORTAL_STRIKE = 65926,
|
||||
SPELL_SHATTERING_THROW = 65940,
|
||||
SPELL_SUNDER_ARMOR = 65936,
|
||||
};
|
||||
|
||||
enum EventTypes
|
||||
@@ -355,7 +361,7 @@ class boss_lady_deathwhisper : public CreatureScript
|
||||
{
|
||||
if (darnavan->IsAlive())
|
||||
{
|
||||
darnavan->SetFaction(35);
|
||||
darnavan->SetFaction(FACTION_FRIENDLY);
|
||||
darnavan->CombatStop(true);
|
||||
darnavan->GetMotionMaster()->MoveIdle();
|
||||
darnavan->SetReactState(REACT_PASSIVE);
|
||||
@@ -636,6 +642,9 @@ class npc_cult_fanatic : public CreatureScript
|
||||
DoCastSelf(SPELL_DARK_MARTYRDOM_FANATIC);
|
||||
break;
|
||||
case SPELL_DARK_MARTYRDOM_FANATIC:
|
||||
case SPELL_DARK_MARTYRDOM_FANATIC_25N:
|
||||
case SPELL_DARK_MARTYRDOM_FANATIC_10H:
|
||||
case SPELL_DARK_MARTYRDOM_FANATIC_25H:
|
||||
_scheduler
|
||||
.Schedule(Seconds(2), [this](TaskContext /*context*/)
|
||||
{
|
||||
@@ -735,6 +744,9 @@ class npc_cult_adherent : public CreatureScript
|
||||
DoCastSelf(SPELL_DARK_MARTYRDOM_ADHERENT);
|
||||
break;
|
||||
case SPELL_DARK_MARTYRDOM_ADHERENT:
|
||||
case SPELL_DARK_MARTYRDOM_ADHERENT_25N:
|
||||
case SPELL_DARK_MARTYRDOM_ADHERENT_10H:
|
||||
case SPELL_DARK_MARTYRDOM_ADHERENT_25H:
|
||||
_scheduler
|
||||
.Schedule(Seconds(2), [this](TaskContext /*context*/)
|
||||
{
|
||||
|
||||
@@ -170,12 +170,6 @@ enum Seats
|
||||
SEAT_0 = 0
|
||||
};
|
||||
|
||||
enum Factions
|
||||
{
|
||||
// Needed for melee hover disks /when Nexus Lords die/
|
||||
FACTION_FRIENDLY = 35
|
||||
};
|
||||
|
||||
enum Actions
|
||||
{
|
||||
// Malygos
|
||||
|
||||
@@ -21,11 +21,6 @@
|
||||
#include "Player.h"
|
||||
#include "nexus.h"
|
||||
|
||||
enum Factions
|
||||
{
|
||||
FACTION_HOSTILE_FOR_ALL = 16
|
||||
};
|
||||
|
||||
class instance_nexus : public InstanceMapScript
|
||||
{
|
||||
public:
|
||||
@@ -59,31 +54,31 @@ class instance_nexus : public InstanceMapScript
|
||||
// Alliance npcs are spawned by default, if you are alliance, you will fight against horde npcs.
|
||||
case NPC_ALLIANCE_BERSERKER:
|
||||
if (ServerAllowsTwoSideGroups())
|
||||
creature->SetFaction(FACTION_HOSTILE_FOR_ALL);
|
||||
creature->SetFaction(FACTION_MONSTER_2);
|
||||
if (_teamInInstance == ALLIANCE)
|
||||
creature->UpdateEntry(NPC_HORDE_BERSERKER);
|
||||
break;
|
||||
case NPC_ALLIANCE_RANGER:
|
||||
if (ServerAllowsTwoSideGroups())
|
||||
creature->SetFaction(FACTION_HOSTILE_FOR_ALL);
|
||||
creature->SetFaction(FACTION_MONSTER_2);
|
||||
if (_teamInInstance == ALLIANCE)
|
||||
creature->UpdateEntry(NPC_HORDE_RANGER);
|
||||
break;
|
||||
case NPC_ALLIANCE_CLERIC:
|
||||
if (ServerAllowsTwoSideGroups())
|
||||
creature->SetFaction(FACTION_HOSTILE_FOR_ALL);
|
||||
creature->SetFaction(FACTION_MONSTER_2);
|
||||
if (_teamInInstance == ALLIANCE)
|
||||
creature->UpdateEntry(NPC_HORDE_CLERIC);
|
||||
break;
|
||||
case NPC_ALLIANCE_COMMANDER:
|
||||
if (ServerAllowsTwoSideGroups())
|
||||
creature->SetFaction(FACTION_HOSTILE_FOR_ALL);
|
||||
creature->SetFaction(FACTION_MONSTER_2);
|
||||
if (_teamInInstance == ALLIANCE)
|
||||
creature->UpdateEntry(NPC_HORDE_COMMANDER);
|
||||
break;
|
||||
case NPC_COMMANDER_STOUTBEARD:
|
||||
if (ServerAllowsTwoSideGroups())
|
||||
creature->SetFaction(FACTION_HOSTILE_FOR_ALL);
|
||||
creature->SetFaction(FACTION_MONSTER_2);
|
||||
if (_teamInInstance == ALLIANCE)
|
||||
creature->UpdateEntry(NPC_COMMANDER_KOLURG);
|
||||
break;
|
||||
|
||||
@@ -531,7 +531,7 @@ class boss_algalon_the_observer : public CreatureScript
|
||||
damage = 0;
|
||||
me->SetReactState(REACT_PASSIVE);
|
||||
me->AttackStop();
|
||||
me->SetFaction(35);
|
||||
me->SetFaction(FACTION_FRIENDLY);
|
||||
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
|
||||
DoCast(me, SPELL_SELF_STUN);
|
||||
events.Reset();
|
||||
|
||||
@@ -222,7 +222,7 @@ class npc_iron_roots : public CreatureScript
|
||||
SetCombatMovement(false);
|
||||
|
||||
me->ApplySpellImmune(0, IMMUNITY_ID, 49560, true); // Death Grip
|
||||
me->SetFaction(14);
|
||||
me->SetFaction(FACTION_MONSTER);
|
||||
me->SetReactState(REACT_PASSIVE);
|
||||
}
|
||||
|
||||
@@ -606,7 +606,7 @@ class boss_freya : public CreatureScript
|
||||
_JustDied();
|
||||
me->RemoveAllAuras();
|
||||
me->AttackStop();
|
||||
me->SetFaction(35);
|
||||
me->SetFaction(FACTION_FRIENDLY);
|
||||
me->DeleteThreatList();
|
||||
me->CombatStop(true);
|
||||
me->DespawnOrUnsummon(7500);
|
||||
|
||||
@@ -405,7 +405,7 @@ class boss_hodir : public CreatureScript
|
||||
|
||||
DoCastAOE(SPELL_KILL_CREDIT, true); /// need to be cast before changing boss faction
|
||||
/// spell will target enemies only
|
||||
me->SetFaction(35);
|
||||
me->SetFaction(FACTION_FRIENDLY);
|
||||
me->DespawnOrUnsummon(10000);
|
||||
|
||||
_JustDied();
|
||||
|
||||
@@ -177,7 +177,7 @@ class boss_ignis : public CreatureScript
|
||||
{
|
||||
if (summon->GetEntry() == NPC_IRON_CONSTRUCT)
|
||||
{
|
||||
summon->SetFaction(16);
|
||||
summon->SetFaction(FACTION_MONSTER_2);
|
||||
summon->SetReactState(REACT_AGGRESSIVE);
|
||||
summon->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_PACIFIED | UNIT_FLAG_STUNNED | UNIT_FLAG_IMMUNE_TO_PC);
|
||||
summon->SetControlled(false, UNIT_STATE_ROOT);
|
||||
|
||||
@@ -635,7 +635,7 @@ class boss_mimiron : public CreatureScript
|
||||
case EVENT_OUTTRO_1:
|
||||
me->RemoveAurasDueToSpell(SPELL_SLEEP_VISUAL_1);
|
||||
DoCast(me, SPELL_SLEEP_VISUAL_2);
|
||||
me->SetFaction(35);
|
||||
me->SetFaction(FACTION_FRIENDLY);
|
||||
events.ScheduleEvent(EVENT_OUTTRO_2, 3000);
|
||||
break;
|
||||
case EVENT_OUTTRO_2:
|
||||
|
||||
File diff suppressed because it is too large.
Load diff
@@ -765,7 +765,7 @@ class boss_sara : public CreatureScript
|
||||
{
|
||||
me->RemoveAllAuras();
|
||||
me->SetReactState(REACT_PASSIVE);
|
||||
me->SetFaction(35);
|
||||
me->SetFaction(FACTION_FRIENDLY);
|
||||
_events.Reset();
|
||||
_events.SetPhase(PHASE_ONE);
|
||||
}
|
||||
@@ -808,7 +808,7 @@ class boss_sara : public CreatureScript
|
||||
case EVENT_TRANSFORM_3:
|
||||
Talk(SAY_SARA_TRANSFORM_4);
|
||||
DoCast(me, SPELL_FULL_HEAL);
|
||||
me->SetFaction(16);
|
||||
me->SetFaction(FACTION_MONSTER_2);
|
||||
if (Creature* voice = _instance->GetCreature(DATA_VOICE_OF_YOGG_SARON))
|
||||
voice->AI()->DoAction(ACTION_PHASE_TWO);
|
||||
if (Creature* mimiron = ObjectAccessor::GetCreature(*me, _instance->GetGuidData(DATA_MIMIRON_YS)))
|
||||
|
||||
@@ -32,9 +32,9 @@ static BossBoundaryData const boundaries =
|
||||
{ BOSS_XT002, new RectangleBoundary(755.0f, 940.0f, -125.0f, 95.0f) },
|
||||
{ BOSS_ASSEMBLY_OF_IRON, new CircleBoundary(Position(1587.2f, 121.0f), 90.0) },
|
||||
{ BOSS_ALGALON, new CircleBoundary(Position(1632.668f, -307.7656f), 45.0) },
|
||||
{ BOSS_ALGALON, new ZRangeBoundary(410.0f, 440.0f) },
|
||||
{ BOSS_ALGALON, new ZRangeBoundary(410.0f, 470.0f) },
|
||||
{ BOSS_HODIR, new EllipseBoundary(Position(2001.5f, -240.0f), 50.0, 75.0) },
|
||||
{ BOSS_THORIM, new CircleBoundary(Position(2134.73f, -263.2f), 50.0) },
|
||||
// Thorim sets boundaries dynamically
|
||||
{ BOSS_FREYA, new RectangleBoundary(2094.6f, 2520.0f, -250.0f, 200.0f) },
|
||||
{ BOSS_MIMIRON, new CircleBoundary(Position(2744.0f, 2569.0f), 70.0) },
|
||||
{ BOSS_VEZAX, new RectangleBoundary(1740.0f, 1930.0f, 31.0f, 228.0f) },
|
||||
@@ -53,6 +53,11 @@ static DoorData const doorData[] =
|
||||
{ GO_MIMIRON_DOOR_1, BOSS_MIMIRON, DOOR_TYPE_ROOM },
|
||||
{ GO_MIMIRON_DOOR_2, BOSS_MIMIRON, DOOR_TYPE_ROOM },
|
||||
{ GO_MIMIRON_DOOR_3, BOSS_MIMIRON, DOOR_TYPE_ROOM },
|
||||
{ GO_THORIM_ENCOUNTER_DOOR, BOSS_THORIM, DOOR_TYPE_ROOM },
|
||||
{ GO_ANCIENT_GATE_OF_THE_KEEPERS, BOSS_HODIR, DOOR_TYPE_PASSAGE },
|
||||
{ GO_ANCIENT_GATE_OF_THE_KEEPERS, BOSS_MIMIRON, DOOR_TYPE_PASSAGE },
|
||||
{ GO_ANCIENT_GATE_OF_THE_KEEPERS, BOSS_THORIM, DOOR_TYPE_PASSAGE },
|
||||
{ GO_ANCIENT_GATE_OF_THE_KEEPERS, BOSS_FREYA, DOOR_TYPE_PASSAGE },
|
||||
{ GO_VEZAX_DOOR, BOSS_VEZAX, DOOR_TYPE_PASSAGE },
|
||||
{ GO_YOGG_SARON_DOOR, BOSS_YOGG_SARON, DOOR_TYPE_ROOM },
|
||||
{ GO_DOODAD_UL_SIGILDOOR_03, BOSS_ALGALON, DOOR_TYPE_ROOM },
|
||||
@@ -89,6 +94,10 @@ ObjectData const creatureData[] =
|
||||
|
||||
{ NPC_EXPEDITION_COMMANDER, DATA_EXPEDITION_COMMANDER },
|
||||
{ NPC_RAZORSCALE_CONTROLLER, DATA_RAZORSCALE_CONTROL },
|
||||
{ NPC_SIF, DATA_SIF },
|
||||
{ NPC_RUNIC_COLOSSUS, DATA_RUNIC_COLOSSUS },
|
||||
{ NPC_RUNE_GIANT, DATA_RUNE_GIANT },
|
||||
{ NPC_THORIM_CONTROLLER, DATA_THORIM_CONTROLLER },
|
||||
{ NPC_COMPUTER, DATA_COMPUTER },
|
||||
{ NPC_WORLD_TRIGGER_MIMIRON, DATA_MIMIRON_WORLD_TRIGGER },
|
||||
{ NPC_VOICE_OF_YOGG_SARON, DATA_VOICE_OF_YOGG_SARON },
|
||||
@@ -112,6 +121,9 @@ ObjectData const objectData[] =
|
||||
{ GO_RAZOR_HARPOON_2, GO_RAZOR_HARPOON_2 },
|
||||
{ GO_RAZOR_HARPOON_3, GO_RAZOR_HARPOON_3 },
|
||||
{ GO_RAZOR_HARPOON_4, GO_RAZOR_HARPOON_4 },
|
||||
{ GO_THORIM_LEVER, DATA_THORIM_LEVER },
|
||||
{ GO_THORIM_STONE_DOOR, DATA_STONE_DOOR },
|
||||
{ GO_THORIM_RUNIC_DOOR, DATA_RUNIC_DOOR },
|
||||
{ 0, 0 }
|
||||
};
|
||||
|
||||
@@ -167,7 +179,9 @@ class instance_ulduar : public InstanceMapScript
|
||||
ObjectGuid LeviathanGateGUID;
|
||||
ObjectGuid KologarnChestGUID;
|
||||
ObjectGuid KologarnBridgeGUID;
|
||||
ObjectGuid ThorimChestGUID;
|
||||
ObjectGuid ThorimDarkIronPortcullisGUID;
|
||||
ObjectGuid CacheOfStormsGUID;
|
||||
ObjectGuid CacheOfStormsHardmodeGUID;
|
||||
ObjectGuid HodirRareCacheGUID;
|
||||
ObjectGuid HodirChestGUID;
|
||||
ObjectGuid MimironTramGUID;
|
||||
@@ -324,6 +338,16 @@ class instance_ulduar : public InstanceMapScript
|
||||
creature->UpdateEntry(NPC_BATTLE_PRIEST_GINA);
|
||||
break;
|
||||
|
||||
// Thorim
|
||||
case NPC_MERCENARY_CAPTAIN_H:
|
||||
if (TeamInInstance == HORDE)
|
||||
creature->UpdateEntry(NPC_MERCENARY_CAPTAIN_A);
|
||||
break;
|
||||
case NPC_MERCENARY_SOLDIER_H:
|
||||
if (TeamInInstance == HORDE)
|
||||
creature->UpdateEntry(NPC_MERCENARY_SOLDIER_A);
|
||||
break;
|
||||
|
||||
// Freya
|
||||
case NPC_IRONBRANCH:
|
||||
ElderGUIDs[0] = creature->GetGUID();
|
||||
@@ -439,9 +463,16 @@ class instance_ulduar : public InstanceMapScript
|
||||
if (GetBossState(BOSS_KOLOGARN) == DONE)
|
||||
HandleGameObject(ObjectGuid::Empty, false, gameObject);
|
||||
break;
|
||||
case GO_THORIM_CHEST_HERO:
|
||||
case GO_THORIM_CHEST:
|
||||
ThorimChestGUID = gameObject->GetGUID();
|
||||
case GO_THORIM_DARK_IRON_PORTCULLIS:
|
||||
ThorimDarkIronPortcullisGUID = gameObject->GetGUID();
|
||||
break;
|
||||
case GO_CACHE_OF_STORMS_10:
|
||||
case GO_CACHE_OF_STORMS_25:
|
||||
CacheOfStormsGUID = gameObject->GetGUID();
|
||||
break;
|
||||
case GO_CACHE_OF_STORMS_HARDMODE_10:
|
||||
case GO_CACHE_OF_STORMS_HARDMODE_25:
|
||||
CacheOfStormsHardmodeGUID = gameObject->GetGUID();
|
||||
break;
|
||||
case GO_HODIR_RARE_CACHE_OF_WINTER_HERO:
|
||||
case GO_HODIR_RARE_CACHE_OF_WINTER:
|
||||
@@ -648,11 +679,23 @@ class instance_ulduar : public InstanceMapScript
|
||||
case BOSS_THORIM:
|
||||
if (state == DONE)
|
||||
{
|
||||
if (GameObject* gameObject = instance->GetGameObject(ThorimChestGUID))
|
||||
gameObject->SetRespawnTime(gameObject->GetRespawnDelay());
|
||||
if (Creature* thorim = GetCreature(BOSS_THORIM))
|
||||
{
|
||||
if (GameObject* cache = instance->GetGameObject(thorim->AI()->GetData(DATA_THORIM_HARDMODE) ? CacheOfStormsHardmodeGUID : CacheOfStormsGUID))
|
||||
{
|
||||
cache->SetLootRecipient(thorim->GetLootRecipient());
|
||||
cache->SetRespawnTime(cache->GetRespawnDelay());
|
||||
cache->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_LOCKED | GO_FLAG_NOT_SELECTABLE | GO_FLAG_NODESPAWN);
|
||||
}
|
||||
}
|
||||
|
||||
instance->SummonCreature(NPC_THORIM_OBSERVATION_RING, ObservationRingKeepersPos[2]);
|
||||
}
|
||||
else
|
||||
{
|
||||
DoCloseDoorOrButton(GetGuidData(DATA_THORIM_LEVER));
|
||||
DoCloseDoorOrButton(ThorimDarkIronPortcullisGUID);
|
||||
}
|
||||
break;
|
||||
case BOSS_ALGALON:
|
||||
if (state == DONE)
|
||||
@@ -871,7 +914,6 @@ class instance_ulduar : public InstanceMapScript
|
||||
return keepersCount <= 1;
|
||||
case CRITERIA_ALONE_IN_THE_DARKNESS_10:
|
||||
case CRITERIA_ALONE_IN_THE_DARKNESS_25:
|
||||
case CRITERIA_DEATHS_DEMISE:
|
||||
return keepersCount == 0;
|
||||
case CRITERIA_C_O_U_LEVIATHAN_10:
|
||||
case CRITERIA_C_O_U_LEVIATHAN_25:
|
||||
|
||||
@@ -153,6 +153,31 @@ enum UlduarNPCs
|
||||
// Freya Achievement Trigger
|
||||
NPC_FREYA_ACHIEVE_TRIGGER = 33406,
|
||||
|
||||
// Thorim
|
||||
NPC_THORIM_INVISIBLE_STALKER = 32780,
|
||||
NPC_JORMUNGAR_BEHEMOTH = 32882,
|
||||
NPC_MERCENARY_CAPTAIN_A = 32908,
|
||||
NPC_MERCENARY_CAPTAIN_H = 32907,
|
||||
NPC_MERCENARY_SOLDIER_A = 32885,
|
||||
NPC_MERCENARY_SOLDIER_H = 32883,
|
||||
NPC_DARK_RUNE_ACOLYTE_PRE = 32886,
|
||||
NPC_RUNIC_COLOSSUS = 32872,
|
||||
NPC_RUNE_GIANT = 32873,
|
||||
NPC_IRON_RING_GUARD = 32874,
|
||||
NPC_IRON_HONOR_GUARD = 32875,
|
||||
NPC_DARK_RUNE_CHAMPION = 32876,
|
||||
NPC_DARK_RUNE_WARBRINGER = 32877,
|
||||
NPC_DARK_RUNE_EVOKER = 32878,
|
||||
NPC_DARK_RUNE_COMMONER = 32904,
|
||||
NPC_DARK_RUNE_ACOLYTE = 33110,
|
||||
NPC_THORIM_EVENT_BUNNY = 32892,
|
||||
NPC_LIGHTNING_ORB = 33138,
|
||||
NPC_GOLEM_RIGHT_HAND_BUNNY = 33140,
|
||||
NPC_GOLEM_LEFT_HAND_BUNNY = 33141,
|
||||
NPC_SIF = 33196,
|
||||
NPC_THUNDER_ORB = 33378,
|
||||
NPC_THORIM_CONTROLLER = 32879,
|
||||
|
||||
// Yogg-Saron
|
||||
NPC_SARA = 33134,
|
||||
NPC_GUARDIAN_OF_YOGG_SARON = 33136,
|
||||
@@ -227,6 +252,8 @@ enum UlduarGameObjects
|
||||
GO_KOLOGARN_BRIDGE = 194232,
|
||||
GO_KOLOGARN_DOOR = 194553,
|
||||
|
||||
GO_ANCIENT_GATE_OF_THE_KEEPERS = 194255,
|
||||
|
||||
// Hodir
|
||||
GO_HODIR_ENTRANCE = 194442,
|
||||
GO_HODIR_DOOR = 194634,
|
||||
@@ -237,8 +264,15 @@ enum UlduarGameObjects
|
||||
GO_HODIR_CHEST = 194307,
|
||||
|
||||
// Thorim
|
||||
GO_THORIM_CHEST_HERO = 194315,
|
||||
GO_THORIM_CHEST = 194314,
|
||||
GO_CACHE_OF_STORMS_10 = 194312,
|
||||
GO_CACHE_OF_STORMS_HARDMODE_10 = 194313,
|
||||
GO_CACHE_OF_STORMS_25 = 194315,
|
||||
GO_CACHE_OF_STORMS_HARDMODE_25 = 194314,
|
||||
GO_THORIM_RUNIC_DOOR = 194557,
|
||||
GO_THORIM_STONE_DOOR = 194558,
|
||||
GO_THORIM_ENCOUNTER_DOOR = 194559,
|
||||
GO_THORIM_LEVER = 194264,
|
||||
GO_THORIM_DARK_IRON_PORTCULLIS = 194560,
|
||||
|
||||
// Mimiron
|
||||
GO_MIMIRON_TRAM = 194675,
|
||||
@@ -275,7 +309,7 @@ enum UlduarGameObjects
|
||||
GO_GIFT_OF_THE_OBSERVER_25 = 194822,
|
||||
};
|
||||
|
||||
enum EventIds
|
||||
enum UUEventIds
|
||||
{
|
||||
EVENT_TOWER_OF_STORM_DESTROYED = 21031,
|
||||
EVENT_TOWER_OF_FROST_DESTROYED = 21032,
|
||||
@@ -315,7 +349,6 @@ enum UlduarAchievementCriteriaIds
|
||||
CRITERIA_ONE_LIGHT_IN_THE_DARKNESS_25 = 10416,
|
||||
CRITERIA_ALONE_IN_THE_DARKNESS_10 = 10412,
|
||||
CRITERIA_ALONE_IN_THE_DARKNESS_25 = 10417,
|
||||
CRITERIA_DEATHS_DEMISE = 10279,
|
||||
CRITERIA_HERALD_OF_TITANS = 10678,
|
||||
|
||||
// Champion of Ulduar
|
||||
@@ -404,6 +437,16 @@ enum UlduarData
|
||||
DATA_ALGALON_TRAPDOOR,
|
||||
DATA_BRANN_BRONZEBEARD_ALG,
|
||||
|
||||
// Thorim
|
||||
DATA_SIF,
|
||||
DATA_THORIM_LEVER,
|
||||
DATA_RUNIC_COLOSSUS,
|
||||
DATA_RUNE_GIANT,
|
||||
DATA_RUNIC_DOOR,
|
||||
DATA_STONE_DOOR,
|
||||
DATA_THORIM_HARDMODE,
|
||||
DATA_THORIM_CONTROLLER,
|
||||
|
||||
// Misc
|
||||
DATA_BRANN_BRONZEBEARD_INTRO,
|
||||
DATA_LORE_KEEPER_OF_NORGANNON,
|
||||
@@ -420,10 +463,15 @@ enum UlduarWorldStates
|
||||
enum UlduarAchievementData
|
||||
{
|
||||
// FL Achievement boolean
|
||||
DATA_UNBROKEN = 29052906, // 2905, 2906 are achievement IDs,
|
||||
DATA_UNBROKEN = 29052906, // 2905, 2906 are achievement IDs,
|
||||
MAX_HERALD_ARMOR_ITEMLEVEL = 226,
|
||||
MAX_HERALD_WEAPON_ITEMLEVEL = 232,
|
||||
SPELL_LUMBERJACKED_CREDIT = 65296
|
||||
MAX_HERALD_WEAPON_ITEMLEVEL = 232
|
||||
};
|
||||
|
||||
enum UlduarSharedSpells
|
||||
{
|
||||
SPELL_LUMBERJACKED_CREDIT = 65296,
|
||||
SPELL_TELEPORT_KEEPER_VISUAL = 62940 // used by keepers
|
||||
};
|
||||
|
||||
enum UlduarEvents
|
||||
@@ -448,6 +496,23 @@ AI* GetUlduarAI(T* obj)
|
||||
return GetInstanceAI<AI, T>(obj, UlduarScriptName);
|
||||
}
|
||||
|
||||
class KeeperDespawnEvent : public BasicEvent
|
||||
{
|
||||
public:
|
||||
KeeperDespawnEvent(Creature* owner, uint32 despawnTimerOffset = 500) : _owner(owner), _despawnTimer(despawnTimerOffset) { }
|
||||
|
||||
bool Execute(uint64 /*eventTime*/, uint32 /*updateTime*/) override
|
||||
{
|
||||
_owner->CastSpell(_owner, SPELL_TELEPORT_KEEPER_VISUAL);
|
||||
_owner->DespawnOrUnsummon(1000 + _despawnTimer);
|
||||
return true;
|
||||
}
|
||||
|
||||
private:
|
||||
Creature* _owner;
|
||||
uint32 _despawnTimer;
|
||||
};
|
||||
|
||||
class PlayerOrPetCheck
|
||||
{
|
||||
public:
|
||||
|
||||
@@ -240,7 +240,7 @@ class npc_ichor_globule : public CreatureScript
|
||||
|
||||
struct npc_ichor_globuleAI : public ScriptedAI
|
||||
{
|
||||
npc_ichor_globuleAI(Creature* creature) : ScriptedAI(creature)
|
||||
npc_ichor_globuleAI(Creature* creature) : ScriptedAI(creature), _splashTriggered(false)
|
||||
{
|
||||
_instance = creature->GetInstanceScript();
|
||||
creature->SetReactState(REACT_PASSIVE);
|
||||
@@ -272,14 +272,21 @@ class npc_ichor_globule : public CreatureScript
|
||||
// this feature should be still implemented
|
||||
void DamageTaken(Unit* /*attacker*/, uint32& damage) override
|
||||
{
|
||||
if (_splashTriggered)
|
||||
return;
|
||||
|
||||
if (damage >= me->GetHealth())
|
||||
{
|
||||
_splashTriggered = true;
|
||||
DoCastAOE(SPELL_SPLASH);
|
||||
}
|
||||
}
|
||||
|
||||
void UpdateAI(uint32 /*diff*/) override { }
|
||||
|
||||
private:
|
||||
InstanceScript* _instance;
|
||||
bool _splashTriggered;
|
||||
};
|
||||
|
||||
CreatureAI* GetAI(Creature* creature) const override
|
||||
|
||||
@@ -110,6 +110,7 @@ void AddSC_boss_general_vezax();
|
||||
void AddSC_boss_mimiron();
|
||||
void AddSC_boss_hodir();
|
||||
void AddSC_boss_freya();
|
||||
void AddSC_boss_thorim();
|
||||
void AddSC_boss_yogg_saron();
|
||||
void AddSC_boss_algalon_the_observer();
|
||||
void AddSC_instance_ulduar();
|
||||
@@ -291,6 +292,7 @@ void AddNorthrendScripts()
|
||||
AddSC_boss_mimiron();
|
||||
AddSC_boss_hodir();
|
||||
AddSC_boss_freya();
|
||||
AddSC_boss_thorim();
|
||||
AddSC_boss_yogg_saron();
|
||||
AddSC_boss_algalon_the_observer();
|
||||
AddSC_instance_ulduar();
|
||||
|
||||
@@ -115,7 +115,7 @@ public:
|
||||
DoCast(me, SPELL_EXPLODE_CART, true);
|
||||
DoCast(me, SPELL_SUMMON_CART, true);
|
||||
if (GameObject* cart = me->FindNearestGameObject(GO_EXPLOSIVES_CART, 3.0f))
|
||||
cart->SetFaction(14);
|
||||
cart->SetFaction(FACTION_MONSTER);
|
||||
phaseTimer = 3000;
|
||||
phase = 2;
|
||||
break;
|
||||
@@ -536,9 +536,6 @@ enum Lurgglbr
|
||||
|
||||
GO_CAGE = 187369,
|
||||
|
||||
FACTION_ESCORTEE_A = 774,
|
||||
FACTION_ESCORTEE_H = 775,
|
||||
|
||||
SAY_START_1 = 0,
|
||||
SAY_START_2 = 1,
|
||||
SAY_END_1 = 2,
|
||||
@@ -667,11 +664,11 @@ public:
|
||||
switch (player->GetTeam())
|
||||
{
|
||||
case ALLIANCE:
|
||||
creature->SetFaction(FACTION_ESCORTEE_A);
|
||||
creature->SetFaction(FACTION_ESCORTEE_A_PASSIVE);
|
||||
break;
|
||||
default:
|
||||
case HORDE:
|
||||
creature->SetFaction(FACTION_ESCORTEE_H);
|
||||
creature->SetFaction(FACTION_ESCORTEE_H_PASSIVE);
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -1628,10 +1625,10 @@ public:
|
||||
switch (player->GetTeam())
|
||||
{
|
||||
case ALLIANCE:
|
||||
creature->SetFaction(FACTION_ESCORTEE_A);
|
||||
creature->SetFaction(FACTION_ESCORTEE_A_PASSIVE);
|
||||
break;
|
||||
case HORDE:
|
||||
creature->SetFaction(FACTION_ESCORTEE_H);
|
||||
creature->SetFaction(FACTION_ESCORTEE_H_PASSIVE);
|
||||
break;
|
||||
}
|
||||
creature->SetStandState(UNIT_STAND_STATE_STAND);
|
||||
|
||||
@@ -379,9 +379,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
|
||||
@@ -414,7 +412,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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -102,7 +102,7 @@ public:
|
||||
Talk(SAY_WORGRAGGRO3);
|
||||
if (Creature* RWORG = me->SummonCreature(NPC_RAVENOUS_WORG, me->GetPositionX()+10, me->GetPositionY()+8, me->GetPositionZ()+2, 3.229f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000))
|
||||
{
|
||||
RWORG->SetFaction(35);
|
||||
RWORG->SetFaction(FACTION_FRIENDLY);
|
||||
_RavenousworgGUID = RWORG->GetGUID();
|
||||
}
|
||||
break;
|
||||
@@ -135,7 +135,7 @@ public:
|
||||
{
|
||||
RWORG->Kill(Mrfloppy);
|
||||
Mrfloppy->ExitVehicle();
|
||||
RWORG->SetFaction(14);
|
||||
RWORG->SetFaction(FACTION_MONSTER);
|
||||
RWORG->GetMotionMaster()->MovePoint(0, RWORG->GetPositionX()+10, RWORG->GetPositionY()+80, RWORG->GetPositionZ());
|
||||
Talk(SAY_VICTORY2);
|
||||
}
|
||||
|
||||
@@ -41,7 +41,6 @@ EndContentData */
|
||||
enum Entries
|
||||
{
|
||||
NPC_APOTHECARY_HANES = 23784,
|
||||
FACTION_ESCORTEE_H = 775,
|
||||
QUEST_TRAIL_OF_FIRE = 11241,
|
||||
|
||||
SPELL_HEALING_POTION = 17534,
|
||||
@@ -162,7 +161,7 @@ public:
|
||||
break;
|
||||
case EVENT_START_ESCORT:
|
||||
events.Reset();
|
||||
me->SetFaction(FACTION_ESCORTEE_H);
|
||||
me->SetFaction(FACTION_ESCORTEE_H_PASSIVE);
|
||||
me->SetReactState(REACT_AGGRESSIVE);
|
||||
ENSURE_AI(npc_escortAI, (me->AI()))->Start(true, true, _player);
|
||||
break;
|
||||
|
||||
@@ -46,7 +46,7 @@ public:
|
||||
{
|
||||
Initialize();
|
||||
creature->GetMotionMaster()->MovePoint(0, 8599.258f, 963.951f, 547.553f);
|
||||
creature->SetFaction(35); //wrong faction in db?
|
||||
creature->SetFaction(FACTION_FRIENDLY); //wrong faction in db?
|
||||
}
|
||||
|
||||
void Initialize()
|
||||
@@ -68,7 +68,7 @@ public:
|
||||
if (uiType != POINT_MOTION_TYPE)
|
||||
return;
|
||||
|
||||
me->SetFaction(14);
|
||||
me->SetFaction(FACTION_MONSTER);
|
||||
}
|
||||
|
||||
void DamageTaken(Unit* pDoneBy, uint32& uiDamage) override
|
||||
@@ -77,7 +77,7 @@ public:
|
||||
{
|
||||
uiDamage = 0;
|
||||
pDoneBy->CastSpell(pDoneBy, SPELL_KILL_CREDIT, true);
|
||||
me->SetFaction(35);
|
||||
me->SetFaction(FACTION_FRIENDLY);
|
||||
me->DespawnOrUnsummon(5000);
|
||||
me->SetHomePosition(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation());
|
||||
EnterEvadeMode();
|
||||
|
||||
@@ -322,7 +322,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);
|
||||
|
||||
@@ -90,7 +90,7 @@ public:
|
||||
if (menuId == GOSSIP_ID && gossipListId == GOSSIP_OPTION_ID)
|
||||
{
|
||||
CloseGossipMenuFor(player);
|
||||
me->SetFaction(113);
|
||||
me->SetFaction(FACTION_ESCORTEE_N_NEUTRAL_PASSIVE);
|
||||
Start(true, true, player->GetGUID());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -135,7 +135,7 @@ public:
|
||||
|
||||
void Reset() override
|
||||
{
|
||||
me->SetFaction(35);
|
||||
me->SetFaction(FACTION_FRIENDLY);
|
||||
DoCast(me, SPELL_KNEEL, true); // Little Hack for kneel - Thanks Illy :P
|
||||
}
|
||||
|
||||
|
||||
@@ -131,7 +131,6 @@ enum BTGameObjectIds
|
||||
|
||||
enum BlackTempleMisc
|
||||
{
|
||||
ASHTONGUE_FACTION_FRIEND = 1820,
|
||||
AKAMA_FACTION_COMBAT = 1868,
|
||||
AKAMA_INTRO = 1,
|
||||
AKAMA_FIGHT = 2,
|
||||
|
||||
@@ -379,7 +379,7 @@ public:
|
||||
void Reset() override
|
||||
{
|
||||
Initialize();
|
||||
me->SetFaction(ASHTONGUE_FACTION_FRIEND);
|
||||
me->SetFaction(FACTION_ASHTONGUE_DEATHSWORN);
|
||||
DoCastSelf(SPELL_STEALTH);
|
||||
|
||||
if (_instance->GetBossState(DATA_SHADE_OF_AKAMA) != DONE)
|
||||
@@ -425,7 +425,7 @@ public:
|
||||
{
|
||||
_isInCombat = false;
|
||||
me->CombatStop(true);
|
||||
me->SetFaction(ASHTONGUE_FACTION_FRIEND);
|
||||
me->SetFaction(FACTION_ASHTONGUE_DEATHSWORN);
|
||||
me->SetWalk(true);
|
||||
_events.Reset();
|
||||
me->GetMotionMaster()->MovePoint(AKAMA_INTRO_WAYPOINT, AkamaWP[1]);
|
||||
@@ -479,7 +479,7 @@ public:
|
||||
case EVENT_SHADE_CHANNEL:
|
||||
me->SetFacingTo(FACE_THE_PLATFORM);
|
||||
DoCastSelf(SPELL_AKAMA_SOUL_CHANNEL);
|
||||
me->SetFaction(AKAMA_FACTION_COMBAT);
|
||||
me->SetFaction(FACTION_MONSTER_SPAR_BUDDY);
|
||||
_events.ScheduleEvent(EVENT_FIXATE, Seconds(5));
|
||||
break;
|
||||
case EVENT_FIXATE:
|
||||
@@ -527,7 +527,7 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
if (me->GetFaction() == AKAMA_FACTION_COMBAT)
|
||||
if (me->GetFaction() == FACTION_MONSTER_SPAR_BUDDY)
|
||||
{
|
||||
if (!UpdateVictim())
|
||||
return;
|
||||
@@ -1165,7 +1165,7 @@ public:
|
||||
Talk(SAY_BROKEN_SPECIAL);
|
||||
break;
|
||||
case ACTION_BROKEN_HAIL:
|
||||
me->SetFaction(ASHTONGUE_FACTION_FRIEND);
|
||||
me->SetFaction(FACTION_ASHTONGUE_DEATHSWORN);
|
||||
Talk(SAY_BROKEN_HAIL);
|
||||
break;
|
||||
case ACTION_BROKEN_EMOTE:
|
||||
|
||||
@@ -123,7 +123,7 @@ class instance_black_temple : public InstanceMapScript
|
||||
case NPC_STORM_FURY:
|
||||
AshtongueGUIDs.emplace_back(creature->GetGUID());
|
||||
if (GetBossState(DATA_SHADE_OF_AKAMA) == DONE)
|
||||
creature->SetFaction(ASHTONGUE_FACTION_FRIEND);
|
||||
creature->SetFaction(FACTION_ASHTONGUE_DEATHSWORN);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
@@ -170,7 +170,7 @@ class instance_black_temple : public InstanceMapScript
|
||||
if (state == DONE)
|
||||
for (ObjectGuid ashtongueGuid : AshtongueGUIDs)
|
||||
if (Creature* ashtongue = instance->GetCreature(ashtongueGuid))
|
||||
ashtongue->SetFaction(ASHTONGUE_FACTION_FRIEND);
|
||||
ashtongue->SetFaction(FACTION_ASHTONGUE_DEATHSWORN);
|
||||
// no break
|
||||
case DATA_TERON_GOREFIEND:
|
||||
case DATA_GURTOGG_BLOODBOIL:
|
||||
|
||||
@@ -754,7 +754,7 @@ public:
|
||||
void Reset() override
|
||||
{
|
||||
me->SetDisableGravity(true);
|
||||
me->SetFaction(14);
|
||||
me->SetFaction(FACTION_MONSTER);
|
||||
Initialize();
|
||||
}
|
||||
|
||||
@@ -789,7 +789,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);
|
||||
}
|
||||
}
|
||||
@@ -807,7 +807,7 @@ public:
|
||||
// remove
|
||||
me->setDeathState(DEAD);
|
||||
me->RemoveCorpse();
|
||||
me->SetFaction(35);
|
||||
me->SetFaction(FACTION_FRIENDLY);
|
||||
}
|
||||
|
||||
CheckTimer = 1000;
|
||||
|
||||
+1
-1
@@ -319,7 +319,7 @@ public:
|
||||
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
|
||||
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
|
||||
me->SetFaction(14);
|
||||
me->SetFaction(FACTION_MONSTER);
|
||||
}
|
||||
|
||||
void EnterCombat(Unit* /*who*/) override { }
|
||||
|
||||
@@ -206,7 +206,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript
|
||||
|
||||
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);
|
||||
|
||||
|
||||
@@ -1277,7 +1277,7 @@ class npc_kael_flamestrike : public CreatureScript
|
||||
Initialize();
|
||||
|
||||
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
|
||||
me->SetFaction(14);
|
||||
me->SetFaction(FACTION_MONSTER);
|
||||
}
|
||||
|
||||
void MoveInLineOfSight(Unit* /*who*/) override { }
|
||||
|
||||
@@ -538,7 +538,7 @@ class npc_zerekethvoidzone : public CreatureScript
|
||||
void Reset() override
|
||||
{
|
||||
me->SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_NONE);
|
||||
me->SetFaction(16);
|
||||
me->SetFaction(FACTION_MONSTER_2);
|
||||
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
|
||||
|
||||
DoCast(me, SPELL_VOID_ZONE_DAMAGE);
|
||||
|
||||
@@ -45,8 +45,6 @@ enum Aeranas
|
||||
{
|
||||
SAY_SUMMON = 0,
|
||||
SAY_FREE = 1,
|
||||
FACTION_HOSTILE = 16,
|
||||
FACTION_FRIENDLY = 35,
|
||||
SPELL_ENVELOPING_WINDS = 15535,
|
||||
SPELL_SHOCK = 12553
|
||||
};
|
||||
@@ -86,7 +84,7 @@ public:
|
||||
{
|
||||
if (faction_Timer <= diff)
|
||||
{
|
||||
me->SetFaction(FACTION_HOSTILE);
|
||||
me->SetFaction(FACTION_MONSTER_2);
|
||||
faction_Timer = 0;
|
||||
} else faction_Timer -= diff;
|
||||
}
|
||||
@@ -250,8 +248,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
|
||||
@@ -280,7 +277,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());
|
||||
}
|
||||
}
|
||||
@@ -1003,7 +1000,7 @@ public:
|
||||
break;
|
||||
case EVENT_ATTACK:
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
|
||||
me->SetFaction(FACTION_HOSTILE);
|
||||
me->SetFaction(FACTION_MONSTER_2);
|
||||
me->CombatStart(ObjectAccessor::GetPlayer(*me, _playerGUID));
|
||||
_events.ScheduleEvent(EVENT_FIREBALL, 1);
|
||||
_events.ScheduleEvent(EVENT_FROSTNOVA, Seconds(5));
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -430,7 +430,7 @@ public:
|
||||
if (npc_kurenai_captiveAI* EscortAI = dynamic_cast<npc_kurenai_captiveAI*>(creature->AI()))
|
||||
{
|
||||
creature->SetStandState(UNIT_STAND_STATE_STAND);
|
||||
creature->SetFaction(231);
|
||||
creature->SetFaction(FACTION_ESCORTEE_A_NEUTRAL_ACTIVE);
|
||||
EscortAI->Start(true, false, player->GetGUID(), quest);
|
||||
creature->AI()->Talk(SAY_KUR_START);
|
||||
|
||||
|
||||
@@ -496,7 +496,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);
|
||||
ENSURE_AI(npc_escortAI, (creature->AI()))->Start(true, false, player->GetGUID());
|
||||
}
|
||||
@@ -662,7 +662,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());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -336,10 +336,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,
|
||||
@@ -375,7 +371,7 @@ public:
|
||||
void Reset() override
|
||||
{
|
||||
if (!Tapped)
|
||||
me->SetFaction(FACTION_DEFAULT);
|
||||
me->SetFaction(FACTION_ORC_DRAGONMAW);
|
||||
|
||||
FlyTimer = 10000;
|
||||
me->SetDisableGravity(false);
|
||||
@@ -392,7 +388,7 @@ public:
|
||||
Tapped = true;
|
||||
PlayerGUID = caster->GetGUID();
|
||||
|
||||
me->SetFaction(FACTION_FRIENDLY);
|
||||
me->SetFaction(FACTION_FLAYER_HUNTER);
|
||||
DoCast(caster, SPELL_FORCE_OF_NELTHARAKU, true);
|
||||
|
||||
Unit* Dragonmaw = me->FindNearestCreature(NPC_DRAGONMAW_SUBJUGATOR, 50);
|
||||
@@ -587,8 +583,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
|
||||
@@ -601,7 +596,7 @@ public:
|
||||
if (quest->GetQuestId() == QUEST_ESCAPE_COILSCAR)
|
||||
{
|
||||
creature->AI()->Talk(SAY_WIL_START, player);
|
||||
creature->SetFaction(FACTION_EARTHEN);
|
||||
creature->SetFaction(FACTION_EARTHEN_RING);
|
||||
|
||||
if (npc_earthmender_wildaAI* pEscortAI = CAST_AI(npc_earthmender_wilda::npc_earthmender_wildaAI, creature->AI()))
|
||||
pEscortAI->Start(false, false, player->GetGUID(), quest);
|
||||
@@ -1407,11 +1402,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
|
||||
@@ -1479,7 +1470,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())
|
||||
|
||||
@@ -46,7 +46,6 @@ enum RaliqTheDrunk
|
||||
{
|
||||
SAY_RALIQ_ATTACK = 0,
|
||||
OPTION_ID_COLLECT_A_DEBT = 0,
|
||||
FACTION_OGRE_HOSTILE = 45,
|
||||
MENU_ID_COLLECT_A_DEBT = 7729,
|
||||
NPC_TEXT_WUT_YOU_WANT = 9440,
|
||||
CRACKIN_SOME_SKULLS = 10009,
|
||||
@@ -64,7 +63,7 @@ public:
|
||||
if (action == GOSSIP_ACTION_INFO_DEF+1)
|
||||
{
|
||||
CloseGossipMenuFor(player);
|
||||
creature->SetFaction(FACTION_OGRE_HOSTILE);
|
||||
creature->SetFaction(FACTION_OGRE);
|
||||
creature->AI()->Talk(SAY_RALIQ_ATTACK, player);
|
||||
creature->AI()->AttackStart(player);
|
||||
}
|
||||
@@ -135,8 +134,6 @@ enum Salsalabim
|
||||
{
|
||||
SAY_DEMONIC_AGGRO = 0,
|
||||
OPTION_ID_ALTRUIS_SENT_ME = 0,
|
||||
FACTION_FRIENDLY = 35,
|
||||
FACTION_DEMON_HOSTILE = 90,
|
||||
MENU_ID_ALTRUIS_SENT_ME = 7725,
|
||||
NPC_TEXT_SAL_GROWLS_AT_YOU = 9435,
|
||||
PATIENCE_AND_UNDERSTANDING = 10004,
|
||||
@@ -154,7 +151,7 @@ public:
|
||||
if (action == GOSSIP_ACTION_INFO_DEF+1)
|
||||
{
|
||||
CloseGossipMenuFor(player);
|
||||
creature->SetFaction(FACTION_DEMON_HOSTILE);
|
||||
creature->SetFaction(FACTION_DEMON);
|
||||
creature->AI()->Talk(SAY_DEMONIC_AGGRO, player);
|
||||
creature->AI()->AttackStart(player);
|
||||
}
|
||||
|
||||
@@ -48,8 +48,6 @@ enum UnkorTheRuthless
|
||||
{
|
||||
SAY_SUBMIT = 0,
|
||||
REQUIRED_KILL_COUNT = 10,
|
||||
FACTION_FRIENDLY = 35,
|
||||
FACTION_HOSTILE = 45,
|
||||
SPELL_PULVERIZE = 2676,
|
||||
QUEST_DONTKILLTHEFATONE = 9889,
|
||||
NPC_BOULDERFIST_INVADER = 18260
|
||||
@@ -87,7 +85,7 @@ public:
|
||||
{
|
||||
Initialize();
|
||||
me->SetStandState(UNIT_STAND_STATE_STAND);
|
||||
me->SetFaction(FACTION_HOSTILE);
|
||||
me->SetFaction(FACTION_OGRE);
|
||||
}
|
||||
|
||||
void EnterCombat(Unit* /*who*/) override { }
|
||||
@@ -310,7 +308,6 @@ enum Floon
|
||||
SAY_FLOON_ATTACK = 0,
|
||||
OPTION_ID_PAY_UP_OR_DIE = 0,
|
||||
OPTION_ID_COLLECT_A_DEBT = 0,
|
||||
FACTION_HOSTILE_FLOON = 1738,
|
||||
MENU_ID_PAY_UP_OR_DIE = 7731,
|
||||
MENU_ID_COLLECT_A_DEBT = 7732,
|
||||
GOSSIP_FLOON_STRANGE_SOUNDS = 9442,
|
||||
@@ -339,7 +336,7 @@ public:
|
||||
if (action == GOSSIP_ACTION_INFO_DEF+1)
|
||||
{
|
||||
CloseGossipMenuFor(player);
|
||||
creature->SetFaction(FACTION_HOSTILE_FLOON);
|
||||
creature->SetFaction(FACTION_ARAKKOA);
|
||||
creature->AI()->Talk(SAY_FLOON_ATTACK, player);
|
||||
creature->AI()->AttackStart(player);
|
||||
}
|
||||
@@ -427,7 +424,6 @@ enum IslaStarmaneData
|
||||
SAY_PROGRESS_3 = 2,
|
||||
SAY_PROGRESS_4 = 3,
|
||||
GO_DISTANCE = 10,
|
||||
FACTION_ESCORTEE = 113,
|
||||
ESCAPE_FROM_FIREWING_POINT_A = 10051,
|
||||
ESCAPE_FROM_FIREWING_POINT_H = 10052,
|
||||
SPELL_TRAVEL_FORM_CAT = 32447,
|
||||
@@ -504,7 +500,7 @@ public:
|
||||
if (quest->GetQuestId() == ESCAPE_FROM_FIREWING_POINT_H || quest->GetQuestId() == ESCAPE_FROM_FIREWING_POINT_A)
|
||||
{
|
||||
ENSURE_AI(npc_escortAI, (creature->AI()))->Start(true, false, player->GetGUID());
|
||||
creature->SetFaction(FACTION_ESCORTEE);
|
||||
creature->SetFaction(FACTION_ESCORTEE_N_NEUTRAL_PASSIVE);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
@@ -644,9 +640,9 @@ public:
|
||||
pEscortAI->Start(false, false, player->GetGUID());
|
||||
|
||||
if (player->GetTeamId() == TEAM_ALLIANCE)
|
||||
creature->SetFaction(FACTION_ESCORT_A_NEUTRAL_PASSIVE);
|
||||
creature->SetFaction(FACTION_ESCORTEE_A_NEUTRAL_PASSIVE);
|
||||
else
|
||||
creature->SetFaction(FACTION_ESCORT_H_NEUTRAL_PASSIVE);
|
||||
creature->SetFaction(FACTION_ESCORTEE_H_NEUTRAL_PASSIVE);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -158,8 +158,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
|
||||
@@ -227,7 +226,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;
|
||||
|
||||
@@ -3741,7 +3741,7 @@ class spell_gen_gm_freeze : public SpellScriptLoader
|
||||
if (Player* player = GetTarget()->ToPlayer())
|
||||
{
|
||||
// stop combat + make player unattackable + duel stop + stop some spells
|
||||
player->SetFaction(35);
|
||||
player->SetFaction(FACTION_FRIENDLY);
|
||||
player->CombatStop();
|
||||
if (player->IsNonMeleeSpellCast(true))
|
||||
player->InterruptNonMeleeSpells(true);
|
||||
|
||||
@@ -256,9 +256,7 @@ enum ChickenCluck
|
||||
EMOTE_HELLO_H = 1,
|
||||
EMOTE_CLUCK_TEXT = 2,
|
||||
|
||||
QUEST_CLUCK = 3861,
|
||||
FACTION_FRIENDLY = 35,
|
||||
FACTION_CHICKEN = 31
|
||||
QUEST_CLUCK = 3861
|
||||
};
|
||||
|
||||
class npc_chicken_cluck : public CreatureScript
|
||||
@@ -283,7 +281,7 @@ public:
|
||||
void Reset() override
|
||||
{
|
||||
Initialize();
|
||||
me->SetFaction(FACTION_CHICKEN);
|
||||
me->SetFaction(FACTION_PREY);
|
||||
me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user