aboutsummaryrefslogtreecommitdiff
path: root/src/server/game
diff options
context:
space:
mode:
authorForesterDev <forester.manv@gmail.com>2017-05-23 14:30:27 +0400
committerfunjoker <funjoker109@gmail.com>2020-06-14 23:49:03 +0200
commitc34b83a467975f5d2ed6f8a98b8d6cb0c7710a34 (patch)
tree44a6e4676cea8beb3baf17ae1b5871c4f5d6dfaf /src/server/game
parent607c5ad5541bac7ce8a2787ef9c87b4ebea74a5e (diff)
Core/Defines: define faction templates and replace magic numbers from scripts
(cherry picked from commit abea8bf4cb3034f56d833982f951a0742dc36fc7)
Diffstat (limited to 'src/server/game')
-rw-r--r--src/server/game/Battlefield/Zones/BattlefieldWG.cpp2
-rw-r--r--src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp2
-rw-r--r--src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp2
-rw-r--r--src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp2
-rw-r--r--src/server/game/Entities/GameObject/GameObject.cpp2
-rw-r--r--src/server/game/Entities/Player/Player.cpp4
-rw-r--r--src/server/game/Miscellaneous/SharedDefines.h45
-rw-r--r--src/server/game/Scripting/ScriptSystem.h24
8 files changed, 52 insertions, 31 deletions
diff --git a/src/server/game/Battlefield/Zones/BattlefieldWG.cpp b/src/server/game/Battlefield/Zones/BattlefieldWG.cpp
index 6e1bba5f1a9..62e37f5d76b 100644
--- a/src/server/game/Battlefield/Zones/BattlefieldWG.cpp
+++ b/src/server/game/Battlefield/Zones/BattlefieldWG.cpp
@@ -57,7 +57,7 @@ BfWGCoordGY const WGGraveYard[BATTLEFIELD_WG_GRAVEYARD_MAX] =
};
uint32 const ClockWorldState[] = { 3781, 4354 };
-uint32 const WintergraspFaction[] = { 1732, 1735, 35 };
+uint32 const WintergraspFaction[] = { FACTION_ALLIANCE_GENERIC_WG, FACTION_HORDE_GENERIC_WG, FACTION_FRIENDLY };
Position const WintergraspStalkerPos = { 4948.985f, 2937.789f, 550.5172f, 1.815142f };
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp
index edd6d3e67ed..31345c14048 100644
--- a/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp
@@ -384,7 +384,7 @@ void BattlegroundAB::_NodeOccupied(uint8 node, Team team)
//aura should only apply to players who have accupied the node, set correct faction for trigger
if (trigger)
{
- trigger->SetFaction(team == ALLIANCE ? 84 : 83);
+ trigger->SetFaction(team == ALLIANCE ? FACTION_ALLIANCE_GENERIC : FACTION_HORDE_GENERIC);
trigger->CastSpell(trigger, SPELL_HONORABLE_DEFENDER_25Y, false);
}
}
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp
index 3fc2cd2ad8d..ff37ce06346 100644
--- a/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp
@@ -757,7 +757,7 @@ void BattlegroundAV::PopulateNode(BG_AV_Nodes node)
DelCreature(node + 302);
return;
}
- trigger->SetFaction(owner == ALLIANCE ? 84 : 83);
+ trigger->SetFaction(owner == ALLIANCE ? FACTION_ALLIANCE_GENERIC : FACTION_HORDE_GENERIC);
trigger->CastSpell(trigger, SPELL_HONORABLE_DEFENDER_25Y, false);
}
}
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp
index c83e1ff48b1..8c4143e0ce3 100644
--- a/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp
@@ -810,7 +810,7 @@ void BattlegroundEY::EventTeamCapturedPoint(Player* player, uint32 Point)
//aura should only apply to players who have accupied the node, set correct faction for trigger
if (trigger)
{
- trigger->SetFaction(Team == ALLIANCE ? 84 : 83);
+ trigger->SetFaction(Team == ALLIANCE ? FACTION_ALLIANCE_GENERIC : FACTION_HORDE_GENERIC);
trigger->CastSpell(trigger, SPELL_HONORABLE_DEFENDER_25Y, false);
}
}
diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp
index 4059e6e72d6..6df8c23d765 100644
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -2121,7 +2121,7 @@ void GameObject::CastSpell(Unit* target, uint32 spellId, TriggerCastFlags trigge
}
else
{
- trigger->SetFaction(spellInfo->IsPositive() ? 35 : 14);
+ trigger->SetFaction(spellInfo->IsPositive() ? FACTION_FRIENDLY : FACTION_MONSTER);
// Set owner guid for target if no owner available - needed by trigger auras
// - trigger gets despawned and there's no caster avalible (see AuraEffect::TriggerSpell())
trigger->CastSpell(target ? target : trigger, spellInfo, triggered, nullptr, nullptr, target ? target->GetGUID() : ObjectGuid::Empty);
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index a7fb7ce765d..0802908a9cf 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -2201,13 +2201,13 @@ void Player::SetGameMaster(bool on)
if (on)
{
m_ExtraFlags |= PLAYER_EXTRA_GM_ON;
- SetFaction(35);
+ SetFaction(FACTION_FRIENDLY);
AddPlayerFlag(PLAYER_FLAGS_GM);
AddUnitFlag2(UNIT_FLAG2_ALLOW_CHEAT_SPELLS);
if (Pet* pet = GetPet())
{
- pet->SetFaction(35);
+ pet->SetFaction(FACTION_FRIENDLY);
pet->getHostileRefManager().setOnlineOfflineState(false);
}
diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h
index 2e7d7e81ddb..03b0f954ccd 100644
--- a/src/server/game/Miscellaneous/SharedDefines.h
+++ b/src/server/game/Miscellaneous/SharedDefines.h
@@ -189,6 +189,51 @@ enum ReputationRank
REP_EXALTED = 7
};
+enum FactionTemplates
+{
+ FACTION_NONE = 0,
+ FACTION_CREATURE = 7,
+ FACTION_ESCORTEE_A_NEUTRAL_PASSIVE = 10,
+ FACTION_MONSTER = 14,
+ FACTION_MONSTER_2 = 16,
+ FACTION_TROLL_BLOODSCALP = 28,
+ FACTION_PREY = 31,
+ FACTION_ESCORTEE_H_NEUTRAL_PASSIVE = 33,
+ FACTION_FRIENDLY = 35,
+ FACTION_OGRE = 45,
+ FACTION_ORC_DRAGONMAW = 62,
+ FACTION_HORDE_GENERIC = 83,
+ FACTION_ALLIANCE_GENERIC = 84,
+ FACTION_DEMON = 90,
+ FACTION_ELEMENTAL = 91,
+ FACTION_DRAGONFLIGHT_BLACK = 103,
+ FACTION_ESCORTEE_N_NEUTRAL_PASSIVE = 113,
+ FACTION_ENEMY = 168,
+ FACTION_ESCORTEE_A_NEUTRAL_ACTIVE = 231,
+ FACTION_ESCORTEE_H_NEUTRAL_ACTIVE = 232,
+ FACTION_ESCORTEE_N_NEUTRAL_ACTIVE = 250,
+ FACTION_ESCORTEE_N_FRIEND_PASSIVE = 290,
+ FACTION_TITAN = 415,
+ FACTION_ESCORTEE_N_FRIEND_ACTIVE = 495,
+ FACTION_GOBLIN_DARK_IRON_BAR_PATRON = 736,
+ FACTION_DARK_IRON_DWARVES = 754,
+ FACTION_ESCORTEE_A_PASSIVE = 774,
+ FACTION_ESCORTEE_H_PASSIVE = 775,
+ FACTION_UNDEAD_SCOURGE = 974,
+ FACTION_EARTHEN_RING = 1726,
+ FACTION_ALLIANCE_GENERIC_WG = 1732,
+ FACTION_HORDE_GENERIC_WG = 1735,
+ FACTION_ARAKKOA = 1738,
+ FACTION_ASHTONGUE_DEATHSWORN = 1820,
+ FACTION_FLAYER_HUNTER = 1840,
+ FACTION_MONSTER_SPAR_BUDDY = 1868,
+ FACTION_ESCORTEE_N_ACTIVE = 1986,
+ FACTION_ESCORTEE_H_ACTIVE = 2046,
+ FACTION_UNDEAD_SCOURGE_2 = 2068,
+ FACTION_UNDEAD_SCOURGE_3 = 2084,
+ FACTION_SCARLET_CRUSADE = 2089
+};
+
#define MIN_REPUTATION_RANK (REP_HATED)
#define MAX_REPUTATION_RANK 8
diff --git a/src/server/game/Scripting/ScriptSystem.h b/src/server/game/Scripting/ScriptSystem.h
index 9f5a0ef78ce..f058bf886ee 100644
--- a/src/server/game/Scripting/ScriptSystem.h
+++ b/src/server/game/Scripting/ScriptSystem.h
@@ -28,30 +28,6 @@ struct SplineChainLink;
#define TEXT_SOURCE_RANGE -1000000 //the amount of entries each text source has available
-/// @todo find better namings and definitions.
-//N=Neutral, A=Alliance, H=Horde.
-//NEUTRAL or FRIEND = Hostility to player surroundings (not a good definition)
-//ACTIVE or PASSIVE = Hostility to environment surroundings.
-enum eEscortFaction
-{
- FACTION_ESCORT_A_NEUTRAL_PASSIVE = 10,
- FACTION_ESCORT_H_NEUTRAL_PASSIVE = 33,
- FACTION_ESCORT_N_NEUTRAL_PASSIVE = 113,
-
- FACTION_ESCORT_A_NEUTRAL_ACTIVE = 231,
- FACTION_ESCORT_H_NEUTRAL_ACTIVE = 232,
- FACTION_ESCORT_N_NEUTRAL_ACTIVE = 250,
-
- FACTION_ESCORT_N_FRIEND_PASSIVE = 290,
- FACTION_ESCORT_N_FRIEND_ACTIVE = 495,
-
- FACTION_ESCORT_A_PASSIVE = 774,
- FACTION_ESCORT_H_PASSIVE = 775,
-
- FACTION_ESCORT_N_ACTIVE = 1986,
- FACTION_ESCORT_H_ACTIVE = 2046
-};
-
struct ScriptPointMove
{
uint32 uiCreatureEntry;