Some item name fixes (#6816)

db/re/item_combos.yml

@@ -25748,7 +25748,7 @@ Body:
       bonus2 bIgnoreDefRaceRate,RC_All,5;
   - Combos:
       - Combo:
-          - aegis_490113     # 490113
+          - Jasper_Ring     # 490113
           - Bear's_Power     # 4875
     Script: |
       bonus2 bSkillCooldown,"RK_IGNITIONBREAK",-200;

db/re/item_db_equip.yml

@@ -69209,6 +69209,14 @@ Body:
          bonus bHealPower,35;
          bonus2 bSkillAtk,"LG_RAYOFGENESIS",35;
       }
+  - Id: 15905
+    AegisName: C_Helmet_Of_Siegfried_J
+    Name: Costume Helmet of Siegfried
+    Type: Armor
+    Locations:
+      Costume_Head_Top: true
+    ArmorLevel: 1
+    View: 1055
   - Id: 15920
     AegisName: Charm_Of_Flame_Heart_BR
     Name: Flaming Heart    # !todo check english name
@@ -96013,6 +96021,54 @@ Body:
       hateffect(HAT_EF_C_POPPING_PORING_AURA,true);
     UnEquipScript: |
       hateffect(HAT_EF_C_POPPING_PORING_AURA,false);
+  - Id: 20549
+    AegisName: C_99LV_Royal_Guard_Blue
+    Name: Costume Aura of the Sea Glow
+    Type: Armor
+    Locations:
+      Costume_Garment: true
+    ArmorLevel: 1
+    EquipLevelMin: 1
+    Script: |
+      hateffect(HAT_EF_99LV_Royal_Guard_Blue,true);
+    UnEquipScript: |
+      hateffect(HAT_EF_99LV_Royal_Guard_Blue,false);
+  - Id: 20550
+    AegisName: C_99LV_Warlock_Violet
+    Name: Costume Violet Energy
+    Type: Armor
+    Locations:
+      Costume_Garment: true
+    ArmorLevel: 1
+    EquipLevelMin: 1
+    Script: |
+      hateffect(HAT_EF_99LV_Warlock_Violet,true);
+    UnEquipScript: |
+      hateffect(HAT_EF_99LV_Warlock_Violet,false);
+  - Id: 20551
+    AegisName: C_99LV_Sorcerer_LBlue
+    Name: Costume Light Blue Energy
+    Type: Armor
+    Locations:
+      Costume_Garment: true
+    ArmorLevel: 1
+    EquipLevelMin: 1
+    Script: |
+      hateffect(HAT_EF_99LV_Sorcerer_LBlue,true);
+    UnEquipScript: |
+      hateffect(HAT_EF_99LV_Sorcerer_LBlue,false);
+  - Id: 20552
+    AegisName: C_99LV_Ranger_Green
+    Name: Costume Green Energy
+    Type: Armor
+    Locations:
+      Costume_Garment: true
+    ArmorLevel: 1
+    EquipLevelMin: 1
+    Script: |
+      hateffect(HAT_EF_99LV_Ranger_Green,true);
+    UnEquipScript: |
+      hateffect(HAT_EF_99LV_Ranger_Green,false);
   - Id: 20553
     AegisName: C_99LV_Minstrel_Pink
     Name: Costume Pink Energy
@@ -96025,6 +96081,30 @@ Body:
       hateffect(HAT_EF_99LV_Minstrel_Pink,true);
     UnEquipScript: |
       hateffect(HAT_EF_99LV_Minstrel_Pink,false);
+  - Id: 20554
+    AegisName: C_99LV_Archbishop_White
+    Name: Costume Aura of Sanctity
+    Type: Armor
+    Locations:
+      Costume_Garment: true
+    ArmorLevel: 1
+    EquipLevelMin: 1
+    Script: |
+      hateffect(HAT_EF_99LV_Archbishop_White,true);
+    UnEquipScript: |
+      hateffect(HAT_EF_99LV_Archbishop_White,false);
+  - Id: 20555
+    AegisName: C_99LV_Guill_Silver
+    Name: Costume Silver Energy
+    Type: Armor
+    Locations:
+      Costume_Garment: true
+    ArmorLevel: 1
+    EquipLevelMin: 1
+    Script: |
+      hateffect(HAT_EF_99LV_Guill_Silver,true);
+    UnEquipScript: |
+      hateffect(HAT_EF_99LV_Guill_Silver,false);
   - Id: 20556
     AegisName: C_99LV_ShadowC_Black
     Name: Costume Aura of Night
