From 756f9a73a7908915af971b271608578a2164c347 Mon Sep 17 00:00:00 2001
From: Atemo <Atemo@users.noreply.github.com>
Date: Wed, 8 Jun 2022 21:26:41 +0200
Subject: [PATCH] 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          |  146 ++--
 db/re/item_db_equip.yml        | 1218 ++++++++++++++++----------------
 db/re/item_db_etc.yml          |  288 ++++----
 db/re/item_db_usable.yml       |  650 ++++++++---------
 db/re/item_randomopt_group.yml |  110 +--
 5 files changed, 1157 insertions(+), 1255 deletions(-)

diff --git a/db/re/item_combos.yml b/db/re/item_combos.yml
index 3d3f302485..55a14c54f7 100644
--- a/db/re/item_combos.yml
+++ b/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
diff --git a/db/re/item_db_equip.yml b/db/re/item_db_equip.yml
index 1dec44adc2..d0d2a1441b 100644
--- a/db/re/item_db_equip.yml
+++ b/db/re/item_db_equip.yml
@@ -68373,12 +68373,12 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bSmatk,2;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bSmatk,1;
             bonus bSpl,3;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus2 bMagicAtkEle,Ele_All,15;
             }
          }
@@ -102025,11 +102025,11 @@ Body:
       bonus2 bSkillAtk,"DK_STORMSLASH",6*(.@r/2);
       bonus2 bSkillAtk,"DK_HACKANDSLASHER",5*(.@r/3);
       bonus bShortAtkRate,3*(.@r/4);
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bPow,2;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus2 bSkillAtk,"DK_STORMSLASH",10;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPAtk,2;
             }
          }
@@ -118276,12 +118276,12 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bSmatk,2;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bSmatk,1;
             bonus bSpl,3;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bVariableCastrate,-5;
             }
          }
@@ -138948,9 +138948,9 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bShortAtkRate,5;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bPAtk,2;
             bonus bPow,2;
          }
@@ -139251,14 +139251,14 @@ Body:
       bonus bMatkRate,2*(.@r/3);
       bonus bAspd,(.@r/5);
       autobonus "{ .@r = getrefine(); bonus bMatk,100; bonus bHit,50; bonus3 bAutoSpell,\"SO_CLOUD_KILL\",max(3,getskilllv(\"SO_CLOUD_KILL\")),50; if (.@r>=7) { bonus bMatk,50; bonus bHit,25; if (.@r>=9) { bonus3 bAutoSpell,\"WL_HELLINFERNO\",5,50; if (.@r>=10) { bonus3 bAutoSpell,\"WL_CHAINLIGHTNING\",3,20; } } }",1,10000,BF_WEAPON;
-      if (.@g>=1 && .@r>=11) {
+      if (.@g >= ENCHANTGRADE_D && .@r>=11) {
          bonus5 bAutoSpell,"RK_IGNITIONBREAK",9,30,BF_MAGIC,1;
       }
-      if (.@g>=2) {
+      if (.@g >= ENCHANTGRADE_C) {
          bonus bPAtk,2;
          bonus bSMatk,2;
       }
-      if (.@g>=3 && .@r>=12) {
+      if (.@g >= ENCHANTGRADE_B && .@r>=12) {
          bonus bFixedCast,-500;
       }
   - Id: 400153
@@ -139293,15 +139293,15 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          if (.@r>=11) {
             bonus bDelayrate,-5;
          }
       }
-      if (.@g>=2) {
+      if (.@g >= ENCHANTGRADE_C) {
          bonus bPAtk,2;
          bonus bSmatk,2;
-         if (.@g>=3) {
+         if (.@g >= ENCHANTGRADE_B) {
             if (.@r>=12) {
                bonus bFixedCast,-500;
             }
@@ -139346,12 +139346,12 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bDelayrate,-5;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bPAtk,2;
             bonus bSmatk,2;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                if (.@r>=12) {
                   bonus bFixedCast,-500;
                }
@@ -139390,13 +139390,13 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bMagicAtkEle,Ele_Holy,5;
          bonus bShortAtkRate,5;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bPAtk,2;
             bonus bSmatk,2;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                if (.@r>=12) {
                   bonus bFixedCast,-500;
                }
@@ -139436,13 +139436,13 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bMagicAtkEle,Ele_Fire,5;
          bonus bShortAtkRate,5;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bPAtk,2;
             bonus bSmatk,2;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                if (.@r>=12) {
                   bonus bFixedCast,-500;
                }
@@ -140998,16 +140998,16 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bAddClass,Class_All,5;
          bonus bPow,3;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bFixedCast,-500;
             bonus bSta,2;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPAtk,2;
                bonus bRes,20;
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus bPAtk,7;
                }
             }
@@ -141045,16 +141045,16 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bMatkRate,5;
          bonus bSpl,3;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bFixedCast,-500;
             bonus bWis,2;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bSmatk,3;
                bonus bMres,20;
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus bSmatk,7;
                }
             }
@@ -146688,19 +146688,19 @@ Body:
             bonus bShortAtkRate,20;
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bAddClass,Class_All,(.@r/2);
          bonus bBaseAtk,2*(.@r/2);
          bonus bShortAtkRate,(.@r/3);
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus2 bAddClass,Class_All,(.@r/2);
             bonus bBaseAtk,3*(.@r/2);
             bonus bShortAtkRate,(.@r/3);
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus2 bAddClass,Class_All,2*(.@r/2);
                bonus bShortAtkRate,(.@r/3);
                bonus bPAtk,(.@r/4);
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus2 bAddClass,Class_All,3*(.@r/2);
                   bonus bShortAtkRate,2*(.@r/3);
                   bonus bPAtk,2*(.@r/4);
@@ -146739,18 +146739,18 @@ Body:
             bonus bMaxHPrate,15;
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bDef,5*(.@r/2);
          bonus bHealPower,2*(.@r/2);
          bonus bRes,(.@r/4);
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bDef,7*(.@r/2);
             bonus bHealPower,3*(.@r/2);
             bonus bRes,2*(.@r/4);
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bMaxHPrate,(.@r/3);
                bonus bRes,3*(.@r/4);
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus bMaxHPrate,2*(.@r/3);
                   bonus bRes,4*(.@r/4);
                }
@@ -146787,19 +146787,19 @@ Body:
             bonus bLongAtkRate,20;
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bAspdRate,(.@r/2);
          bonus2 bAddClass,Class_All,(.@r/2);
          bonus bBaseAtk,2*(.@r/2);
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bAspdRate,(.@r/2);
             bonus2 bAddClass,Class_All,2*(.@r/2);
             bonus bBaseAtk,3*(.@r/2);
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bAspdRate,2*(.@r/2);
                bonus bLongAtkRate,(.@r/3);
                bonus bPAtk,(.@r/4);
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus bAspdRate,2*(.@r/2);
                   bonus bLongAtkRate,2*(.@r/3);
                   bonus bPAtk,2*(.@r/4);
@@ -146837,19 +146837,19 @@ Body:
             bonus bCritAtkRate,20;
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bBaseAtk,(.@r/2);
          bonus bCritAtkRate,2*(.@r/3);
          bonus bCritical,(.@r/3);
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bBaseAtk,2*(.@r/2);
             bonus bCritAtkRate,3*(.@r/3);
             bonus bCritical,2*(.@r/3);
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bCritAtkRate,5*(.@r/3);
                bonus bCrate,(.@r/4);
                bonus bPAtk,(.@r/4);
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus bCritAtkRate,7*(.@r/3);
                   bonus bCrate,(.@r/4);
                   bonus bPAtk,2*(.@r/4);
@@ -146888,19 +146888,19 @@ Body:
             bonus2 bMagicAtkEle,Ele_All,15;
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bMatkRate,(.@r/2);
          bonus bMatk,2*(.@r/2);
          bonus2 bMagicAtkEle,Ele_All,3*(.@r/3);
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bMatkRate,(.@r/2);
             bonus bMatk,3*(.@r/2);
             bonus2 bMagicAtkEle,Ele_All,3*(.@r/3);
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bMatkRate,2*(.@r/2);
                bonus2 bMagicAtkEle,Ele_All,5*(.@r/3);
                bonus bSmatk,(.@r/4);
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus bMatkRate,3*(.@r/2);
                   bonus2 bMagicAtkEle,Ele_All,5*(.@r/3);
                   bonus bSmatk,2*(.@r/4);
@@ -146940,19 +146940,19 @@ Body:
             bonus bVariableCastrate,-10;
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bSPrecovRate,2*(.@r/2);
          bonus bHealPower,(.@r/2);
          bonus bMres,(.@r/3);
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bSPrecovRate,3*(.@r/2);
             bonus bHealPower,2*(.@r/2);
             bonus bMres,2*(.@r/3);
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bMaxSPrate,(.@r/2);
                bonus bMres,2*(.@r/3);
                bonus bHplus,2*(.@r/4);
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus bMaxSPrate,2*(.@r/2);
                   bonus bMres,3*(.@r/3);
                   bonus bHplus,3*(.@r/4);
@@ -147339,14 +147339,14 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bAddClass,Class_All,3;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus2 bAddClass,Class_All,3;
             bonus bPow,3;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bShortAtkRate,10;
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus bDelayrate,-10;
                }
             }
@@ -147384,14 +147384,14 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bMaxHPrate,3;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bMaxHPrate,3;
             bonus bSta,3;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bDelayrate,-5;
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus bDelayrate,-10;
                }
             }
@@ -147429,14 +147429,14 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bMatkRate,3;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bMatkRate,3;
             bonus bSpl,3;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus2 bMagicAtkEle,Ele_All,10;
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus bDelayrate,-10;
                }
             }
@@ -147474,14 +147474,14 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bAddClass,Class_All,3;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus2 bAddClass,Class_All,3;
             bonus bCon,3;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bLongAtkRate,10;
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus bDelayrate,-10;
                }
             }
