diff --git a/db/pre-re/item_db_equip.yml b/db/pre-re/item_db_equip.yml
index 5a6049ecc4..a9120def12 100644
--- a/db/pre-re/item_db_equip.yml
+++ b/db/pre-re/item_db_equip.yml
@@ -10431,8 +10431,9 @@ Body:
       bonus bDex,1;
       bonus bAtkEle,Ele_Undead;
       bonus bMatkRate,20;
-      bonus3 bAutoSpellWhenHit,"NPC_WIDECURSE",5,10+getrefine();
-      if (getrefine()>=9) {
+      .@r = getrefine();
+      bonus3 bAutoSpellWhenHit,"NPC_WIDECURSE",5,10+.@r;
+      if (.@r>=9) {
          bonus bMatkRate,3;
          bonus bMaxSP,300;
       }
@@ -10484,8 +10485,9 @@ Body:
     Script: |
       bonus bInt,4;
       bonus bMatkRate,15;
-      bonus2 bIgnoreMdefClassRate,Class_Normal,10+getrefine();
-      bonus2 bIgnoreMdefClassRate,Class_Boss,10+getrefine();
+      .@r = getrefine();
+      bonus2 bIgnoreMdefClassRate,Class_Normal,10+.@r;
+      bonus2 bIgnoreMdefClassRate,Class_Boss,10+.@r;
   - Id: 1627
     AegisName: Staffy
     Name: Staffy
@@ -10780,9 +10782,10 @@ Body:
       bonus bInt,3;
       bonus bDex,3;
       bonus bMatkRate,20;
-      bonus2 bIgnoreMdefClassRate,Class_Normal,getrefine();
-      bonus2 bIgnoreMdefClassRate,Class_Boss,getrefine();
-      bonus bDelayRate,-(getrefine()*3/2);
+      .@r = getrefine();
+      bonus2 bIgnoreMdefClassRate,Class_Normal,.@r;
+      bonus2 bIgnoreMdefClassRate,Class_Boss,.@r;
+      bonus bDelayRate,-(.@r*3/2);
   - Id: 1637
     AegisName: Eraser
     Name: Eraser
@@ -10907,12 +10910,14 @@ Body:
       NoMail: true
       NoAuction: true
     Script: |
+      bonus bMatkRate,15;
       bonus2 bMagicAddRace,RC_DemiHuman,15;
       bonus2 bMagicAddRace,RC_Player_Human,15;
-      bonus2 bIgnoreMdefRaceRate,RC_DemiHuman,25 + ((getrefine()>5) ? 5 : 0);
-      bonus2 bIgnoreMdefRaceRate,RC_Player_Human,25 + ((getrefine()>5) ? 5 : 0);
+      .@r = getrefine();
+      bonus2 bIgnoreMdefRaceRate,RC_DemiHuman,25 + ((.@r>5) ? 5 : 0);
+      bonus2 bIgnoreMdefRaceRate,RC_Player_Human,25 + ((.@r>5) ? 5 : 0);
       bonus bUnbreakableWeapon;
-      if (getrefine()>8) {
+      if (.@r>8) {
          bonus bCastrate,-5;
          bonus bDelayRate,-5;
          bonus bMatkRate,5;
@@ -10947,17 +10952,19 @@ Body:
       NoMail: true
       NoAuction: true
     Script: |
+      bonus bMatkRate,15;
       bonus bHealPower,14;
       bonus bDelayRate,-10;
       bonus bUnbreakableWeapon;
-      if (getrefine()>5) {
+      .@r = getrefine();
+      if (.@r>5) {
          bonus2 bIgnoreMdefRaceRate,RC_DemiHuman,5;
          bonus2 bIgnoreMdefRaceRate,RC_Player_Human,5;
-         bonus bHealPower,5+(getrefine()-5)*2;
+         bonus bHealPower,5+(.@r-5)*2;
       }
-      if (getrefine()>8)
+      if (.@r>8)
          bonus5 bAutoSpellOnSkill,"AL_HEAL","AL_HEAL",10,100,1;
-      if (getrefine()>9) {
+      if (.@r>9) {
          bonus bHealPower,10;
       }
   - Id: 1642
@@ -11015,10 +11022,11 @@ Body:
     EquipLevelMin: 70
     Refineable: true
     Script: |
-      bonus bMatk,15;
+      bonus bMatkRate,15;
       bonus bInt,4;
-      if (getrefine()>5) {
-         bonus bInt,getrefine()-5;
+      .@r = getrefine();
+      if (.@r>5) {
+         bonus bInt,.@r-5;
          bonus bMaxHP,-200;
          bonus bMaxSP,-100;
       }
@@ -11056,8 +11064,9 @@ Body:
     Script: |
       bonus bInt,4;
       bonus bMatkRate,15;
-      bonus2 bIgnoreMdefClassRate,Class_Normal,10+getrefine();
-      bonus2 bIgnoreMdefClassRate,Class_Boss,10+getrefine();
+      .@r = getrefine();
+      bonus2 bIgnoreMdefClassRate,Class_Normal,10+.@r;
+      bonus2 bIgnoreMdefClassRate,Class_Boss,10+.@r;
   - Id: 1645
     AegisName: Lich_Bone_Wand_M
     Name: Lich's Bone Wand
@@ -11095,8 +11104,9 @@ Body:
       bonus bDex,1;
       bonus bAtkEle,Ele_Undead;
       bonus bMatkRate,20;
-      bonus3 bAutoSpellWhenHit,"NPC_WIDECURSE",5,10+getrefine();
-      if (getrefine()>=9) {
+      .@r = getrefine();
+      bonus3 bAutoSpellWhenHit,"NPC_WIDECURSE",5,10+.@r;
+      if (.@r>=9) {
          bonus bMatkRate,3;
          bonus bMaxSP,300;
       }
@@ -11124,9 +11134,10 @@ Body:
     Script: |
       bonus bInt,4;
       bonus bMatkRate,15;
-      bonus bMdef,getrefine();
-      bonus2 bSkillAtk,"WZ_STORMGUST",getrefine();
-      if (getrefine()>9)
+      .@r = getrefine();
+      bonus bMdef,.@r;
+      bonus2 bSkillAtk,"WZ_STORMGUST",.@r;
+      if (.@r>9)
          bonus2 bCastrate,"WZ_STORMGUST",-8;
   - Id: 1647
     AegisName: Croce_Staff
@@ -14222,11 +14233,12 @@ Body:
     EquipLevelMin: 80
     Refineable: true
     Script: |
-      bonus bMatkRate,25+getrefine()/2;
+      .@r = getrefine();
+      bonus bMatkRate,25+(.@r/2);
       bonus bInt,3;
       bonus bAgi,10;
-      bonus bUseSPrate,(getrefine()*2);
-      bonus3 bAutoSpellWhenHit,"WZ_JUPITEL",5,(getrefine()*20);
+      bonus bUseSPrate,(.@r*2);
+      bonus3 bAutoSpellWhenHit,"WZ_JUPITEL",5,(.@r*20);
       bonus2 bCastrate,"HW_MAGICPOWER",-50;
   - Id: 2001
     AegisName: Divine_Cross
@@ -14280,19 +14292,20 @@ Body:
       NoMail: true
       NoAuction: true
     Script: |
-      bonus bMatkRate,getrefine();
+      .@r = getrefine();
+      bonus bMatkRate,15 + .@r;
       bonus2 bMagicAddRace,RC_DemiHuman,15;
       bonus2 bMagicAddRace,RC_Player_Human,15;
       bonus2 bIgnoreMdefRaceRate,RC_DemiHuman,25;
       bonus2 bIgnoreMdefRaceRate,RC_Player_Human,25;
       bonus bUnbreakableWeapon;
-      if (getrefine()>5) {
-         bonus2 bMagicAddRace,RC_DemiHuman,(getrefine()-5)*2;
-         bonus2 bMagicAddRace,RC_Player_Human,(getrefine()-5)*2;
-         bonus2 bIgnoreMdefRaceRate,RC_DemiHuman,5+(getrefine()-5)*2;
-         bonus2 bIgnoreMdefRaceRate,RC_Player_Human,5+(getrefine()-5)*2;
+      if (.@r>5) {
+         bonus2 bMagicAddRace,RC_DemiHuman,(.@r-5)*2;
+         bonus2 bMagicAddRace,RC_Player_Human,(.@r-5)*2;
+         bonus2 bIgnoreMdefRaceRate,RC_DemiHuman,5+(.@r-5)*2;
+         bonus2 bIgnoreMdefRaceRate,RC_Player_Human,5+(.@r-5)*2;
       }
-      if (getrefine()>8) {
+      if (.@r>8) {
          bonus5 bAutoSpellOnSkill,"WZ_STORMGUST","MG_SAFETYWALL",10,200,1;
          bonus5 bAutoSpellOnSkill,"WZ_METEOR","MG_SAFETYWALL",10,200,1;
          bonus5 bAutoSpellOnSkill,"WZ_VERMILION","MG_SAFETYWALL",10,200,1;
@@ -14325,11 +14338,12 @@ Body:
       NoMail: true
       NoAuction: true
     Script: |
-      bonus bMatkRate,25+getrefine()/2;
+      .@r = getrefine();
+      bonus bMatkRate,25+(.@r/2);
       bonus bInt,3;
       bonus bAgi,10;
-      bonus bUseSPrate,(getrefine()*2);
-      bonus3 bAutoSpellWhenHit,"WZ_JUPITEL",5,(getrefine()*20);
+      bonus bUseSPrate,(.@r*2);
+      bonus3 bAutoSpellWhenHit,"WZ_JUPITEL",5,(.@r*20);
       bonus2 bCastrate,"HW_MAGICPOWER",-50;
   - Id: 2004
     AegisName: Kronos
@@ -14352,9 +14366,10 @@ Body:
     EquipLevelMin: 50
     Refineable: true
     Script: |
+      .@r = getrefine();
       bonus bMatkRate,20;
-      bonus bInt,3+(getrefine()/2);
-      bonus bMaxHP,300+(50*getrefine()/2);
+      bonus bInt,3+(.@r/2);
+      bonus bMaxHP,300+(50*.@r/2);
       autobonus "{ bonus bMatkRate,12; bonus buseSPRate,20; }",1,5000,BF_MAGIC,"{ specialeffect2 EF_ENHANCE; }";
   - Id: 2005
     AegisName: Dea_Staff
@@ -14383,29 +14398,6 @@ Body:
       bonus bInt,6;
       bonus bVit,2;
       autobonus3 "{ }",20,1000,"AL_HEAL","{ specialeffect2 EF_MAGICALATTHIT; heal 0,200; }";
-  - Id: 2006
-    AegisName: G_Staff_Of_Light
-    Name: Staff Of Light
-    Type: Weapon
-    SubType: 2hStaff
-    Buy: 20
-    Weight: 1900
-    Attack: 80
-    Range: 1
-    Jobs:
-      Mage: true
-      Sage: true
-      SoulLinker: true
-      Wizard: true
-    Locations:
-      Both_Hand: true
-    WeaponLevel: 4
-    EquipLevelMin: 60
-    Refineable: true
-    Script: |
-      /* bonus bMatk,150;
-      */ bonus bAtkEle,Ele_Holy;
-      bonus bInt,6;
   - Id: 2101
     AegisName: Guard
     Name: Guard