From 6d962d73d1d310438f01d09d50e1dbbd72f8d22c Mon Sep 17 00:00:00 2001 From: aleos89 Date: Mon, 12 Jun 2017 12:13:02 -0400 Subject: [PATCH] Corrected enum constant naming convention. Follow up to 6c266ae. --- src/map/itemdb.h | 98 +++++++++++++++++++------------------- src/map/script_constants.h | 96 ++++++++++++++++++------------------- 2 files changed, 97 insertions(+), 97 deletions(-) diff --git a/src/map/itemdb.h b/src/map/itemdb.h index b3d49fef82..30b7a042bc 100644 --- a/src/map/itemdb.h +++ b/src/map/itemdb.h @@ -636,87 +636,87 @@ enum e_random_item_group { IG_HOLY_EGG_2, IG_ADVENTURER_RETURNS_SUPPORT_BOX, IG_SUPPORT_PACKAGE, - IG_Support_Package_10, + IG_SUPPORT_PACKAGE_10, IG_EVENT_ALMIGHTY_BOX, - IG_Event_Almighty_Box_100, + IG_EVENT_ALMIGHTY_BOX_100, IG_LOTTOBOX1, IG_LOTTOBOX2, IG_LOTTOBOX3, IG_LOTTOBOX4, IG_LOTTOBOX5, IG_SUPPORT_PACKAGE_III, - IG_Support_Package_III_10, + IG_SUPPORT_PACKAGE_III_10, IG_UNLIMITED_BOX, - IG_Unlimited_Box_10, + IG_UNLIMITED_BOX_10, IG_UNLIMITED_BOX_II, - IG_Unlimited_Box_II_10, + IG_UNLIMITED_BOX_II_10, IG_THREE_MASTER_PACKAGE_III, - IG_Three_Master_Package_III_10, + IG_THREE_MASTER_PACKAGE_III_10, IG_2013_RWC_SCROLL, IG_SUPPORT_PACKAGE_II, - IG_Support_Package_II_10, + IG_SUPPORT_PACKAGE_II_10, IG_LEVEL_UP_BOX100, IG_LEVEL_UP_BOX120, IG_LEVEL_UP_BOX130, IG_LEVEL_UP_BOX140, IG_LEVEL_UP_BOX150, IG_LEVEL_UP_BOX160, - IG_GIFT_BUFF_SET , + IG_GIFT_BUFF_SET, IG_LUCKY_SILVERVINE_FRUIT_BOX_III10, IG_LUCKY_SILVERVINE_FRUIT_BOX_III110, IG_OLD_ORE_BOX, - IG_Blessing_Lucky_Scroll, - IG_Sograt_Lucky_Scroll, - IG_Garnet_Lucky_Scroll, - IG_Amora_Lucky_Scroll, - IG_Venus_Lucky_Scroll, - IG_Erzulie_Lucky_Scroll, - IG_Majestic_Lucky_Scroll, + IG_BLESSING_LUCKY_SCROLL, + IG_SOGRAT_LUCKY_SCROLL, + IG_GARNET_LUCKY_SCROLL, + IG_AMORA_LUCKY_SCROLL, + IG_VENUS_LUCKY_SCROLL, + IG_ERZULIE_LUCKY_SCROLL, + IG_MAJESTIC_LUCKY_SCROLL, IG_EPIC_HEROES_LUCKY_EGG, IG_HERO_MIDGARD_EGG, - IG_Imortal_Midgard_Scroll, - IG_TW_13y_Lucky_Egg_06, - IG_Happy_Time_Scroll, - IG_Time_Travel_Scroll, + IG_IMORTAL_MIDGARD_SCROLL, + IG_TW_13Y_LUCKY_EGG_06, + IG_HAPPY_TIME_SCROLL, + IG_TIME_TRAVEL_SCROLL, IG_SOLARIS_FESTIVAL_SCROLL, - IG_Midgard_Fes_Scroll, - IG_Midgard_Scroll, - IG_Sweet_Midgard_Scroll, - IG_Winter_Midgard_Scroll, - IG_Spring_Festival_Scroll, - IG_IdRO10th_Scroll, - IG_Requiem_Scroll, - IG_Holy_Spirit_Scroll, - IG_Garuda_Scroll, - IG_Thanks_Giving_Scroll, - IG_Idn_Legend_Hero_Scroll, - IG_Blessing_Midgard_Scroll, - IG_Chronosian_Lucky_Scroll, - IG_Sanctuary_Lucky_Scroll, - IG_Cyborg_Lucky_Scroll, - IG_Undine_Lucky_Scroll, + IG_MIDGARD_FES_SCROLL, + IG_MIDGARD_SCROLL, + IG_SWEET_MIDGARD_SCROLL, + IG_WINTER_MIDGARD_SCROLL, + IG_SPRING_FESTIVAL_SCROLL, + IG_IDRO10TH_SCROLL, + IG_REQUIEM_SCROLL, + IG_HOLY_SPIRIT_SCROLL, + IG_GARUDA_SCROLL, + IG_THANKS_GIVING_SCROLL, + IG_IDN_LEGEND_HERO_SCROLL, + IG_BLESSING_MIDGARD_SCROLL, + IG_CHRONOSIAN_LUCKY_SCROLL, + IG_SANCTUARY_LUCKY_SCROLL, + IG_CYBORG_LUCKY_SCROLL, + IG_UNDINE_LUCKY_SCROLL, IG_GOD_MATERIAL_BOX, IG_SEALED_MIND_BOX, - IG_Costama_Egg18, - IG_Costama_Egg19, + IG_COSTAMA_EGG18, + IG_COSTAMA_EGG19, IG_FLOWER_BLOSSOM_SCROLL, - IG_Costama_Egg24, - IG_Smithy_Lucky_Scroll, - IG_Ganymede_Lucky_Scroll, + IG_COSTAMA_EGG24, + IG_SMITHY_LUCKY_SCROLL, + IG_GANYMEDE_LUCKY_SCROLL, IG_LASTANGEL_LUCKYSCROLL, - IG_Valkyrie_Lucky_Scroll, - IG_Splash_Rainbow_Lucky_Scroll, + IG_VALKYRIE_LUCKY_SCROLL, + IG_SPLASH_RAINBOW_LUCKY_SCROLL, IG_SHAPESHIFTER_COSTUME, - IG_July_Lucky_Scroll, - IG_Costama_Egg23, - IG_Costama_Egg28, + IG_JULY_LUCKY_SCROLL, + IG_COSTAMA_EGG23, + IG_COSTAMA_EGG28, IG_MIDGARD_LUCKY_SCROLL, - IG_Blessing_Scarlet_Scroll, - IG_Costama_Egg29, + IG_BLESSING_SCARLET_SCROLL, + IG_COSTAMA_EGG29, IG_INK_BALL, IG_SOMETHING_CANDY_HOLDER, - IG_Mysterious_Egg, - IG_Agust_Lucky_Scroll, + IG_MYSTERIOUS_EGG, + IG_AGUST_LUCKY_SCROLL, IG_RUNE, IG_ELEMENT, IG_POISON, diff --git a/src/map/script_constants.h b/src/map/script_constants.h index 41e74b6313..0d9953c98a 100644 --- a/src/map/script_constants.h +++ b/src/map/script_constants.h @@ -3700,85 +3700,85 @@ export_constant(IG_SUPPORT_PACKAGE); export_constant(IG_Support_Package_10); export_constant(IG_EVENT_ALMIGHTY_BOX); - export_constant(IG_Event_Almighty_Box_100); + export_constant(IG_EVENT_ALMIGHTY_BOX_100); export_constant(IG_LOTTOBOX1); export_constant(IG_LOTTOBOX2); export_constant(IG_LOTTOBOX3); export_constant(IG_LOTTOBOX4); export_constant(IG_LOTTOBOX5); export_constant(IG_SUPPORT_PACKAGE_III); - export_constant(IG_Support_Package_III_10); + export_constant(IG_SUPPORT_PACKAGE_III_10); export_constant(IG_UNLIMITED_BOX); - export_constant(IG_Unlimited_Box_10); + export_constant(IG_UNLIMITED_BOX_10); export_constant(IG_UNLIMITED_BOX_II); - export_constant(IG_Unlimited_Box_II_10); + export_constant(IG_UNLIMITED_BOX_II_10); export_constant(IG_THREE_MASTER_PACKAGE_III); - export_constant(IG_Three_Master_Package_III_10); + export_constant(IG_THREE_MASTER_PACKAGE_III_10); export_constant(IG_2013_RWC_SCROLL); export_constant(IG_SUPPORT_PACKAGE_II); - export_constant(IG_Support_Package_II_10); + export_constant(IG_SUPPORT_PACKAGE_II_10); export_constant(IG_LEVEL_UP_BOX100); export_constant(IG_LEVEL_UP_BOX120); export_constant(IG_LEVEL_UP_BOX130); export_constant(IG_LEVEL_UP_BOX140); export_constant(IG_LEVEL_UP_BOX150); export_constant(IG_LEVEL_UP_BOX160); - export_constant(IG_GIFT_BUFF_SET ); + export_constant(IG_GIFT_BUFF_SET); export_constant(IG_LUCKY_SILVERVINE_FRUIT_BOX_III10); export_constant(IG_LUCKY_SILVERVINE_FRUIT_BOX_III110); export_constant(IG_OLD_ORE_BOX); - export_constant(IG_Blessing_Lucky_Scroll); - export_constant(IG_Sograt_Lucky_Scroll); - export_constant(IG_Garnet_Lucky_Scroll); - export_constant(IG_Amora_Lucky_Scroll); - export_constant(IG_Venus_Lucky_Scroll); - export_constant(IG_Erzulie_Lucky_Scroll); - export_constant(IG_Majestic_Lucky_Scroll); + export_constant(IG_BLESSING_LUCKY_SCROLL); + export_constant(IG_SOGRAT_LUCKY_SCROLL); + export_constant(IG_GARNET_LUCKY_SCROLL); + export_constant(IG_AMORA_LUCKY_SCROLL); + export_constant(IG_VENUS_LUCKY_SCROLL); + export_constant(IG_ERZULIE_LUCKY_SCROLL); + export_constant(IG_MAJESTIC_LUCKY_SCROLL); export_constant(IG_EPIC_HEROES_LUCKY_EGG); export_constant(IG_HERO_MIDGARD_EGG); - export_constant(IG_Imortal_Midgard_Scroll); - export_constant(IG_TW_13y_Lucky_Egg_06); - export_constant(IG_Happy_Time_Scroll); - export_constant(IG_Time_Travel_Scroll); + export_constant(IG_IMORTAL_MIDGARD_SCROLL); + export_constant(IG_TW_13Y_LUCKY_EGG_06); + export_constant(IG_HAPPY_TIME_SCROLL); + export_constant(IG_TIME_TRAVEL_SCROLL); export_constant(IG_SOLARIS_FESTIVAL_SCROLL); - export_constant(IG_Midgard_Fes_Scroll); - export_constant(IG_Midgard_Scroll); - export_constant(IG_Sweet_Midgard_Scroll); - export_constant(IG_Winter_Midgard_Scroll); - export_constant(IG_Spring_Festival_Scroll); - export_constant(IG_IdRO10th_Scroll); - export_constant(IG_Requiem_Scroll); - export_constant(IG_Holy_Spirit_Scroll); - export_constant(IG_Garuda_Scroll); - export_constant(IG_Thanks_Giving_Scroll); - export_constant(IG_Idn_Legend_Hero_Scroll); - export_constant(IG_Blessing_Midgard_Scroll); - export_constant(IG_Chronosian_Lucky_Scroll); - export_constant(IG_Sanctuary_Lucky_Scroll); - export_constant(IG_Cyborg_Lucky_Scroll); - export_constant(IG_Undine_Lucky_Scroll); + export_constant(IG_MIDGARD_FES_SCROLL); + export_constant(IG_MIDGARD_SCROLL); + export_constant(IG_SWEET_MIDGARD_SCROLL); + export_constant(IG_WINTER_MIDGARD_SCROLL); + export_constant(IG_SPRING_FESTIVAL_SCROLL); + export_constant(IG_IDRO10TH_SCROLL); + export_constant(IG_REQUIEM_SCROLL); + export_constant(IG_HOLY_SPIRIT_SCROLL); + export_constant(IG_GARUDA_SCROLL); + export_constant(IG_THANKS_GIVING_SCROLL); + export_constant(IG_IDN_LEGEND_HERO_SCROLL); + export_constant(IG_BLESSING_MIDGARD_SCROLL); + export_constant(IG_CHRONOSIAN_LUCKY_SCROLL); + export_constant(IG_SANCTUARY_LUCKY_SCROLL); + export_constant(IG_CYBORG_LUCKY_SCROLL); + export_constant(IG_UNDINE_LUCKY_SCROLL); export_constant(IG_GOD_MATERIAL_BOX); export_constant(IG_SEALED_MIND_BOX); - export_constant(IG_Costama_Egg18); - export_constant(IG_Costama_Egg19); + export_constant(IG_COSTAMA_EGG18); + export_constant(IG_COSTAMA_EGG19); export_constant(IG_FLOWER_BLOSSOM_SCROLL); - export_constant(IG_Costama_Egg24); - export_constant(IG_Smithy_Lucky_Scroll); - export_constant(IG_Ganymede_Lucky_Scroll); + export_constant(IG_COSTAMA_EGG24); + export_constant(IG_SMITHY_LUCKY_SCROLL); + export_constant(IG_GANYMEDE_LUCKY_SCROLL); export_constant(IG_LASTANGEL_LUCKYSCROLL); - export_constant(IG_Valkyrie_Lucky_Scroll); - export_constant(IG_Splash_Rainbow_Lucky_Scroll); + export_constant(IG_VALKYRIE_LUCKY_SCROLL); + export_constant(IG_SPLASH_RAINBOW_LUCKY_SCROLL); export_constant(IG_SHAPESHIFTER_COSTUME); - export_constant(IG_July_Lucky_Scroll); - export_constant(IG_Costama_Egg23); - export_constant(IG_Costama_Egg28); + export_constant(IG_JULY_LUCKY_SCROLL); + export_constant(IG_COSTAMA_EGG23); + export_constant(IG_COSTAMA_EGG28); export_constant(IG_MIDGARD_LUCKY_SCROLL); - export_constant(IG_Blessing_Scarlet_Scroll); - export_constant(IG_Costama_Egg29); + export_constant(IG_BLESSING_SCARLET_SCROLL); + export_constant(IG_COSTAMA_EGG29); export_constant(IG_INK_BALL); export_constant(IG_SOMETHING_CANDY_HOLDER); - export_constant(IG_Mysterious_Egg); - export_constant(IG_Agust_Lucky_Scroll); + export_constant(IG_MYSTERIOUS_EGG); + export_constant(IG_AGUST_LUCKY_SCROLL); export_constant(IG_RUNE); export_constant(IG_ELEMENT); export_constant(IG_POISON);