Core/Spells: Defined names for some new spell effects

2 files changed, 65 insertions, 65 deletions

diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h
index 975d74795fc..4e552e40322 100644
--- a/src/server/game/Miscellaneous/SharedDefines.h
+++ b/src/server/game/Miscellaneous/SharedDefines.h
@@ -1199,8 +1199,8 @@ enum SpellEffectName
     SPELL_EFFECT_LOOT                               = 189, // NYI, lootid in MiscValue ?
     SPELL_EFFECT_190                                = 190,
     SPELL_EFFECT_TELEPORT_TO_DIGSITE                = 191, // NYI
-    SPELL_EFFECT_192                                = 192,
-    SPELL_EFFECT_193                                = 193,
+    SPELL_EFFECT_UNCAGE_BATTLEPET                   = 192,
+    SPELL_EFFECT_START_PET_BATTLE                   = 193,
     SPELL_EFFECT_194                                = 194,
     SPELL_EFFECT_195                                = 195,
     SPELL_EFFECT_196                                = 196,
@@ -1211,53 +1211,53 @@ enum SpellEffectName
     SPELL_EFFECT_ENABLE_BATTLE_PETS                 = 201, // NYI
     SPELL_EFFECT_202                                = 202,
     SPELL_EFFECT_203                                = 203,
-    SPELL_EFFECT_204                                = 204,
-    SPELL_EFFECT_205                                = 205,
+    SPELL_EFFECT_CHANGE_BATTLEPET_QUALITY           = 204,
+    SPELL_EFFECT_LAUNCH_QUEST_CHOICE                = 205,
     SPELL_EFFECT_206                                = 206,
-    SPELL_EFFECT_207                                = 207,
+    SPELL_EFFECT_LAUNCH_QUEST_TASK                  = 207, // Starts one of the "progress bar" quests
     SPELL_EFFECT_208                                = 208,
     SPELL_EFFECT_209                                = 209,
-    SPELL_EFFECT_210                                = 210,
-    SPELL_EFFECT_211                                = 211,
+    SPELL_EFFECT_LEARN_GARRISON_BUILDING            = 210,
+    SPELL_EFFECT_LEARN_GARRISON_SPECIALIZATION      = 211,
     SPELL_EFFECT_212                                = 212,
     SPELL_EFFECT_213                                = 213,
-    SPELL_EFFECT_214                                = 214,
-    SPELL_EFFECT_215                                = 215,
-    SPELL_EFFECT_216                                = 216,
-    SPELL_EFFECT_217                                = 217,
+    SPELL_EFFECT_CREATE_GARRISON                    = 214,
+    SPELL_EFFECT_UPGRADE_CHARACTER_SPELLS           = 215, // Unlocks boosted players' spells (ChrUpgrade*.db2)
+    SPELL_EFFECT_CREATE_SHIPMENT                    = 216,
+    SPELL_EFFECT_UPGRADE_GARRISON                   = 217,
     SPELL_EFFECT_218                                = 218,
     SPELL_EFFECT_219                                = 219,
-    SPELL_EFFECT_220                                = 220,
+    SPELL_EFFECT_ADD_GARRISON_FOLLOWER              = 220,
     SPELL_EFFECT_221                                = 221,
-    SPELL_EFFECT_222                                = 222,
-    SPELL_EFFECT_223                                = 223,
-    SPELL_EFFECT_224                                = 224,
-    SPELL_EFFECT_225                                = 225,
+    SPELL_EFFECT_CREATE_HEIRLOOM_ITEM               = 222,
+    SPELL_EFFECT_CHANGE_ITEM_BONUSES                = 223,
+    SPELL_EFFECT_ACTIVATE_GARRISON_BUILDING         = 224,
+    SPELL_EFFECT_GRANT_BATTLEPET_LEVEL              = 225,
     SPELL_EFFECT_226                                = 226,
     SPELL_EFFECT_227                                = 227,
     SPELL_EFFECT_228                                = 228,
