Updates item_db using new constants (#7019)

* item_db updated using new constants

Additionally :
* sort the id in item_db_usable
* corrected sc_start* for SC_L_LIFEPOTION and SC_S_LIFEPOTION in item_db_usable
* removed useless value in item_randomopt_db.yml
* corrected the option for GRAY_CHARCOAL_MELEE

db/re/item_combos.yml

@@ -21432,7 +21432,7 @@ Body:
       .@r_weapon = getequiprefinerycnt(EQI_HAND_R);
       bonus2 bSkillAtk,"AG_SOUL_VC_STRIKE",7*(.@r_weapon/3);
       bonus2 bSkillAtk,"WL_SOULEXPANSION",5*(.@r_weapon/3);
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"AG_SOUL_VC_STRIKE",15;
       }
   - Combos:
@@ -21454,7 +21454,7 @@ Body:
       .@r_weapon = getequiprefinerycnt(EQI_HAND_R);
       bonus2 bSkillAtk,"AG_MYSTERY_ILLUSION",7*(.@r_weapon/3);
       bonus2 bSkillAtk,"WL_COMET",5*(.@r_weapon/3);
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"AG_MYSTERY_ILLUSION",15;
       }
   - Combos:
@@ -21474,7 +21474,7 @@ Body:
       .@r_weapon = getequiprefinerycnt(EQI_HAND_R);
       bonus2 bSkillAtk,"IQ_THIRD_FLAME_BOMB",7*(.@r_weapon/3);
       bonus2 bSkillAtk,"SR_TIGERCANNON",5*(.@r_weapon/3);
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"IQ_THIRD_FLAME_BOMB",15;
       }
   - Combos:
@@ -21494,7 +21494,7 @@ Body:
       .@r_weapon = getequiprefinerycnt(EQI_HAND_R);
       bonus2 bSkillAtk,"IQ_EXPOSION_BLASTER",7*(.@r_weapon/3);
       bonus2 bSkillAtk,"SR_RAMPAGEBLASTER",5*(.@r_weapon/3);
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"IQ_EXPOSION_BLASTER",15;
       }
   - Combos:
@@ -21516,7 +21516,7 @@ Body:
       .@r_weapon = getequiprefinerycnt(EQI_HAND_R);
       bonus2 bSkillAtk,"CD_ARBITRIUM_ATK",7*(.@r_weapon/3);
       bonus2 bSkillAtk,"AB_ADORAMUS",5*(.@r_weapon/3);
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"CD_ARBITRIUM_ATK",15;
       }
   - Combos:
@@ -21536,7 +21536,7 @@ Body:
       .@r_weapon = getequiprefinerycnt(EQI_HAND_R);
       bonus2 bSkillAtk,"CD_PETITIO",7*(.@r_weapon/3);
       bonus2 bSkillAtk,"AB_DUPLELIGHT",5*(.@r_weapon/3);
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"CD_PETITIO",15;
       }
   - Combos:
@@ -21556,7 +21556,7 @@ Body:
       .@r_weapon = getequiprefinerycnt(EQI_HAND_R);
       bonus2 bSkillAtk,"ABC_ABYSS_DAGGER",7*(.@r_weapon/3);
       bonus2 bSkillAtk,"SC_FATALMENACE",5*(.@r_weapon/3);
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"ABC_ABYSS_DAGGER",15;
       }
   - Combos:
@@ -21576,7 +21576,7 @@ Body:
       .@r_weapon = getequiprefinerycnt(EQI_HAND_R);
       bonus2 bSkillAtk,"ABC_FRENZY_SHOT",7*(.@r_weapon/3);
       bonus2 bSkillAtk,"SC_TRIANGLESHOT",5*(.@r_weapon/3);
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"ABC_FRENZY_SHOT",15;
       }
   - Combos:
@@ -21596,7 +21596,7 @@ Body:
       .@r_weapon = getequiprefinerycnt(EQI_HAND_R);
       bonus2 bSkillAtk,"WH_GALESTORM",7*(.@r_weapon/3);
       bonus2 bSkillAtk,"RA_ARROWSTORM",5*(.@r_weapon/3);
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"WH_GALESTORM",15;
       }
   - Combos:
@@ -21616,7 +21616,7 @@ Body:
       .@r_weapon = getequiprefinerycnt(EQI_HAND_R);
       bonus2 bSkillAtk,"WH_CRESCIVE_BOLT",7*(.@r_weapon/3);
       bonus2 bSkillAtk,"RA_AIMEDBOLT",5*(.@r_weapon/3);
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"WH_CRESCIVE_BOLT",15;
       }
   - Combos:
@@ -21638,7 +21638,7 @@ Body:
       .@r_weapon = getequiprefinerycnt(EQI_HAND_R);
       bonus2 bSkillAtk,"IG_CROSS_RAIN",7*(.@r_weapon/3);
       bonus2 bSkillAtk,"LG_RAYOFGENESIS",5*(.@r_weapon/3);
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"IG_CROSS_RAIN",15;
       }
   - Combos:
@@ -21658,7 +21658,7 @@ Body:
       .@r_weapon = getequiprefinerycnt(EQI_HAND_R);
       bonus2 bSkillAtk,"IG_OVERSLASH",7*(.@r_weapon/3);
       bonus2 bSkillAtk,"LG_OVERBRAND",5*(.@r_weapon/3);
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"IG_OVERSLASH",15;
       }
   - Combos:
@@ -21678,7 +21678,7 @@ Body:
       .@r_weapon = getequiprefinerycnt(EQI_HAND_R);
       bonus2 bSkillAtk,"SHC_ETERNAL_SLASH",7*(.@r_weapon/3);
       bonus2 bSkillAtk,"GC_COUNTERSLASH",5*(.@r_weapon/3);
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"SHC_ETERNAL_SLASH",15;
       }
   - Combos:
@@ -21698,7 +21698,7 @@ Body:
       .@r_weapon = getequiprefinerycnt(EQI_HAND_R);
       bonus2 bSkillAtk,"SHC_IMPACT_CRATER",7*(.@r_weapon/3);
       bonus2 bSkillAtk,"GC_ROLLINGCUTTER",5*(.@r_weapon/3);
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"SHC_IMPACT_CRATER",15;
       }
   - Combos:
@@ -21720,7 +21720,7 @@ Body:
       bonus2 bSkillAtk,"EM_CONFLAGRATION",7*(.@r_weapon/3);
       bonus2 bSkillAtk,"EM_VENOM_SWAMP",7*(.@r_weapon/3);
       bonus2 bSkillAtk,"SO_POISON_BUSTER",5*(.@r_weapon/3);
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"EM_CONFLAGRATION",15;
          bonus2 bSkillAtk,"EM_VENOM_SWAMP",15;
       }
@@ -21744,7 +21744,7 @@ Body:
       bonus2 bSkillAtk,"EM_LIGHTNING_LAND",7*(.@r_weapon/3);
       bonus2 bSkillAtk,"EM_TERRA_DRIVE",7*(.@r_weapon/3);
       bonus2 bSkillAtk,"SO_PSYCHIC_WAVE",5*(.@r_weapon/3);
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"EM_LIGHTNING_LAND",15;
          bonus2 bSkillAtk,"EM_TERRA_DRIVE",15;
       }
@@ -22029,7 +22029,7 @@ Body:
          bonus2 bSkillAtk,"AG_CRIMSON_ARROW_ATK",10;
          bonus2 bSkillAtk,"AG_ROCK_DOWN",10;
       }
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus bSmatk,5;
          bonus bSpl,5;
          bonus2 bSkillAtk,"AG_CRIMSON_ARROW_ATK",10;
@@ -22046,7 +22046,7 @@ Body:
          bonus2 bSkillAtk,"AG_SOUL_VC_STRIKE",10;
          bonus2 bSkillAtk,"AG_FROZEN_SLASH",10;
       }
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus bSmatk,5;
          bonus bSpl,5;
          bonus2 bSkillAtk,"AG_SOUL_VC_STRIKE",10;
@@ -22062,7 +22062,7 @@ Body:
          bonus bLongAtkRate,10;
          bonus2 bSkillAtk,"WH_CRESCIVE_BOLT",10;
       }
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus bPAtk,5;
          bonus bCon,5;
          bonus2 bSkillAtk,"WH_CRESCIVE_BOLT",10;
@@ -22077,7 +22077,7 @@ Body:
          bonus bLongAtkRate,10;
          bonus2 bSkillAtk,"WH_GALESTORM",10;
       }
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus bPAtk,5;
          bonus bCon,5;
          bonus2 bSkillAtk,"WH_GALESTORM",10;
@@ -22092,7 +22092,7 @@ Body:
          bonus2 bMagicAtkEle,Ele_All,10;
          bonus2 bSkillAtk,"IG_CROSS_RAIN",10;
       }
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus bSmatk,5;
          bonus bSpl,5;
          bonus2 bSkillAtk,"IG_CROSS_RAIN",10;
@@ -22107,7 +22107,7 @@ Body:
          bonus bLongAtkRate,10;
          bonus2 bSkillAtk,"IG_SHIELD_SHOOTING",10;
       }
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus bPAtk,5;
          bonus bPow,5;
          bonus2 bSkillAtk,"IG_SHIELD_SHOOTING",10;
@@ -22123,7 +22123,7 @@ Body:
          bonus bShortAtkRate,10;
          bonus2 bSkillAtk,"CD_PETITIO",10;
       }
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus bPAtk,5;
          bonus bPow,5;
          bonus2 bSkillAtk,"CD_PETITIO",10;