@@ -96037,6 +96117,30 @@ Body:
       hateffect(HAT_EF_99LV_ShadowC_Black,true);
     UnEquipScript: |
       hateffect(HAT_EF_99LV_ShadowC_Black,false);
+  - Id: 20557
+    AegisName: C_99LV_Mechanic_Gold
+    Name: Costume Gold Energy
+    Type: Armor
+    Locations:
+      Costume_Garment: true
+    ArmorLevel: 1
+    EquipLevelMin: 1
+    Script: |
+      hateffect(HAT_EF_99LV_Mechanic_Gold,true);
+    UnEquipScript: |
+      hateffect(HAT_EF_99LV_Mechanic_Gold,false);
+  - Id: 20558
+    AegisName: C_99LV_Genetic_YGreen
+    Name: Costume Yellow Green Energy
+    Type: Armor
+    Locations:
+      Costume_Garment: true
+    ArmorLevel: 1
+    EquipLevelMin: 1
+    Script: |
+      hateffect(HAT_EF_99LV_Genetic_YGreen,true);
+    UnEquipScript: |
+      hateffect(HAT_EF_99LV_Genetic_YGreen,false);
   - Id: 20559
     AegisName: C_160LV_Rune_Red
     Name: Costume Red Aura
@@ -96073,6 +96177,30 @@ Body:
       hateffect(HAT_EF_160LV_Warlock_Violet,true);
     UnEquipScript: |
       hateffect(HAT_EF_160LV_Warlock_Violet,false);
+  - Id: 20562
+    AegisName: C_160LV_Sorcerer_LBlue
+    Name: Costume Light Blue Aura
+    Type: Armor
+    Locations:
+      Costume_Garment: true
+    ArmorLevel: 1
+    EquipLevelMin: 1
+    Script: |
+      hateffect(HAT_EF_160LV_Sorcerer_LBlue,true);
+    UnEquipScript: |
+      hateffect(HAT_EF_160LV_Sorcerer_LBlue,false);
+  - Id: 20563
+    AegisName: C_160LV_Ranger_Green
+    Name: Costume Green Aura
+    Type: Armor
+    Locations:
+      Costume_Garment: true
+    ArmorLevel: 1
+    EquipLevelMin: 1
+    Script: |
+      hateffect(HAT_EF_160LV_Ranger_Green,true);
+    UnEquipScript: |
+      hateffect(HAT_EF_160LV_Ranger_Green,false);
   - Id: 20564
     AegisName: C_160LV_Minstrel_Pink
     Name: Costume Pink Aura
@@ -96133,6 +96261,18 @@ Body:
       hateffect(HAT_EF_160LV_MECHANIC_GOLD,true);
     UnEquipScript: |
       hateffect(HAT_EF_160LV_MECHANIC_GOLD,false);
+  - Id: 20569
+    AegisName: C_160LV_Genetic_YGreen
+    Name: Costume Yellow Green Aura
+    Type: Armor
+    Locations:
+      Costume_Garment: true
+    ArmorLevel: 1
+    EquipLevelMin: 1
+    Script: |
+      hateffect(HAT_EF_160LV_Genetic_YGreen,true);
+    UnEquipScript: |
+      hateffect(HAT_EF_160LV_Genetic_YGreen,false);
   - Id: 20570
     AegisName: C_HeartChocoBag
     Name: Costume HeartChocoBag
@@ -140547,7 +140687,7 @@ Body:
     ArmorLevel: 1
     View: 2142
   - Id: 410072
-    AegisName: aegis_410072
+    AegisName: C_Demons_Familiar
     Name: Costume Demons Familia    # !todo check english name
     Type: Armor
     Locations:
@@ -140579,7 +140719,7 @@ Body:
     Script: |
       bonus bVariableCastrate,-5;
   - Id: 410087
-    AegisName: C_Demons_Familiar
+    AegisName: C_Demons_Familiar_K
     Name: Costume Robotic Watcher
     Type: Armor
     Locations:
@@ -141225,7 +141365,7 @@ Body:
     ArmorLevel: 1
     View: 2150
   - Id: 420079
-    AegisName: aegis_420079
+    AegisName: C_Inner_Color_Long
     Name: Costume Inner Color Long
     Type: Armor
     Locations:
@@ -151929,7 +152069,7 @@ Body:
          bonus bSPGainValue,10;
       }
   - Id: 490113
-    AegisName: aegis_490113
+    AegisName: Jasper_Ring
     Name: Jasper Ring    # !todo check english name
     Type: Armor
     Weight: 400

db/re/item_db_etc.yml

@@ -40941,28 +40941,28 @@ Body:
     Script: |
       bonus bDelayrate,-5;
   - Id: 27413
-    AegisName: aegis_27413
+    AegisName: Big_Fire_BR
     Name: Power of Shango    # !todo check english name
     Type: Card
     SubType: Enchant
     Script: |
       autobonus "{ bonus bDelayrate,-70; bonus bVariableCastrate,-70; bonus bHealPower,70; bonus bHealPower2,70; bonus bAddItemHealRate,70; }",30,10000,BF_WEAPON|BF_MAGIC,"{}";
   - Id: 27414
-    AegisName: aegis_27414
+    AegisName: Sky_Ground_BR
     Name: Power of Ochosi    # !todo check english name
     Type: Card
     SubType: Enchant
     Script: |
       autobonus "{ bonus bDelayrate,-70; bonus bVariableCastrate,-70; bonus2 bIgnoreDefClassRate,Class_Normal,70; bonus2 bIgnoreMdefClassRate,Class_Normal,70; }",30,10000,BF_WEAPON|BF_MAGIC,"{}";
   - Id: 27415
-    AegisName: aegis_27415
+    AegisName: Storm_BR
     Name: Power of Iansa    # !todo check english name
     Type: Card
     SubType: Enchant
     Script: |
       autobonus "{ bonus bDelayrate,-70; bonus bVariableCastrate,-70; bonus bAspdRate,70; }",30,10000,BF_WEAPON|BF_MAGIC,"{}";
   - Id: 27416
-    AegisName: aegis_27416
+    AegisName: Water_Sky_BR
     Name: Power of Oshun    # !todo check english name
     Type: Card
     SubType: Enchant

db/re/item_db_usable.yml

@@ -7497,7 +7497,7 @@ Body:
     Buy: 1800
     Weight: 100
     Script: |
-      sc_start SC_INCLUK,3600000,20;
+      sc_start SC_INCALLSTATUS,20000,10;
   - Id: 12329
     AegisName: Recall_MaleGM
     Name: Summon Male GameMaster Scroll
@@ -46081,7 +46081,7 @@ Body:
       getitem 25184,1;
       getitem 25185,1;
   - Id: 23100
-    AegisName: Drooping_Gunslinger_Scroll
+    AegisName: Gunslinger_Enchant
     Name: Drooping Gunslinger Scroll
     Type: Delayconsume
     Weight: 10
@@ -46136,6 +46136,17 @@ Body:
     Weight: 250
     Script: |
       getitem 13232,500;
+  - Id: 23136
+    AegisName: WOB_Box
+    Name: Butterfly Wing Box
+    Type: Usable
+    Buy: 10
+    Weight: 20
+    Script: |
+      getitem 12507,3;
+      getitem 12508,3;
+      getitem 12509,3;
+      getitem 12510,3;
   - Id: 23151
     AegisName: EnchantStone_Recipe
     Name: Enchant Stone Recipe
@@ -46164,6 +46175,14 @@ Body:
     Weight: 10
     Script: |
       laphine_synthesis();
+  - Id: 23161
+    AegisName: Gunslinger_Box
+    Name: Gunslinger Box
+    Type: Usable
+    Weight: 1
+    Script: |
+      getitem 23100,1;
+      getitem 19157,1;
   - Id: 23168
     AegisName: Mini_Fan_Box
     Name: Mini Fan Box
@@ -46184,7 +46203,7 @@ Body:
     Script: |
       getitem callfunc("F_Rand",7135,7136,7137,7138,7139),1;
   - Id: 23170
-    AegisName: Fan_Modification_Kit
+    AegisName: Fan_Upgrade_Kit
     Name: Fan Modification Kit
     Type: Delayconsume
     Weight: 10
