Replaced hardcoded Item IDs with constants

- This makes it harder to get the item IDs wrong in the code.
- Fixes item 'Slot_Coupon' being incorrectly considered a Spell Book due
  to an oversight (wrong item nameid) when the check was introduced.

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

1 files changed, 277 insertions, 60 deletions

diff --git a/src/map/itemdb.h b/src/map/itemdb.h
index 4ee6637c1..1030035ea 100644
--- a/src/map/itemdb.h
+++ b/src/map/itemdb.h
@@ -34,69 +34,286 @@ struct item_package;
 #define UNKNOWN_ITEM_ID 512
 
 enum item_itemid {
-	ITEMID_HOLY_WATER = 523,
-	ITEMID_EMPERIUM = 714,
-	ITEMID_YELLOW_GEMSTONE = 715,
-	ITEMID_RED_GEMSTONE = 716,
-	ITEMID_BLUE_GEMSTONE = 717,
-	ITEMID_TRAP = 1065,
-	ITEMID_STRANGE_EMBRYO = 6415,
-	ITEMID_FACE_PAINT = 6120,
-	ITEMID_STONE = 7049,
-	ITEMID_SKULL_ = 7420,
-	ITEMID_TOKEN_OF_SIEGFRIED = 7621,
-	ITEMID_TRAP_ALLOY = 7940,
-	ITEMID_ANCILLA = 12333,
-	ITEMID_REINS_OF_MOUNT = 12622,
-	ITEMID_LOVE_ANGEL = 12287,
-	ITEMID_SQUIRREL = 12288,
-	ITEMID_GOGO = 12289,
-	ITEMID_PICTURE_DIARY = 12304,
-	ITEMID_MINI_HEART = 12305,
-	ITEMID_NEWCOMER = 12306,
-	ITEMID_KID = 12307,
-	ITEMID_MAGIC_CASTLE = 12308,
-	ITEMID_BULGING_HEAD = 12309,
+	ITEMID_RED_POTION            = 501,
+	ITEMID_YELLOW_POTION         = 503,
+	ITEMID_WHITE_POTION          = 504,
+	ITEMID_BLUE_POTION           = 505,
+	ITEMID_HOLY_WATER            = 523,
+	ITEMID_RED_SLIM_POTION       = 545,
+	ITEMID_YELLOW_SLIM_POTION    = 546,
+	ITEMID_WHITE_SLIM_POTION     = 547,
+	ITEMID_WING_OF_FLY           = 601,
+	ITEMID_WING_OF_BUTTERFLY     = 602,
+	ITEMID_BRANCH_OF_DEAD_TREE   = 604,
+	ITEMID_ANODYNE               = 605,
+	ITEMID_ALOEBERA              = 606,
+	ITEMID_EMPTY_BOTTLE          = 713,
+	ITEMID_EMPERIUM              = 714,
+	ITEMID_YELLOW_GEMSTONE       = 715,
+	ITEMID_RED_GEMSTONE          = 716,
+	ITEMID_BLUE_GEMSTONE         = 717,
+	ITEMID_ORIDECON_STONE        = 756,
+	ITEMID_ALCHOL                = 970,
+	ITEMID_ORIDECON              = 984,
+	ITEMID_BOODY_RED             = 990,
+	ITEMID_CRYSTAL_BLUE          = 991,
+	ITEMID_WIND_OF_VERDURE       = 992,
+	ITEMID_YELLOW_LIVE           = 993,
+	ITEMID_FLAME_HEART           = 994,
+	ITEMID_MISTIC_FROZEN         = 995,
+	ITEMID_ROUGH_WIND            = 996,
+	ITEMID_GREAT_NATURE          = 997,
+	ITEMID_IRON                  = 998,
+	ITEMID_STEEL                 = 999,
+	ITEMID_STAR_CRUMB            = 1000,
+	ITEMID_IRON_ORE              = 1002,
+	ITEMID_PHRACON               = 1010,
+	ITEMID_EMVERETARCON          = 1011,
+	ITEMID_TRAP                  = 1065,
+	ITEMID_STRANGE_EMBRYO        = 6415,
+	ITEMID_FACE_PAINT            = 6120,
+	ITEMID_STONE                 = 7049,
+	ITEMID_FIRE_BOTTLE           = 7135,
+	ITEMID_ACID_BOTTLE           = 7136,
+	ITEMID_MENEATER_PLANT_BOTTLE = 7137,
+	ITEMID_MINI_BOTTLE           = 7138,
+	ITEMID_COATING_BOTTLE        = 7139,
+	ITEMID_FRAGMENT_OF_CRYSTAL   = 7321,
+	ITEMID_SKULL_                = 7420,
+	ITEMID_TOKEN_OF_SIEGFRIED    = 7621,
+	ITEMID_TRAP_ALLOY            = 7940,
+	ITEMID_RED_POUCH_OF_SURPRISE = 12024,
+	ITEMID_BLOODY_DEAD_BRANCH    = 12103,
+	ITEMID_PORING_BOX            = 12109,
+	ITEMID_MERCENARY_RED_POTION  = 12184,
+	ITEMID_MERCENARY_BLUE_POTION = 12185,
+	ITEMID_BATTLE_MANUAL         = 12208,
+	ITEMID_BUBBLE_GUM            = 12210,
+	ITEMID_GIANT_FLY_WING        = 12212,
+	ITEMID_NEURALIZER            = 12213,
+	ITEMID_M_CENTER_POTION       = 12241,
+	ITEMID_M_AWAKENING_POTION    = 12242,
+	ITEMID_M_BERSERK_POTION      = 12243,
+	ITEMID_COMP_BATTLE_MANUAL    = 12263,
+	ITEMID_COMP_BUBBLE_GUM       = 12264,
+	ITEMID_LOVE_ANGEL            = 12287,
+	ITEMID_SQUIRREL              = 12288,
+	ITEMID_GOGO                  = 12289,
+	ITEMID_PICTURE_DIARY         = 12304,
+	ITEMID_MINI_HEART            = 12305,
+	ITEMID_NEWCOMER              = 12306,
+	ITEMID_KID                   = 12307,
+	ITEMID_MAGIC_CASTLE          = 12308,
+	ITEMID_BULGING_HEAD          = 12309,
+	ITEMID_THICK_MANUAL50        = 12312,
+	ITEMID_ANCILLA               = 12333,
+	ITEMID_BLACK_THING           = 12435,
+	ITEMID_REINS_OF_MOUNT        = 12622,
+	ITEMID_NOBLE_NAMEPLATE       = 12705,
+	ITEMID_DUN_TELE_SCROLL1      = 14527,
+	ITEMID_BATTLE_MANUAL25       = 14532,
+	ITEMIDBATTLE_MANUAL100       = 14533,
+	ITEMID_BATTLE_MANUAL_X3      = 14545,
+	ITEMID_DUN_TELE_SCROLL2      = 14581,
+	ITEMID_WOB_RUNE              = 14582,
+	ITEMID_WOB_SCHWALTZ          = 14583,
+	ITEMID_WOB_RACHEL            = 14584,
+	ITEMID_WOB_LOCAL             = 14585,
+	ITEMID_SIEGE_TELEPORT_SCROLL = 14591,
+	ITEMID_JOB_MANUAL50          = 14592,
+};
+
+enum cards_item_list {
+	ITEMID_GHOSTRING_CARD = 4047,
+	ITEMID_PHREEONI_CARD  = 4121,
+	ITEMID_MISTRESS_CARD  = 4132,
+	ITEMID_ORC_LOAD_CARD  = 4135,
+	ITEMID_ORC_HERO_CARD  = 4143,
+	ITEMID_TAO_GUNKA_CARD = 4302,
 };
 
 /**
- * Rune Knight
+ * Mechanic
  **/