@@ -22138,7 +22138,7 @@ Body:
          bonus2 bMagicAtkEle,Ele_All,10;
          bonus2 bSkillAtk,"CD_FRAMEN",10;
       }
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus bSmatk,5;
          bonus bSpl,5;
          bonus2 bSkillAtk,"CD_FRAMEN",10;
@@ -22205,7 +22205,7 @@ Body:
          bonus bShortAtkRate,10;
          bonus2 bSkillAtk,"SHC_ETERNAL_SLASH",10;
       }
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus bPAtk,5;
          bonus bPow,5;
          bonus2 bSkillAtk,"SHC_ETERNAL_SLASH",10;
@@ -22220,7 +22220,7 @@ Body:
          bonus bShortAtkRate,10;
          bonus2 bSkillAtk,"SHC_SAVAGE_IMPACT",10;
       }
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus bPAtk,5;
          bonus bPow,5;
          bonus2 bSkillAtk,"SHC_SAVAGE_IMPACT",10;
@@ -22235,7 +22235,7 @@ Body:
          bonus2 bMagicAtkEle,Ele_All,10;
          bonus2 bSkillAtk,"ABC_ABYSS_SQUARE",10;
       }
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus bSmatk,5;
          bonus bSpl,5;
          bonus2 bSkillAtk,"ABC_ABYSS_SQUARE",10;
@@ -22250,7 +22250,7 @@ Body:
          bonus bShortAtkRate,10;
          bonus2 bSkillAtk,"ABC_ABYSS_DAGGER",10;
       }
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus bPAtk,5;
          bonus bPow,5;
          bonus2 bSkillAtk,"ABC_ABYSS_DAGGER",10;
@@ -22267,7 +22267,7 @@ Body:
          bonus2 bSkillAtk,"RK_DRAGONBREATH_WATER",10;
          bonus2 bSkillAtk,"RK_DRAGONBREATH",10;
       }
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus bPAtk,5;
          bonus bPow,5;
          bonus2 bSkillAtk,"RK_DRAGONBREATH_WATER",10;
@@ -22284,7 +22284,7 @@ Body:
          bonus bShortAtkRate,10;
          bonus2 bSkillAtk,"DK_SERVANTWEAPON_ATK",10;
       }
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus bPAtk,5;
          bonus bPow,5;
          bonus2 bSkillAtk,"DK_SERVANTWEAPON_ATK",10;
@@ -22302,7 +22302,7 @@ Body:
          bonus2 bSkillAtk,"BO_ACIDIFIED_ZONE_WATER",10;
          bonus2 bSkillAtk,"BO_ACIDIFIED_ZONE_GROUND",10;
       }
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus bPAtk,5;
          bonus bPow,5;
          bonus2 bSkillAtk,"BO_ACIDIFIED_ZONE_WIND",10;
@@ -22320,7 +22320,7 @@ Body:
          bonus bShortAtkRate,10;
          bonus2 bSkillAtk,"GN_CART_TORNADO",10;
       }
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus bPAtk,5;
          bonus bPow,5;
          bonus2 bSkillAtk,"GN_CART_TORNADO",10;
@@ -22336,7 +22336,7 @@ Body:
          bonus2 bSkillAtk,"EM_TERRA_DRIVE",10;
          bonus2 bSkillAtk,"EM_VENOM_SWAMP",10;
       }
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus bSmatk,5;
          bonus bSpl,5;
          bonus2 bSkillAtk,"EM_TERRA_DRIVE",10;
@@ -22353,7 +22353,7 @@ Body:
          bonus2 bSkillAtk,"EM_DIAMOND_STORM",10;
          bonus2 bSkillAtk,"EM_LIGHTNING_LAND",10;
       }
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus bSmatk,5;
          bonus bSpl,5;
          bonus2 bSkillAtk,"EM_DIAMOND_STORM",10;
@@ -22368,11 +22368,11 @@ Body:
           - Barb_Wire_K_LT
     Script: |
       bonus2 bMagicAddSize,Size_All,15;
-      if (getequiprefinerycnt(EQI_HAND_R) >= 10 && getequiprefinerycnt(EQI_HAND_R) >= 10) {
+      if (getequiprefinerycnt(EQI_HAND_R) >= 10) {
          bonus2 bMagicAtkEle,Ele_All,10;
          bonus2 bSkillAtk,"TR_METALIC_FURY",10;
       }
-      if (getenchantgrade(EQI_HAND_R) >= 2 && getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus bSmatk,5;
          bonus bSpl,5;
          bonus2 bSkillAtk,"TR_METALIC_FURY",10;
@@ -22387,7 +22387,7 @@ Body:
          bonus bLongAtkRate,10;
          bonus2 bSkillAtk,"TR_RHYTHMSHOOTING",10;
       }
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus bPAtk,5;
          bonus bCon,5;
          bonus2 bSkillAtk,"TR_RHYTHMSHOOTING",10;
@@ -22821,7 +22821,7 @@ Body:
       bonus2 bSkillAtk,"DK_STORMSLASH",7*(.@r_weapon/3);
       bonus2 bSkillAtk,"RK_IGNITIONBREAK",5*(.@r_weapon/3);
       bonus2 bSkillAtk,"RK_WINDCUTTER",5*(.@r_weapon/3);
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"DK_STORMSLASH",15;
       }
   - Combos:
@@ -22841,7 +22841,7 @@ Body:
       .@r_weapon = getequiprefinerycnt(EQI_HAND_R);
       bonus2 bSkillAtk,"DK_MADNESS_CRUSHER",7*(.@r_weapon/3);
       bonus2 bSkillAtk,"RK_HUNDREDSPEAR",5*(.@r_weapon/3);
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"DK_MADNESS_CRUSHER",15;
       }
   - Combos:
@@ -22867,7 +22867,7 @@ Body:
       .@r_weapon = getequiprefinerycnt(EQI_HAND_R);
       bonus2 bSkillAtk,"TR_METALIC_FURY",7*(.@r_weapon/3);
       bonus2 bSkillAtk,"WM_METALICSOUND",5*(.@r_weapon/3);
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"TR_METALIC_FURY",15;
       }
   - Combos:
@@ -22893,7 +22893,7 @@ Body:
       .@r_weapon = getequiprefinerycnt(EQI_HAND_R);
       bonus2 bSkillAtk,"TR_RHYTHMSHOOTING",7*(.@r_weapon/3);
       bonus2 bSkillAtk,"WM_SEVERE_RAINSTORM",5*(.@r_weapon/3);
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"TR_RHYTHMSHOOTING",15;
       }
   - Combos:
@@ -22917,7 +22917,7 @@ Body:
       bonus2 bSkillAtk,"MT_AXE_STOMP",7*(.@r_weapon/3);
       bonus2 bSkillAtk,"NC_AXETORNADO",5*(.@r_weapon/3);
       bonus2 bSkillAtk,"NC_AXEBOOMERANG",5*(.@r_weapon/3);
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"MT_AXE_STOMP",15;
       }
   - Combos:
@@ -22937,7 +22937,7 @@ Body:
       .@r_weapon = getequiprefinerycnt(EQI_HAND_R);
       bonus2 bSkillAtk,"MT_A_MACHINE",7*(.@r_weapon/3);
       bonus2 bSkillAtk,"NC_VULCANARM",5*(.@r_weapon/3);
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"MT_A_MACHINE",15;
       }
   - Combos:
@@ -22960,7 +22960,7 @@ Body:
       bonus2 bSkillAtk,"BO_ACIDIFIED_ZONE_WATER",7*(.@r_weapon/3);
       bonus2 bSkillAtk,"BO_ACIDIFIED_ZONE_GROUND",7*(.@r_weapon/3);
       bonus2 bSkillAtk,"GN_CARTCANNON",5*(.@r_weapon/3);
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"BO_ACIDIFIED_ZONE_WIND",15;
          bonus2 bSkillAtk,"BO_ACIDIFIED_ZONE_FIRE",15;
          bonus2 bSkillAtk,"BO_ACIDIFIED_ZONE_WATER",15;
@@ -22983,7 +22983,7 @@ Body:
       .@r_weapon = getequiprefinerycnt(EQI_HAND_R);
       bonus2 bSkillAtk,"GN_HELLS_PLANT",15*(.@r_weapon/3);
       bonus2 bSkillAtk,"GN_CART_TORNADO",5*(.@r_weapon/3);
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"GN_HELLS_PLANT",25;
       }
   - Combos:
@@ -23003,7 +23003,7 @@ Body:
       .@r_weapon = getequiprefinerycnt(EQI_HAND_R);
       bonus2 bSkillAtk,"SS_FUUMASHOUAKU",7*(.@r_weapon/3);
       bonus2 bSkillAtk,"KO_HUUMARANKA",5*(.@r_weapon/3);
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"SS_FUUMASHOUAKU",15;
       }
   - Combos:
@@ -23023,7 +23023,7 @@ Body:
       .@r_weapon = getequiprefinerycnt(EQI_HAND_R);
       bonus2 bSkillAtk,"SS_KUNAIWAIKYOKU",7*(.@r_weapon/3);
       bonus2 bSkillAtk,"KO_JYUMONJIKIRI",5*(.@r_weapon/3);
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"SS_KUNAIWAIKYOKU",15;
       }
   - Combos:
@@ -23035,7 +23035,7 @@ Body:
       .@r_weapon = getequiprefinerycnt(EQI_HAND_R);
       bonus2 bSkillAtk,"NW_SPIRAL_SHOOTING",7*(.@r_weapon/3);
       bonus2 bSkillAtk,"RL_D_TAIL",5*(.@r_weapon/3);
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"NW_SPIRAL_SHOOTING",15;
       }
   - Combos:
@@ -23055,7 +23055,7 @@ Body:
       .@r_weapon = getequiprefinerycnt(EQI_HAND_R);
       bonus2 bSkillAtk,"NW_MAGAZINE_FOR_ONE",7*(.@r_weapon/3);
       bonus2 bSkillAtk,"RL_FIREDANCE",5*(.@r_weapon/3);
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"NW_MAGAZINE_FOR_ONE",15;
       }
   - Combos:
@@ -23075,7 +23075,7 @@ Body:
       .@r_weapon = getequiprefinerycnt(EQI_HAND_R);
       bonus2 bSkillAtk,"NW_ONLY_ONE_BULLET",7*(.@r_weapon/3);
       bonus2 bSkillAtk,"RL_HAMMER_OF_GOD",5*(.@r_weapon/3);
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"NW_ONLY_ONE_BULLET",15;
       }
   - Combos:
@@ -23103,7 +23103,7 @@ Body:
       .@r_weapon = getequiprefinerycnt(EQI_HAND_R);
       bonus2 bSkillAtk,"NW_WILD_FIRE",7*(.@r_weapon/3);
       bonus2 bSkillAtk,"RL_S_STORM",5*(.@r_weapon/3);
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"NW_WILD_FIRE",15;
       }
   - Combos:
@@ -23123,7 +23123,7 @@ Body:
       .@r_weapon = getequiprefinerycnt(EQI_HAND_R);
       bonus2 bSkillAtk,"NW_THE_VIGILANTE_AT_NIGHT_GUN_GATLING",7*(.@r_weapon/3);
       bonus2 bSkillAtk,"RL_R_TRIP",5*(.@r_weapon/3);
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"NW_THE_VIGILANTE_AT_NIGHT_GUN_GATLING",15;
       }
   - Combos:
@@ -23146,7 +23146,7 @@ Body:
       bonus2 bSkillAtk,"SOA_TALISMAN_OF_BLACK_TORTOISE",7*(.@r_weapon/3);
       bonus2 bSkillAtk,"SP_SPA",5*(.@r_weapon/3);
       bonus2 bSkillAtk,"SP_SWHOO",5*(.@r_weapon/3);
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"SOA_TALISMAN_OF_RED_PHOENIX",15;
          bonus2 bSkillAtk,"SOA_TALISMAN_OF_BLACK_TORTOISE",15;
       }
@@ -23167,7 +23167,7 @@ Body:
       .@r_weapon = getequiprefinerycnt(EQI_HAND_R);
       bonus2 bSkillAtk,"SOA_EXORCISM_OF_MALICIOUS_SOUL",7*(.@r_weapon/3);
       bonus2 bSkillAtk,"SP_CURSEEXPLOSION",5*(.@r_weapon/3);
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"SOA_EXORCISM_OF_MALICIOUS_SOUL",15;
       }
   - Combos:
@@ -23189,7 +23189,7 @@ Body:
       bonus2 bSkillAtk,"SKE_MIDNIGHT_KICK",7*(.@r_weapon/3);
       bonus2 bSkillAtk,"SJ_FULLMOONKICK",5*(.@r_weapon/3);
       bonus2 bSkillAtk,"SJ_NEWMOONKICK",5*(.@r_weapon/3);
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"SKE_MIDNIGHT_KICK",15;
       }
   - Combos:
@@ -23209,7 +23209,7 @@ Body:
       .@r_weapon = getequiprefinerycnt(EQI_HAND_R);
       bonus2 bSkillAtk,"SKE_STAR_CANNON",7*(.@r_weapon/3);
       bonus2 bSkillAtk,"SJ_FALLINGSTAR_ATK",5*(.@r_weapon/3);
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"SKE_STAR_CANNON",15;
       }
   - Combos:
@@ -23231,7 +23231,7 @@ Body:
       bonus2 bSkillAtk,"SH_CHUL_HO_SONIC_CLAW",7*(.@r_weapon/3);
       bonus2 bSkillAtk,"SU_LUNATICCARROTBEAT",5*(.@r_weapon/3);
       bonus2 bSkillAtk,"SU_PICKYPECK",5*(.@r_weapon/3);
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"SH_CHUL_HO_SONIC_CLAW",15;
       }
   - Combos:
@@ -23253,7 +23253,7 @@ Body:
       bonus2 bSkillAtk,"SH_HYUN_ROKS_BREEZE",7*(.@r_weapon/3);
       bonus2 bSkillAtk,"SU_SV_STEMSPEAR",5*(.@r_weapon/3);
       bonus2 bSkillAtk,"SU_CN_METEOR",5*(.@r_weapon/3);
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"SH_HYUN_ROKS_BREEZE",15;
       }
   - Combos:
@@ -23329,7 +23329,7 @@ Body:
          bonus bLongAtkRate,10;
          bonus2 bSkillAtk,"NC_ARMSCANNON",10;
       }
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus bPAtk,5;
          bonus bPow,5;
          bonus2 bSkillAtk,"NC_ARMSCANNON",10;
@@ -23344,7 +23344,7 @@ Body:
          bonus bShortAtkRate,10;
          bonus2 bSkillAtk,"MT_AXE_STOMP",10;
       }
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus bPAtk,5;
          bonus bPow,5;
          bonus2 bSkillAtk,"MT_AXE_STOMP",10;
@@ -23359,7 +23359,7 @@ Body:
          bonus bLongAtkRate,10;
          bonus2 bSkillAtk,"IQ_EXPOSION_BLASTER",10;
       }
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus bPAtk,5;
          bonus bPow,5;
          bonus2 bSkillAtk,"IQ_EXPOSION_BLASTER",10;
@@ -23374,7 +23374,7 @@ Body:
          bonus bShortAtkRate,10;
          bonus2 bSkillAtk,"IQ_THIRD_FLAME_BOMB",10;
       }
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus bPAtk,5;
          bonus bPow,5;
          bonus2 bSkillAtk,"IQ_THIRD_FLAME_BOMB",10;
@@ -23392,7 +23392,7 @@ Body:
          bonus2 bSkillAtk,"SS_KUNAIWAIKYOKU",10;
          bonus2 bSkillAtk,"SS_KUNAIKAITEN",10;
       }
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus bPAtk,5;
          bonus bPow,5;
          bonus2 bSkillAtk,"SS_KUNAIWAIKYOKU",10;
@@ -23408,7 +23408,7 @@ Body:
          bonus bLongAtkRate,10;
          bonus2 bSkillAtk,"SS_FUUMASHOUAKU",10;
       }
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus bPAtk,5;
          bonus bPow,5;
          bonus2 bSkillAtk,"SS_FUUMASHOUAKU",10;
@@ -23423,7 +23423,7 @@ Body:
          bonus bCritAtkRate,10;
          bonus2 bSkillAtk,"NW_MAGAZINE_FOR_ONE",10;
       }
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus bPAtk,5;
          bonus bPow,5;
          bonus2 bSkillAtk,"NW_MAGAZINE_FOR_ONE",10;
@@ -23440,7 +23440,7 @@ Body:
          bonus2 bSkillAtk,"NW_HASTY_FIRE_IN_THE_HOLE",10;
          bonus2 bSkillAtk,"NW_BASIC_GRENADE",10;
       }
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus bPAtk,5;
          bonus bPow,5;
          bonus2 bSkillAtk,"NW_HASTY_FIRE_IN_THE_HOLE",10;
@@ -23456,7 +23456,7 @@ Body:
          bonus bLongAtkRate,10;
          bonus2 bSkillAtk,"NW_WILD_FIRE",10;
       }
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus bPAtk,5;
          bonus bPow,5;
          bonus2 bSkillAtk,"NW_WILD_FIRE",10;
@@ -23471,7 +23471,7 @@ Body:
          bonus bLongAtkRate,10;
          bonus2 bSkillAtk,"NW_THE_VIGILANTE_AT_NIGHT_GUN_GATLING",10;
       }
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus bPAtk,5;
          bonus bPow,5;
          bonus2 bSkillAtk,"NW_THE_VIGILANTE_AT_NIGHT_GUN_GATLING",10;
@@ -23486,7 +23486,7 @@ Body:
          bonus bLongAtkRate,10;
          bonus2 bSkillAtk,"NW_SPIRAL_SHOOTING",10;
       }
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus bPAtk,5;
          bonus bPow,5;
          bonus2 bSkillAtk,"NW_SPIRAL_SHOOTING",10;
@@ -23502,7 +23502,7 @@ Body:
          bonus2 bSkillAtk,"SOA_TALISMAN_OF_BLUE_DRAGON",10;
          bonus2 bSkillAtk,"SOA_TALISMAN_OF_WHITE_TIGER",10;
       }
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus bSmatk,5;
          bonus bSpl,5;
          bonus2 bSkillAtk,"SOA_TALISMAN_OF_BLUE_DRAGON",10;
@@ -23519,7 +23519,7 @@ Body:
          bonus2 bSkillAtk,"SKE_NOON_BLAST",10;
          bonus2 bSkillAtk,"SKE_SUNSET_BLAST",10;
       }
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus bPAtk,5;
          bonus bPow,5;
          bonus2 bSkillAtk,"SKE_NOON_BLAST",10;
@@ -23538,7 +23538,7 @@ Body:
          bonus2 bSkillAtk,"SH_HYUN_ROKS_BREEZE",10;
          bonus2 bSkillAtk,"SH_HOGOGONG_STRIKE",10;
       }
