Standardized (source) mob_id enum

- MOBID_ constant names now follow the Mob DB spritenames.
- The following names were changed:
  * MOBID_EMPERIUM => MOBID_EMPELIUM
  * MOBID_TREAS01 => MOBID_TREASURE_BOX1
  * MOBID_TREAS40 => MOBID_TREASURE_BOX40
  * MOBID_BARRICADE1 => MOBID_BARRICADE
  * MOBID_BARRICADE2 => MOBID_BARRICADE_
  * MOBID_GUARIDAN_STONE1 => MOBID_S_EMPEL_1
  * MOBID_GUARIDAN_STONE2 => MOBID_S_EMPEL_2
  * MOBID_FOOD_STOR => MOBID_OBJ_A
  * MOBID_BLUE_CRYST => MOBID_OBJ_A2
  * MOBID_PINK_CRYST => MOBID_OBJ_B2
  * MOBID_TREAS41 => MOBID_TREASURE_BOX41
  * MOBID_TREAS49 => MOBID_TREASURE_BOX49
- Added several missing items

Signed-off-by: Haru <haru@dotalux.com>

1 files changed, 79 insertions, 3 deletions

diff --git a/src/map/mob.h b/src/map/mob.h
index 48b44aab3..342d24985 100644
--- a/src/map/mob.h
+++ b/src/map/mob.h
@@ -268,6 +268,82 @@ enum {
 	MSC_SPAWN,
 };
 
