diff options
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.h | 7 | ||||
| -rw-r--r-- | src/server/game/Miscellaneous/SharedDefines.h | 7 | ||||
| -rw-r--r-- | src/server/game/Miscellaneous/enuminfo_SharedDefines.cpp | 15 |
3 files changed, 17 insertions, 12 deletions
diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index 0c17b38a2fe..96596d60ac6 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -174,7 +174,7 @@ enum UnitMods UNIT_MOD_RAGE, UNIT_MOD_FOCUS, UNIT_MOD_ENERGY, - UNIT_MOD_COMBO_POINTS, + UNIT_MOD_HAPPINESS, UNIT_MOD_RUNES, UNIT_MOD_RUNIC_POWER, UNIT_MOD_SOUL_SHARDS, @@ -184,7 +184,7 @@ enum UnitMods UNIT_MOD_MAELSTROM, UNIT_MOD_CHI, UNIT_MOD_INSANITY, - UNIT_MOD_BURNING_EMBERS, + UNIT_MOD_COMBO_POINTS, UNIT_MOD_DEMONIC_FURY, UNIT_MOD_ARCANE_CHARGES, UNIT_MOD_FURY, @@ -196,6 +196,7 @@ enum UnitMods UNIT_MOD_ALTERNATE_QUEST, UNIT_MOD_ALTERNATE_ENCOUNTER, UNIT_MOD_ALTERNATE_MOUNT, + UNIT_MOD_BALANCE, UNIT_MOD_ARMOR, // UNIT_MOD_ARMOR..UNIT_MOD_RESISTANCE_ARCANE must be in existed order, it's accessed by index values of SpellSchools enum. UNIT_MOD_RESISTANCE_HOLY, UNIT_MOD_RESISTANCE_FIRE, @@ -215,7 +216,7 @@ enum UnitMods UNIT_MOD_RESISTANCE_START = UNIT_MOD_ARMOR, UNIT_MOD_RESISTANCE_END = UNIT_MOD_RESISTANCE_ARCANE + 1, UNIT_MOD_POWER_START = UNIT_MOD_MANA, - UNIT_MOD_POWER_END = UNIT_MOD_ALTERNATE_MOUNT + 1 + UNIT_MOD_POWER_END = UNIT_MOD_BALANCE + 1 }; static_assert(UNIT_MOD_POWER_END - UNIT_MOD_POWER_START == MAX_POWERS, "UnitMods powers section does not match Powers enum!"); diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h index 2ce94b50cb6..08954b5c251 100644 --- a/src/server/game/Miscellaneous/SharedDefines.h +++ b/src/server/game/Miscellaneous/SharedDefines.h @@ -288,7 +288,7 @@ enum Powers : int8 POWER_RAGE = 1, // TITLE Rage POWER_FOCUS = 2, // TITLE Focus POWER_ENERGY = 3, // TITLE Energy - POWER_COMBO_POINTS = 4, // TITLE Combo Points + POWER_HAPPINESS = 4, // TITLE Happiness POWER_RUNES = 5, // TITLE Runes POWER_RUNIC_POWER = 6, // TITLE Runic Power POWER_SOUL_SHARDS = 7, // TITLE Soul Shards @@ -298,7 +298,7 @@ enum Powers : int8 POWER_MAELSTROM = 11, // TITLE Maelstrom POWER_CHI = 12, // TITLE Chi POWER_INSANITY = 13, // TITLE Insanity - POWER_BURNING_EMBERS = 14, // TITLE Burning Embers (Obsolete) + POWER_COMBO_POINTS = 14, // TITLE Combo Points POWER_DEMONIC_FURY = 15, // TITLE Demonic Fury (Obsolete) POWER_ARCANE_CHARGES = 16, // TITLE Arcane Charges POWER_FURY = 17, // TITLE Fury @@ -310,7 +310,8 @@ enum Powers : int8 POWER_ALTERNATE_QUEST = 23, // TITLE Alternate (Quest) POWER_ALTERNATE_ENCOUNTER = 24, // TITLE Alternate (Encounter) POWER_ALTERNATE_MOUNT = 25, // TITLE Alternate (Mount) - MAX_POWERS = 26, // SKIP + POWER_BALANCE = 26, // TITLE Balance + MAX_POWERS = 27, // SKIP POWER_ALL = 127 // SKIP }; diff --git a/src/server/game/Miscellaneous/enuminfo_SharedDefines.cpp b/src/server/game/Miscellaneous/enuminfo_SharedDefines.cpp index b6a27b664f4..6204cbb70d7 100644 --- a/src/server/game/Miscellaneous/enuminfo_SharedDefines.cpp +++ b/src/server/game/Miscellaneous/enuminfo_SharedDefines.cpp @@ -111,7 +111,7 @@ TC_API_EXPORT EnumText EnumUtils<Powers>::ToString(Powers value) case POWER_RAGE: return { "POWER_RAGE", "Rage", "" }; case POWER_FOCUS: return { "POWER_FOCUS", "Focus", "" }; case POWER_ENERGY: return { "POWER_ENERGY", "Energy", "" }; - case POWER_COMBO_POINTS: return { "POWER_COMBO_POINTS", "Combo Points", "" }; + case POWER_HAPPINESS: return { "POWER_HAPPINESS", "Happiness", "" }; case POWER_RUNES: return { "POWER_RUNES", "Runes", "" }; case POWER_RUNIC_POWER: return { "POWER_RUNIC_POWER", "Runic Power", "" }; case POWER_SOUL_SHARDS: return { "POWER_SOUL_SHARDS", "Soul Shards", "" }; @@ -121,7 +121,7 @@ TC_API_EXPORT EnumText EnumUtils<Powers>::ToString(Powers value) case POWER_MAELSTROM: return { "POWER_MAELSTROM", "Maelstrom", "" }; case POWER_CHI: return { "POWER_CHI", "Chi", "" }; case POWER_INSANITY: return { "POWER_INSANITY", "Insanity", "" }; - case POWER_BURNING_EMBERS: return { "POWER_BURNING_EMBERS", "Burning Embers (Obsolete)", "" }; + case POWER_COMBO_POINTS: return { "POWER_COMBO_POINTS", "Combo Points", "" }; case POWER_DEMONIC_FURY: return { "POWER_DEMONIC_FURY", "Demonic Fury (Obsolete)", "" }; case POWER_ARCANE_CHARGES: return { "POWER_ARCANE_CHARGES", "Arcane Charges", "" }; case POWER_FURY: return { "POWER_FURY", "Fury", "" }; @@ -133,6 +133,7 @@ TC_API_EXPORT EnumText EnumUtils<Powers>::ToString(Powers value) case POWER_ALTERNATE_QUEST: return { "POWER_ALTERNATE_QUEST", "Alternate (Quest)", "" }; case POWER_ALTERNATE_ENCOUNTER: return { "POWER_ALTERNATE_ENCOUNTER", "Alternate (Encounter)", "" }; case POWER_ALTERNATE_MOUNT: return { "POWER_ALTERNATE_MOUNT", "Alternate (Mount)", "" }; + case POWER_BALANCE: return { "POWER_BALANCE", "Balance", "" }; default: throw std::out_of_range("value"); } } @@ -150,7 +151,7 @@ TC_API_EXPORT Powers EnumUtils<Powers>::FromIndex(size_t index) case 2: return POWER_RAGE; case 3: return POWER_FOCUS; case 4: return POWER_ENERGY; - case 5: return POWER_COMBO_POINTS; + case 5: return POWER_HAPPINESS; case 6: return POWER_RUNES; case 7: return POWER_RUNIC_POWER; case 8: return POWER_SOUL_SHARDS; @@ -160,7 +161,7 @@ TC_API_EXPORT Powers EnumUtils<Powers>::FromIndex(size_t index) case 12: return POWER_MAELSTROM; case 13: return POWER_CHI; case 14: return POWER_INSANITY; - case 15: return POWER_BURNING_EMBERS; + case 15: return POWER_COMBO_POINTS; case 16: return POWER_DEMONIC_FURY; case 17: return POWER_ARCANE_CHARGES; case 18: return POWER_FURY; @@ -172,6 +173,7 @@ TC_API_EXPORT Powers EnumUtils<Powers>::FromIndex(size_t index) case 24: return POWER_ALTERNATE_QUEST; case 25: return POWER_ALTERNATE_ENCOUNTER; case 26: return POWER_ALTERNATE_MOUNT; + case 27: return POWER_BALANCE; default: throw std::out_of_range("index"); } } @@ -186,7 +188,7 @@ TC_API_EXPORT size_t EnumUtils<Powers>::ToIndex(Powers value) case POWER_RAGE: return 2; case POWER_FOCUS: return 3; case POWER_ENERGY: return 4; - case POWER_COMBO_POINTS: return 5; + case POWER_HAPPINESS: return 5; case POWER_RUNES: return 6; case POWER_RUNIC_POWER: return 7; case POWER_SOUL_SHARDS: return 8; @@ -196,7 +198,7 @@ TC_API_EXPORT size_t EnumUtils<Powers>::ToIndex(Powers value) case POWER_MAELSTROM: return 12; case POWER_CHI: return 13; case POWER_INSANITY: return 14; - case POWER_BURNING_EMBERS: return 15; + case POWER_COMBO_POINTS: return 15; case POWER_DEMONIC_FURY: return 16; case POWER_ARCANE_CHARGES: return 17; case POWER_FURY: return 18; @@ -208,6 +210,7 @@ TC_API_EXPORT size_t EnumUtils<Powers>::ToIndex(Powers value) case POWER_ALTERNATE_QUEST: return 24; case POWER_ALTERNATE_ENCOUNTER: return 25; case POWER_ALTERNATE_MOUNT: return 26; + case POWER_BALANCE: return 27; default: throw std::out_of_range("value"); } } |