-      if (getenchantgrade(EQI_HAND_R) >= 2) {
+      if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus bSmatk,5;
          bonus bSpl,5;
          bonus2 bSkillAtk,"SH_HYUN_ROKS_BREEZE",10;
@@ -25779,7 +25779,7 @@ Body:
   - Combos:
       - Combo:
           - ShoesOfHero     # 22129
-          - Veteran_Sword_     # 1188
+          - Veteran_Sword     # 1188
       - Combo:
           - ShoesOfHero     # 22129
           - Veteran_Sword_     # 21024

db/re/item_db_etc.yml

@@ -53106,16 +53106,16 @@ Body:
       .@g = getenchantgrade();
       bonus bShortAtkRate,.@param;
       bonus bBaseAtk,5*.@param;
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bShortAtkRate,.@param;
          bonus bPAtk,.@param;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bShortAtkRate,.@param;
             bonus bPAtk,.@param;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bShortAtkRate,.@param;
                bonus bPAtk,.@param;
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus bShortAtkRate,.@param;
                   bonus bPAtk,.@param;
                }
@@ -53132,16 +53132,16 @@ Body:
       .@g = getenchantgrade();
       bonus bShortAtkRate,.@param;
       bonus bBaseAtk,7*.@param;
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bShortAtkRate,.@param;
          bonus bPAtk,.@param;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bShortAtkRate,.@param;
             bonus bPAtk,.@param;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bShortAtkRate,.@param;
                bonus bPAtk,2*.@param;
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus bShortAtkRate,2*.@param;
                   bonus bPAtk,2*.@param;
                }
@@ -53158,16 +53158,16 @@ Body:
       .@g = getenchantgrade();
       bonus bShortAtkRate,2*.@param;
       bonus bBaseAtk,15*.@param;
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bShortAtkRate,.@param;
          bonus bPAtk,.@param;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bShortAtkRate,.@param;
             bonus bPAtk,2*.@param;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bShortAtkRate,2*.@param;
                bonus bPAtk,2*.@param;
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus bShortAtkRate,3*.@param;
                   bonus bPAtk,3*.@param;
                }
@@ -53184,16 +53184,16 @@ Body:
       .@g = getenchantgrade();
       bonus bMaxHPrate,.@param;
       bonus bRes,.@param;
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bMaxHPrate,.@param;
          bonus bRes,.@param;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bMaxHPrate,.@param;
             bonus bRes,.@param;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bMaxHPrate,.@param;
                bonus bRes,.@param;
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus bMaxHPrate,.@param;
                   bonus bRes,2*.@param;
                }
@@ -53210,16 +53210,16 @@ Body:
       .@g = getenchantgrade();
       bonus bMaxHPrate,2*.@param;
       bonus bRes,2*.@param;
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bMaxHPrate,.@param;
          bonus bRes,.@param;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bMaxHPrate,.@param;
             bonus bRes,.@param;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bMaxHPrate,2*.@param;
                bonus bRes,.@param;
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus bMaxHPrate,2*.@param;
                   bonus bRes,2*.@param;
                }
@@ -53236,16 +53236,16 @@ Body:
       .@g = getenchantgrade();
       bonus bMaxHPrate,3*.@param;
       bonus bRes,4*.@param;
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bMaxHPrate,.@param;
          bonus bRes,.@param;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bMaxHPrate,2*.@param;
             bonus bRes,2*.@param;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bMaxHPrate,2*.@param;
                bonus bRes,2*.@param;
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus bMaxHPrate,3*.@param;
                   bonus bRes,3*.@param;
                }
@@ -53262,16 +53262,16 @@ Body:
       .@g = getenchantgrade();
       bonus bLongAtkRate,.@param;
       bonus bBaseAtk,5*.@param;
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bLongAtkRate,.@param;
          bonus bPAtk,.@param;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bLongAtkRate,.@param;
             bonus bPAtk,.@param;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bLongAtkRate,.@param;
                bonus bPAtk,.@param;
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus bLongAtkRate,.@param;
                   bonus bPAtk,2*.@param;
                }
@@ -53288,16 +53288,16 @@ Body:
       .@g = getenchantgrade();
       bonus bLongAtkRate,2*.@param;
       bonus bBaseAtk,7*.@param;
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bLongAtkRate,.@param;
          bonus bPAtk,.@param;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bLongAtkRate,.@param;
             bonus bPAtk,.@param;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bLongAtkRate,.@param;
                bonus bPAtk,2*.@param;
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus bLongAtkRate,2*.@param;
                   bonus bPAtk,2*.@param;
                }
@@ -53314,16 +53314,16 @@ Body:
       .@g = getenchantgrade();
       bonus bLongAtkRate,2*.@param;
       bonus bBaseAtk,15*.@param;
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bLongAtkRate,.@param;
          bonus bPAtk,.@param;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bLongAtkRate,2*.@param;
             bonus bPAtk,2*.@param;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bLongAtkRate,2*.@param;
                bonus bPAtk,2*.@param;
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus bLongAtkRate,3*.@param;
                   bonus bPAtk,3*.@param;
                }
@@ -53340,16 +53340,16 @@ Body:
       .@g = getenchantgrade();
       bonus bCritAtkRate,.@param;
       bonus bBaseAtk,5*.@param;
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bCritAtkRate,.@param;
          bonus bPAtk,.@param;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bCritAtkRate,.@param;
             bonus bPAtk,.@param;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bCritAtkRate,.@param;
                bonus bPAtk,.@param;
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus bCritAtkRate,.@param;
                   bonus bPAtk,.@param;
                }
@@ -53366,16 +53366,16 @@ Body:
       .@g = getenchantgrade();
       bonus bCritAtkRate,2*.@param;
       bonus bBaseAtk,7*.@param;
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bCritAtkRate,.@param;
          bonus bPAtk,.@param;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bCritAtkRate,.@param;
             bonus bPAtk,.@param;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bCritAtkRate,.@param;
                bonus bPAtk,2*.@param;
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus bCritAtkRate,2*.@param;
                   bonus bPAtk,2*.@param;
                }
@@ -53392,16 +53392,16 @@ Body:
       .@g = getenchantgrade();
       bonus bCritAtkRate,3*.@param;
       bonus bBaseAtk,15*.@param;
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bCritAtkRate,.@param;
          bonus bPAtk,.@param;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bCritAtkRate,.@param;
             bonus bPAtk,.@param;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bCritAtkRate,2*.@param;
                bonus bPAtk,3*.@param;
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus bCritAtkRate,3*.@param;
                   bonus bCrate,.@param;
                }
@@ -53418,16 +53418,16 @@ Body:
       .@g = getenchantgrade();
       bonus2 bMagicAtkEle,Ele_All,.@param;
       bonus bMatk,5*.@param;
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bMagicAtkEle,Ele_All,.@param;
          bonus bSmatk,.@param;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus2 bMagicAtkEle,Ele_All,.@param;
             bonus bSmatk,.@param;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus2 bMagicAtkEle,Ele_All,.@param;
                bonus bSmatk,.@param;
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus2 bMagicAtkEle,Ele_All,.@param;
                   bonus bSmatk,.@param;
                }
@@ -53444,16 +53444,16 @@ Body:
       .@g = getenchantgrade();
       bonus2 bMagicAtkEle,Ele_All,2*.@param;
       bonus bMatk,7*.@param;
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bMagicAtkEle,Ele_All,.@param;
          bonus bSmatk,.@param;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus2 bMagicAtkEle,Ele_All,.@param;
             bonus bSmatk,.@param;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus2 bMagicAtkEle,Ele_All,2*.@param;
                bonus bSmatk,.@param;
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus2 bMagicAtkEle,Ele_All,2*.@param;
                   bonus bSmatk,2*.@param;
                }
@@ -53470,16 +53470,16 @@ Body:
       .@g = getenchantgrade();
       bonus2 bMagicAtkEle,Ele_All,3*.@param;
       bonus bMatk,15*.@param;
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bMagicAtkEle,Ele_All,.@param;
          bonus bSmatk,.@param;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus2 bMagicAtkEle,Ele_All,.@param;
             bonus bSmatk,.@param;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus2 bMagicAtkEle,Ele_All,2*.@param;
                bonus bSmatk,2*.@param;
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus2 bMagicAtkEle,Ele_All,3*.@param;
                   bonus bSmatk,2*.@param;
                }
@@ -53496,18 +53496,18 @@ Body:
       .@g = getenchantgrade();
       bonus bMaxSPrate,.@param;
       bonus bHealPower,.@param;
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bMaxSPrate,.@param;
          bonus bHealPower,.@param;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bSPrecovRate,.@param;
             bonus bMaxSPrate,.@param;
             bonus bHealPower,2*.@param;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bSPrecovRate,2*.@param;
                bonus bMaxSPrate,.@param;
                bonus bHealPower,2*.@param;
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus bHplus,.@param;
                   bonus bMaxSPrate,.@param;
                }
@@ -53524,18 +53524,18 @@ Body:
       .@g = getenchantgrade();
       bonus bMaxSPrate,.@param;
       bonus bHealPower,3*.@param;
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bMaxSPrate,.@param;
          bonus bHealPower,2*.@param;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bSPrecovRate,.@param;
             bonus bMaxSPrate,.@param;
             bonus bHealPower,2*.@param;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bSPrecovRate,2*.@param;
                bonus bHplus,.@param;
                bonus bMaxSPrate,.@param;
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus bHplus,2*.@param;
                   bonus bMaxSPrate,2*.@param;
                }