+enum mechanic_item_list {
+	ITEMID_ACCELERATOR                = 2800,
+	ITEMID_HOVERING_BOOSTER,         // 2801
+	ITEMID_SUICIDAL_DEVICE,          // 2802
+	ITEMID_SHAPE_SHIFTER,            // 2803
+	ITEMID_COOLING_DEVICE,           // 2804
+	ITEMID_MAGNETIC_FIELD_GENERATOR, // 2805
+	ITEMID_BARRIER_BUILDER,          // 2806
+	ITEMID_REPAIR_KIT,               // 2807
+	ITEMID_CAMOUFLAGE_GENERATOR,     // 2808
+	ITEMID_HIGH_QUALITY_COOLER,      // 2809
+	ITEMID_SPECIAL_COOLER,           // 2810
+	ITEMID_MONKEY_SPANNER             = 6186,
+};
 
-enum {
-	ITEMID_NAUTHIZ = 12725,
-	ITEMID_RAIDO,
-	ITEMID_BERKANA,
-	ITEMID_ISA,
-	ITEMID_OTHILA,
-	ITEMID_URUZ,
-	ITEMID_THURISAZ,
-	ITEMID_WYRD,
-	ITEMID_HAGALAZ,
-	ITEMID_LUX_ANIMA = 22540,
-} rune_list;
+/**
+ * Spell Books
+ */
+enum spell_book_item_list {
+	ITEMID_MAGIC_BOOK_FB    = 6189,
+	ITEMID_MAGIC_BOOK_CB,  // 6190
+	ITEMID_MAGIC_BOOK_LB,  // 6191
+	ITEMID_MAGIC_BOOK_SG,  // 6192
+	ITEMID_MAGIC_BOOK_LOV, // 6193
+	ITEMID_MAGIC_BOOK_MS,  // 6194
+	ITEMID_MAGIC_BOOK_CM,  // 6195
+	ITEMID_MAGIC_BOOK_TV,  // 6196
+	ITEMID_MAGIC_BOOK_TS,  // 6197
+	ITEMID_MAGIC_BOOK_JT,  // 6198
+	ITEMID_MAGIC_BOOK_WB,  // 6199
+	ITEMID_MAGIC_BOOK_HD,  // 6200
+	ITEMID_MAGIC_BOOK_ES,  // 6201
+	ITEMID_MAGIC_BOOK_ES_, // 6202
+	ITEMID_MAGIC_BOOK_CL,  // 6203
+	ITEMID_MAGIC_BOOK_CR,  // 6204
+	ITEMID_MAGIC_BOOK_DL,  // 6205
+};
 
 /**
- * Mechanic
+ * Mercenary Scrolls
+ */
+enum mercenary_scroll_item_list {
+	ITEMID_BOW_MERCENARY_SCROLL1     = 12153,
+	ITEMID_BOW_MERCENARY_SCROLL2,   // 12154
+	ITEMID_BOW_MERCENARY_SCROLL3,   // 12155
+	ITEMID_BOW_MERCENARY_SCROLL4,   // 12156
+	ITEMID_BOW_MERCENARY_SCROLL5,   // 12157
+	ITEMID_BOW_MERCENARY_SCROLL6,   // 12158
+	ITEMID_BOW_MERCENARY_SCROLL7,   // 12159
+	ITEMID_BOW_MERCENARY_SCROLL8,   // 12160
+	ITEMID_BOW_MERCENARY_SCROLL9,   // 12161
+	ITEMID_BOW_MERCENARY_SCROLL10,  // 12162
+	ITEMID_SWORDMERCENARY_SCROLL1,  // 12163
+	ITEMID_SWORDMERCENARY_SCROLL2,  // 12164
+	ITEMID_SWORDMERCENARY_SCROLL3,  // 12165
+	ITEMID_SWORDMERCENARY_SCROLL4,  // 12166
+	ITEMID_SWORDMERCENARY_SCROLL5,  // 12167
+	ITEMID_SWORDMERCENARY_SCROLL6,  // 12168
+	ITEMID_SWORDMERCENARY_SCROLL7,  // 12169
+	ITEMID_SWORDMERCENARY_SCROLL8,  // 12170
+	ITEMID_SWORDMERCENARY_SCROLL9,  // 12171
+	ITEMID_SWORDMERCENARY_SCROLL10, // 12172
+	ITEMID_SPEARMERCENARY_SCROLL1,  // 12173
+	ITEMID_SPEARMERCENARY_SCROLL2,  // 12174
+	ITEMID_SPEARMERCENARY_SCROLL3,  // 12175
+	ITEMID_SPEARMERCENARY_SCROLL4,  // 12176
+	ITEMID_SPEARMERCENARY_SCROLL5,  // 12177
+	ITEMID_SPEARMERCENARY_SCROLL6,  // 12178
+	ITEMID_SPEARMERCENARY_SCROLL7,  // 12179
+	ITEMID_SPEARMERCENARY_SCROLL8,  // 12180
+	ITEMID_SPEARMERCENARY_SCROLL9,  // 12181
+	ITEMID_SPEARMERCENARY_SCROLL10, // 12182
+};
+
+/**
+ * Cash Food
+ */
+enum cash_food_item_list {
+	ITEMID_STR_DISH10_   = 12202,
+	ITEMID_AGI_DISH10_, // 12203
+	ITEMID_INT_DISH10_, // 12204
+	ITEMID_DEX_DISH10_, // 12205
+	ITEMID_LUK_DISH10_, // 12206
+	ITEMID_VIT_DISH10_, // 12207
+};
+
+/**
+ * GC Poison
+ */
+enum poison_item_list {
+	ITEMID_POISON_PARALYSIS       = 12717,
+	ITEMID_POISON_LEECH,         // 12718
+	ITEMID_POISON_OBLIVION,      // 12719
+	ITEMID_POISON_CONTAMINATION, // 12720
+	ITEMID_POISON_NUMB,          // 12721
+	ITEMID_POISON_FEVER,         // 12722
+	ITEMID_POISON_LAUGHING,      // 12723
+	ITEMID_POISON_FATIGUE,       // 12724
+};
+
+
+/**
+ * Rune Knight
  **/