@@ -147669,11 +147669,11 @@ Body:
       bonus bMaxSPrate,5;
       bonus bMdef,10*(.@r/3);
       bonus bDef,50*(.@r/3);
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bSkillAtk,"IG_SHIELD_SHOOTING",5;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus2 bSkillAtk,"IG_SHIELD_SHOOTING",8;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bSpl,1;
                bonus2 bSkillAtk,"IG_SHIELD_SHOOTING",15;
             }
@@ -147742,14 +147742,14 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
-         if (.@g>=2) {
+      if (.@g >= ENCHANTGRADE_D) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bPow,2;
             bonus bSpl,2;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPAtk,2;
                bonus bSmatk,2;
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus bDelayrate,-5;
                }
             }
@@ -148992,7 +148992,7 @@ Body:
       if (.@r>=9) {
          bonus bAspdRate,7;
          if (.@r>=11) {
-            autobonus "{ .@g = getenchantgrade(); if (.@g>=1) { .@val = 25; if (.@g>=2) { .@val += 25; } } bonus bStr,175+.@val; }",1,10000,BF_WEAPON;
+            autobonus "{ .@g = getenchantgrade(); if (.@g >= ENCHANTGRADE_D) { .@val = 25; if (.@g >= ENCHANTGRADE_C) { .@val += 25; } } bonus bStr,175+.@val; }",1,10000,BF_WEAPON;
             if (.@r>=13) {
                bonus bShortAtkRate,7;
             }
@@ -149018,7 +149018,7 @@ Body:
       if (.@r>=9) {
          bonus bAspdRate,7;
          if (.@r>=11) {
-            autobonus "{ .@g = getenchantgrade(); if (.@g>=1) { .@val = 25; if (.@g>=2) { .@val += 25; } } bonus bDex,175+.@val; }",1,10000,BF_WEAPON|BF_MAGIC;
+            autobonus "{ .@g = getenchantgrade(); if (.@g >= ENCHANTGRADE_D) { .@val = 25; if (.@g >= ENCHANTGRADE_C) { .@val += 25; } } bonus bDex,175+.@val; }",1,10000,BF_WEAPON|BF_MAGIC;
             if (.@r>=13) {
                bonus bFixedCast,-500;
             }
@@ -149046,7 +149046,7 @@ Body:
          bonus bAspdRate,5;
          bonus bVariableCastrate,-5;
          if (.@r>=11) {
-            autobonus "{ .@g = getenchantgrade(); if (.@g>=1) { .@val = 25; if (.@g>=2) { .@val += 25; } } bonus bVit,175+.@val; }",1,10000,BF_WEAPON|BF_MAGIC;
+            autobonus "{ .@g = getenchantgrade(); if (.@g >= ENCHANTGRADE_D) { .@val = 25; if (.@g >= ENCHANTGRADE_C) { .@val += 25; } } bonus bVit,175+.@val; }",1,10000,BF_WEAPON|BF_MAGIC;
             if (.@r>=13) {
                bonus bDelayrate,-5;
             }
@@ -149073,7 +149073,7 @@ Body:
       if (.@r>=9) {
          bonus bVariableCastrate,-7;
          if (.@r>=11) {
-            autobonus "{ .@g = getenchantgrade(); if (.@g>=1) { .@val = 25; if (.@g>=2) { .@val += 25; } } bonus bInt,175+.@val; }",1,10000,BF_MAGIC;
+            autobonus "{ .@g = getenchantgrade(); if (.@g >= ENCHANTGRADE_D) { .@val = 25; if (.@g >= ENCHANTGRADE_C) { .@val += 25; } } bonus bInt,175+.@val; }",1,10000,BF_MAGIC;
             if (.@r>=13) {
                bonus2 bMagicAtkEle,Ele_All,7;
             }
@@ -149121,7 +149121,7 @@ Body:
       if (.@r>=9) {
          bonus bAspdRate,7;
          if (.@r>=11) {
-            autobonus "{ .@g = getenchantgrade(); if (.@g>=1) { .@val = 25; if (.@g>=2) { .@val += 25; } } bonus bAgi,175+.@val; }",1,10000,BF_WEAPON;
+            autobonus "{ .@g = getenchantgrade(); if (.@g >= ENCHANTGRADE_D) { .@val = 25; if (.@g >= ENCHANTGRADE_C) { .@val += 25; } } bonus bAgi,175+.@val; }",1,10000,BF_WEAPON;
             if (.@r>=13) {
                bonus bLongAtkRate,4;
                bonus bShortAtkRate,4;
@@ -149148,7 +149148,7 @@ Body:
       if (.@r>=9) {
          bonus bAspdRate,7;
          if (.@r>=11) {
-            autobonus "{ .@g = getenchantgrade(); if (.@g>=1) { .@val = 25; if (.@g>=2) { .@val += 25; } } bonus bLuk,175+.@val; }",1,10000,BF_WEAPON;
+            autobonus "{ .@g = getenchantgrade(); if (.@g >= ENCHANTGRADE_D) { .@val = 25; if (.@g >= ENCHANTGRADE_C) { .@val += 25; } } bonus bLuk,175+.@val; }",1,10000,BF_WEAPON;
             if (.@r>=13) {
                bonus bCritAtkRate,7;
                bonus bCritical,7;
@@ -149592,16 +149592,16 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bMres,50;
          bonus bRes,50;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus2 bMagicAddEle,Ele_All,10;
             bonus2 bAddEle,Ele_All,10;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bSta,5;
                bonus bWis,5;
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus bPAtk,5;
                   bonus bSmatk,5;
                   if (.@r>=13) {
@@ -149684,14 +149684,14 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bMaxHPrate,2;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bFixedCast,-300;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bVariableCastrate,-5;
                bonus bMaxHPrate,2;
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus bFixedCast,-200;
                }
             }
@@ -149730,14 +149730,14 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bAddClass,Class_All,2;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bFixedCast,-300;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPAtk,2;
                bonus2 bAddClass,Class_All,2;
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus bFixedCast,-200;
                }
             }
@@ -149776,14 +149776,14 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bMatkRate,2;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bFixedCast,-300;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bSmatk,2;
                bonus bMatkRate,2;
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus bFixedCast,-200;
                }
             }
@@ -149822,14 +149822,14 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bAddClass,Class_All,2;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bFixedCast,-300;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPAtk,2;
                bonus2 bAddClass,Class_All,2;
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus bCrate,1;
                }
             }
@@ -151409,15 +151409,15 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bMaxHPrate,3;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bMaxHPrate,3;
             bonus bMres,2;
             bonus bRes,2;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bDelayrate,-5;
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus bDelayrate,-10;
                }
             }
@@ -151454,14 +151454,14 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bAddClass,Class_All,3;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bPAtk,2;
             bonus2 bAddClass,Class_All,3;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bShortAtkRate,5;
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus bDelayrate,-10;
                }
             }
@@ -151498,14 +151498,14 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bMatkRate,3;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bSmatk,2;
             bonus bMatkRate,3;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus2 bMagicAtkEle,Ele_All,5;
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus bDelayrate,-10;
                }
             }
@@ -151542,14 +151542,14 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bAddClass,Class_All,3;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bPAtk,2;
             bonus2 bAddClass,Class_All,3;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bLongAtkRate,5;
-               if (.@g>=4) {
+               if (.@g >= ENCHANTGRADE_A) {
                   bonus bDelayrate,-10;
                }
             }
@@ -154476,12 +154476,12 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bSkillAtk,"IG_CROSS_RAIN",5;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bSmatk,1;
             bonus2 bSkillAtk,"IG_CROSS_RAIN",8;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bSpl,1;
                bonus2 bSkillAtk,"IG_CROSS_RAIN",12;
             }
@@ -154523,14 +154523,14 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bSkillAtk,"BO_ACIDIFIED_ZONE_WIND",5;
          bonus2 bSkillAtk,"BO_ACIDIFIED_ZONE_FIRE",5;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bPAtk,1;
             bonus2 bSkillAtk,"BO_ACIDIFIED_ZONE_WATER",8;
             bonus2 bSkillAtk,"BO_ACIDIFIED_ZONE_GROUND",8;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPow,2;
                bonus2 bSkillAtk,"BO_ACIDIFIED_ZONE_WIND",10;
                bonus2 bSkillAtk,"BO_ACIDIFIED_ZONE_FIRE",10;
@@ -154576,16 +154576,16 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bAddClass,Class_All,2;
          bonus2 bSkillAtk,"BO_ACIDIFIED_ZONE_WIND",10;
          bonus2 bSkillAtk,"BO_ACIDIFIED_ZONE_FIRE",10;
          bonus2 bSkillAtk,"BO_ACIDIFIED_ZONE_WATER",10;
          bonus2 bSkillAtk,"BO_ACIDIFIED_ZONE_GROUND",10;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bPAtk,1;
             bonus2 bAddClass,Class_All,3;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus2 bSkillAtk,"BO_ACIDIFIED_ZONE_WIND",10;
                bonus2 bSkillAtk,"BO_ACIDIFIED_ZONE_FIRE",10;
                bonus2 bSkillAtk,"BO_ACIDIFIED_ZONE_WATER",10;
@@ -154702,16 +154702,16 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          if (.@r>=11) {
             bonus2 bMagicAddEle,Ele_All,15;
          }
       }