@@ -53552,18 +53552,18 @@ Body:
       .@g = getenchantgrade();
       bonus bMaxSPrate,2*.@param;
       bonus bHealPower,5*.@param;
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bMaxSPrate,.@param;
          bonus bHealPower,2*.@param;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bSPrecovRate,2*.@param;
             bonus bMaxSPrate,.@param;
             bonus bHealPower,2*.@param;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bSPrecovRate,3*.@param;
                bonus bHplus,2*.@param;
                bonus bMaxSPrate,2*.@param;
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus bHplus,3*.@param;
                   bonus bMaxSPrate,2*.@param;
                }
@@ -54556,13 +54556,13 @@ Body:
       bonus bPow,1;
       bonus bPAtk,.@param;
       bonus bBaseAtk,3*.@param;
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bPAtk,.@param;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bPAtk,.@param;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPAtk,.@param;
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus bPAtk,.@param;
                }
             }
@@ -54579,13 +54579,13 @@ Body:
       bonus bPow,2;
       bonus bPAtk,2*.@param;
       bonus bBaseAtk,4*.@param;
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bPAtk,.@param;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bPAtk,.@param;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPAtk,.@param;
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus bPAtk,2*.@param;
                }
             }
@@ -54602,13 +54602,13 @@ Body:
       bonus bPow,3;
       bonus bPAtk,3*.@param;
       bonus bBaseAtk,5*.@param;
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bPAtk,.@param;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bPAtk,2*.@param;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPAtk,2*.@param;
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus bPAtk,2*.@param;
                }
             }
@@ -54625,13 +54625,13 @@ Body:
       bonus bSpl,1;
       bonus bSmatk,.@param;
       bonus bMatk,3*.@param;
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bSmatk,.@param;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bSmatk,.@param;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bSmatk,.@param;
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus bSmatk,.@param;
                }
             }
@@ -54648,13 +54648,13 @@ Body:
       bonus bSpl,2;
       bonus bSmatk,2*.@param;
       bonus bMatk,4*.@param;
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bSmatk,.@param;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bSmatk,.@param;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bSmatk,.@param;
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus bSmatk,2*.@param;
                }
             }
@@ -54671,13 +54671,13 @@ Body:
       bonus bSpl,3;
       bonus bSmatk,3*.@param;
       bonus bMatk,5*.@param;
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bSmatk,.@param;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bSmatk,2*.@param;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bSmatk,2*.@param;
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus bSmatk,2*.@param;
                }
             }
@@ -54694,13 +54694,13 @@ Body:
       bonus bCon,1;
       bonus bPAtk,.@param;
       bonus bBaseAtk,3*.@param;
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bPAtk,.@param;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bPAtk,.@param;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPAtk,.@param;
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus bPAtk,.@param;
                }
             }
@@ -54717,13 +54717,13 @@ Body:
       bonus bCon,2;
       bonus bPAtk,2*.@param;
       bonus bBaseAtk,4*.@param;
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bPAtk,.@param;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bPAtk,.@param;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPAtk,.@param;
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus bPAtk,2*.@param;
                }
             }
@@ -54740,13 +54740,13 @@ Body:
       bonus bCon,3;
       bonus bPAtk,3*.@param;
       bonus bBaseAtk,5*.@param;
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bPAtk,.@param;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bPAtk,2*.@param;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPAtk,2*.@param;
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus bPAtk,2*.@param;
                }
             }
@@ -54764,13 +54764,13 @@ Body:
       bonus bCritAtkRate,3*.@param;
       bonus bPAtk,.@param;
       bonus bBaseAtk,3*.@param;
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bPAtk,.@param;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bPAtk,.@param;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPAtk,.@param;
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus bPAtk,2*.@param;
                }
             }
@@ -54788,13 +54788,13 @@ Body:
       bonus bCritAtkRate,4*.@param;
       bonus bPAtk,2*.@param;
       bonus bBaseAtk,4*.@param;
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bPAtk,.@param;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bPAtk,.@param;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPAtk,.@param;
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus bPAtk,2*.@param;
                }
             }
@@ -54812,13 +54812,13 @@ Body:
       bonus bCritAtkRate,5*.@param;
       bonus bPAtk,2*.@param;
       bonus bBaseAtk,5*.@param;
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bPAtk,.@param;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bPAtk,.@param;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPAtk,.@param;
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus bPAtk,2*.@param;
                }
             }
@@ -54835,16 +54835,16 @@ Body:
       bonus bWis,1;
       bonus bMaxSPrate,.@param;
       bonus bHealPower,.@param;
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bMaxSPrate,.@param;
          bonus bHealPower,.@param;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bMaxSPrate,.@param;
             bonus bHealPower,.@param;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bMaxSPrate,.@param;
                bonus bHealPower,2*.@param;
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus bMaxSPrate,.@param;
                   bonus bHealPower,2*.@param;
                }
@@ -54862,16 +54862,16 @@ Body:
       bonus bWis,2;
       bonus bMaxSPrate,2*.@param;
       bonus bHealPower,2*.@param;
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bMaxSPrate,.@param;
          bonus bHealPower,.@param;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bMaxSPrate,.@param;
             bonus bHealPower,2*.@param;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bMaxSPrate,.@param;
                bonus bHealPower,2*.@param;
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus bHplus,.@param;
                   bonus bMaxSPrate,2*.@param;
                }
@@ -54889,16 +54889,16 @@ Body:
       bonus bWis,3;
       bonus bMaxSPrate,3*.@param;
       bonus bHealPower,3*.@param;
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bMaxSPrate,.@param;
          bonus bHealPower,.@param;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bMaxSPrate,.@param;
             bonus bHealPower,2*.@param;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bHplus,.@param;
                bonus bMaxSPrate,.@param;
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus bHplus,2*.@param;
                   bonus bMaxSPrate,2*.@param;
                }
@@ -54916,16 +54916,16 @@ Body:
       bonus bSta,1;
       bonus bMaxHP,250*.@param;
       bonus bRes,.@param;
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bMaxHPrate,.@param;
          bonus bRes,.@param;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bMaxHPrate,.@param;
             bonus bRes,.@param;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bMaxHPrate,.@param;
                bonus bRes,.@param;
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus bMaxHPrate,.@param;
                   bonus bRes,.@param;
                }
@@ -54943,16 +54943,16 @@ Body:
       bonus bSta,2;
       bonus bMaxHP,400*.@param;
       bonus bRes,2*.@param;
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bMaxHPrate,.@param;
          bonus bRes,.@param;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bMaxHPrate,.@param;
             bonus bRes,.@param;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bMaxHPrate,.@param;
                bonus bRes,.@param;
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus bMaxHPrate,.@param;
                   bonus bRes,2*.@param;
                }
@@ -54970,16 +54970,16 @@ Body:
       bonus bSta,3;
       bonus bMaxHP,600*.@param;
       bonus bRes,3*.@param;
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bMaxHPrate,.@param;
          bonus bRes,.@param;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bMaxHPrate,.@param;
             bonus bRes,.@param;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bMaxHPrate,.@param;
                bonus bRes,2*.@param;
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus bMaxHPrate,2*.@param;
                   bonus bRes,2*.@param;
                }

db/re/item_db_usable.yml

@@ -31876,7 +31876,7 @@ Body:
       NoAuction: true
     Script: |
       specialeffect2 EF_HEAL3;
-      sc_start4 SC_S_LIFEPOTION,600000,-5,5,0,0;
+      sc_start2 SC_S_LIFEPOTION,600000,-5,5;
   - Id: 14535
     AegisName: Med_Life_Potion
     Name: Medium Life Potion
@@ -31892,7 +31892,7 @@ Body:
       NoAuction: true
     Script: |
       specialeffect2 EF_HEAL3;
-      sc_start4 SC_L_LIFEPOTION,600000,-7,4,0,0;
+      sc_start2 SC_L_LIFEPOTION,600000,-7,4;
   - Id: 14536
     AegisName: Abrasive
     Name: Abrasive
@@ -34262,7 +34262,7 @@ Body:
       NoAuction: true
     Script: |
       specialeffect2 EF_HEAL3;
-      sc_start4 SC_L_LIFEPOTION,600000,-7,4,0,0;
+      sc_start2 SC_L_LIFEPOTION,600000,-7,4;
   - Id: 14886
     AegisName: UltimateCook_S
     Name: "[Scroll] Ultimate Cook"
@@ -47517,6 +47517,32 @@ Body:
     Script: |
       specialeffect2 EF_POTION_BERSERK;
       bonus_script "{ bonus bMaxHPrate,5; bonus bMaxSPrate,5; bonus bCritAtkRate,5; bonus bLongAtkRate,5; bonus bMatkRate,5; bonus bNoCastCancel; }",1800,1,1,EFST_INFINITY_DRINK;
+  - Id: 23505
+    AegisName: Yellow_Potion_B_20
+    Name: "[Not for Sale] Yellow Potions Box 20"   # !todo check english name
+    Type: Usable
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoStorage: true
+      NoGuildStorage: true
+      NoAuction: true
+    Script: |
+      getitem 11566,20;
+  - Id: 23506
+    AegisName: White_Potion_B_20
+    Name: "[Not for Sale] White Potion Box 20"   # !todo check english name
+    Type: Usable
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoStorage: true
+      NoGuildStorage: true
+      NoAuction: true
+    Script: |
+      getitem 11565,20;
   - Id: 23524
     AegisName: Enchant_Stone_Box13
     Name: Costume Enchant Stone Box 13
@@ -47621,6 +47647,113 @@ Body:
     Script: |
       percentheal 5,0;
       sc_start SC_MATKPOTION,600000,3;