+/**
+ * Mob IDs
+ */
+enum mob_id {
+	MOBID_EMPELIUM         = 1288, ///<         EMPELIUM / Emperium
+
+	MOBID_TREASURE_BOX1    = 1324, ///<    TREASURE_BOX1 / Treasure Chest
+	MOBID_TREASURE_BOX2    = 1325, ///<    TREASURE_BOX2 / Treasure Chest
+	MOBID_TREASURE_BOX3    = 1326, ///<    TREASURE_BOX3 / Treasure Chest
+	MOBID_TREASURE_BOX4    = 1327, ///<    TREASURE_BOX4 / Treasure Chest
+	MOBID_TREASURE_BOX5    = 1328, ///<    TREASURE_BOX5 / Treasure Chest
+	MOBID_TREASURE_BOX6    = 1329, ///<    TREASURE_BOX6 / Treasure Chest
+	MOBID_TREASURE_BOX7    = 1330, ///<    TREASURE_BOX7 / Treasure Chest
+	MOBID_TREASURE_BOX8    = 1331, ///<    TREASURE_BOX8 / Treasure Chest
+	MOBID_TREASURE_BOX9    = 1332, ///<    TREASURE_BOX9 / Treasure Chest
+	MOBID_TREASURE_BOX10   = 1333, ///<   TREASURE_BOX10 / Treasure Chest
+	MOBID_TREASURE_BOX11   = 1334, ///<   TREASURE_BOX11 / Treasure Chest
+	MOBID_TREASURE_BOX12   = 1335, ///<   TREASURE_BOX12 / Treasure Chest
+	MOBID_TREASURE_BOX13   = 1336, ///<   TREASURE_BOX13 / Treasure Chest
+	MOBID_TREASURE_BOX14   = 1337, ///<   TREASURE_BOX14 / Treasure Chest
+	MOBID_TREASURE_BOX15   = 1338, ///<   TREASURE_BOX15 / Treasure Chest
+	MOBID_TREASURE_BOX16   = 1339, ///<   TREASURE_BOX16 / Treasure Chest
+	MOBID_TREASURE_BOX17   = 1340, ///<   TREASURE_BOX17 / Treasure Chest
+	MOBID_TREASURE_BOX18   = 1341, ///<   TREASURE_BOX18 / Treasure Chest
+	MOBID_TREASURE_BOX19   = 1342, ///<   TREASURE_BOX19 / Treasure Chest
+	MOBID_TREASURE_BOX20   = 1343, ///<   TREASURE_BOX20 / Treasure Chest
+	MOBID_TREASURE_BOX21   = 1344, ///<   TREASURE_BOX21 / Treasure Chest
+	MOBID_TREASURE_BOX22   = 1345, ///<   TREASURE_BOX22 / Treasure Chest
+	MOBID_TREASURE_BOX23   = 1346, ///<   TREASURE_BOX23 / Treasure Chest
+	MOBID_TREASURE_BOX24   = 1347, ///<   TREASURE_BOX24 / Treasure Chest
+	MOBID_TREASURE_BOX25   = 1348, ///<   TREASURE_BOX25 / Treasure Chest
+	MOBID_TREASURE_BOX26   = 1349, ///<   TREASURE_BOX26 / Treasure Chest
+	MOBID_TREASURE_BOX27   = 1350, ///<   TREASURE_BOX27 / Treasure Chest
+	MOBID_TREASURE_BOX28   = 1351, ///<   TREASURE_BOX28 / Treasure Chest
+	MOBID_TREASURE_BOX29   = 1352, ///<   TREASURE_BOX29 / Treasure Chest
+	MOBID_TREASURE_BOX30   = 1353, ///<   TREASURE_BOX30 / Treasure Chest
+	MOBID_TREASURE_BOX31   = 1354, ///<   TREASURE_BOX31 / Treasure Chest
+	MOBID_TREASURE_BOX32   = 1355, ///<   TREASURE_BOX32 / Treasure Chest
+	MOBID_TREASURE_BOX33   = 1356, ///<   TREASURE_BOX33 / Treasure Chest
+	MOBID_TREASURE_BOX34   = 1357, ///<   TREASURE_BOX34 / Treasure Chest
+	MOBID_TREASURE_BOX35   = 1358, ///<   TREASURE_BOX35 / Treasure Chest
+	MOBID_TREASURE_BOX36   = 1359, ///<   TREASURE_BOX36 / Treasure Chest
+	MOBID_TREASURE_BOX37   = 1360, ///<   TREASURE_BOX37 / Treasure Chest
+	MOBID_TREASURE_BOX38   = 1361, ///<   TREASURE_BOX38 / Treasure Chest
+	MOBID_TREASURE_BOX39   = 1362, ///<   TREASURE_BOX39 / Treasure Chest
+	MOBID_TREASURE_BOX40   = 1363, ///<   TREASURE_BOX40 / Treasure Chest
+
+	MOBID_BARRICADE        = 1905, ///<        BARRICADE / Barricade
+	MOBID_BARRICADE_       = 1906, ///<       BARRICADE_ / Barricade
+	MOBID_S_EMPEL_1        = 1907, ///<        S_EMPEL_1 / Guardian Stone
+	MOBID_S_EMPEL_2        = 1908, ///<        S_EMPEL_2 / Guardian Stone
+	MOBID_OBJ_A            = 1909, ///<            OBJ_A / Food Storage
+	MOBID_OBJ_B            = 1910, ///<            OBJ_B / Food Depot
+	MOBID_OBJ_NEUTRAL      = 1911, ///<      OBJ_NEUTRAL / Neutrality Flag
+	MOBID_OBJ_FLAG_A       = 1912, ///<       OBJ_FLAG_A / Lion Flag
+	MOBID_OBJ_FLAG_B       = 1913, ///<       OBJ_FLAG_B / Eagle Flag
+	MOBID_OBJ_A2           = 1914, ///<           OBJ_A2 / Blue Crystal
+	MOBID_OBJ_B2           = 1915, ///<           OBJ_B2 / Pink Crystal
+
+	MOBID_TREASURE_BOX41   = 1938, ///<   TREASURE_BOX41 / Treasure Chest
+	MOBID_TREASURE_BOX42   = 1939, ///<   TREASURE_BOX42 / Treasure Chest
+	MOBID_TREASURE_BOX43   = 1940, ///<   TREASURE_BOX43 / Treasure Chest
+	MOBID_TREASURE_BOX44   = 1941, ///<   TREASURE_BOX44 / Treasure Chest
+	MOBID_TREASURE_BOX45   = 1942, ///<   TREASURE_BOX45 / Treasure Chest
+	MOBID_TREASURE_BOX46   = 1943, ///<   TREASURE_BOX46 / Treasure Chest
+	MOBID_TREASURE_BOX47   = 1944, ///<   TREASURE_BOX47 / Treasure Chest
+	MOBID_TREASURE_BOX48   = 1945, ///<   TREASURE_BOX48 / Treasure Chest
+	MOBID_TREASURE_BOX49   = 1946, ///<   TREASURE_BOX49 / Treasure Chest
+
+	MOBID_SILVERSNIPER     = 2042, ///<     SILVERSNIPER / Silver Sniper
+	MOBID_MAGICDECOY_FIRE  = 2043, ///<  MAGICDECOY_FIRE / Magic Decoy
+	MOBID_MAGICDECOY_WATER = 2044, ///< MAGICDECOY_WATER / Magic Decoy
+	MOBID_MAGICDECOY_EARTH = 2045, ///< MAGICDECOY_EARTH / Magic Decoy
+	MOBID_MAGICDECOY_WIND  = 2046, ///<  MAGICDECOY_WIND / Magic Decoy
+};
+
 // The data structures for storing delayed item drops
 struct item_drop {
 	struct item item_data;
@@ -283,9 +359,9 @@ struct item_drop_list {
 #define mob_stop_walking(md, type) (unit->stop_walking(&(md)->bl, (type)))
 #define mob_stop_attack(md)        (unit->stop_attack(&(md)->bl))
 
-#define mob_is_battleground(md) (map->list[(md)->bl.m].flag.battleground && ((md)->class_ == MOBID_BARRICADE2 || ((md)->class_ >= MOBID_FOOD_STORAGE && (md)->class_ <= MOBID_PINK_CRYSTAL)))
-#define mob_is_gvg(md) (map->list[(md)->bl.m].flag.gvg_castle && ( (md)->class_ == MOBID_EMPERIUM || (md)->class_ == MOBID_BARRICADE1 || (md)->class_ == MOBID_GUARDIAN_STONE1 || (md)->class_ == MOBID_GUARDIAN_STONE2))
-#define mob_is_treasure(md) (((md)->class_ >= MOBID_TREASURE_01 && (md)->class_ <= MOBID_TREASURE_40) || ((md)->class_ >= MOBID_TREASURE_41 && (md)->class_ <= MOBID_TREASURE_49))
+#define mob_is_battleground(md) (map->list[(md)->bl.m].flag.battleground && ((md)->class_ == MOBID_BARRICADE_ || ((md)->class_ >= MOBID_OBJ_A && (md)->class_ <= MOBID_OBJ_B2)))
+#define mob_is_gvg(md) (map->list[(md)->bl.m].flag.gvg_castle && ( (md)->class_ == MOBID_EMPELIUM || (md)->class_ == MOBID_BARRICADE || (md)->class_ == MOBID_S_EMPEL_1 || (md)->class_ == MOBID_S_EMPEL_2))
+#define mob_is_treasure(md) (((md)->class_ >= MOBID_TREASURE_BOX1 && (md)->class_ <= MOBID_TREASURE_BOX40) || ((md)->class_ >= MOBID_TREASURE_BOX41 && (md)->class_ <= MOBID_TREASURE_BOX49))
 
 struct mob_interface {
 	// Dynamic mob database, allows saving of memory when there's big gaps in the mob_db [Skotlex]