-      if (.@g>=2) {
+      if (.@g >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"LG_RAYOFGENESIS",15;
-         if (.@g>=3) {
+         if (.@g >= ENCHANTGRADE_B) {
             bonus bMatkRate,7;
-            if (.@g>=4) {
+            if (.@g >= ENCHANTGRADE_A) {
                bonus bSmatk,(.@r/3);
                bonus bSpl,(.@r/3);
             }
@@ -154752,16 +154752,16 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          if (.@r>=11) {
             bonus2 bAddEle,Ele_All,15;
          }
       }
-      if (.@g>=2) {
+      if (.@g >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"GN_CARTCANNON",15;
-         if (.@g>=3) {
+         if (.@g >= ENCHANTGRADE_B) {
             bonus2 bAddClass,Class_All,7;
-            if (.@g>=4) {
+            if (.@g >= ENCHANTGRADE_A) {
                bonus bPAtk,(.@r/3);
                bonus bPow,(.@r/3);
             }
@@ -155053,13 +155053,13 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bMatkRate,3;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus2 bMagicAtkEle,Ele_Holy,15;
             bonus2 bMagicAtkEle,Ele_Neutral,15;
             bonus bSmatk,1;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bSmatk,2;
                bonus bSpl,3;
             }
@@ -155108,12 +155108,12 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bAddClass,Class_All,3;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bLongAtkRate,15;
             bonus bPAtk,1;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPAtk,2;
                bonus bPow,3;
             }
@@ -155161,12 +155161,12 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bAddClass,Class_All,3;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bShortAtkRate,15;
             bonus bPAtk,1;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPAtk,2;
                bonus bPow,3;
             }
@@ -155283,11 +155283,11 @@ Body:
       bonus2 bSkillAtk,"HN_DOUBLEBOWLINGBASH",6*(.@r/2);
       bonus2 bSkillAtk,"HN_MEGA_SONIC_BLOW",8*(.@r/3);
       bonus bShortAtkRate,4*(.@r/4);
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bPow,2;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus2 bSkillAtk,"HN_DOUBLEBOWLINGBASH",10;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPAtk,2;
             }
          }
@@ -155317,12 +155317,12 @@ Body:
       bonus2 bSkillAtk,"BO_ACIDIFIED_ZONE_FIRE",6*(.@r/2);
       bonus2 bSkillAtk,"GN_CART_TORNADO",7*(.@r/3);
       bonus2 bAddClass,Class_All,5*(.@r/4);
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bPow,2;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus2 bSkillAtk,"BO_ACIDIFIED_ZONE_WIND",10;
             bonus2 bSkillAtk,"BO_ACIDIFIED_ZONE_FIRE",10;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPAtk,2;
             }
          }
@@ -155361,14 +155361,14 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bSkillAtk,"HN_DOUBLEBOWLINGBASH",5;
          bonus2 bSkillAtk,"HN_SHIELD_CHAIN_RUSH",5;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bPAtk,1;
             bonus2 bSkillAtk,"HN_DOUBLEBOWLINGBASH",3;
             bonus2 bSkillAtk,"HN_SHIELD_CHAIN_RUSH",3;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPow,1;
                bonus2 bSkillAtk,"HN_DOUBLEBOWLINGBASH",5;
                bonus2 bSkillAtk,"HN_SHIELD_CHAIN_RUSH",5;
@@ -155849,12 +155849,12 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bSkillAtk,"SHC_SHADOW_STAB",5;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bPAtk,1;
             bonus2 bSkillAtk,"SHC_SHADOW_STAB",8;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPow,1;
                bonus2 bSkillAtk,"SHC_SHADOW_STAB",12;
             }
@@ -155893,12 +155893,12 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bSkillAtk,"ABC_DEFT_STAB",5;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bPAtk,1;
             bonus2 bSkillAtk,"ABC_DEFT_STAB",8;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPow,1;
                bonus2 bSkillAtk,"ABC_DEFT_STAB",12;
             }
@@ -155945,13 +155945,13 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bMatkRate,2;
          bonus2 bSkillAtk,"ABC_FROM_THE_ABYSS",10;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bSmatk,1;
             bonus bMatkRate,3;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus2 bSkillAtk,"ABC_FROM_THE_ABYSS",10;
             }
          }
@@ -156026,16 +156026,16 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          if (.@r>=11) {
             bonus2 bAddEle,Ele_All,15;
          }
       }
-      if (.@g>=2) {
+      if (.@g >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"SC_FATALMENACE",15;
-         if (.@g>=3) {
+         if (.@g >= ENCHANTGRADE_B) {
             bonus2 bAddClass,Class_All,7;
-            if (.@g>=4) {
+            if (.@g >= ENCHANTGRADE_A) {
                bonus bPAtk,(.@r/3);
                bonus bPow,(.@r/3);
             }
@@ -156311,12 +156311,12 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bMatkRate,3;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus2 bMagicAtkEle,Ele_All,15;
             bonus bSmatk,1;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bSmatk,2;
                bonus bSpl,3;
             }
@@ -156364,12 +156364,12 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bAddClass,Class_All,3;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bShortAtkRate,15;
             bonus bPAtk,1;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPAtk,2;
                bonus bPow,3;
             }
@@ -156410,12 +156410,12 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bSmatk,2;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bSmatk,1;
             bonus bSpl,3;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus2 bMagicAtkEle,Ele_All,15;
             }
          }
@@ -156440,12 +156440,12 @@ Body:
     Refineable: true
     Script: |
       .@g = getenchantgrade();
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bSpl,1;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus2 bSkillAtk,"SS_SEKIENHOU",7;
             bonus2 bSkillAtk,"SS_REIKETSUHOU",7;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bSmatk,1;
             }
          }
@@ -156475,11 +156475,11 @@ Body:
       bonus2 bSkillAtk,"ABC_ABYSS_SQUARE",7*(.@r/2);
       bonus2 bSkillAtk,"ABC_FROM_THE_ABYSS",10*(.@r/3);
       bonus2 bMagicAtkEle,Ele_All,3*(.@r/4);
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bSpl,2;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus2 bSkillAtk,"ABC_ABYSS_SQUARE",10;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bSmatk,2;
             }
          }
@@ -156508,11 +156508,11 @@ Body:
       bonus2 bSkillAtk,"SS_KAGENOMAI",5*(.@r/2);
       bonus2 bSkillAtk,"SS_KAGEGISSEN",7*(.@r/3);
       bonus bShortAtkRate,3*(.@r/4);
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bPow,1;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus2 bSkillAtk,"SS_KAGENOMAI",7;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPAtk,1;
             }
          }
@@ -156620,14 +156620,14 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bSkillAtk,"SS_KUNAIKAITEN",5;
          bonus2 bSkillAtk,"SS_KUNAIKUSSETSU",5;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bPAtk,1;
             bonus2 bSkillAtk,"SS_KUNAIKAITEN",3;
             bonus2 bSkillAtk,"SS_KUNAIKUSSETSU",3;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPow,1;
                bonus2 bSkillAtk,"SS_KUNAIKAITEN",5;
                bonus2 bSkillAtk,"SS_KUNAIKUSSETSU",5;
@@ -156675,14 +156675,14 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bSkillAtk,"SS_RAIDENPOU",5;
          bonus2 bSkillAtk,"SS_KINRYUUHOU",5;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bSmatk,1;
             bonus2 bSkillAtk,"SS_RAIDENPOU",3;
             bonus2 bSkillAtk,"SS_KINRYUUHOU",3;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bSpl,1;
                bonus2 bSkillAtk,"SS_RAIDENPOU",5;
                bonus2 bSkillAtk,"SS_KINRYUUHOU",5;
@@ -156708,12 +156708,12 @@ Body:
     Refineable: true
     Script: |
       .@g = getenchantgrade();
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bAddClass,Class_All,3;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bLongAtkRate,15;
             bonus bPAtk,1;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPAtk,2;
                bonus bPow,3;
             }
@@ -156887,16 +156887,16 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          if (.@r>=11) {
             bonus2 bAddEle,Ele_All,15;
          }
       }