+  - Id: 23582
+    AegisName: E_Wing_Of_Fly_3Day_Box
+    Name: "[Not for Sale] Infinite Flywing Box 7-Day"    # !todo check english name
+    Type: Usable
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoStorage: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+    Script: |
+      rentitem 12887,604800;
+  - Id: 23583
+    AegisName: Rebeginer_Box
+    Name: Beginner's Armor Box    # !todo check english name
+    Type: Usable
+    EquipLevelMin: 100
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoStorage: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+    Script: |
+      getitem 19310,1;
+      getitem 15250,1;
+      getitem 20906,1;
+      getitem 22173,1;
+      getitem 28566,1;
+  - Id: 23584
+    AegisName: Rebeginer_S_Box
+    Name: Shadow Box for Beginners    # !todo check english name
+    Type: Usable
+    EquipLevelMin: 120
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoStorage: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+    Script: |
+      getitem 24387,1;
+      getitem 24388,1;
+      getitem 24390,1;
+      getitem 24389,1;
+      getitem 24391,1;
+      getitem 24392,1;
+  - Id: 23585
+    AegisName: Rebeginer_Box_100
+    Name: Beginner Support Box (100)    # !todo check english name
+    Type: Usable
+    EquipLevelMin: 100
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoStorage: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+    Script: |
+      getitem 23505,25;
+      getitem 23583,1;
+      getitem 23582,1;
+      getitem 23427,1;
+      getitem 23586,1;
+  - Id: 23586
+    AegisName: Rebeginer_Box_110
+    Name: Beginner Support Box (110)    # !todo check english name
+    Type: Usable
+    EquipLevelMin: 110
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoStorage: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+    Script: |
+      getitem 23506,20;
+      getitem 23582,2;
+      getitem 23428,1;
+      getitem 23587,1;
+  - Id: 23587
+    AegisName: Rebeginer_Box_120
+    Name: Beginner Support Box (120)    # !todo check english name
+    Type: Usable
+    EquipLevelMin: 120
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoStorage: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+    Script: |
+      getitem 23506,25;
+      getitem 23582,3;
+      getitem 23584,1;
   - Id: 23604
     AegisName: Main_Dish_Course
     Name: Main Dish Course
@@ -48030,172 +48163,39 @@ Body:
     Weight: 50
     Script: |
       laphine_upgrade();
-  - Id: 23505
-    AegisName: Yellow_Potion_B_20
-    Name: "[Not for Sale] Yellow Potions Box 20"   # !todo check english name
-    Type: Usable
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoStorage: true
-      NoGuildStorage: true
-      NoAuction: true
-    Script: |
-      getitem 11566,20;
-  - Id: 23506
-    AegisName: White_Potion_B_20
-    Name: "[Not for Sale] White Potion Box 20"   # !todo check english name
-    Type: Usable
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoStorage: true
-      NoGuildStorage: true
-      NoAuction: true
+  - Id: 23815
+    AegisName: Magma_Essence
+    Name: Lava Essence
+    Type: Delayconsume
+    Weight: 50
     Script: |
-      getitem 11565,20;
-  - Id: 23582
-    AegisName: E_Wing_Of_Fly_3Day_Box
-    Name: "[Not for Sale] Infinite Flywing Box 7-Day"    # !todo check english name
-    Type: Usable
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoStorage: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
+      laphine_upgrade();
+  - Id: 23817
+    AegisName: Bs_Making_S
+    Name: Mysterious Combination Bundle
+    Type: Delayconsume
+    Weight: 10
     Script: |
-      rentitem 12887,604800;
-  - Id: 23583
-    AegisName: Rebeginer_Box
-    Name: Beginner's Armor Box    # !todo check english name
-    Type: Usable
-    EquipLevelMin: 100
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoStorage: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
+      /* TODO Update Description */
+  - Id: 23818
+    AegisName: Bs_Item_M_S_2
+    Name: Giant Orc Helm Combination SynthesisBox
+    Type: Delayconsume
+    Weight: 10
     Script: |
-      getitem 19310,1;
-      getitem 15250,1;
-      getitem 20906,1;
-      getitem 22173,1;
-      getitem 28566,1;
-  - Id: 23584
-    AegisName: Rebeginer_S_Box
-    Name: Shadow Box for Beginners    # !todo check english name
-    Type: Usable
-    EquipLevelMin: 120
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoStorage: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
+      laphine_synthesis();
+  - Id: 23819
+    AegisName: Bs_Item_M_S_8
+    Name: Crimson Rose SynthesisBox
+    Type: Delayconsume
+    Weight: 10
     Script: |
-      getitem 24387,1;
-      getitem 24388,1;
-      getitem 24390,1;
-      getitem 24389,1;
-      getitem 24391,1;
-      getitem 24392,1;
-  - Id: 23585
-    AegisName: Rebeginer_Box_100
-    Name: Beginner Support Box (100)    # !todo check english name
-    Type: Usable
-    EquipLevelMin: 100
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoStorage: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-    Script: |
-      getitem 23505,25;
-      getitem 23583,1;
-      getitem 23582,1;
-      getitem 23427,1;
-      getitem 23586,1;
-  - Id: 23586
-    AegisName: Rebeginer_Box_110
-    Name: Beginner Support Box (110)    # !todo check english name
-    Type: Usable
-    EquipLevelMin: 110
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoStorage: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-    Script: |
-      getitem 23506,20;
-      getitem 23582,2;
-      getitem 23428,1;
-      getitem 23587,1;
-  - Id: 23587
-    AegisName: Rebeginer_Box_120
-    Name: Beginner Support Box (120)    # !todo check english name
-    Type: Usable
-    EquipLevelMin: 120
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoStorage: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-    Script: |
-      getitem 23506,25;
-      getitem 23582,3;
-      getitem 23584,1;
-  - Id: 23815
-    AegisName: Magma_Essence
-    Name: Lava Essence
-    Type: Delayconsume
-    Weight: 50
-    Script: |
-      laphine_upgrade();
-  - Id: 23817
-    AegisName: Bs_Making_S
-    Name: Mysterious Combination Bundle
-    Type: Delayconsume
-    Weight: 10
-    Script: |
-      /* TODO Update Description */
-  - Id: 23818
-    AegisName: Bs_Item_M_S_2
-    Name: Giant Orc Helm Combination SynthesisBox
-    Type: Delayconsume
-    Weight: 10
-    Script: |
-      laphine_synthesis();
-  - Id: 23819
-    AegisName: Bs_Item_M_S_8
-    Name: Crimson Rose SynthesisBox
-    Type: Delayconsume
-    Weight: 10
-    Script: |
-      laphine_synthesis();
-  - Id: 23820
-    AegisName: Bs_Item_M_S_10
-    Name: Grand Peco Hairband SynthesisBox
-    Type: Delayconsume
-    Weight: 10
+      laphine_synthesis();
+  - Id: 23820
+    AegisName: Bs_Item_M_S_10
+    Name: Grand Peco Hairband SynthesisBox
+    Type: Delayconsume
+    Weight: 10
     Script: |
       laphine_synthesis();
   - Id: 23821
@@ -49111,178 +49111,6 @@ Body:
       Container: true
     Script: |
       getitem callfunc("F_Rand",31754,31755,31756,31757,31758,31759,31760,31761),1;
