diff options
author | Andrei Karas <akaras@inbox.ru> | 2015-12-28 23:48:06 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2015-12-28 23:48:06 +0300 |
commit | cb6e0f1b68ad76402f00968ea6ea65758daa8fbd (patch) | |
tree | bbb13e6d59b0143817e559c9fb8f6a9656fe864e /src/map/homunculus.h | |
parent | 296e6c04a4c1a01a233c937bd198a31fa849f49c (diff) | |
parent | f1afe0dfee7f97d46f6dad924f75d08956d17620 (diff) | |
download | hercules-cb6e0f1b68ad76402f00968ea6ea65758daa8fbd.tar.gz hercules-cb6e0f1b68ad76402f00968ea6ea65758daa8fbd.tar.bz2 hercules-cb6e0f1b68ad76402f00968ea6ea65758daa8fbd.tar.xz hercules-cb6e0f1b68ad76402f00968ea6ea65758daa8fbd.zip |
Merge pull request #955 from HerculesWS/src-id-constants
Replaced several numeric constants with enums
Diffstat (limited to 'src/map/homunculus.h')
-rw-r--r-- | src/map/homunculus.h | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/src/map/homunculus.h b/src/map/homunculus.h index 9582c875c..1712c98a9 100644 --- a/src/map/homunculus.h +++ b/src/map/homunculus.h @@ -28,6 +28,36 @@ struct map_session_data; +/// Homunuculus IDs +enum homun_id { + HOMID_LIF = 6001, ///< Lif + HOMID_AMISTR = 6002, ///< Amistr + HOMID_FILIR = 6003, ///< Filir + HOMID_VANILMIRTH = 6004, ///< Vanilmirth + HOMID_LIF2 = 6005, ///< Lif (Alternate) + HOMID_AMISTR2 = 6006, ///< Amistr (Alternate) + HOMID_FILIR2 = 6007, ///< Filir (Alternate) + HOMID_VANILMIRTH2 = 6008, ///< Vanilmirth (Alternate) + HOMID_LIF_E = 6009, ///< Lif (Evolved) + HOMID_AMISTR_E = 6010, ///< Amistr (Evolved) + HOMID_FILIR_E = 6011, ///< Filir (Evolved) + HOMID_VANILMIRTH_E = 6012, ///< Vanilmirth (Evolved) + HOMID_LIF2_E = 6013, ///< Lif (Alternate, Evolved) + HOMID_AMISTR2_E = 6014, ///< Amistr (Alternate, Evolved) + HOMID_FILIR2_E = 6015, ///< Filir (Alternate, Evolved) + HOMID_VANILMIRTH2_E = 6016, ///< Vanilmirth (Alternate, Evolved) + + HOMID_EIRA = 6048, ///< Eira + HOMID_BAYERI = 6049, ///< Bayeri + HOMID_SERA = 6050, ///< Sera + HOMID_DIETR = 6051, ///< Dietr + HOMID_ELEANOR = 6052, ///< Eleanor +}; + +#define MAX_HOMUNCULUS_CLASS 52 // [orn] Increased to 60 from 16 to allow new Homun-S. +#define HM_CLASS_BASE 6001 +#define HM_CLASS_MAX (HM_CLASS_BASE+MAX_HOMUNCULUS_CLASS-1) + #define MAX_HOM_SKILL_REQUIRE 5 #define homdb_checkid(id) ((id) >= HM_CLASS_BASE && (id) <= HM_CLASS_MAX) #define homun_alive(x) ((x) && (x)->homunculus.vaporize == HOM_ST_ACTIVE && (x)->battle_status.hp > 0) |