-    SPELL_EFFECT_229                                = 229,
-    SPELL_EFFECT_230                                = 230,
-    SPELL_EFFECT_231                                = 231,
-    SPELL_EFFECT_232                                = 232,
-    SPELL_EFFECT_233                                = 233,
+    SPELL_EFFECT_SET_FOLLOWER_QUALITY               = 229,
+    SPELL_EFFECT_INCREASE_FOLLOWER_ITEM_LEVEL       = 230,
+    SPELL_EFFECT_INCREASE_FOLLOWER_EXPERIENCE       = 231,
+    SPELL_EFFECT_REMOVE_PHASE                       = 232,
+    SPELL_EFFECT_RANDOMIZE_FOLLOWER_ABILITIES       = 233,
     SPELL_EFFECT_234                                = 234,
     SPELL_EFFECT_235                                = 235,
-    SPELL_EFFECT_236                                = 236,
-    SPELL_EFFECT_237                                = 237,
-    SPELL_EFFECT_238                                = 238,
-    SPELL_EFFECT_239                                = 239,
+    SPELL_EFFECT_GIVE_EXPERIENCE                    = 236, // Increases players XP
+    SPELL_EFFECT_GIVE_RESTED_EXPERIENCE_BONUS       = 237,
+    SPELL_EFFECT_INCREASE_SKILL                     = 238,
+    SPELL_EFFECT_END_GARRISON_BUILDING_CONSTRUCTION = 239, // Instantly finishes building construction
     SPELL_EFFECT_240                                = 240,
     SPELL_EFFECT_241                                = 241,
     SPELL_EFFECT_242                                = 242,
-    SPELL_EFFECT_243                                = 243,
-    SPELL_EFFECT_244                                = 244,
-    SPELL_EFFECT_245                                = 245,
-    SPELL_EFFECT_246                                = 246,
-    SPELL_EFFECT_247                                = 247,
-    SPELL_EFFECT_248                                = 248,
+    SPELL_EFFECT_APPLY_ENCHANT_ILLUSION             = 243,
+    SPELL_EFFECT_LEARN_FOLLOWER_ABILITY             = 244,
+    SPELL_EFFECT_UPGRADE_HEIRLOOM                   = 245,
+    SPELL_EFFECT_FINISH_GARRISON_MISSION            = 246,
+    SPELL_EFFECT_ADD_GARRISON_MISSION               = 247,
+    SPELL_EFFECT_FINISH_SHIPMENT                    = 248,
     SPELL_EFFECT_249                                = 249,
-    SPELL_EFFECT_250                                = 250,
+    SPELL_EFFECT_TAKE_SCREENSHOT                    = 250, // Serverside marker for selfie screenshot - achievement check
     TOTAL_SPELL_EFFECTS                             = 251,
 };
 
diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp
index 36ae4fab797..89112b194e1 100644
--- a/src/server/game/Spells/SpellEffects.cpp
+++ b/src/server/game/Spells/SpellEffects.cpp
@@ -265,8 +265,8 @@ pEffect SpellEffects[TOTAL_SPELL_EFFECTS]=
     &Spell::EffectNULL,                                     //189 SPELL_EFFECT_LOOT
     &Spell::EffectNULL,                                     //190 SPELL_EFFECT_190
     &Spell::EffectNULL,                                     //191 SPELL_EFFECT_TELEPORT_TO_DIGSITE
-    &Spell::EffectNULL,                                     //192 SPELL_EFFECT_192
-    &Spell::EffectNULL,                                     //193 SPELL_EFFECT_193
+    &Spell::EffectNULL,                                     //192 SPELL_EFFECT_UNCAGE_BATTLEPET
+    &Spell::EffectNULL,                                     //193 SPELL_EFFECT_START_PET_BATTLE
     &Spell::EffectNULL,                                     //194 SPELL_EFFECT_194
     &Spell::EffectNULL,                                     //195 SPELL_EFFECT_195
     &Spell::EffectNULL,                                     //196 SPELL_EFFECT_196