-  - Id: 100316
-    AegisName: G_Tyrs_Blessing
-    Name: Gin Tyr's Blessing    # !todo check english name
-    Type: Usable
-    Weight: 10
-    NoUse:
-      Sitting: true
-    Script: |
-      bonus_script "{ bonus bBaseAtk,20; bonus bMatk,20; bonus bHit,30; bonus bFlee,30; }",3600,3,1;
-      sc_start SC_SPEEDUP0,600000,25;
-  - Id: 100317
-    AegisName: G_Mental_Potion
-    Name: Gin Mental Potion    # !todo check english name
-    Type: Usable
-    Weight: 10
-    NoUse:
-      Sitting: true
-    Script: |
-      specialeffect2 EF_SPELLBREAKER;
-      bonus_script "{ bonus bUseSPrate,-10; bonus bMaxSPrate,10; }",3600,1,1,EFST_TARGET_ASPD;
-      sc_start SC_SPEEDUP0,600000,25;
-  - Id: 101097
-    AegisName: aegis_101097
-    Name: "[Scroll] Unlimited Drink"
-    Type: Usable
-    Weight: 10
-    Script: |
-      bonus_script "{ bonus bMaxHPrate,5; bonus bMaxSPrate,5; bonus bCritAtkRate,5; bonus bLongAtkRate,5; bonus2 bMagicAddEle,Ele_All,5; bonus bNoCastCancel;}",1800;
-  - Id: 101107
-    AegisName: Cannon_Box_Ice
-    Name: Cannon Box Ice
-    Type: Usable
-    Weight: 250
-    Flags:
-      Container: true
-    Script: |
-      getitem 18005,500;
-  - Id: 101108
-    AegisName: Cannon_Box_Lightning
-    Name: Cannon Box Lightning
-    Type: Usable
-    Weight: 250
-    Flags:
-      Container: true
-    Script: |
-      getitem 18006,500;
-  - Id: 101109
-    AegisName: Cannon_Box_Stone
-    Name: Cannon Box Stone
-    Type: Usable
-    Weight: 250
-    Flags:
-      Container: true
-    Script: |
-      getitem 18007,500;
-  - Id: 101110
-    AegisName: Cannon_Box_Flare
-    Name: Cannon Box Fire
-    Type: Usable
-    Weight: 250
-    Flags:
-      Container: true
-    Script: |
-      getitem 18008,500;
-  - Id: 101111
-    AegisName: Cannon_Box_Poisoning
-    Name: Cannon Box Poison
-    Type: Usable
-    Weight: 250
-    Flags:
-      Container: true
-    Script: |
-      getitem 18009,500;
-  - Id: 101112
-    AegisName: Kunai_Scroll
-    Name: Kunai Scroll
-    Type: Usable
-    Weight: 250
-    Flags:
-      Container: true
-    Script: |
-      getitem 1220001,500;
-  - Id: 101113
-    AegisName: Kunai_Scroll_Nothing
-    Name: Kunai Scroll Nothing
-    Type: Usable
-    Weight: 250
-    Flags:
-      Container: true
-    Script: |
-      getitem 1220002,500;
-  - Id: 101114
-    AegisName: Kunai_Scroll_Shadow
-    Name: Kunai Scroll Shadow
-    Type: Usable
-    Weight: 250
-    Flags:
-      Container: true
-    Script: |
-      getitem 1220003,500;
-  - Id: 101115
-    AegisName: Kunai_Scroll_Hamaya
-    Name: Kunai Scroll Hamaya
-    Type: Usable
-    Weight: 250
-    Flags:
-      Container: true
-    Script: |
-      getitem 1220004,500;
-  - Id: 101116
-    AegisName: Nw_Grenade_Box
-    Name: Nw Grenade Box
-    Type: Usable
-    Weight: 250
-    Flags:
-      Container: true
-    Script: |
-      getitem 1000564,500;
-  - Id: 101117
-    AegisName: Soa_Charm_Bundle
-    Name: Soa Charm Bundle
-    Type: Usable
-    Weight: 250
-    Flags:
-      Container: true
-    Script: |
-      getitem 1000563,500;
-  - Id: 101118
-    AegisName: SS_Charm_Box
-    Name: SS Charm Box
-    Type: Usable
-    Weight: 250
-    Flags:
-      Container: true
-    Script: |
-      getitem 1000565,500;
-  - Id: 101119
-    AegisName: SS_Charm_F_Box
-    Name: SS Charm F Box
-    Type: Usable
-    Weight: 250
-    Flags:
-      Container: true
-    Script: |
-      getitem 1000566,500;
-  - Id: 101120
-    AegisName: SS_Charm_W_Box
-    Name: SS Charm W Box
-    Type: Usable
-    Weight: 250
-    Flags:
-      Container: true
-    Script: |
-      getitem 1000567,500;
-  - Id: 101121
-    AegisName: SS_Charm_G_Box
-    Name: SS Charm G Box
-    Type: Usable
-    Weight: 250
-    Flags:
-      Container: true
-    Script: |
-      getitem 1000568,500;
-  - Id: 101122
-    AegisName: SS_Charm_L_Box
-    Name: SS Charm L Box
-    Type: Usable
-    Weight: 250
-    Flags:
-      Container: true
-    Script: |
-      getitem 1000569,500;
   - Id: 100125
     AegisName: Metal_7_Ticket
     Name: Metal Weapon +7 Refinement Ticket
@@ -49511,6 +49339,23 @@ Body:
       BuyingStore: true
     Script: |
       laphine_synthesis();
+  - Id: 100158
+    AegisName: Mado_Box02
+    Name: Mado Strengthening Suit
+    Type: Usable
+    Buy: 10000
+    Weight: 300
+    Jobs:
+      Blacksmith: true
+    Classes:
+      All_Third: true
+      Fourth: true
+    EquipLevelMin: 100
+    Delay:
+      Duration: 180000
+    Script: |
+      specialeffect2 EF_CLAYMORE;
+      setmadogear true,MADO_SUIT;
   - Id: 100164
     AegisName: Auto_Imp_Melee_1
     Name: Normal Automatic Improvement Device (Physical)
@@ -49950,6 +49795,27 @@ Body:
       Container: true
     Script: |
       getgroupitem(IG_Enchant_Stone_Box21);
+  - Id: 100316
+    AegisName: G_Tyrs_Blessing
+    Name: Gin Tyr's Blessing    # !todo check english name
+    Type: Usable
+    Weight: 10
+    NoUse:
+      Sitting: true
+    Script: |
+      bonus_script "{ bonus bBaseAtk,20; bonus bMatk,20; bonus bHit,30; bonus bFlee,30; }",3600,3,1;
+      sc_start SC_SPEEDUP0,600000,25;
+  - Id: 100317
+    AegisName: G_Mental_Potion
+    Name: Gin Mental Potion    # !todo check english name
+    Type: Usable
+    Weight: 10
+    NoUse:
+      Sitting: true
+    Script: |
+      specialeffect2 EF_SPELLBREAKER;
+      bonus_script "{ bonus bUseSPrate,-10; bonus bMaxSPrate,10; }",3600,1,1,EFST_TARGET_ASPD;
+      sc_start SC_SPEEDUP0,600000,25;
   - Id: 100321
     AegisName: OS_Weapon_Refine_Cube
     Name: OS Weapon +11 Refinement Cube
@@ -50391,23 +50257,6 @@ Body:
     Weight: 10
     Script: |
       laphine_synthesis();
-  - Id: 100158
-    AegisName: Mado_Box02
-    Name: Mado Strengthening Suit
-    Type: Usable
-    Buy: 10000
-    Weight: 300
-    Jobs:
-      Blacksmith: true
-    Classes:
-      All_Third: true
-      Fourth: true
-    EquipLevelMin: 100
-    Delay:
-      Duration: 180000
-    Script: |
-      specialeffect2 EF_CLAYMORE;
-      setmadogear true,MADO_SUIT;
   - Id: 100412
     AegisName: Great_Hero_Bravery
     Name: Great Hero's Bravery
@@ -51352,6 +51201,157 @@ Body:
       BuyingStore: true
     Script: |
       /* reform(); */
+  - Id: 101097
+    AegisName: aegis_101097
+    Name: "[Scroll] Unlimited Drink"
+    Type: Usable
+    Weight: 10
+    Script: |
+      bonus_script "{ bonus bMaxHPrate,5; bonus bMaxSPrate,5; bonus bCritAtkRate,5; bonus bLongAtkRate,5; bonus2 bMagicAddEle,Ele_All,5; bonus bNoCastCancel;}",1800;
+  - Id: 101107
+    AegisName: Cannon_Box_Ice
+    Name: Cannon Box Ice
+    Type: Usable
+    Weight: 250
+    Flags:
+      Container: true
+    Script: |
+      getitem 18005,500;
+  - Id: 101108
+    AegisName: Cannon_Box_Lightning
+    Name: Cannon Box Lightning
+    Type: Usable
+    Weight: 250
+    Flags:
+      Container: true
+    Script: |
+      getitem 18006,500;
+  - Id: 101109
+    AegisName: Cannon_Box_Stone
+    Name: Cannon Box Stone
+    Type: Usable
+    Weight: 250
+    Flags:
+      Container: true
+    Script: |
+      getitem 18007,500;
+  - Id: 101110
+    AegisName: Cannon_Box_Flare
+    Name: Cannon Box Fire
+    Type: Usable
+    Weight: 250
+    Flags:
+      Container: true
+    Script: |
+      getitem 18008,500;
+  - Id: 101111
+    AegisName: Cannon_Box_Poisoning
+    Name: Cannon Box Poison
+    Type: Usable
+    Weight: 250
+    Flags:
+      Container: true
+    Script: |
+      getitem 18009,500;
+  - Id: 101112
+    AegisName: Kunai_Scroll
+    Name: Kunai Scroll
+    Type: Usable
+    Weight: 250
+    Flags:
+      Container: true
+    Script: |
+      getitem 1220001,500;
+  - Id: 101113
+    AegisName: Kunai_Scroll_Nothing
+    Name: Kunai Scroll Nothing
+    Type: Usable
+    Weight: 250
+    Flags:
+      Container: true
+    Script: |
+      getitem 1220002,500;
+  - Id: 101114
+    AegisName: Kunai_Scroll_Shadow
+    Name: Kunai Scroll Shadow
+    Type: Usable
+    Weight: 250
+    Flags:
+      Container: true
+    Script: |
+      getitem 1220003,500;
+  - Id: 101115
+    AegisName: Kunai_Scroll_Hamaya
+    Name: Kunai Scroll Hamaya
+    Type: Usable
+    Weight: 250
+    Flags:
+      Container: true
+    Script: |
+      getitem 1220004,500;
+  - Id: 101116
+    AegisName: Nw_Grenade_Box
+    Name: Nw Grenade Box
+    Type: Usable
+    Weight: 250
+    Flags:
+      Container: true
+    Script: |
+      getitem 1000564,500;
+  - Id: 101117
+    AegisName: Soa_Charm_Bundle
+    Name: Soa Charm Bundle
+    Type: Usable
+    Weight: 250
+    Flags:
+      Container: true
+    Script: |
+      getitem 1000563,500;
+  - Id: 101118
+    AegisName: SS_Charm_Box
+    Name: SS Charm Box
+    Type: Usable
+    Weight: 250
+    Flags:
+      Container: true
+    Script: |
+      getitem 1000565,500;
+  - Id: 101119
+    AegisName: SS_Charm_F_Box
+    Name: SS Charm F Box
+    Type: Usable
+    Weight: 250
+    Flags:
+      Container: true
+    Script: |
+      getitem 1000566,500;
+  - Id: 101120
+    AegisName: SS_Charm_W_Box
+    Name: SS Charm W Box
+    Type: Usable
+    Weight: 250
+    Flags:
+      Container: true
+    Script: |
+      getitem 1000567,500;
+  - Id: 101121
+    AegisName: SS_Charm_G_Box
+    Name: SS Charm G Box
+    Type: Usable
+    Weight: 250
+    Flags:
+      Container: true
+    Script: |
+      getitem 1000568,500;
+  - Id: 101122
+    AegisName: SS_Charm_L_Box
+    Name: SS Charm L Box
+    Type: Usable
+    Weight: 250
+    Flags:
+      Container: true
+    Script: |
+      getitem 1000569,500;
   - Id: 101126
     AegisName: aegis_101126
     Name: "[Scroll] Halloween Candy"