-enum {
-	ITEMID_ACCELERATOR = 2800,
-	ITEMID_HOVERING_BOOSTER,
-	ITEMID_SUICIDAL_DEVICE,
-	ITEMID_SHAPE_SHIFTER,
-	ITEMID_COOLING_DEVICE,
-	ITEMID_MAGNETIC_FIELD_GENERATOR,
-	ITEMID_BARRIER_BUILDER,
-	ITEMID_REPAIR_KIT,
-	ITEMID_CAMOUFLAGE_GENERATOR,
-	ITEMID_HIGH_QUALITY_COOLER,
-	ITEMID_SPECIAL_COOLER,
-	ITEMID_MONKEY_SPANNER = 6186,
-} mecha_item_list;
-
-enum {
+enum rune_item_list {
+	ITEMID_NAUTHIZ    = 12725,
+	ITEMID_RAIDO,    // 12726
+	ITEMID_BERKANA,  // 12727
+	ITEMID_ISA,      // 12728
+	ITEMID_OTHILA,   // 12729
+	ITEMID_URUZ,     // 12730
+	ITEMID_THURISAZ, // 12731
+	ITEMID_WYRD,     // 12732
+	ITEMID_HAGALAZ,  // 12733
+	ITEMID_LUX_ANIMA  = 22540,
+};
+
+/**
+ * Geneticist
+ */
+enum geneticist_item_list {
+	/// Pharmacy / Cooking
+	ITEMID_SEED_OF_HORNY_PLANT      = 6210,
+	ITEMID_BLOODSUCK_PLANT_SEED,   // 6211
+	ITEMID_BOMB_MUSHROOM_SPORE,    // 6212
+	ITEMID_HP_INCREASE_POTIONS      = 12422,
+	ITEMID_HP_INCREASE_POTIONM,    // 12423
+	ITEMID_HP_INCREASE_POTIONL,    // 12424
+	ITEMID_SP_INCREASE_POTIONS,    // 12425
+	ITEMID_SP_INCREASE_POTIONM,    // 12426
+	ITEMID_SP_INCREASE_POTIONL,    // 12427
+	ITEMID_ENRICH_WHITE_POTIONZ,   // 12428
+	ITEMID_SAVAGE_BBQ,             // 12429
+	ITEMID_WUG_BLOOD_COCKTAIL,     // 12430
+	ITEMID_MINOR_BRISKET,          // 12431
+	ITEMID_SIROMA_ICETEA,          // 12432
+	ITEMID_DROCERA_HERB_STEW,      // 12433
+	ITEMID_PETTI_TAIL_NOODLE,      // 12434
+	ITEMID_VITATA500,              // 12436
+	ITEMID_ENRICH_CELERMINE_JUICE, // 12437
+	ITEMID_CURE_FREE,              // 12475
+	/// Bombs
+	ITEMID_APPLE_BOMB               = 13260,
+	ITEMID_COCONUT_BOMB,           // 13261
+	ITEMID_MELON_BOMB,             // 13262
+	ITEMID_PINEAPPLE_BOMB,         // 13263
+	ITEMID_BANANA_BOMB,            // 13264
+	ITEMID_BLACK_LUMP,             // 13265
+	ITEMID_BLACK_HARD_LUMP,        // 13266
+	ITEMID_VERY_HARD_LUMP,         // 13267
+	/// Throwables
+	ITEMID_MYSTERIOUS_POWDER,      // 13268
+	ITEMID_BOOST500_TO_THROW,      // 13269
+	ITEMID_FULL_SWINGK_TO_THROW,   // 13270
+	ITEMID_MANA_PLUS_TO_THROW,     // 13271
+	ITEMID_CURE_FREE_TO_THROW,     // 13272
+	ITEMID_STAMINA_UP_M_TO_THROW,  // 13273
+	ITEMID_DIGESTIVE_F_TO_THROW,   // 13274
+	ITEMID_HP_INC_POTS_TO_THROW,   // 13275
+	ITEMID_HP_INC_POTM_TO_THROW,   // 13276
+	ITEMID_HP_INC_POTL_TO_THROW,   // 13277
+	ITEMID_SP_INC_POTS_TO_THROW,   // 13278
+	ITEMID_SP_INC_POTM_TO_THROW,   // 13279
+	ITEMID_SP_INC_POTL_TO_THROW,   // 13280
+	ITEMID_EN_WHITE_POTZ_TO_THROW, // 13281
+	ITEMID_VITATA500_TO_THROW,     // 13282
+	ITEMID_EN_CEL_JUICE_TO_THROW,  // 13283
+	ITEMID_SAVAGE_BBQ_TO_THROW,    // 13284
+	ITEMID_WUG_COCKTAIL_TO_THROW,  // 13285
+	ITEMID_M_BRISKET_TO_THROW,     // 13286
+	ITEMID_SIROMA_ICETEA_TO_THROW, // 13287
+	ITEMID_DROCERA_STEW_TO_THROW,  // 13288
+	ITEMID_PETTI_NOODLE_TO_THROW,  // 13289
+	ITEMID_BLACK_THING_TO_THROW,   // 13290
+};
+
+enum item_nouse_list {
 	NOUSE_SITTING = 0x01,
-} item_nouse_list;
+};
 
 //
 enum e_chain_cache {
@@ -257,13 +474,13 @@ struct item_package {
 #define itemdb_canrefine(n)   (!itemdb->search(n)->flag.no_refine)
 
 #define itemdb_is_rune(n)        (((n) >= ITEMID_NAUTHIZ && (n) <= ITEMID_HAGALAZ) || (n) == ITEMID_LUX_ANIMA)
-#define itemdb_is_element(n)     ((n) >= 990 && (n) <= 993)
-#define itemdb_is_spellbook(n)   ((n) >= 6188 && (n) <= 6205)
-#define itemdb_is_poison(n)      ((n) >= 12717 && (n) <= 12724)
+#define itemdb_is_element(n)     ((n) >= ITEMID_BOODY_RED && (n) <= ITEMID_YELLOW_LIVE)
+#define itemdb_is_spellbook(n)   ((n) >= ITEMID_MAGIC_BOOK_FB && (n) <= ITEMID_MAGIC_BOOK_DL)
+#define itemdb_is_poison(n)      ((n) >= ITEMID_POISON_PARALYSIS && (n) <= ITEMID_POISON_FATIGUE)
 #define itemid_isgemstone(n)     ((n) >= ITEMID_YELLOW_GEMSTONE && (n) <= ITEMID_BLUE_GEMSTONE)
-#define itemdb_iscashfood(n)     ((n) >= 12202 && (n) <= 12207)
-#define itemdb_is_GNbomb(n)      ((n) >= 13260 && (n) <= 13267)
-#define itemdb_is_GNthrowable(n) ((n) >= 13268 && (n) <= 13290)
+#define itemdb_iscashfood(n)     ((n) >= ITEMID_STR_DISH10_ && (n) <= ITEMID_VIT_DISH10_)
+#define itemdb_is_GNbomb(n)      ((n) >= ITEMID_APPLE_BOMB && (n) <= ITEMID_VERY_HARD_LUMP)
+#define itemdb_is_GNthrowable(n) ((n) >= ITEMID_MYSTERIOUS_POWDER && (n) <= ITEMID_BLACK_THING_TO_THROW)
 
 //Item trade restrictions [Skotlex]
 #define itemdb_isdropable(item, gmlv)             (itemdb->isrestricted((item), (gmlv), 0, itemdb->isdropable_sub))