@@ -277,53 +277,53 @@ pEffect SpellEffects[TOTAL_SPELL_EFFECTS]=
     &Spell::EffectNULL,                                     //201 SPELL_EFFECT_ENABLE_BATTLE_PETS
     &Spell::EffectNULL,                                     //202 SPELL_EFFECT_202
     &Spell::EffectNULL,                                     //203 SPELL_EFFECT_203
-    &Spell::EffectNULL,                                     //204 SPELL_EFFECT_204
-    &Spell::EffectNULL,                                     //205 SPELL_EFFECT_205
+    &Spell::EffectNULL,                                     //204 SPELL_EFFECT_CHANGE_BATTLEPET_QUALITY
+    &Spell::EffectNULL,                                     //205 SPELL_EFFECT_LAUNCH_QUEST_CHOICE
     &Spell::EffectNULL,                                     //206 SPELL_EFFECT_206
-    &Spell::EffectNULL,                                     //207 SPELL_EFFECT_207
+    &Spell::EffectNULL,                                     //207 SPELL_EFFECT_LAUNCH_QUEST_TASK
     &Spell::EffectNULL,                                     //208 SPELL_EFFECT_208
     &Spell::EffectNULL,                                     //209 SPELL_EFFECT_209
-    &Spell::EffectNULL,                                     //210 SPELL_EFFECT_210
-    &Spell::EffectNULL,                                     //211 SPELL_EFFECT_211
+    &Spell::EffectNULL,                                     //210 SPELL_EFFECT_LEARN_GARRISON_BUILDING
+    &Spell::EffectNULL,                                     //211 SPELL_EFFECT_LEARN_GARRISON_SPECIALIZATION
     &Spell::EffectNULL,                                     //212 SPELL_EFFECT_212
     &Spell::EffectNULL,                                     //213 SPELL_EFFECT_213
-    &Spell::EffectNULL,                                     //214 SPELL_EFFECT_214
-    &Spell::EffectNULL,                                     //215 SPELL_EFFECT_215
-    &Spell::EffectNULL,                                     //216 SPELL_EFFECT_216
-    &Spell::EffectNULL,                                     //217 SPELL_EFFECT_217
+    &Spell::EffectNULL,                                     //214 SPELL_EFFECT_CREATE_GARRISON
+    &Spell::EffectNULL,                                     //215 SPELL_EFFECT_UPGRADE_CHARACTER_SPELLS
+    &Spell::EffectNULL,                                     //216 SPELL_EFFECT_CREATE_SHIPMENT
+    &Spell::EffectNULL,                                     //217 SPELL_EFFECT_UPGRADE_GARRISON
     &Spell::EffectNULL,                                     //218 SPELL_EFFECT_218
     &Spell::EffectNULL,                                     //219 SPELL_EFFECT_219
-    &Spell::EffectNULL,                                     //220 SPELL_EFFECT_220
+    &Spell::EffectNULL,                                     //220 SPELL_EFFECT_ADD_GARRISON_FOLLOWER
     &Spell::EffectNULL,                                     //221 SPELL_EFFECT_221
-    &Spell::EffectNULL,                                     //222 SPELL_EFFECT_222
-    &Spell::EffectNULL,                                     //223 SPELL_EFFECT_223
-    &Spell::EffectNULL,                                     //224 SPELL_EFFECT_224
-    &Spell::EffectNULL,                                     //225 SPELL_EFFECT_225
+    &Spell::EffectNULL,                                     //222 SPELL_EFFECT_CREATE_HEIRLOOM_ITEM
+    &Spell::EffectNULL,                                     //223 SPELL_EFFECT_CHANGE_ITEM_BONUSES
+    &Spell::EffectNULL,                                     //224 SPELL_EFFECT_ACTIVATE_GARRISON_BUILDING
+    &Spell::EffectNULL,                                     //225 SPELL_EFFECT_GRANT_BATTLEPET_LEVEL
     &Spell::EffectNULL,                                     //226 SPELL_EFFECT_226
     &Spell::EffectNULL,                                     //227 SPELL_EFFECT_227
     &Spell::EffectNULL,                                     //228 SPELL_EFFECT_228