db/re/item_randomopt_group.yml

@@ -4848,32 +4848,18 @@ Body:
             MaxValue: 20
             Chance: 1000
           - Option: WEAPON_ATTR_WATER
-            MinValue: 0
-            MaxValue: 0
             Chance: 500
           - Option: WEAPON_ATTR_GROUND
-            MinValue: 0
-            MaxValue: 0
             Chance: 500
           - Option: WEAPON_ATTR_FIRE
-            MinValue: 0
-            MaxValue: 0
             Chance: 500
           - Option: WEAPON_ATTR_WIND
-            MinValue: 0
-            MaxValue: 0
             Chance: 500
           - Option: WEAPON_ATTR_SAINT
-            MinValue: 0
-            MaxValue: 0
             Chance: 500
           - Option: WEAPON_ATTR_DARKNESS
-            MinValue: 0
-            MaxValue: 0
             Chance: 500
           - Option: DAMAGE_SIZE_PERFECT
-            MinValue: 0
-            MaxValue: 0
             Chance: 50
       - Slot: 2
         Options:
@@ -5007,32 +4993,18 @@ Body:
             MaxValue: 20
             Chance: 1000
           - Option: WEAPON_ATTR_WATER
-            MinValue: 0
-            MaxValue: 0
             Chance: 500
           - Option: WEAPON_ATTR_GROUND
-            MinValue: 0
-            MaxValue: 0
             Chance: 500
           - Option: WEAPON_ATTR_FIRE
-            MinValue: 0
-            MaxValue: 0
             Chance: 500
           - Option: WEAPON_ATTR_WIND
-            MinValue: 0
-            MaxValue: 0
             Chance: 500
           - Option: WEAPON_ATTR_SAINT
-            MinValue: 0
-            MaxValue: 0
             Chance: 500
           - Option: WEAPON_ATTR_DARKNESS
-            MinValue: 0
-            MaxValue: 0
             Chance: 500
           - Option: DAMAGE_SIZE_PERFECT
-            MinValue: 0
-            MaxValue: 0
             Chance: 50
       - Slot: 2
         Options:
@@ -8557,8 +8529,6 @@ Body:
             MaxValue: 20
             Chance: 357
           - Option: BODY_INDESTRUCTIBLE
-            MinValue: 1
-            MaxValue: 1
             Chance: 357
           - Option: BODY_ATTR_WATER
             MinValue: 3
@@ -9435,8 +9405,6 @@ Body:
             MaxValue: 5
             Chance: 212
           - Option: DAMAGE_SIZE_PERFECT
-            MinValue: 1
-            MaxValue: 1
             Chance: 212
           - Option: CLASS_IGNORE_MDEF_PERCENT_NORMAL
             MinValue: 30
@@ -9530,28 +9498,16 @@ Body:
             MaxValue: 10
             Chance: 666
           - Option: BODY_INDESTRUCTIBLE
-            MinValue: 1
-            MaxValue: 1
             Chance: 666
           - Option: BODY_ATTR_WATER
-            MinValue: 1
-            MaxValue: 1
             Chance: 666
           - Option: BODY_ATTR_WIND
-            MinValue: 1
-            MaxValue: 1
             Chance: 666
           - Option: BODY_ATTR_DARKNESS
-            MinValue: 1
-            MaxValue: 1
             Chance: 666
           - Option: BODY_ATTR_FIRE
-            MinValue: 1
-            MaxValue: 1
             Chance: 666
           - Option: BODY_ATTR_GROUND
-            MinValue: 1
-            MaxValue: 1
             Chance: 666
   - Id: 119
     Group: GRAY_CHARCOAL_MELEE
@@ -9599,8 +9555,6 @@ Body:
             MaxValue: 20
             Chance: 526
           - Option: DAMAGE_SIZE_PERFECT
-            MinValue: 1
-            MaxValue: 1
             Chance: 526
           - Option: VAR_PLUSASPD
             MinValue: 1
@@ -9610,29 +9564,17 @@ Body:
             MinValue: 5
             MaxValue: 10
             Chance: 526
-          - Option: DAMAGE_PROPERTY_WATER_TARGET
-            MinValue: 1
-            MaxValue: 1
+          - Option: WEAPON_ATTR_WATER
             Chance: 526
-          - Option: DAMAGE_PROPERTY_GROUND_TARGET
-            MinValue: 1
-            MaxValue: 1
+          - Option: WEAPON_ATTR_GROUND
             Chance: 526
-          - Option: DAMAGE_PROPERTY_FIRE_TARGET
-            MinValue: 1
-            MaxValue: 1
+          - Option: WEAPON_ATTR_FIRE
             Chance: 526
-          - Option: DAMAGE_PROPERTY_WIND_TARGET
-            MinValue: 1
-            MaxValue: 1
+          - Option: WEAPON_ATTR_WIND
             Chance: 526
-          - Option: DAMAGE_PROPERTY_SAINT_TARGET
-            MinValue: 1
-            MaxValue: 1
+          - Option: WEAPON_ATTR_SAINT
             Chance: 526
-          - Option: DAMAGE_PROPERTY_DARKNESS_TARGET
-            MinValue: 1
-            MaxValue: 1
+          - Option: WEAPON_ATTR_DARKNESS
             Chance: 526
       - Slot: 2
         Options:
@@ -9693,8 +9635,6 @@ Body:
             MaxValue: 20
             Chance: 666
           - Option: WEAPON_INDESTRUCTIBLE
-            MinValue: 1
-            MaxValue: 1
             Chance: 666
   - Id: 120
     Group: GRAY_CHARCOAL_MAGIC
@@ -9861,8 +9801,6 @@ Body:
             MaxValue: 20
             Chance: 666
           - Option: DAMAGE_SIZE_PERFECT
-            MinValue: 1
-            MaxValue: 1
             Chance: 666
           - Option: VAR_PLUSASPD
             MinValue: 1
@@ -9877,8 +9815,6 @@ Body:
             MaxValue: 10
             Chance: 666
           - Option: WEAPON_INDESTRUCTIBLE
-            MinValue: 1
-            MaxValue: 1
             Chance: 666
       - Slot: 2
         Options:
@@ -10131,32 +10067,18 @@ Body:
             MaxValue: 20
             Chance: 384
           - Option: WEAPON_ATTR_WATER
-            MinValue: 1
-            MaxValue: 1
             Chance: 384
           - Option: WEAPON_ATTR_GROUND
-            MinValue: 1
-            MaxValue: 1
             Chance: 384
           - Option: WEAPON_ATTR_FIRE
-            MinValue: 1
-            MaxValue: 1
             Chance: 384
           - Option: WEAPON_ATTR_WIND
-            MinValue: 1
-            MaxValue: 1
             Chance: 384
           - Option: WEAPON_ATTR_SAINT
-            MinValue: 1
-            MaxValue: 1
             Chance: 384
           - Option: WEAPON_ATTR_DARKNESS
-            MinValue: 1
-            MaxValue: 1
             Chance: 384
           - Option: DAMAGE_SIZE_PERFECT
-            MinValue: 1
-            MaxValue: 1
             Chance: 384
   - Id: 124
     Group: CHARLESTON_PARTS_R
@@ -10236,32 +10158,18 @@ Body:
             MaxValue: 20
             Chance: 384
           - Option: WEAPON_ATTR_WATER
-            MinValue: 1
-            MaxValue: 1
             Chance: 384
           - Option: WEAPON_ATTR_GROUND
-            MinValue: 1
-            MaxValue: 1
             Chance: 384
           - Option: WEAPON_ATTR_FIRE
-            MinValue: 1
-            MaxValue: 1
             Chance: 384
           - Option: WEAPON_ATTR_WIND
-            MinValue: 1
-            MaxValue: 1
             Chance: 384
           - Option: WEAPON_ATTR_SAINT
-            MinValue: 1
-            MaxValue: 1
             Chance: 384
           - Option: WEAPON_ATTR_DARKNESS
-            MinValue: 1
-            MaxValue: 1
             Chance: 384
           - Option: DAMAGE_SIZE_PERFECT
-            MinValue: 1
-            MaxValue: 1
             Chance: 384
   - Id: 125
     Group: SHADOW_RANDOM_MIX
@@ -10762,8 +10670,6 @@ Body:
             MaxValue: 10
             Chance: 500
           - Option: WEAPON_INDESTRUCTIBLE
-            MinValue: 1
-            MaxValue: 1
             Chance: 500
   - Id: 129
     Group: EP17_1_SPC08
@@ -11143,8 +11049,6 @@ Body:
             MaxValue: 10
             Chance: 555
           - Option: WEAPON_INDESTRUCTIBLE
-            MinValue: 1
-            MaxValue: 1
             Chance: 555
   - Id: 132
     Group: MAGMA_ESSENCE
@@ -11713,8 +11617,6 @@ Body:
             MaxValue: 10
             Chance: 666
           - Option: WEAPON_INDESTRUCTIBLE
-            MinValue: 1
-            MaxValue: 1
             Chance: 666
   - Id: 136
     Group: ANCIENT_HERO_WISDOM