@@ -46200,7 +46219,7 @@ Body:
     Script: |
       getgroupitem(IG_Enchant_Stone_Box11);
   - Id: 23175
-    AegisName: Uniform_Repair_Kit
+    AegisName: Suit_Upgrade_Kit
     Name: Uniform Repair Kit
     Type: Delayconsume
     Weight: 10
@@ -46653,22 +46672,22 @@ Body:
     Script: |
       itemskill "AL_TELEPORT",1;
   - Id: 23289
-    AegisName: Candy_Pouch_Blessing_Scroll_Melee
-    Name: Candy Pouch Blessing Scroll(Physical)
+    AegisName: Candy_Bag_Scroll_Melee
+    Name: Candy Bag Blessing Scroll(Physical)
     Type: Delayconsume
     Weight: 10
     Script: |
       laphine_synthesis();
   - Id: 23290
-    AegisName: Candy_Pouch_Blessing_Scroll_Range
-    Name: Candy Pouch Blessing Scroll(Ranged)
+    AegisName: Candy_Bag_Scroll_Range
+    Name: Candy Bag Blessing Scroll(Ranged)
     Type: Delayconsume
     Weight: 10
     Script: |
       laphine_synthesis();
   - Id: 23291
-    AegisName: Candy_Pouch_Blessing_Scroll_Magic
-    Name: Candy Pouch Blessing Scroll(Magic)
+    AegisName: Candy_Bag_Scroll_Magic
+    Name: Candy Bag Blessing Scroll(Magic)
     Type: Delayconsume
     Weight: 10
     Script: |
@@ -46734,15 +46753,15 @@ Body:
       bonus_script "{ bonus bDef,500; bonus bMdef,200; }",600;
       /* fix me: unknown flag and specialeffect */
   - Id: 23308
-    AegisName: Magical_Booster_Amplifier
-    Name: Magical Booster Amplifier
+    AegisName: Booster_Amplifier
+    Name: Booster Amplifier
     Type: Delayconsume
     Weight: 10
     Script: |
       laphine_synthesis();
   - Id: 23311
-    AegisName: Magic_Cat_hand_Scroll
-    Name: Magic Cat Hand Scroll
+    AegisName: Magical_Cat_Hand
+    Name: Magic Cat Hand
     Type: Delayconsume
     Weight: 10
     Script: |

db/re/item_group_db.yml

@@ -25388,12 +25388,12 @@ Body:
             Rate: 73
           - Item: S_FullPene_Earring
             Rate: 73
-  - Group: DROOPING_GUNSLINGER_SCROLL
+  - Group: GUNSLINGER_ENCHANT
     SubGroups:
       - SubGroup: 0
         List:
           - Item: Drooping_Rebellion_
-            RandomOptionGroup: DROOPING_GUNSLINGER_SCROLL
+            RandomOptionGroup: GUNSLINGER_ENCHANT
   - Group: ENCHANTSTONE_RECIPE
     SubGroups:
       - SubGroup: 1
@@ -26046,18 +26046,18 @@ Body:
             Rate: 130
           - Item: C_Giant_White_Rabbit
             Rate: 130
-  - Group: FAN_MODIFICATION_KIT
+  - Group: FAN_UPGRADE_KIT
     SubGroups:
       - SubGroup: 0
         List:
           - Item: Sea_Otter_Mini_Fan
-            RandomOptionGroup: FAN_MODIFICATION_KIT
-  - Group: UNIFORM_REPAIR_KIT
+            RandomOptionGroup: FAN_UPGRADE_KIT
+  - Group: SUIT_UPGRADE_KIT
     SubGroups:
       - SubGroup: 0
         List:
           - Item: Kafra_Uniform
-            RandomOptionGroup: UNIFORM_REPAIR_KIT
+            RandomOptionGroup: SUIT_UPGRADE_KIT
   - Group: SCROLL_OF_FALLEN_ANGEL_WINGS
     SubGroups:
       - SubGroup: 0
@@ -26580,39 +26580,39 @@ Body:
             Rate: 1
           - Item: S_All_Race_Shield
             Rate: 1
-  - Group: CANDY_POUCH_BLESSING_SCROLL_MELEE
+  - Group: CANDY_BAG_SCROLL_MELEE
     SubGroups:
       - SubGroup: 0
         List:
           - Item: Bag_Of_Antonio_P