-      if (.@g>=2) {
+      if (.@g >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"NC_AXEBOOMERANG",15;
-         if (.@g>=3) {
+         if (.@g >= ENCHANTGRADE_B) {
             bonus2 bAddClass,Class_All,7;
-            if (.@g>=4) {
+            if (.@g >= ENCHANTGRADE_A) {
                bonus bPAtk,(.@r/3);
                bonus bPow,(.@r/3);
             }
@@ -157239,12 +157239,12 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bSkillAtk,"IG_OVERSLASH",5;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bPAtk,1;
             bonus2 bSkillAtk,"IG_OVERSLASH",8;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPow,1;
                bonus2 bSkillAtk,"IG_OVERSLASH",12;
             }
@@ -157287,13 +157287,13 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bAddClass,Class_All,2;
          bonus2 bSkillAtk,"IG_OVERSLASH",10;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bPAtk,1;
             bonus2 bAddClass,Class_All,3;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus2 bSkillAtk,"IG_OVERSLASH",10;
             }
          }
@@ -157368,16 +157368,16 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          if (.@r>=11) {
             bonus2 bAddEle,Ele_All,15;
          }
       }
-      if (.@g>=2) {
+      if (.@g >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"LG_OVERBRAND",15;
-         if (.@g>=3) {
+         if (.@g >= ENCHANTGRADE_B) {
             bonus2 bAddClass,Class_All,7;
-            if (.@g>=4) {
+            if (.@g >= ENCHANTGRADE_A) {
                bonus bPAtk,(.@r/3);
                bonus bPow,(.@r/3);
             }
@@ -157534,12 +157534,12 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bAddClass,Class_All,3;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus2 bAddEle,Ele_All,15;
             bonus bPAtk,1;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPAtk,2;
                bonus bPow,3;
             }
@@ -157571,11 +157571,11 @@ Body:
       bonus2 bSkillAtk,"IG_SHIELD_SHOOTING",6*(.@r/2);
       bonus2 bSkillAtk,"PA_SHIELDCHAIN",15*(.@r/3);
       bonus bLongAtkRate,3*(.@r/4);
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bPow,2;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus2 bSkillAtk,"IG_SHIELD_SHOOTING",10;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPAtk,2;
             }
          }
@@ -157915,14 +157915,14 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bSkillAtk,"EM_DIAMOND_STORM",5;
          bonus2 bSkillAtk,"EM_TERRA_DRIVE",5;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bSmatk,1;
             bonus2 bSkillAtk,"EM_DIAMOND_STORM",8;
             bonus2 bSkillAtk,"EM_TERRA_DRIVE",8;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bSpl,1;
                bonus2 bSkillAtk,"EM_DIAMOND_STORM",12;
                bonus2 bSkillAtk,"EM_TERRA_DRIVE",12;
@@ -157965,12 +157965,12 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bSkillAtk,"CD_PETITIO",5;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bSmatk,1;
             bonus2 bSkillAtk,"CD_PETITIO",8;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bSpl,1;
                bonus2 bSkillAtk,"CD_PETITIO",12;
             }
@@ -158185,16 +158185,16 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          if (.@r>=11) {
             bonus2 bMagicAddEle,Ele_All,15;
          }
       }
-      if (.@g>=2) {
+      if (.@g >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"SO_PSYCHIC_WAVE",15;
-         if (.@g>=3) {
+         if (.@g >= ENCHANTGRADE_B) {
             bonus bMatkRate,7;
-            if (.@g>=4) {
+            if (.@g >= ENCHANTGRADE_A) {
                bonus bSmatk,(.@r/3);
                bonus bSpl,(.@r/3);
             }
@@ -158236,16 +158236,16 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          if (.@r>=11) {
             bonus2 bMagicAddEle,Ele_All,15;
          }
       }
-      if (.@g>=2) {
+      if (.@g >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"SO_POISON_BUSTER",15;
-         if (.@g>=3) {
+         if (.@g >= ENCHANTGRADE_B) {
             bonus bMatkRate,7;
-            if (.@g>=4) {
+            if (.@g >= ENCHANTGRADE_A) {
                bonus bSmatk,(.@r/3);
                bonus bSpl,(.@r/3);
             }
@@ -158288,18 +158288,18 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          if (.@r>=11) {
             bonus2 bMagicAddEle,Ele_All,15;
             bonus2 bAddEle,Ele_All,15;
          }
       }
-      if (.@g>=2) {
+      if (.@g >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"AB_DUPLELIGHT",25;
-         if (.@g>=3) {
+         if (.@g >= ENCHANTGRADE_B) {
             bonus bMatkRate,7;
             bonus2 bAddClass,Class_All,7;
-            if (.@g>=4) {
+            if (.@g >= ENCHANTGRADE_A) {
                bonus bPAtk,(.@r/3);
                bonus bPow,(.@r/3);
             }
@@ -158667,12 +158667,12 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bMatkRate,3;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus2 bMagicAtkEle,Ele_Holy,15;
             bonus bSmatk,1;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bSmatk,2;
                bonus bSpl,3;
             }
@@ -158801,12 +158801,12 @@ Body:
       bonus2 bSkillAtk,"EM_LIGHTNING_LAND",6*(.@r/2);
       bonus2 bSkillAtk,"SO_PSYCHIC_WAVE",15*(.@r/3);
       bonus2 bMagicAtkEle,Ele_All,4*(.@r/4);
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bSpl,2;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus2 bSkillAtk,"EM_CONFLAGRATION",10;
             bonus2 bSkillAtk,"EM_LIGHTNING_LAND",10;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bSmatk,2;
             }
          }
@@ -158836,11 +158836,11 @@ Body:
       bonus2 bSkillAtk,"SKE_NOON_BLAST",6*(.@r/2);
       bonus2 bSkillAtk,"SKE_RISING_SUN",8*(.@r/3);
       bonus bShortAtkRate,4*(.@r/4);
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bPow,2;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus2 bSkillAtk,"SKE_NOON_BLAST",10;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPAtk,2;
             }
          }
@@ -158903,14 +158903,14 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bSkillAtk,"SKE_SUNSET_BLAST",5;
          bonus2 bSkillAtk,"SKE_DAWN_BREAK",5;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bPAtk,1;
             bonus2 bSkillAtk,"SKE_SUNSET_BLAST",3;
             bonus2 bSkillAtk,"SKE_DAWN_BREAK",3;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPow,1;
                bonus2 bSkillAtk,"SKE_SUNSET_BLAST",5;
                bonus2 bSkillAtk,"SKE_DAWN_BREAK",5;
@@ -158952,16 +158952,16 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          if (.@r>=11) {
             bonus2 bAddEle,Ele_All,15;
          }
       }
-      if (.@g>=2) {
+      if (.@g >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"SJ_FALLINGSTAR_ATK",15;
-         if (.@g>=3) {
+         if (.@g >= ENCHANTGRADE_B) {
             bonus2 bAddClass,Class_All,7;
-            if (.@g>=4) {
+            if (.@g >= ENCHANTGRADE_A) {
                bonus bPAtk,(.@r/3);
                bonus bPow,(.@r/3);
             }
@@ -159002,16 +159002,16 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          if (.@r>=11) {
             bonus2 bAddEle,Ele_All,15;
          }
       }
-      if (.@g>=2) {
+      if (.@g >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"SJ_FULLMOONKICK",15;
-         if (.@g>=3) {
+         if (.@g >= ENCHANTGRADE_B) {
             bonus2 bAddClass,Class_All,7;
-            if (.@g>=4) {
+            if (.@g >= ENCHANTGRADE_A) {
                bonus bPAtk,(.@r/3);
                bonus bPow,(.@r/3);
             }
@@ -159054,12 +159054,12 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bAddClass,Class_All,3;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bShortAtkRate,15;
             bonus bPAtk,1;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPAtk,2;
                bonus bPow,3;
             }
@@ -159576,14 +159576,14 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bSkillAtk,"EM_CONFLAGRATION",5;
          bonus2 bSkillAtk,"EM_LIGHTNING_LAND",5;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bSmatk,1;
             bonus2 bSkillAtk,"EM_CONFLAGRATION",8;
             bonus2 bSkillAtk,"EM_LIGHTNING_LAND",8;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bSpl,1;
                bonus2 bSkillAtk,"EM_CONFLAGRATION",12;
                bonus2 bSkillAtk,"EM_LIGHTNING_LAND",12;
@@ -159627,12 +159627,12 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bSkillAtk,"CD_FRAMEN",5;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bSmatk,1;
             bonus2 bSkillAtk,"CD_FRAMEN",8;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bSpl,1;
                bonus2 bSkillAtk,"CD_FRAMEN",12;
             }
@@ -159677,13 +159677,13 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bMatkRate,2;
          bonus2 bSkillAtk,"EM_LIGHTNING_LAND",10;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bSmatk,1;
             bonus bMatkRate,3;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus2 bSkillAtk,"EM_LIGHTNING_LAND",10;
             }
          }
@@ -159903,16 +159903,16 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          if (.@r>=11) {
             bonus2 bMagicAddEle,Ele_All,15;
          }
       }
-      if (.@g>=2) {
+      if (.@g >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"AB_ADORAMUS",15;
-         if (.@g>=3) {
+         if (.@g >= ENCHANTGRADE_B) {
             bonus bMatkRate,7;
-            if (.@g>=4) {
+            if (.@g >= ENCHANTGRADE_A) {
                bonus bSmatk,(.@r/3);
                bonus bSpl,(.@r/3);
             }
@@ -160517,13 +160517,13 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bMatkRate,3;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus2 bMagicAtkEle,Ele_Poison,15;
             bonus2 bMagicAtkEle,Ele_Earth,15;
             bonus bSmatk,1;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bSmatk,2;
                bonus bSpl,3;
             }
@@ -160573,13 +160573,13 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bMatkRate,3;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus2 bMagicAtkEle,Ele_Water,15;
             bonus2 bMagicAtkEle,Ele_Wind,15;
             bonus bSmatk,1;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bSmatk,2;
                bonus bSpl,3;
             }
@@ -160790,11 +160790,11 @@ Body:
       bonus2 bSkillAtk,"SOA_TALISMAN_OF_FOUR_BEARING_GOD",6*(.@r/2);
       bonus2 bSkillAtk,"SOA_TALISMAN_OF_SOUL_STEALING",8*(.@r/3);
       bonus2 bMagicAtkEle,Ele_All,4*(.@r/4);
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bSpl,2;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus2 bSkillAtk,"SOA_TALISMAN_OF_FOUR_BEARING_GOD",10;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bSmatk,2;
             }
          }
@@ -160825,11 +160825,11 @@ Body:
       bonus2 bSkillAtk,"HN_METEOR_STORM_BUSTER",6*(.@r/2);
       bonus2 bSkillAtk,"HN_NAPALM_VULCAN_STRIKE",10*(.@r/3);
       bonus2 bMagicAtkEle,Ele_All,4*(.@r/4);
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bSpl,2;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus2 bSkillAtk,"HN_METEOR_STORM_BUSTER",10;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bSmatk,2;
             }
          }
@@ -160863,12 +160863,12 @@ Body:
       bonus2 bSkillAtk,"SH_HYUN_ROK_CANNON",7*(.@r/3);
       bonus2 bMagicAtkEle,Ele_All,4*(.@r/4);
       bonus bLongAtkRate,4*(.@r/4);
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bSpl,1;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus2 bSkillAtk,"SH_HYUN_ROKS_BREEZE",10;
             bonus2 bSkillAtk,"SH_HOWLING_OF_CHUL_HO",10;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPAtk,1;
                bonus bSmatk,1;
             }
@@ -160987,14 +160987,14 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bSkillAtk,"SH_HYUN_ROKS_BREEZE",5;
          bonus2 bSkillAtk,"SH_HYUN_ROK_CANNON",5;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bSmatk,1;
             bonus2 bSkillAtk,"SH_HYUN_ROKS_BREEZE",8;
             bonus2 bSkillAtk,"SH_HYUN_ROK_CANNON",8;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bSpl,1;
                bonus2 bSkillAtk,"SH_HYUN_ROKS_BREEZE",12;
                bonus2 bSkillAtk,"SH_HYUN_ROK_CANNON",12;
@@ -161041,14 +161041,14 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bSkillAtk,"SOA_EXORCISM_OF_MALICIOUS_SOUL",5;
          bonus2 bSkillAtk,"SOA_TALISMAN_OF_SOUL_STEALING",5;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bSmatk,1;
             bonus2 bSkillAtk,"SOA_EXORCISM_OF_MALICIOUS_SOUL",8;
             bonus2 bSkillAtk,"SOA_TALISMAN_OF_SOUL_STEALING",8;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bSpl,1;
                bonus2 bSkillAtk,"SOA_EXORCISM_OF_MALICIOUS_SOUL",12;
                bonus2 bSkillAtk,"SOA_TALISMAN_OF_SOUL_STEALING",12;
@@ -161093,14 +161093,14 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bSkillAtk,"HN_METEOR_STORM_BUSTER",5;
          bonus2 bSkillAtk,"HN_JACK_FROST_NOVA",5;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bSmatk,1;
             bonus2 bSkillAtk,"HN_METEOR_STORM_BUSTER",8;
             bonus2 bSkillAtk,"HN_JACK_FROST_NOVA",8;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bSpl,1;
                bonus2 bSkillAtk,"HN_METEOR_STORM_BUSTER",12;
                bonus2 bSkillAtk,"HN_JACK_FROST_NOVA",12;
@@ -161144,16 +161144,16 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          if (.@r>=11) {
             bonus2 bMagicAddEle,Ele_All,15;
          }
       }
-      if (.@g>=2) {
+      if (.@g >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"SP_CURSEEXPLOSION",15;
-         if (.@g>=3) {
+         if (.@g >= ENCHANTGRADE_B) {
             bonus bMatkRate,7;
-            if (.@g>=4) {
+            if (.@g >= ENCHANTGRADE_A) {
                bonus bSmatk,(.@r/3);
                bonus bSpl,(.@r/3);
             }
@@ -161202,16 +161202,16 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          if (.@r>=11) {
             bonus2 bMagicAddEle,Ele_All,15;
          }
       }
-      if (.@g>=2) {
+      if (.@g >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"SP_SWHOO",15;
-         if (.@g>=3) {
+         if (.@g >= ENCHANTGRADE_B) {
             bonus bMatkRate,7;
-            if (.@g>=4) {
+            if (.@g >= ENCHANTGRADE_A) {
                bonus bSmatk,(.@r/3);
                bonus bSpl,(.@r/3);
             }
@@ -161254,16 +161254,16 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          if (.@r>=11) {
             bonus2 bMagicAddEle,Ele_All,15;
          }
       }
-      if (.@g>=2) {
+      if (.@g >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"SU_CN_METEOR",15;
-         if (.@g>=3) {
+         if (.@g >= ENCHANTGRADE_B) {
             bonus bMatkRate,7;
-            if (.@g>=4) {
+            if (.@g >= ENCHANTGRADE_A) {
                bonus bSmatk,(.@r/3);
                bonus bSpl,(.@r/3);
             }
@@ -161305,16 +161305,16 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          if (.@r>=11) {
             bonus2 bAddEle,Ele_All,15;
          }
       }
-      if (.@g>=2) {
+      if (.@g >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"SU_PICKYPECK",15;
-         if (.@g>=3) {
+         if (.@g >= ENCHANTGRADE_B) {
             bonus2 bAddClass,Class_All,7;
-            if (.@g>=4) {
+            if (.@g >= ENCHANTGRADE_A) {
                bonus bPAtk,(.@r/3);
                bonus bPow,(.@r/3);
             }
@@ -161359,14 +161359,14 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bAddClass,Class_All,3;
          bonus bMatkRate,3;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus2 bMagicAtkEle,Ele_All,15;
             bonus2 bMagicAtkEle,Ele_Earth,15;
             bonus bSmatk,1;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bSmatk,2;
                bonus bSpl,3;
             }
@@ -161413,12 +161413,12 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bMatkRate,3;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus2 bMagicAtkEle,Ele_All,15;
             bonus bSmatk,1;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bSmatk,2;
                bonus bSpl,3;
             }
@@ -161778,12 +161778,12 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bSkillAtk,"IQ_SECOND_FAITH",5;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bPAtk,1;
             bonus2 bSkillAtk,"IQ_SECOND_FAITH",8;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPow,1;
                bonus2 bSkillAtk,"IQ_SECOND_FAITH",12;
             }
@@ -161822,12 +161822,12 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bSkillAtk,"IQ_EXPOSION_BLASTER",5;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bPAtk,1;
             bonus2 bSkillAtk,"IQ_EXPOSION_BLASTER",8;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPow,1;
                bonus2 bSkillAtk,"IQ_EXPOSION_BLASTER",12;
             }
@@ -161870,13 +161870,13 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bAddClass,Class_All,2;
          bonus2 bSkillAtk,"IQ_THIRD_FLAME_BOMB",10;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bPAtk,1;
             bonus2 bAddClass,Class_All,3;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus2 bSkillAtk,"IQ_THIRD_FLAME_BOMB",10;
             }
          }
@@ -161986,16 +161986,16 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          if (.@r>=11) {
             bonus2 bAddEle,Ele_All,15;
          }
       }
-      if (.@g>=2) {
+      if (.@g >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"SR_TIGERCANNON",15;
-         if (.@g>=3) {
+         if (.@g >= ENCHANTGRADE_B) {
             bonus2 bAddClass,Class_All,7;
-            if (.@g>=4) {
+            if (.@g >= ENCHANTGRADE_A) {
                bonus bPAtk,(.@r/3);
                bonus bPow,(.@r/3);
             }
@@ -162036,16 +162036,16 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          if (.@r>=11) {
             bonus2 bAddEle,Ele_All,15;
          }
       }
-      if (.@g>=2) {
+      if (.@g >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"SR_RAMPAGEBLASTER",15;
-         if (.@g>=3) {
+         if (.@g >= ENCHANTGRADE_B) {
             bonus2 bAddClass,Class_All,7;
-            if (.@g>=4) {
+            if (.@g >= ENCHANTGRADE_A) {
                bonus bPAtk,(.@r/3);
                bonus bPow,(.@r/3);
             }
@@ -162232,12 +162232,12 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bAddClass,Class_All,3;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bLongAtkRate,15;
             bonus bPAtk,1;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPAtk,2;
                bonus bPow,3;
             }
@@ -162285,13 +162285,13 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bAddClass,Class_All,3;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bLongAtkRate,15;
             bonus bShortAtkRate,15;
             bonus bPAtk,1;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPAtk,2;
                bonus bPow,3;
             }
@@ -162323,12 +162323,12 @@ Body:
       bonus2 bSkillAtk,"IQ_SECOND_FAITH",7*(.@r/2);
       bonus2 bSkillAtk,"IQ_SECOND_JUDGEMENT",7*(.@r/2);
       bonus bShortAtkRate,4*(.@r/4);
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bPow,2;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus2 bSkillAtk,"IQ_SECOND_FAITH",10;
             bonus2 bSkillAtk,"IQ_SECOND_JUDGEMENT",10;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPAtk,2;
             }
          }
@@ -162639,12 +162639,12 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bSkillAtk,"TR_METALIC_FURY",5;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bSmatk,1;
             bonus2 bSkillAtk,"TR_METALIC_FURY",8;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bSpl,1;
                bonus2 bSkillAtk,"TR_METALIC_FURY",12;
             }
@@ -162688,13 +162688,13 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bAddClass,Class_All,2;
          bonus2 bSkillAtk,"TR_RHYTHMSHOOTING",10;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bPAtk,1;
             bonus2 bAddClass,Class_All,3;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus2 bSkillAtk,"TR_RHYTHMSHOOTING",10;
             }
          }
@@ -162808,16 +162808,16 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          if (.@r>=11) {
             bonus2 bAddEle,Ele_All,15;
          }
       }
-      if (.@g>=2) {
+      if (.@g >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"WM_SEVERE_RAINSTORM",15;
-         if (.@g>=3) {
+         if (.@g >= ENCHANTGRADE_B) {
             bonus2 bAddClass,Class_All,7;
-            if (.@g>=4) {
+            if (.@g >= ENCHANTGRADE_A) {
                bonus bPAtk,(.@r/3);
                bonus bPow,(.@r/3);
             }
@@ -162860,16 +162860,16 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          if (.@r>=11) {
             bonus2 bMagicAddEle,Ele_All,15;
          }
       }
-      if (.@g>=2) {
+      if (.@g >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"WM_METALICSOUND",15;
-         if (.@g>=3) {
+         if (.@g >= ENCHANTGRADE_B) {
             bonus bMatkRate,7;
-            if (.@g>=4) {
+            if (.@g >= ENCHANTGRADE_A) {
                bonus bSmatk,(.@r/3);
                bonus bSpl,(.@r/3);
             }
@@ -163075,12 +163075,12 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bMatkRate,3;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus2 bMagicAtkEle,Ele_All,15;
             bonus bSmatk,1;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bSmatk,2;
                bonus bSpl,3;
             }
@@ -163114,12 +163114,12 @@ Body:
       bonus2 bSkillAtk,"TR_RHYTHMSHOOTING",7*(.@r/2);
       bonus2 bSkillAtk,"WM_SEVERE_RAINSTORM",10*(.@r/3);
       bonus bLongAtkRate,4*(.@r/4);
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bCon,2;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus2 bSkillAtk,"TR_ROSEBLOSSOM_ATK",10;
             bonus2 bSkillAtk,"TR_RHYTHMSHOOTING",10;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPAtk,2;
             }
          }
@@ -163431,12 +163431,12 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bSkillAtk,"TR_METALIC_FURY",5;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bSmatk,1;
             bonus2 bSkillAtk,"TR_METALIC_FURY",8;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bSpl,1;
                bonus2 bSkillAtk,"TR_METALIC_FURY",12;
             }
@@ -163480,13 +163480,13 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bAddClass,Class_All,2;
          bonus2 bSkillAtk,"TR_RHYTHMSHOOTING",10;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bPAtk,1;
             bonus2 bAddClass,Class_All,3;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus2 bSkillAtk,"TR_RHYTHMSHOOTING",10;
             }
          }
@@ -163600,16 +163600,16 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          if (.@r>=11) {
             bonus2 bAddEle,Ele_All,15;
          }
       }
-      if (.@g>=2) {
+      if (.@g >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"WM_SEVERE_RAINSTORM",15;
-         if (.@g>=3) {
+         if (.@g >= ENCHANTGRADE_B) {
             bonus2 bAddClass,Class_All,7;
-            if (.@g>=4) {
+            if (.@g >= ENCHANTGRADE_A) {
                bonus bPAtk,(.@r/3);
                bonus bPow,(.@r/3);
             }
@@ -163652,16 +163652,16 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          if (.@r>=11) {
             bonus2 bMagicAddEle,Ele_All,15;
          }
       }
-      if (.@g>=2) {
+      if (.@g >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"WM_METALICSOUND",15;
-         if (.@g>=3) {
+         if (.@g >= ENCHANTGRADE_B) {
             bonus bMatkRate,7;
-            if (.@g>=4) {
+            if (.@g >= ENCHANTGRADE_A) {
                bonus bSmatk,(.@r/3);
                bonus bSpl,(.@r/3);
             }
@@ -163867,12 +163867,12 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bMatkRate,3;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus2 bMagicAtkEle,Ele_All,15;
             bonus bSmatk,1;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bSmatk,2;
                bonus bSpl,3;
             }
@@ -163906,12 +163906,12 @@ Body:
       bonus2 bSkillAtk,"TR_RHYTHMSHOOTING",7*(.@r/2);
       bonus2 bSkillAtk,"WM_SEVERE_RAINSTORM",10*(.@r/3);
       bonus bLongAtkRate,4*(.@r/4);
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bCon,2;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus2 bSkillAtk,"TR_ROSEBLOSSOM_ATK",10;
             bonus2 bSkillAtk,"TR_RHYTHMSHOOTING",10;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPAtk,2;
             }
          }
@@ -164341,11 +164341,11 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bLongAtkRate,2;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bLongAtkRate,3;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPAtk,1;
                bonus2 bSkillAtk,"NC_ARMSCANNON",10;
             }
@@ -164387,14 +164387,14 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bSkillAtk,"BO_ACIDIFIED_ZONE_WIND",5;
          bonus2 bSkillAtk,"BO_ACIDIFIED_ZONE_FIRE",5;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bPAtk,1;
             bonus2 bSkillAtk,"BO_ACIDIFIED_ZONE_WATER",8;
             bonus2 bSkillAtk,"BO_ACIDIFIED_ZONE_GROUND",8;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPow,2;
                bonus2 bSkillAtk,"BO_ACIDIFIED_ZONE_WIND",10;
                bonus2 bSkillAtk,"BO_ACIDIFIED_ZONE_FIRE",10;
@@ -164445,13 +164445,13 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bAddClass,Class_All,3;
          bonus2 bSkillAtk,"CD_PETITIO",10;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bLongAtkRate,15;
             bonus bPAtk,1;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus2 bSkillAtk,"CD_PETITIO",10;
             }
          }
@@ -164564,16 +164564,16 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          if (.@r>=11) {
             bonus2 bAddEle,Ele_All,15;
          }
       }
-      if (.@g>=2) {
+      if (.@g >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"NC_VULCANARM",15;
-         if (.@g>=3) {
+         if (.@g >= ENCHANTGRADE_B) {
             bonus2 bAddClass,Class_All,7;
-            if (.@g>=4) {
+            if (.@g >= ENCHANTGRADE_A) {
                bonus bPAtk,(.@r/3);
                bonus bPow,(.@r/3);
             }
@@ -164615,16 +164615,16 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          if (.@r>=11) {
             bonus2 bAddEle,Ele_All,15;
          }
       }
-      if (.@g>=2) {
+      if (.@g >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"GN_CART_TORNADO",15;
-         if (.@g>=3) {
+         if (.@g >= ENCHANTGRADE_B) {
             bonus2 bAddClass,Class_All,7;
-            if (.@g>=4) {
+            if (.@g >= ENCHANTGRADE_A) {
                bonus bPAtk,(.@r/3);
                bonus bPow,(.@r/3);
             }
@@ -164852,12 +164852,12 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bMatkRate,3;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus2 bMagicAtkEle,Ele_Holy,15;
             bonus bSmatk,1;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bSmatk,2;
                bonus bSpl,3;
             }
@@ -164905,12 +164905,12 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bAddClass,Class_All,3;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bLongAtkRate,15;
             bonus bPAtk,1;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPAtk,2;
                bonus bPow,3;
             }
@@ -164944,10 +164944,10 @@ Body:
       bonus bUnbreakableWeapon;
       bonus2 bSkillAtk,"CD_ARBITRIUM_ATK",7*(.@r/3);
       bonus2 bMagicAtkEle,Ele_All,3*(.@r/4);
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bSpl,2;
-         if (.@g>=2) {
-            if (.@g>=3) {
+         if (.@g >= ENCHANTGRADE_C) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bSmatk,2;
             }
          }
@@ -165293,12 +165293,12 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bSkillAtk,"DK_STORMSLASH",5;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bPAtk,1;
             bonus2 bSkillAtk,"DK_STORMSLASH",8;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPow,2;
                bonus2 bSkillAtk,"DK_STORMSLASH",12;
             }
@@ -165340,13 +165340,13 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bAddClass,Class_All,2;
          bonus2 bSkillAtk,"DK_SERVANTWEAPON_ATK",10;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bPAtk,1;
             bonus2 bAddClass,Class_All,3;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus2 bSkillAtk,"DK_SERVANTWEAPON_ATK",10;
             }
          }
@@ -165421,16 +165421,16 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          if (.@r>=11) {
             bonus2 bAddEle,Ele_All,15;
          }
       }
-      if (.@g>=2) {
+      if (.@g >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"RK_WINDCUTTER",15;
-         if (.@g>=3) {
+         if (.@g >= ENCHANTGRADE_B) {
             bonus2 bAddClass,Class_All,7;
-            if (.@g>=4) {
+            if (.@g >= ENCHANTGRADE_A) {
                bonus bPAtk,(.@r/3);
                bonus bPow,(.@r/3);
             }
@@ -165548,13 +165548,13 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bAddClass,Class_All,3;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bLongAtkRate,15;
             bonus bShortAtkRate,15;
             bonus bPAtk,1;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPAtk,2;
                bonus bPow,3;
             }
@@ -165602,14 +165602,14 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bMaxHPrate,3;
          bonus bMaxSPrate,3;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bLongAtkRate,15;
             bonus bMres,30;
             bonus bRes,30;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus2 bSubEle,Ele_All,15;
             }
          }
@@ -165926,12 +165926,12 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bSkillAtk,"SHC_IMPACT_CRATER",5;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bPAtk,1;
             bonus2 bSkillAtk,"SHC_IMPACT_CRATER",8;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPow,1;
                bonus2 bSkillAtk,"SHC_IMPACT_CRATER",12;
             }
@@ -165974,13 +165974,13 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bAddClass,Class_All,3;
          bonus2 bSkillAtk,"SHC_IMPACT_CRATER",10;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bDelayrate,-5;
             bonus bPAtk,1;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus2 bSkillAtk,"SHC_IMPACT_CRATER",10;
             }
          }
@@ -166090,16 +166090,16 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          if (.@r>=11) {
             bonus2 bAddEle,Ele_All,15;
          }
       }
-      if (.@g>=2) {
+      if (.@g >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"GC_ROLLINGCUTTER",15;
-         if (.@g>=3) {
+         if (.@g >= ENCHANTGRADE_B) {
             bonus2 bAddClass,Class_All,7;
-            if (.@g>=4) {
+            if (.@g >= ENCHANTGRADE_A) {
                bonus bPAtk,(.@r/3);
                bonus bPow,(.@r/3);
             }
@@ -166140,16 +166140,16 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          if (.@r>=11) {
             bonus2 bAddEle,Ele_All,15;
          }
       }
-      if (.@g>=2) {
+      if (.@g >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"GC_COUNTERSLASH",15;
-         if (.@g>=3) {
+         if (.@g >= ENCHANTGRADE_B) {
             bonus2 bAddClass,Class_All,7;
-            if (.@g>=4) {
+            if (.@g >= ENCHANTGRADE_A) {
                bonus bPAtk,(.@r/3);
                bonus bPow,(.@r/3);
             }
@@ -166379,12 +166379,12 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bAddClass,Class_All,3;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bShortAtkRate,15;
             bonus bPAtk,1;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPAtk,2;
                bonus bPow,3;
             }
@@ -166434,13 +166434,13 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bAddClass,Class_All,3;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bLongAtkRate,15;
             bonus bShortAtkRate,15;
             bonus bPAtk,1;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPAtk,2;
                bonus bPow,3;
             }
@@ -166472,11 +166472,11 @@ Body:
       bonus2 bSkillAtk,"SHC_IMPACT_CRATER",6*(.@r/2);
       bonus2 bSkillAtk,"SHC_SAVAGE_IMPACT",7*(.@r/3);
       bonus bShortAtkRate,3*(.@r/4);
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bPow,2;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus2 bSkillAtk,"SHC_IMPACT_CRATER",10;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPAtk,2;
             }
          }
@@ -166638,12 +166638,12 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bSkillAtk,"MT_AXE_STOMP",5;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bPAtk,1;
             bonus2 bSkillAtk,"MT_AXE_STOMP",8;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPow,2;
                bonus2 bSkillAtk,"MT_AXE_STOMP",12;
             }
@@ -166687,13 +166687,13 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bAddClass,Class_All,2;
          bonus2 bSkillAtk,"MT_AXE_STOMP",10;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bPAtk,1;
             bonus2 bAddClass,Class_All,3;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus2 bSkillAtk,"MT_AXE_STOMP",10;
             }
          }
@@ -166846,13 +166846,13 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bAddClass,Class_All,3;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bLongAtkRate,15;
             bonus bShortAtkRate,15;
             bonus bPAtk,1;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPAtk,2;
                bonus bPow,3;
             }
@@ -166885,11 +166885,11 @@ Body:
       bonus2 bSkillAtk,"MT_AXE_STOMP",7*(.@r/2);
       bonus2 bSkillAtk,"NC_AXETORNADO",8*(.@r/3);
       bonus bShortAtkRate,3*(.@r/4);
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bPow,2;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus2 bSkillAtk,"MT_AXE_STOMP",10;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPAtk,2;
             }
          }
@@ -167101,12 +167101,12 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bSkillAtk,"DK_MADNESS_CRUSHER",5;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bPAtk,1;
             bonus2 bSkillAtk,"DK_MADNESS_CRUSHER",8;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPow,2;
                bonus2 bSkillAtk,"DK_MADNESS_CRUSHER",12;
             }
@@ -167182,16 +167182,16 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          if (.@r>=11) {
             bonus2 bAddEle,Ele_All,15;
          }
       }
-      if (.@g>=2) {
+      if (.@g >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"RK_HUNDREDSPEAR",15;
-         if (.@g>=3) {
+         if (.@g >= ENCHANTGRADE_B) {
             bonus2 bAddClass,Class_All,7;
-            if (.@g>=4) {
+            if (.@g >= ENCHANTGRADE_A) {
                bonus bPAtk,(.@r/3);
                bonus bPow,(.@r/3);
             }
@@ -167627,14 +167627,14 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bSkillAtk,"AG_CRIMSON_ARROW_ATK",5;
          bonus2 bSkillAtk,"AG_FROZEN_SLASH",5;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bSmatk,1;
             bonus2 bSkillAtk,"AG_CRIMSON_ARROW_ATK",8;
             bonus2 bSkillAtk,"AG_FROZEN_SLASH",8;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bSpl,2;
                bonus2 bSkillAtk,"AG_CRIMSON_ARROW_ATK",12;
                bonus2 bSkillAtk,"AG_FROZEN_SLASH",12;
@@ -167680,14 +167680,14 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bSkillAtk,"AG_STORM_CANNON",5;
          bonus2 bSkillAtk,"AG_ROCK_DOWN",5;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bSmatk,1;
             bonus2 bSkillAtk,"AG_STORM_CANNON",8;
             bonus2 bSkillAtk,"AG_ROCK_DOWN",8;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bSpl,2;
                bonus2 bSkillAtk,"AG_STORM_CANNON",12;
                bonus2 bSkillAtk,"AG_ROCK_DOWN",12;
@@ -167733,14 +167733,14 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bMatkRate,2;
          bonus2 bSkillAtk,"AG_STRANTUM_TREMOR",10;
          bonus2 bSkillAtk,"AG_FLORAL_FLARE_ROAD",10;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bSmatk,1;
             bonus bMatkRate,3;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus2 bSkillAtk,"AG_STRANTUM_TREMOR",10;
                bonus2 bSkillAtk,"AG_FLORAL_FLARE_ROAD",10;
             }
@@ -167857,16 +167857,16 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          if (.@r>=11) {
             bonus2 bMagicAddEle,Ele_All,15;
          }
       }
-      if (.@g>=2) {
+      if (.@g >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"WL_COMET",15;
-         if (.@g>=3) {
+         if (.@g >= ENCHANTGRADE_B) {
             bonus bMatkRate,7;
-            if (.@g>=4) {
+            if (.@g >= ENCHANTGRADE_A) {
                bonus bSmatk,(.@r/3);
                bonus bSpl,(.@r/3);
             }
@@ -167909,16 +167909,16 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          if (.@r>=11) {
             bonus2 bMagicAddEle,Ele_All,15;
          }
       }
-      if (.@g>=2) {
+      if (.@g >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"WL_SOULEXPANSION",15;
-         if (.@g>=3) {
+         if (.@g >= ENCHANTGRADE_B) {
             bonus bMatkRate,7;
-            if (.@g>=4) {
+            if (.@g >= ENCHANTGRADE_A) {
                bonus bSmatk,(.@r/3);
                bonus bSpl,(.@r/3);
             }
@@ -168140,13 +168140,13 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bMatkRate,3;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus2 bMagicAtkEle,Ele_Fire,15;
             bonus2 bMagicAtkEle,Ele_Earth,15;
             bonus bSmatk,1;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bSmatk,2;
                bonus bSpl,3;
             }
@@ -168200,14 +168200,14 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bMatkRate,3;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus2 bMagicAtkEle,Ele_Ghost,15;
             bonus2 bMagicAtkEle,Ele_Water,15;
             bonus2 bMagicAtkEle,Ele_Wind,15;
             bonus bSmatk,1;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bSmatk,2;
                bonus bSpl,3;
             }
@@ -168242,12 +168242,12 @@ Body:
       bonus2 bSkillAtk,"AG_FROZEN_SLASH",6*(.@r/2);
       bonus2 bSkillAtk,"AG_CRYSTAL_IMPACT_ATK",5*(.@r/3);
       bonus2 bMagicAtkEle,Ele_All,3*(.@r/4);
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bSpl,2;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus2 bSkillAtk,"AG_CRIMSON_ARROW_ATK",10;
             bonus2 bSkillAtk,"AG_FROZEN_SLASH",10;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bSmatk,2;
             }
          }
@@ -168677,11 +168677,11 @@ Body:
       .@g = getenchantgrade();
       bonus bUnbreakableWeapon;
       bonus bLongAtkRate,4*(getrefine()/4);
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bPow,2;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus2 bSkillAtk,"SS_FUUMASHOUAKU",10;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPAtk,2;
             }
          }
@@ -168745,16 +168745,16 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          if (.@r>=11) {
             bonus2 bAddEle,Ele_All,15;
          }
       }
-      if (.@g>=2) {
+      if (.@g >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"KO_JYUMONJIKIRI",15;
-         if (.@g>=3) {
+         if (.@g >= ENCHANTGRADE_B) {
             bonus2 bAddClass,Class_All,7;
-            if (.@g>=4) {
+            if (.@g >= ENCHANTGRADE_A) {
                bonus bPAtk,(.@r/3);
                bonus bPow,(.@r/3);
             }
@@ -168796,16 +168796,16 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          if (.@r>=11) {
             bonus2 bAddEle,Ele_All,15;
          }
       }
-      if (.@g>=2) {
+      if (.@g >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"KO_HUUMARANKA",15;
-         if (.@g>=3) {
+         if (.@g >= ENCHANTGRADE_B) {
             bonus2 bAddClass,Class_All,7;
-            if (.@g>=4) {
+            if (.@g >= ENCHANTGRADE_A) {
                bonus bPAtk,(.@r/3);
                bonus bPow,(.@r/3);
             }
@@ -168850,12 +168850,12 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bAddClass,Class_All,3;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bLongAtkRate,15;
             bonus bPAtk,1;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPAtk,2;
                bonus bPow,3;
             }
@@ -169401,12 +169401,12 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bSkillAtk,"ABC_FRENZY_SHOT",5;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bPAtk,1;
             bonus2 bSkillAtk,"ABC_FRENZY_SHOT",8;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bCon,1;
                bonus2 bSkillAtk,"ABC_FRENZY_SHOT",12;
             }
@@ -169445,12 +169445,12 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bSkillAtk,"WH_CRESCIVE_BOLT",5;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bPAtk,1;
             bonus2 bSkillAtk,"WH_CRESCIVE_BOLT",8;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bCon,1;
                bonus2 bSkillAtk,"WH_CRESCIVE_BOLT",12;
             }
@@ -169489,12 +169489,12 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bSkillAtk,"WH_GALESTORM",5;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bPAtk,1;
             bonus2 bSkillAtk,"WH_GALESTORM",8;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bCon,1;
                bonus2 bSkillAtk,"WH_GALESTORM",12;
             }
@@ -169533,12 +169533,12 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bSkillAtk,"TR_RHYTHMSHOOTING",5;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bPAtk,1;
             bonus2 bSkillAtk,"TR_RHYTHMSHOOTING",8;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bCon,1;
                bonus2 bSkillAtk,"TR_RHYTHMSHOOTING",12;
             }
@@ -169581,13 +169581,13 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bAddClass,Class_All,3;
          bonus2 bSkillAtk,"WH_CRESCIVE_BOLT",10;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bDelayrate,-5;
             bonus bPAtk,1;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus2 bSkillAtk,"WH_CRESCIVE_BOLT",10;
             }
          }
@@ -169733,16 +169733,16 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          if (.@r>=11) {
             bonus2 bAddEle,Ele_All,15;
          }
       }
-      if (.@g>=2) {
+      if (.@g >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"SC_TRIANGLESHOT",15;
-         if (.@g>=3) {
+         if (.@g >= ENCHANTGRADE_B) {
             bonus2 bAddClass,Class_All,7;
-            if (.@g>=4) {
+            if (.@g >= ENCHANTGRADE_A) {
                bonus bPAtk,(.@r/3);
                bonus bPow,(.@r/3);
             }
@@ -169784,16 +169784,16 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          if (.@r>=11) {
             bonus2 bAddEle,Ele_All,15;
          }
       }
-      if (.@g>=2) {
+      if (.@g >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"RA_ARROWSTORM",15;
-         if (.@g>=3) {
+         if (.@g >= ENCHANTGRADE_B) {
             bonus2 bAddClass,Class_All,7;
-            if (.@g>=4) {
+            if (.@g >= ENCHANTGRADE_A) {
                bonus bPAtk,(.@r/3);
                bonus bPow,(.@r/3);
             }
@@ -169834,16 +169834,16 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          if (.@r>=11) {
             bonus2 bAddEle,Ele_All,15;
          }
       }
-      if (.@g>=2) {
+      if (.@g >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"RA_AIMEDBOLT",15;
-         if (.@g>=3) {
+         if (.@g >= ENCHANTGRADE_B) {
             bonus2 bAddClass,Class_All,7;
-            if (.@g>=4) {
+            if (.@g >= ENCHANTGRADE_A) {
                bonus bPAtk,(.@r/3);
                bonus bPow,(.@r/3);
             }
@@ -170154,12 +170154,12 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bAddClass,Class_All,3;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bLongAtkRate,15;
             bonus bPAtk,1;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPAtk,2;
                bonus bPow,3;
             }
@@ -170206,12 +170206,12 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bAddClass,Class_All,3;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bLongAtkRate,15;
             bonus bPAtk,1;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPAtk,2;
                bonus bPow,3;
             }
@@ -170261,12 +170261,12 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bAddClass,Class_All,3;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bLongAtkRate,15;
             bonus bPAtk,1;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPAtk,2;
                bonus bPow,3;
             }
@@ -170298,11 +170298,11 @@ Body:
       bonus2 bSkillAtk,"WH_GALESTORM",7*(.@r/2);
       bonus2 bSkillAtk,"RA_ARROWSTORM",10*(.@r/3);
       bonus bLongAtkRate,4*(.@r/4);
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bCon,2;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus2 bSkillAtk,"WH_GALESTORM",10;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPAtk,2;
             }
          }
@@ -170575,11 +170575,11 @@ Body:
       bonus2 bSkillAtk,"NW_ONLY_ONE_BULLET",7*(.@r/2);
       bonus2 bSkillAtk,"RL_FIREDANCE",10*(.@r/3);
       bonus bLongAtkRate,4*(.@r/4);
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bCon,2;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus2 bSkillAtk,"NW_ONLY_ONE_BULLET",10;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPAtk,2;
             }
          }
@@ -170640,14 +170640,14 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bSkillAtk,"NW_ONLY_ONE_BULLET",5;
          bonus2 bSkillAtk,"NW_MAGAZINE_FOR_ONE",5;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bPAtk,1;
             bonus2 bSkillAtk,"NW_ONLY_ONE_BULLET",3;
             bonus2 bSkillAtk,"NW_MAGAZINE_FOR_ONE",3;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bCon,1;
                bonus2 bSkillAtk,"NW_ONLY_ONE_BULLET",5;
                bonus2 bSkillAtk,"NW_MAGAZINE_FOR_ONE",5;
@@ -170690,16 +170690,16 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          if (.@r>=11) {
             bonus2 bAddEle,Ele_All,15;
          }
       }
-      if (.@g>=2) {
+      if (.@g >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"RL_FIREDANCE",15;
-         if (.@g>=3) {
+         if (.@g >= ENCHANTGRADE_B) {
             bonus2 bAddClass,Class_All,7;
-            if (.@g>=4) {
+            if (.@g >= ENCHANTGRADE_A) {
                bonus bPAtk,(.@r/3);
                bonus bCon,(.@r/3);
             }
@@ -170741,12 +170741,12 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bAddClass,Class_All,3;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bLongAtkRate,15;
             bonus bPAtk,1;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPAtk,2;
                bonus bPow,3;
             }
@@ -170922,11 +170922,11 @@ Body:
       bonus2 bSkillAtk,"NW_SPIRAL_SHOOTING",7*(.@r/2);
       bonus2 bSkillAtk,"RL_HAMMER_OF_GOD",10*(.@r/3);
       bonus bLongAtkRate,4*(.@r/4);
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bCon,2;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus2 bSkillAtk,"NW_SPIRAL_SHOOTING",10;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPAtk,2;
             }
          }
@@ -170988,14 +170988,14 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bSkillAtk,"NW_SPIRAL_SHOOTING",5;
          bonus2 bSkillAtk,"NW_ONLY_ONE_BULLET",5;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bPAtk,1;
             bonus2 bSkillAtk,"NW_SPIRAL_SHOOTING",3;
             bonus2 bSkillAtk,"NW_ONLY_ONE_BULLET",3;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bCon,1;
                bonus2 bSkillAtk,"NW_SPIRAL_SHOOTING",5;
                bonus2 bSkillAtk,"NW_ONLY_ONE_BULLET",5;
@@ -171038,16 +171038,16 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          if (.@r>=11) {
             bonus2 bAddEle,Ele_All,15;
          }
       }
-      if (.@g>=2) {
+      if (.@g >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"RL_HAMMER_OF_GOD",15;
-         if (.@g>=3) {
+         if (.@g >= ENCHANTGRADE_B) {
             bonus2 bAddClass,Class_All,7;
-            if (.@g>=4) {
+            if (.@g >= ENCHANTGRADE_A) {
                bonus bPAtk,(.@r/3);
                bonus bCon,(.@r/3);
             }
@@ -171090,12 +171090,12 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bMatkRate,3;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus2 bMagicAtkEle,Ele_Ghost,15;
             bonus bSmatk,1;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bSmatk,2;
                bonus bSpl,3;
             }
@@ -171245,11 +171245,11 @@ Body:
       bonus2 bSkillAtk,"NW_THE_VIGILANTE_AT_NIGHT_GUN_GATLING",7*(.@r/2);
       bonus2 bSkillAtk,"RL_BANISHING_BUSTER",10*(.@r/3);
       bonus bLongAtkRate,4*(.@r/4);
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bCon,2;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus2 bSkillAtk,"NW_THE_VIGILANTE_AT_NIGHT_GUN_GATLING",10;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPAtk,2;
             }
          }
@@ -171310,16 +171310,16 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          if (.@r>=11) {
             bonus2 bAddEle,Ele_All,15;
          }
       }
-      if (.@g>=2) {
+      if (.@g >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"RL_S_STORM",15;
-         if (.@g>=3) {
+         if (.@g >= ENCHANTGRADE_B) {
             bonus2 bAddClass,Class_All,7;
-            if (.@g>=4) {
+            if (.@g >= ENCHANTGRADE_A) {
                bonus bPAtk,(.@r/3);
                bonus bCon,(.@r/3);
             }
@@ -171364,12 +171364,12 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bAddClass,Class_All,3;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bLongAtkRate,15;
             bonus bPAtk,1;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPAtk,2;
                bonus bPow,3;
             }
@@ -171623,11 +171623,11 @@ Body:
       bonus2 bSkillAtk,"NW_MAGAZINE_FOR_ONE",7*(.@r/2);
       bonus2 bSkillAtk,"RL_R_TRIP",10*(.@r/3);
       bonus bLongAtkRate,4*(.@r/4);
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bCon,2;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus2 bSkillAtk,"NW_MAGAZINE_FOR_ONE",10;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPAtk,2;
             }
          }
@@ -171688,14 +171688,14 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bSkillAtk,"NW_THE_VIGILANTE_AT_NIGHT_GUN_GATLING",5;
          bonus2 bSkillAtk,"NW_MAGAZINE_FOR_ONE",5;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bPAtk,1;
             bonus2 bSkillAtk,"NW_THE_VIGILANTE_AT_NIGHT_GUN_GATLING",3;
             bonus2 bSkillAtk,"NW_MAGAZINE_FOR_ONE",3;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bCon,1;
                bonus2 bSkillAtk,"NW_THE_VIGILANTE_AT_NIGHT_GUN_GATLING",5;
                bonus2 bSkillAtk,"NW_MAGAZINE_FOR_ONE",5;
@@ -171737,16 +171737,16 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          if (.@r>=11) {
             bonus2 bAddEle,Ele_All,15;
          }
       }
-      if (.@g>=2) {
+      if (.@g >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"RL_R_TRIP",15;
-         if (.@g>=3) {
+         if (.@g >= ENCHANTGRADE_B) {
             bonus2 bAddClass,Class_All,7;
-            if (.@g>=4) {
+            if (.@g >= ENCHANTGRADE_A) {
                bonus bPAtk,(.@r/3);
                bonus bCon,(.@r/3);
             }
@@ -171788,12 +171788,12 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bAddClass,Class_All,3;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bLongAtkRate,15;
             bonus bPAtk,1;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPAtk,2;
                bonus bPow,3;
             }
@@ -171938,11 +171938,11 @@ Body:
       bonus2 bSkillAtk,"NW_WILD_FIRE",7*(.@r/2);
       bonus2 bSkillAtk,"RL_H_MINE",10*(.@r/3);
       bonus bLongAtkRate,4*(.@r/4);
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus bCon,2;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus2 bSkillAtk,"NW_WILD_FIRE",10;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPAtk,2;
             }
          }
@@ -172004,14 +172004,14 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bSkillAtk,"NW_SPIRAL_SHOOTING",5;
          bonus2 bSkillAtk,"NW_WILD_FIRE",5;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bPAtk,1;
             bonus2 bSkillAtk,"NW_SPIRAL_SHOOTING",3;
             bonus2 bSkillAtk,"NW_WILD_FIRE",3;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bCon,1;
                bonus2 bSkillAtk,"NW_SPIRAL_SHOOTING",5;
                bonus2 bSkillAtk,"NW_WILD_FIRE",5;
@@ -172053,16 +172053,16 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          if (.@r>=11) {
             bonus2 bAddEle,Ele_All,15;
          }
       }
-      if (.@g>=2) {
+      if (.@g >= ENCHANTGRADE_C) {
          bonus2 bSkillAtk,"RL_D_TAIL",15;
-         if (.@g>=3) {
+         if (.@g >= ENCHANTGRADE_B) {
             bonus2 bAddClass,Class_All,7;
-            if (.@g>=4) {
+            if (.@g >= ENCHANTGRADE_A) {
                bonus bPAtk,(.@r/3);
                bonus bCon,(.@r/3);
             }
@@ -172104,12 +172104,12 @@ Body:
             }
          }
       }
-      if (.@g>=1) {
+      if (.@g >= ENCHANTGRADE_D) {
          bonus2 bAddClass,Class_All,3;
-         if (.@g>=2) {
+         if (.@g >= ENCHANTGRADE_C) {
             bonus bLongAtkRate,15;
             bonus bPAtk,1;
-            if (.@g>=3) {
+            if (.@g >= ENCHANTGRADE_B) {
                bonus bPAtk,2;
                bonus bPow,3;
             }
diff --git a/db/re/item_db_etc.yml b/db/re/item_db_etc.yml
index 9dd69e943d..6f7d79ffb0 100644
--- a/db/re/item_db_etc.yml
+++ b/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;
                }
diff --git a/db/re/item_db_usable.yml b/db/re/item_db_usable.yml
index 41b11ee01c..9bed92cc28 100644
--- a/db/re/item_db_usable.yml
+++ b/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,139 +48163,6 @@ 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
-    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
-    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: 23815
     AegisName: Magma_Essence
     Name: Lava Essence
@@ -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"
diff --git a/db/re/item_randomopt_group.yml b/db/re/item_randomopt_group.yml
index 0afbc976ac..0e2402b4e4 100644
--- a/db/re/item_randomopt_group.yml
+++ b/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