Core/Spells: change Targets enum to use consistent naming schema. This is not a functional change, but it's needed for upcoming changes, also this makes target type research and use easier.

1 files changed, 47 insertions, 46 deletions

diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h
index c0a28014cb2..83d12c6d4e6 100755
--- a/src/server/game/Miscellaneous/SharedDefines.h
+++ b/src/server/game/Miscellaneous/SharedDefines.h
@@ -1277,6 +1277,8 @@ enum SpellImmunity
 
 #define MAX_SPELL_IMMUNITY           7
 
+// target enum name consist of:
+// TARGET_[OBJECT_TYPE]_[REFERENCE_TYPE(skipped for caster)]_[SELECTION_TYPE(skipped for default)]_[additional specifiers(friendly, BACK_LEFT, etc.]
 enum Targets
 {
     TARGET_UNIT_CASTER                 = 1,
@@ -1285,67 +1287,66 @@ enum Targets
     TARGET_UNIT_NEARBY_ALLY            = 4,
     TARGET_UNIT_PET                    = 5,
     TARGET_UNIT_TARGET_ENEMY           = 6,
-    TARGET_UNIT_AREA_ENTRY_SRC         = 7,
-    TARGET_UNIT_AREA_ENTRY_DST         = 8,
-    TARGET_DST_HOME                    = 9,
+    TARGET_UNIT_SRC_AREA_ENTRY         = 7,
+    TARGET_UNIT_DEST_AREA_ENTRY        = 8,
+    TARGET_DEST_HOME                   = 9,
     TARGET_UNIT_TARGET_DEST_CASTER     = 11, // teleport target to caster
-    TARGET_UNIT_AREA_ENEMY_SRC         = 15,
-    TARGET_UNIT_AREA_ENEMY_DST         = 16,
-    TARGET_DST_DB                      = 17,
-    TARGET_DST_CASTER                  = 18,
-    TARGET_UNIT_PARTY_CASTER           = 20,
+    TARGET_UNIT_SRC_AREA_ENEMY         = 15,
+    TARGET_UNIT_DEST_AREA_ENEMY        = 16,
+    TARGET_DEST_DB                     = 17,
+    TARGET_DEST_CASTER                 = 18,
+    TARGET_UNIT_CASTER_AREA_PARTY      = 20,
     TARGET_UNIT_TARGET_ALLY            = 21,
     TARGET_SRC_CASTER                  = 22,
-    TARGET_GAMEOBJECT                  = 23,
-    TARGET_UNIT_CONE_ENEMY             = 24,
+    TARGET_GAMEOBJECT_TARGET           = 23,
+    TARGET_UNIT_CONE_ENEMY_24          = 24,
     TARGET_UNIT_TARGET_ANY             = 25,
-    TARGET_GAMEOBJECT_ITEM             = 26,
+    TARGET_GAMEOBJECT_ITEM_TARGET      = 26,
     TARGET_UNIT_MASTER                 = 27,
     TARGET_DEST_DYNOBJ_ENEMY           = 28,
     TARGET_DEST_DYNOBJ_ALLY            = 29,
-    TARGET_UNIT_AREA_ALLY_SRC          = 30,
-    TARGET_UNIT_AREA_ALLY_DST          = 31,
-    TARGET_MINION                      = 32,
-    //TARGET_DEST_SUMMON
-    TARGET_UNIT_AREA_PARTY_SRC         = 33,
-    TARGET_UNIT_AREA_PARTY_DST         = 34,
+    TARGET_UNIT_SRC_AREA_ALLY          = 30,
+    TARGET_UNIT_DEST_AREA_ALLY         = 31,
+    TARGET_DEST_CASTER_SUMMON          = 32, // front left, doesn't use radius
+    TARGET_UNIT_SRC_AREA_PARTY         = 33,
+    TARGET_UNIT_DEST_AREA_PARTY        = 34,
     TARGET_UNIT_TARGET_PARTY           = 35,
-    TARGET_DEST_CASTER_RANDOM_UNKNOWN  = 36, //unknown
-    TARGET_UNIT_TARGET_ALLY_PARTY      = 37,
+    TARGET_DEST_CASTER_UNK_36          = 36,
+    TARGET_UNIT_LASTTARGET_AREA_PARTY  = 37,
     TARGET_UNIT_NEARBY_ENTRY           = 38,
-    TARGET_UNIT_CASTER_FISHING         = 39,
+    TARGET_DEST_CASTER_FISHING         = 39,
     TARGET_GAMEOBJECT_NEARBY_ENTRY     = 40,
-    TARGET_DEST_CASTER_FRONT_LEFT      = 41,
-    TARGET_DEST_CASTER_BACK_LEFT       = 42,
-    TARGET_DEST_CASTER_BACK_RIGHT      = 43,
-    TARGET_DEST_CASTER_FRONT_RIGHT     = 44,
-    TARGET_UNIT_CHAINHEAL              = 45,
-    TARGET_DST_NEARBY_ENTRY            = 46,
+    TARGET_DEST_CASTER_FRONT_RIGHT     = 41,
+    TARGET_DEST_CASTER_BACK_RIGHT      = 42,
+    TARGET_DEST_CASTER_BACK_LEFT       = 43,
+    TARGET_DEST_CASTER_FRONT_LEFT      = 44,
+    TARGET_UNIT_TARGET_CHAINHEAL_ALLY  = 45,
+    TARGET_DEST_NEARBY_ENTRY           = 46,
     TARGET_DEST_CASTER_FRONT           = 47,
     TARGET_DEST_CASTER_BACK            = 48,
     TARGET_DEST_CASTER_RIGHT           = 49,
     TARGET_DEST_CASTER_LEFT            = 50,
-    TARGET_GAMEOBJECT_AREA_SRC         = 51,
-    TARGET_GAMEOBJECT_AREA_DST         = 52,
-    TARGET_DST_TARGET_ENEMY            = 53, // set unit coordinates as dest, only 16 target B imlemented
-    TARGET_UNIT_CONE_ENEMY_UNKNOWN     = 54, // 180 degree, or different angle
+    TARGET_GAMEOBJECT_SRC_AREA         = 51,
+    TARGET_GAMEOBJECT_DEST_AREA        = 52,
+    TARGET_DEST_TARGET_ENEMY           = 53,
+    TARGET_UNIT_CONE_ENEMY_54          = 54,
     TARGET_DEST_CASTER_FRONT_LEAP      = 55, // for a leap spell
-    TARGET_UNIT_RAID_CASTER            = 56,
+    TARGET_UNIT_CASTER_AREA_RAID       = 56,
     TARGET_UNIT_TARGET_RAID            = 57,
     TARGET_UNIT_NEARBY_RAID            = 58,
     TARGET_UNIT_CONE_ALLY              = 59,
     TARGET_UNIT_CONE_ENTRY             = 60,
-    TARGET_UNIT_TARGET_CLASS_RAID      = 61,
-    TARGET_TEST                        = 62, // for a test spell
+    TARGET_UNIT_TARGET_AREA_RAID_CLASS = 61,
+    TARGET_UNK_62                      = 62,
     TARGET_DEST_TARGET_ANY             = 63,
     TARGET_DEST_TARGET_FRONT           = 64,
     TARGET_DEST_TARGET_BACK            = 65,
     TARGET_DEST_TARGET_RIGHT           = 66,
     TARGET_DEST_TARGET_LEFT            = 67,
-    TARGET_DEST_TARGET_FRONT_LEFT      = 68,
-    TARGET_DEST_TARGET_BACK_LEFT       = 69,
-    TARGET_DEST_TARGET_BACK_RIGHT      = 70,
-    TARGET_DEST_TARGET_FRONT_RIGHT     = 71,
+    TARGET_DEST_TARGET_FRONT_RIGHT     = 68,
+    TARGET_DEST_TARGET_BACK_RIGHT      = 69,
+    TARGET_DEST_TARGET_BACK_LEFT       = 70,
+    TARGET_DEST_TARGET_FRONT_LEFT      = 71,
     TARGET_DEST_CASTER_RANDOM          = 72,
     TARGET_DEST_CASTER_RADIUS          = 73,
     TARGET_DEST_TARGET_RANDOM          = 74,
@@ -1356,18 +1357,18 @@ enum Targets
     TARGET_DEST_DEST_BACK              = 79,
     TARGET_DEST_DEST_RIGHT             = 80,
     TARGET_DEST_DEST_LEFT              = 81,
-    TARGET_DEST_DEST_FRONT_LEFT        = 82,
-    TARGET_DEST_DEST_BACK_LEFT         = 83,
-    TARGET_DEST_DEST_BACK_RIGHT        = 84,
-    TARGET_DEST_DEST_FRONT_RIGHT       = 85,
+    TARGET_DEST_DEST_FRONT_RIGHT       = 82,
+    TARGET_DEST_DEST_BACK_RIGHT        = 83,
+    TARGET_DEST_DEST_BACK_LEFT         = 84,
+    TARGET_DEST_DEST_FRONT_LEFT        = 85,
     TARGET_DEST_DEST_RANDOM            = 86,
     TARGET_DEST_DEST                   = 87,
     TARGET_DEST_DYNOBJ_NONE            = 88,
     TARGET_DEST_TRAJ                   = 89,
     TARGET_UNIT_TARGET_MINIPET         = 90,
-    TARGET_DEST_DEST_RANDOM_DIR_DIST   = 91,
+    TARGET_DEST_DEST_RADIUS            = 91,
     TARGET_UNIT_SUMMONER               = 92,
-    TARGET_CORPSE_AREA_ENEMY_PLAYER_SRC= 93, // TODO
+    TARGET_CORPSE_SRC_AREA_ENEMY       = 93, // NYI
     TARGET_UNIT_VEHICLE                = 94,
     TARGET_UNIT_TARGET_PASSENGER       = 95,
     TARGET_UNIT_PASSENGER_0            = 96,
@@ -1378,12 +1379,12 @@ enum Targets
     TARGET_UNIT_PASSENGER_5            = 101,
     TARGET_UNIT_PASSENGER_6            = 102,
     TARGET_UNIT_PASSENGER_7            = 103,
-    TARGET_UNIT_AREA_PATH              = 104,
+    TARGET_UNIT_CONE_ENEMY_104         = 104,
     TARGET_UNIT_UNK_105                = 105, // 1 spell
     TARGET_DEST_CHANNEL_CASTER         = 106,
     TARGET_UNK_AREA_UNK_DST_107        = 107, // not enough info - only generic spells avalible
-    TARGET_GAMEOBJECT_AREA_PATH        = 108,
-    TARGET_DEST_UNK_110                = 110, // some kind of traj?
+    TARGET_GAMEOBJECT_CONE             = 108,
+    TARGET_DEST_UNK_110                = 110, // 1 spell
     TOTAL_SPELL_TARGETS
 };