-            RandomOptionGroup: CANDY_POUCH_BLESSING_SCROLL_MELEE
-  - Group: CANDY_POUCH_BLESSING_SCROLL_RANGE
+            RandomOptionGroup: CANDY_BAG_SCROLL_MELEE
+  - Group: CANDY_BAG_SCROLL_RANGE
     SubGroups:
       - SubGroup: 0
         List:
           - Item: Bag_Of_Antonio_S
-            RandomOptionGroup: CANDY_POUCH_BLESSING_SCROLL_RANGE
-  - Group: CANDY_POUCH_BLESSING_SCROLL_MAGIC
+            RandomOptionGroup: CANDY_BAG_SCROLL_RANGE
+  - Group: CANDY_BAG_SCROLL_MAGIC
     SubGroups:
       - SubGroup: 0
         List:
           - Item: Bag_Of_Antonio_
-            RandomOptionGroup: CANDY_POUCH_BLESSING_SCROLL_MAGIC
-  - Group: MAGICAL_BOOSTER_AMPLIFIER
+            RandomOptionGroup: CANDY_BAG_SCROLL_MAGIC
+  - Group: BOOSTER_AMPLIFIER
     SubGroups:
       - SubGroup: 1
         List:
           - Item: Crimson_Booster
             Rate: 1
           - Item: Magical_Booster_K
-            RandomOptionGroup: MAGICAL_BOOSTER_AMPLIFIER
+            RandomOptionGroup: BOOSTER_AMPLIFIER
             Rate: 1
-  - Group: MAGIC_CAT_HAND_SCROLL
+  - Group: MAGICAL_CAT_HAND
     SubGroups:
       - SubGroup: 0
         List:
           - Item: Neko_Headress
-            RandomOptionGroup: MAGIC_CAT_HAND_SCROLL
+            RandomOptionGroup: MAGICAL_CAT_HAND
   - Group: INFINITYSHADOW_MIX
     SubGroups:
       - SubGroup: 0

db/re/item_randomopt_group.yml

@@ -7456,7 +7456,7 @@ Body:
         Chance: 625
   # TODO: Confirm official rates
   - Id: 100
-    Group: DROOPING_GUNSLINGER_SCROLL
+    Group: GUNSLINGER_ENCHANT
     Slots:
       - Slot: 1
         Options:
@@ -7560,7 +7560,7 @@ Body:
             Chance: 1250
   # Source: https://ro.gnjoy.com/news/probability/View.asp?seq=3999572
   - Id: 101
-    Group: FAN_MODIFICATION_KIT
+    Group: FAN_UPGRADE_KIT
     Slots:
       - Slot: 1
         Options:
@@ -7672,7 +7672,7 @@ Body:
             Chance: 769
   # Source: https://ro.gnjoy.com/news/probability/View.asp?seq=3964871
   - Id: 102
-    Group: UNIFORM_REPAIR_KIT
+    Group: SUIT_UPGRADE_KIT
     Slots:
       - Slot: 1
         Options:
@@ -7810,7 +7810,7 @@ Body:
             Chance: 5000
   # Source: https://ro.gnjoy.com/news/probability/View.asp?seq=3999577
   - Id: 109
-    Group: CANDY_POUCH_BLESSING_SCROLL_MELEE
+    Group: CANDY_BAG_SCROLL_MELEE
     Slots:
       - Slot: 1
         Options:
@@ -7934,7 +7934,7 @@ Body:
             Chance: 454
   # Source: https://ro.gnjoy.com/news/probability/View.asp?seq=3999578
   - Id: 110
-    Group: CANDY_POUCH_BLESSING_SCROLL_RANGE
+    Group: CANDY_BAG_SCROLL_RANGE
     Slots:
       - Slot: 1
         Options:
@@ -8058,7 +8058,7 @@ Body:
             Chance: 454
   # Source: https://ro.gnjoy.com/news/probability/View.asp?seq=3999579
   - Id: 111
-    Group: CANDY_POUCH_BLESSING_SCROLL_MAGIC
+    Group: CANDY_BAG_SCROLL_MAGIC
     Slots:
       - Slot: 1
         Options:
@@ -8182,7 +8182,7 @@ Body:
             Chance: 454
   # Source: https://ro.gnjoy.com/news/probability/View.asp?seq=3964872
   - Id: 112
-    Group: MAGICAL_BOOSTER_AMPLIFIER
+    Group: BOOSTER_AMPLIFIER
     Slots:
       - Slot: 1
         Options:
@@ -8310,7 +8310,7 @@ Body:
             Chance: 714
   # Source: https://ro.gnjoy.com/news/probability/View.asp?seq=3964879
   - Id: 113
-    Group: MAGIC_CAT_HAND_SCROLL
+    Group: MAGICAL_CAT_HAND
     Slots:
       - Slot: 1
         Options:

db/re/laphine_synthesis.yml

@@ -723,8 +723,8 @@ Body:
       - Item: S_R_Bearers_Earring
       - Item: S_Mega_Blitz_Shield
       - Item: S_Mega_Blitz_Weapon
-  - Item: Drooping_Gunslinger_Scroll
-    RewardGroup: DROOPING_GUNSLINGER_SCROLL
+  - Item: Gunslinger_Enchant
+    RewardGroup: GUNSLINGER_ENCHANT
     Requirements:
       - Item: Drooping_Rebellion_
   - Item: EnchantStone_Recipe
@@ -1850,12 +1850,12 @@ Body:
       - Item: C_L_RibbonMuff_Black
       - Item: C_Black_Cat_Ears_Beret
       - Item: C_Watery_Eyes
-  - Item: Fan_Modification_Kit
-    RewardGroup: FAN_MODIFICATION_KIT
+  - Item: Fan_Upgrade_Kit
+    RewardGroup: FAN_UPGRADE_KIT
     Requirements:
       - Item: Sea_Otter_Mini_Fan
-  - Item: Uniform_Repair_Kit
-    RewardGroup: UNIFORM_REPAIR_KIT
+  - Item: Suit_Upgrade_Kit
+    RewardGroup: SUIT_UPGRADE_KIT
     Requirements:
       - Item: Kafra_Uniform
   - Item: Scroll_of_Fallen_Angel_Wings
@@ -2048,24 +2048,24 @@ Body:
       - Item: S_Chemical_Shoes
       - Item: S_Bloody_Shoes
       - Item: S_Dragoon_Shoes
-  - Item: Candy_Pouch_Blessing_Scroll_Melee
-    RewardGroup: CANDY_POUCH_BLESSING_SCROLL_MELEE
+  - Item: Candy_Bag_Scroll_Melee
+    RewardGroup: CANDY_BAG_SCROLL_MELEE
     Requirements:
       - Item: Bag_Of_Antonio_P
-  - Item: Candy_Pouch_Blessing_Scroll_Range
-    RewardGroup: CANDY_POUCH_BLESSING_SCROLL_RANGE
+  - Item: Candy_BAG_Scroll_Range
+    RewardGroup: CANDY_BAG_SCROLL_RANGE
     Requirements:
       - Item: Bag_Of_Antonio_S
-  - Item: Candy_Pouch_Blessing_Scroll_Magic
-    RewardGroup: CANDY_POUCH_BLESSING_SCROLL_MAGIC
+  - Item: Candy_BAG_Scroll_Magic
+    RewardGroup: CANDY_BAG_SCROLL_MAGIC
     Requirements:
       - Item: Bag_Of_Antonio_
-  - Item: Magical_Booster_Amplifier
-    RewardGroup: MAGICAL_BOOSTER_AMPLIFIER
+  - Item: Booster_Amplifier
+    RewardGroup: BOOSTER_AMPLIFIER
     Requirements:
       - Item: Magical_Booster_K
-  - Item: Magic_Cat_hand_Scroll
-    RewardGroup: MAGIC_CAT_HAND_SCROLL
+  - Item: Magical_Cat_Hand
+    RewardGroup: MAGICAL_CAT_HAND
     Requirements:
       - Item: Neko_Headress
   - Item: StabilityShadow_Mix

src/map/itemdb.hpp