-    &Spell::EffectNULL,                                     //229 SPELL_EFFECT_229
-    &Spell::EffectNULL,                                     //230 SPELL_EFFECT_230
-    &Spell::EffectNULL,                                     //231 SPELL_EFFECT_231
-    &Spell::EffectNULL,                                     //232 SPELL_EFFECT_232
-    &Spell::EffectNULL,                                     //233 SPELL_EFFECT_233
+    &Spell::EffectNULL,                                     //229 SPELL_EFFECT_SET_FOLLOWER_QUALITY
+    &Spell::EffectNULL,                                     //230 SPELL_EFFECT_INCREASE_FOLLOWER_ITEM_LEVEL
+    &Spell::EffectNULL,                                     //231 SPELL_EFFECT_INCREASE_FOLLOWER_EXPERIENCE
+    &Spell::EffectNULL,                                     //232 SPELL_EFFECT_REMOVE_PHASE
+    &Spell::EffectNULL,                                     //233 SPELL_EFFECT_RANDOMIZE_FOLLOWER_ABILITIES
     &Spell::EffectNULL,                                     //234 SPELL_EFFECT_234
     &Spell::EffectNULL,                                     //235 SPELL_EFFECT_235
-    &Spell::EffectNULL,                                     //236 SPELL_EFFECT_236
-    &Spell::EffectNULL,                                     //237 SPELL_EFFECT_237
-    &Spell::EffectNULL,                                     //238 SPELL_EFFECT_238
-    &Spell::EffectNULL,                                     //239 SPELL_EFFECT_239
+    &Spell::EffectNULL,                                     //236 SPELL_EFFECT_GIVE_EXPERIENCE
+    &Spell::EffectNULL,                                     //237 SPELL_EFFECT_GIVE_RESTED_EXPERIENCE_BONUS
+    &Spell::EffectNULL,                                     //238 SPELL_EFFECT_INCREASE_SKILL
+    &Spell::EffectNULL,                                     //239 SPELL_EFFECT_END_GARRISON_BUILDING_CONSTRUCTION
     &Spell::EffectNULL,                                     //240 SPELL_EFFECT_240
     &Spell::EffectNULL,                                     //241 SPELL_EFFECT_241
     &Spell::EffectNULL,                                     //242 SPELL_EFFECT_242
-    &Spell::EffectNULL,                                     //243 SPELL_EFFECT_243
-    &Spell::EffectNULL,                                     //244 SPELL_EFFECT_244
-    &Spell::EffectNULL,                                     //244 SPELL_EFFECT_245
-    &Spell::EffectNULL,                                     //244 SPELL_EFFECT_246
-    &Spell::EffectNULL,                                     //244 SPELL_EFFECT_247
-    &Spell::EffectNULL,                                     //244 SPELL_EFFECT_248
-    &Spell::EffectNULL,                                     //244 SPELL_EFFECT_249
-    &Spell::EffectNULL,                                     //244 SPELL_EFFECT_250
+    &Spell::EffectNULL,                                     //243 SPELL_EFFECT_APPLY_ENCHANT_ILLUSION
+    &Spell::EffectNULL,                                     //244 SPELL_EFFECT_LEARN_FOLLOWER_ABILITY
+    &Spell::EffectNULL,                                     //245 SPELL_EFFECT_UPGRADE_HEIRLOOM
+    &Spell::EffectNULL,                                     //246 SPELL_EFFECT_FINISH_GARRISON_MISSION
+    &Spell::EffectNULL,                                     //247 SPELL_EFFECT_ADD_GARRISON_MISSION
+    &Spell::EffectNULL,                                     //248 SPELL_EFFECT_FINISH_SHIPMENT
+    &Spell::EffectNULL,                                     //249 SPELL_EFFECT_249
+    &Spell::EffectNULL,                                     //250 SPELL_EFFECT_TAKE_SCREENSHOT
 };
 
 void Spell::EffectNULL(SpellEffIndex /*effIndex*/)