@@ -778,12 +778,12 @@ enum e_random_item_group {
 	IG_THIRD_JOB_STONE_BOTTOM_BOX,
 	IG_THIRD_JOB_STONE_BOTTOM_BOX2,
 	IG_SHADOW_EXCHANGE_BOX,
-	IG_DROOPING_GUNSLINGER_SCROLL,
+	IG_GUNSLINGER_ENCHANT,
 	IG_ENCHANTSTONE_RECIPE,
 	IG_PET_EGG_BOX,
 	IG_COSTUME_EXCHANGE_BOX,
-	IG_FAN_MODIFICATION_KIT,
-	IG_UNIFORM_REPAIR_KIT,
+	IG_FAN_UPGRADE_KIT,
+	IG_SUIT_UPGRADE_KIT,
 	IG_SCROLL_OF_FALLEN_ANGEL_WINGS,
 	IG_CLASS_SHADOW_BOX_WEAPON,
 	IG_CLASS_SHADOW_BOX_ARMOR,
@@ -796,11 +796,11 @@ enum e_random_item_group {
 	IG_BEARERSSHADOW_MIX,
 	IG_COMPOSESHADOW_MIX,
 	IG_RACESHADOW_MIX,
-	IG_CANDY_POUCH_BLESSING_SCROLL_MELEE,
-	IG_CANDY_POUCH_BLESSING_SCROLL_RANGE,
-	IG_CANDY_POUCH_BLESSING_SCROLL_MAGIC,
-	IG_MAGICAL_BOOSTER_AMPLIFIER,
-	IG_MAGIC_CAT_HAND_SCROLL,
+	IG_CANDY_BAG_SCROLL_MELEE,
+	IG_CANDY_BAG_SCROLL_RANGE,
+	IG_CANDY_BAG_SCROLL_MAGIC,
+	IG_BOOSTER_AMPLIFIER,
+	IG_MAGICAL_CAT_HAND,
 	IG_INFINITYSHADOW_MIX,
 	IG_SILVER_STATUE,
 	IG_PHYSICALMAGICAL_MIX,

src/map/script_constants.hpp

@@ -5540,12 +5540,12 @@
 	export_constant(IG_THIRD_JOB_STONE_BOTTOM_BOX);
 	export_constant(IG_THIRD_JOB_STONE_BOTTOM_BOX2);
 	export_constant(IG_SHADOW_EXCHANGE_BOX);
-	export_constant(IG_DROOPING_GUNSLINGER_SCROLL);
+	export_constant(IG_GUNSLINGER_ENCHANT);
 	export_constant(IG_ENCHANTSTONE_RECIPE);
 	export_constant(IG_PET_EGG_BOX);
 	export_constant(IG_COSTUME_EXCHANGE_BOX);
-	export_constant(IG_FAN_MODIFICATION_KIT);
-	export_constant(IG_UNIFORM_REPAIR_KIT);
+	export_constant(IG_FAN_UPGRADE_KIT);
+	export_constant(IG_SUIT_UPGRADE_KIT);
 	export_constant(IG_SCROLL_OF_FALLEN_ANGEL_WINGS);
 	export_constant(IG_CLASS_SHADOW_BOX_WEAPON);
 	export_constant(IG_CLASS_SHADOW_BOX_ARMOR);
@@ -5558,11 +5558,11 @@
 	export_constant(IG_BEARERSSHADOW_MIX);
 	export_constant(IG_COMPOSESHADOW_MIX);
 	export_constant(IG_RACESHADOW_MIX);
-	export_constant(IG_CANDY_POUCH_BLESSING_SCROLL_MELEE);
-	export_constant(IG_CANDY_POUCH_BLESSING_SCROLL_RANGE);
-	export_constant(IG_CANDY_POUCH_BLESSING_SCROLL_MAGIC);
-	export_constant(IG_MAGICAL_BOOSTER_AMPLIFIER);
-	export_constant(IG_MAGIC_CAT_HAND_SCROLL);
+	export_constant(IG_CANDY_BAG_SCROLL_MELEE);
+	export_constant(IG_CANDY_BAG_SCROLL_RANGE);
+	export_constant(IG_CANDY_BAG_SCROLL_MAGIC);
+	export_constant(IG_BOOSTER_AMPLIFIER);
+	export_constant(IG_MAGICAL_CAT_HAND);
 	export_constant(IG_INFINITYSHADOW_MIX);
 	export_constant(IG_SILVER_STATUE);
 	export_constant(IG_PHYSICALMAGICAL_MIX);