Browse Source

Corrected script for some item #27 (#8235)

idk-whoami 1 year ago
parent
commit
ffbbb94080
4 changed files with 2551 additions and 167 deletions
  1. 806 26
      db/re/item_combos.yml
  2. 833 21
      db/re/item_db_equip.yml
  3. 799 26
      db/re/item_db_etc.yml
  4. 113 94
      db/re/item_db_usable.yml

+ 806 - 26
db/re/item_combos.yml

@@ -203,16 +203,19 @@ Body:
       bonus3 bAutoSpellWhenHit,"HP_ASSUMPTIO",2,5;
   - Combos:
       - Combo:
-          - Long_Horn
-          - Tournament_Shield
+          - Long_Horn    # 1420
+          - Tournament_Shield    # 2133
+      - Combo:
+          - Battle_Hook    # 1421
+          - Tournament_Shield    # 2133
       - Combo:
-          - Battle_Hook
-          - Tournament_Shield
+          - Hunting_Spear    # 1422
+          - Tournament_Shield    # 2133
       - Combo:
-          - Hunting_Spear
-          - Tournament_Shield
+          - Battle_Hook_    # 1440
+          - Tournament_Shield    # 2133
     Script: |
-      bonus2 bAddClass,Class_All,4;
+      bonus bAtkRate,4;
       bonus bDef,2;
       if (Class == 4008 || Class == 4054 || Class == 4060 || Class == 4252) {
          bonus bAspdRate,-5;
@@ -462,8 +465,8 @@ Body:
       bonus bMaxHP,300;
       .@r_weapon = getequiprefinerycnt(EQI_HAND_R);
       .@r_garment = getequiprefinerycnt(EQI_GARMENT);
-      bonus bMatkRate,(min(10,.@r_weapon)-5);
-      bonus2 bSubEle,Ele_Neutral,(min(10,.@r_garment)*3);
+      bonus bMatkRate,.@r_weapon-5;
+      bonus2 bSubEle,Ele_Neutral,.@r_garment*3;
   - Combos:
       - Combo:
           - Survival_Rod_
@@ -541,8 +544,8 @@ Body:
       .@weapon = getequiprefinerycnt(EQI_HAND_R);
       .@eq = getequiprefinerycnt(EQI_GARMENT);
       bonus bMaxHP,1000;
-      bonus bMatk,(-50+(20*.@weapon));
-      bonus bDelayrate,-(3*(min(.@weapon,10)/3));
+      bonus bMatk,(-50+(min(.@weapon,10)*20));
+      bonus bDelayrate,-3*(.@weapon/3);
       bonus2 bSubEle,Ele_Neutral,(min(.@eq,10)/2);
   - Combos:
       - Combo:
@@ -837,7 +840,7 @@ Body:
           - Arrow_Of_Wind
     Script: |
       bonus bLongAtkRate,25;
-      bonus3 bAutoSpell,"NJ_HUUJIN",5,(readparam(bInt) > 39) ? 300 : 100;
+      bonus3 bAutoSpell,"NJ_HUUJIN",5,(readparam(bInt) > 39) ? 200 : 100;
   - Combos:
       - Combo:
           - Gust_Bow
@@ -26523,18 +26526,19 @@ Body:
       bonus2 bCriticalAddRace,RC_Undead,50;
       bonus2 bCriticalAddRace,RC_Demon,50;
       bonus2 bCriticalAddRace,RC_DemiHuman,50;
-      /* todo auto spell */
+      bonus5 bAutoSpell,"CR_HOLYCROSS",getskilllv("CR_HOLYCROSS"),20,BF_WEAPON|BF_MAGIC,1;
+      bonus5 bAutoSpell,"AB_DUPLELIGHT",getskilllv("AB_DUPLELIGHT"),20,BF_WEAPON|BF_MAGIC,1;
+      autobonus2 "{ bonus3 bAutoSpellWhenHit,\"NPC_HELLJUDGEMENT\",3,1000; }",20,5000,BF_WEAPON,"{ active_transform 1871,5000; }";
       if (.@r >= 7) {
-         bonus2 bAddClass,Class_All,5;
+         bonus bAtkRate,5;
          bonus bMatkRate,5;
          bonus2 bSkillAtk,"CR_HOLYCROSS",50;
       }
       if (.@r >= 9) {
-         bonus2 bAddClass,Class_All,15;
+         bonus bAtkRate,15;
          bonus bMatkRate,15;
          bonus2 bSkillAtk,"CR_HOLYCROSS",100;
       }
-      /* todo CR_HOLYCROSS skill */
   - Combos:
       - Combo:
           - ShoesOfHero     # 22129
@@ -30393,32 +30397,44 @@ Body:
       bonus2 bMagicAddRace,RC_All,7*(.@r/3);
   - Combos:
       - Combo:
+          - Two_Hand_Spear_170   # 21018
           - Palace_Ring   # 490208
+      - Combo:
           - Two_Hand_Spear_170   # 21018
+          - aegis_490514   # 490514
     Script: |
       .@r = getequiprefinerycnt(EQI_HAND_R);
       bonus2 bSkillCooldown,"RK_IGNITIONBREAK",-1500;
       bonus bShortAtkRate,3*(.@r/2);
   - Combos:
       - Combo:
+          - Katar_170   # 28010
           - Palace_Ring   # 490208
+      - Combo:
           - Katar_170   # 28010
+          - aegis_490514   # 490514
     Script: |
       .@r = getequiprefinerycnt(EQI_HAND_R);
       bonus2 bSkillCooldown,"GC_DARKCROW",-8000;
       bonus bShortAtkRate,3*(.@r/2);
   - Combos:
       - Combo:
+          - Staff_170   # 2027
           - Palace_Ring   # 490208
+      - Combo:
           - Staff_170   # 2027
+          - aegis_490514   # 490514
     Script: |
       .@r = getequiprefinerycnt(EQI_HAND_R);
       bonus2 bSkillAtk,"WL_TETRAVORTEX",30;
       bonus2 bMagicAddRace,RC_All,4*(.@r/2);
   - Combos:
       - Combo:
+          - As_Ragged_Golem_Card   # 31026
           - Palace_Ring   # 490208
+      - Combo:
           - As_Ragged_Golem_Card   # 31026
+          - aegis_490514   # 490514
     Script: |
       bonus2 bAddRace,RC_All,10;
       bonus2 bMagicAddRace,RC_All,10;
@@ -36550,15 +36566,6 @@ Body:
           - Golden_Bug_Card    # 4128
     Script: |
       autobonus3 "{ bonus bAbsorbDmgMaxHP2,10; }",1000,10000,"ALL_FULL_THROTTLE";
-  - Combos:
-      - Combo:
-          - Battle_Hook_    # 1440
-          - Tournament_Shield    # 2133
-    Script: |
-      bonus bDef,2;
-      bonus bAtkRate,4;
-      if (Class == 4008 || Class == 4054 || Class == 4060 || Class == 4252)
-         bonus bAspdRate,-5;
   - Combos:
       - Combo:
           - Spiritual_Ring_    # 28432
@@ -45014,7 +45021,7 @@ Body:
           - Chonchon_Card    # 4009
           - aegis_400412    # 400412
     Script: |
-      .@r = getequiprefinerycnt(EQI_SHADOW_SHOES);
+      .@r = getequiprefinerycnt(EQI_SHOES);
       bonus bMaxHPrate,4+.@r;
       bonus bMaxSPrate,4+.@r;
   - Combos:
@@ -48714,3 +48721,776 @@ Body:
           - IDTest_gun   # 800000
     Script: |
       bonus bDex,1;
+  - Combos:
+      - Combo:
+          - aegis_312418    # 312418
+          - aegis_410284    # 410284
+      - Combo:
+          - aegis_312418    # 312418
+          - aegis_410285    # 410285
+    Script: |
+      bonus2 bSubRace,RC_Player_Doram,5;
+      bonus2 bSubRace,RC_Player_Human,5;
+      bonus2 bSubEle,Ele_Ghost,5;
+      bonus2 bSubEle,Ele_Holy,5;
+  - Combos:
+      - Combo:
+          - aegis_29725    # 29725
+          - aegis_420270    # 420270
+    Script: |
+      bonus bAllStats,10;
+      bonus2 bSubRace,RC_Player_Doram,3;
+      bonus2 bSubRace,RC_Player_Human,3;
+      bonus bNoCastCancel;
+  - Combos:
+      - Combo:
+          - aegis_300389    # 300389
+          - aegis_450338    # 450338
+    Script: |
+      bonus2 bSubEle,Ele_Ghost,15;
+      bonus2 bAddRace,RC_All,30;
+      bonus2 bMagicAddRace,RC_All,30;
+  - Combos:
+      - Combo:
+          - Tha_Anger_1    # 310197
+          - aegis_470243    # 470243
+    Script: |
+      bonus bAllStats,30;
+      bonus bAtkRate,30;
+      bonus bMatkRate,30;
+  - Combos:
+      - Combo:
+          - EvilDragon_Armor_BR    # 15238
+          - Vanargand_Helm    # 18652
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HEAD_TOP);
+      .@a = getequiprefinerycnt(EQI_ARMOR);
+      if (.@a>=12) {
+         bonus2 bHPDrainRate,-60,6;
+         bonus2 bSPDrainRate,-60,5;
+      }
+      else if (.@r>=9) {
+         bonus2 bHPDrainRate,-60,8;
+         bonus2 bSPDrainRate,-20,4;
+      }
+      else if (.@a>=9) {
+         bonus2 bHPDrainRate,-40,4;
+         bonus2 bSPDrainRate,-40,3;
+      }
+      else if (.@r>= 8) {
+         bonus2 bHPDrainRate,-50,5;
+         bonus2 bSPDrainRate,-10,2;
+      } 
+      else if (.@r >= 7) {
+         bonus2 bHPDrainRate,-30,5;
+         bonus2 bSPDrainRate,-10,2;
+      }
+      else if (.@a >=6) {
+         bonus2 bHPDrainRate,-30,3;
+         bonus2 bSPDrainRate,-30,2;
+      }
+      else if (.@r >= 5) {
+         bonus2 bHPDrainRate,-10,3;
+         bonus2 bSPDrainRate,-10,1;
+      }
+      else {
+         bonus2 bHPDrainRate,-10,1;
+         bonus2 bSPDrainRate,-10,1;
+      }
+  - Combos:
+      - Combo:
+          - Rideword_Hat    # 5208
+          - EvilDragon_Armor_BR    # 15238
+    Script: |
+      .@r = getequiprefinerycnt(EQI_ARMOR);
+      if (.@r>=12) {
+         bonus2 bHPDrainRate,-60,6;
+         bonus2 bSPDrainRate,-60,5;
+      }
+      else if (.@r>=9) {
+         bonus2 bHPDrainRate,-40,4;
+         bonus2 bSPDrainRate,-40,3;
+      }
+      else if (.@r>=6) {
+         bonus2 bHPDrainRate,-30,3;
+         bonus2 bSPDrainRate,-30,2;
+      }
+      else {
+         bonus2 bHPDrainRate,-50,8;
+         bonus2 bSPDrainRate,-10,4;
+      }
+  - Combos:
+      - Combo:
+          - Piece_Of_Angent_Skin    # 2554
+          - EvilDragon_Armor_BR    # 15238
+    Script: |
+      .@r = getequiprefinerycnt(EQI_ARMOR);
+      if (.@r>=12) {
+         bonus2 bHPDrainRate,-60,6;
+         bonus2 bSPDrainRate,-60,5;
+      }
+      else if (.@r>=9) {
+         bonus2 bHPDrainRate,-40,4;
+         bonus2 bSPDrainRate,-40,3;
+      }
+      else if (.@r>=6) {
+         bonus2 bHPDrainRate,-30,3;
+         bonus2 bSPDrainRate,-30,2;
+      }
+      else
+         bonus2 bSPDrainRate,-10,1;
+  - Combos:
+      - Combo:
+          - Majestic_Evil_Horn    # 5584
+          - EvilDragon_Armor_BR    # 15238
+    Script: |
+      .@r = getequiprefinerycnt(EQI_ARMOR);
+      if (.@r>=12) {
+         bonus2 bHPDrainRate,-60,6;
+         bonus2 bSPDrainRate,-60,5;
+      }
+      else if (.@r>=9) {
+         bonus2 bHPDrainRate,-40,4;
+         bonus2 bSPDrainRate,-40,3;
+      }
+      else if (.@r>=6) {
+         bonus2 bHPDrainRate,-30,3;
+         bonus2 bSPDrainRate,-30,2;
+      }
+      else {
+         bonus2 bHPDrainRate,30,15;
+         bonus2 bSPDrainRate,10,7;
+      }
+  - Combos:
+      - Combo:
+          - EvilDragon_Armor_BR    # 15238
+          - Cursed_Book    # 18752
+    Script: |
+      .@a = getequiprefinerycnt(EQI_HEAD_TOP);
+      .@r = getequiprefinerycnt(EQI_ARMOR);
+      if (.@r>=12) {
+         bonus2 bHPDrainRate,-60,6;
+         bonus2 bSPDrainRate,-60,5;
+      }
+      else if (.@r>=9) {
+         bonus2 bHPDrainRate,-40,4;
+         bonus2 bSPDrainRate,-40,3;
+      }
+      else if (.@r>=6) {
+         bonus2 bHPDrainRate,-30,3;
+         bonus2 bSPDrainRate,-30,2;
+      }
+      else {
+         bonus2 bHPDrainRate,-40,4+(.@a/2);
+         bonus2 bSPDrainRate,-10,1+(.@a/3);
+      }
+  - Combos:
+      - Combo:
+          - Hero    # 29509
+          - Amp_LG_2    # 310941
+    Script: |
+      autobonus "{ bonus2 bSkillUseSP,\"LG_EARTHDRIVE\",83; }",30,10000,BF_WEAPON;
+  - Combos:
+      - Combo:
+          - Release_Of_Magic    # 29371
+          - Amp_SO_4    # 310947
+    Script: |
+      bonus2 bSkillCooldown,"SO_VARETYR_SPEAR",-1000;
+  - Combos:
+      - Combo:
+          - Hero    # 29509
+          - Amp_RA_2    # 310949
+    Script: |
+      bonus2 bSkillCooldown,"RA_ARROWSTORM",-300;
+  - Combos:
+      - Combo:
+          - Release_Of_Magic    # 29371
+          - Amp_AB_2    # 310953
+    Script: |
+      bonus4 bAutoSpellOnSkill,"AB_JUDEX","MG_SAFETYWALL",max(getskilllv("MG_SAFETYWALL"),3),100;
+  - Combos:
+      - Combo:
+          - Hero    # 29509
+          - Amp_RK_3    # 310956
+    Script: |
+      autobonus "{ bonus2 bSkillUseSP,\"RK_SONICWAVE\",56; }",30,10000,BF_WEAPON;
+  - Combos:
+      - Combo:
+          - Hero    # 29509
+          - Amp_GN_2    # 310962
+    Script: |
+      autobonus "{ bonus2 bSkillUseSP,\"GN_CARTCANNON\",49; }",30,10000,BF_WEAPON;
+  - Combos:
+      - Combo:
+          - Hero    # 29509
+          - Amp_GC_2    # 310964
+    Script: |
+      autobonus3 "{ bonus2 bSkillAtk,\"GC_ROLLINGCUTTER\",150; }",1000,10000,"GC_CROSSRIPPERSLASHER";
+  - Combos:
+      - Combo:
+          - Hero    # 29509
+          - Amp_SC_1    # 310965
+    Script: |
+      autobonus "{ bonus2 bSkillUseSP,\"SC_TRIANGLESHOT\",17; }",30,10000,BF_WEAPON;
+  - Combos:
+      - Combo:
+          - Hero    # 29509
+          - Amp_SC_2    # 310966
+    Script: |
+      autobonus "{ bonus2 bSkillUseSP,\"SC_FATALMENACE\",46; }",30,10000,BF_WEAPON;
+  - Combos:
+      - Combo:
+          - Hero    # 29509
+          - Amp_KGOB_1    # 310967
+    Script: |
+      autobonus "{ bonus2 bSkillUseSP,\"KO_HUUMARANKA\",59; }",30,10000,BF_WEAPON;
+  - Combos:
+      - Combo:
+          - Hero    # 29509
+          - Amp_KGOB_2    # 310968
+    Script: |
+      bonus2 bSkillCooldown,"KO_JYUMONJIKIRI",-600;
+  - Combos:
+      - Combo:
+          - Hero    # 29509
+          - Amp_SJ_2    # 310974
+    Script: |
+      bonus2 bSkillCooldown,"SJ_LIGHTOFSUN",-10000;
+  - Combos:
+      - Combo:
+          - Hero    # 29509
+          - Amp_SJ_3    # 310975
+    Script: |
+      bonus2 bSkillCooldown,"SJ_LIGHTOFMOON",-10000;
+  - Combos:
+      - Combo:
+          - Release_Of_Magic    # 29371
+          - Amp_SU_3    # 310980
+    Script: |
+      autobonus "{ bonus2 bSkillUseSP,\"SU_SV_STEMSPEAR\",29; }",30,10000,BF_MAGIC;
+  - Combos:
+      - Combo:
+          - Release_Of_Magic    # 29371
+          - aegis_312808    # 312808
+    Script: |
+      bonus2 bSkillCooldown,"WL_EARTHSTRAIN",-3000;
+  - Combos:
+      - Combo:
+          - Release_Of_Magic    # 29371
+          - aegis_312809    # 312809
+    Script: |
+      bonus2 bFixedCastrate,"WL_JACKFROST",-100;
+  - Combos:
+      - Combo:
+          - Release_Of_Magic    # 29371
+          - aegis_312810    # 312810
+    Script: |
+      autobonus "{ bonus2 bSkillUseSP,\"WL_HELLINFERNO\",29; }",30,10000,BF_MAGIC;
+  - Combos:
+      - Combo:
+          - Hero    # 29509
+          - aegis_312811    # 312811
+    Script: |
+      bonus2 bSkillCooldown,"RA_AIMEDBOLT",-250;
+  - Combos:
+      - Combo:
+          - Hero    # 29509
+          - aegis_312813    # 312813
+    Script: |
+      autobonus "{ bonus2 bSkillUseSP,\"NC_POWERSWING\",27; }",30,10000,BF_WEAPON;
+  - Combos:
+      - Combo:
+          - Release_Of_Magic    # 29371
+          - aegis_312814    # 312814
+    Script: |
+      bonus4 bAutoSpellOnSkill,"AB_ADORAMUS","MG_SAFETYWALL",max(getskilllv("MG_SAFETYWALL"),3),100;
+  - Combos:
+      - Combo:
+          - Hero    # 29509
+          - aegis_312815    # 312815
+    Script: |
+      bonus2 bSkillCooldown,"LG_CANNONSPEAR",-1000;
+  - Combos:
+      - Combo:
+          - Release_Of_Magic    # 29371
+          - aegis_312816    # 312816
+    Script: |
+      bonus4 bAutoSpellOnSkill,"PA_PRESSURE","LG_RAYOFGENESIS",max(getskilllv("LG_RAYOFGENESIS"),3),100;
+  - Combos:
+      - Combo:
+          - Hero    # 29509
+          - aegis_312817    # 312817
+    Script: |
+      autobonus "{ bonus2 bSkillUseSP,\"LG_SHIELDPRESS\",27; }",30,10000,BF_WEAPON;
+  - Combos:
+      - Combo:
+          - Hero    # 29509
+          - aegis_312818    # 312818
+    Script: |
+      autobonus "{ bonus2 bSkillUseSP,\"LG_BANISHINGPOINT\",24; }",30,10000,BF_WEAPON;
+  - Combos:
+      - Combo:
+          - Release_Of_Magic    # 29371
+          - aegis_312819    # 312819
+    Script: |
+      skill "TF_DOUBLE",10;
+      bonus2 bSkillCooldown,"MG_FIREBOLT",10000;
+      bonus2 bSkillCooldown,"MG_COLDBOLT",10000;
+      bonus2 bSkillCooldown,"MG_LIGHTNINGBOLT",10000;
+  - Combos:
+      - Combo:
+          - Release_Of_Magic    # 29371
+          - aegis_312820    # 312820
+    Script: |
+      autobonus "{ bonus2 bSkillUseSP,\"WM_METALICSOUND\",24; }",30,10000,BF_MAGIC;
+  - Combos:
+      - Combo:
+          - Hero    # 29509
+          - aegis_312821    # 312821
+    Script: |
+      autobonus "{ bonus2 bSkillUseSP,\"GN_CART_TORNADO\",19; }",30,10000,BF_WEAPON;
+  - Combos:
+      - Combo:
+          - Hero    # 29509
+          - aegis_312822    # 312822
+    Script: |
+      autobonus "{ bonus2 bSkillUseSP,\"GN_SPORE_EXPLOSION\",99; }",30,10000,BF_WEAPON;
+  - Combos:
+      - Combo:
+          - Hero    # 29509
+          - aegis_312824    # 312824
+    Script: |
+      autobonus "{ bonus4 bAutoSpellOnSkill,\"SR_RIDEINLIGHTNING\",\"CH_SOULCOLLECT\",1,1000; }",30,15000,BF_WEAPON;
+  - Combos:
+      - Combo:
+          - Hero    # 29509
+          - aegis_312826    # 312826
+    Script: |
+      bonus2 bSkillCooldown,"SJ_LIGHTOFSTAR",-10000;
+  - Combos:
+      - Combo:
+          - Hero    # 29509
+          - aegis_312830    # 312830
+    Script: |
+      autobonus "{ .@val = max(100, (Hp/1000)); bonus2 bSkillAtk,\"SU_PICKYPECK\",.@val; bonus2 bSkillAtk,\"SU_SCAROFTAROU\",.@val; bonus2 bSkillAtk,\"SU_LUNATICCARROTBEAT\",.@val; bonus2 bSkillAtk,\"SU_SVG_SPIRIT\",.@val; }",30,15000,BF_WEAPON;
+  - Combos:
+      - Combo:
+          - Hero    # 29509
+          - aegis_312831    # 312831
+    Script: |
+      bonus2 bSkillCooldown,"RK_IGNITIONBREAK",-300;
+      bonus2 bSkillCooldown,"RK_SONICWAVE",-200;
+  - Combos:
+      - Combo:
+          - Release_Of_Magic    # 29371
+          - aegis_312832    # 312832
+    Script: |
+      bonus2 bSkillCooldown,"WL_CRIMSONROCK",-100;
+      bonus2 bSkillCooldown,"WL_TELEKINESIS_INTENSE",-185000;
+    UnEquipScript: |
+      sc_end SC_TELEKINESIS_INTENSE;
+  - Combos:
+      - Combo:
+          - Hero    # 29509
+          - aegis_312833    # 312833
+    Script: |
+      bonus2 bSkillCooldown,"RA_ARROWSTORM",-200;
+      bonus2 bSkillCooldown,"RA_UNLIMIT",-240000;
+    UnEquipScript: |
+      sc_end SC_UNLIMIT;
+  - Combos:
+      - Combo:
+          - Hero    # 29509
+          - aegis_312834    # 312834
+    Script: |
+      bonus2 bSkillCooldown,"NC_AXETORNADO",-2000;
+      bonus2 bSkillCooldown,"NC_MAGMA_ERUPTION",-200;
+  - Combos:
+      - Combo:
+          - Hero    # 29509
+          - aegis_312835    # 312835
+    Script: |
+      bonus2 bSkillCooldown,"GC_DARKCROW",-35000;
+      bonus2 bSkillCooldown,"GC_ROLLINGCUTTER",-200;
+  - Combos:
+      - Combo:
+          - Release_Of_Magic    # 29371
+          - aegis_312836    # 312836
+    Script: |
+      bonus2 bSkillCooldown,"AB_ORATIO",-1500;
+      bonus2 bSkillCooldown,"AB_SILENTIUM",-14000;
+  - Combos:
+      - Combo:
+          - Hero    # 29509
+          - aegis_312837    # 312837
+    Script: |
+      bonus2 bSkillCooldown,"LG_EARTHDRIVE",-1000;
+      bonus2 bSkillCooldown,"LG_SHIELDSPELL",-1500;
+  - Combos:
+      - Combo:
+          - Release_Of_Magic    # 29371
+          - aegis_312838    # 312838
+    Script: |
+      bonus2 bFixedCastrate,"SO_PSYCHIC_WAVE",-100;
+      bonus2 bSkillCooldown,"SO_VARETYR_SPEAR",-1000;
+  - Combos:
+      - Combo:
+          - Release_Of_Magic    # 29371
+          - aegis_312839    # 312839
+    Script: |
+      bonus2 bSkillCooldown,"WM_METALICSOUND",-200;
+      bonus2 bSkillCooldown,"WM_LULLABY_DEEPSLEEP",-2000;
+  - Combos:
+      - Combo:
+          - Hero    # 29509
+          - aegis_312840    # 312840
+    Script: |
+      bonus2 bSkillCooldown,"GN_CART_TORNADO",-200;
+      autobonus3 "{ bonus bPerfectHitRate,100; }",1000,3000,"GN_CART_TORNADO";
+  - Combos:
+      - Combo:
+          - Hero    # 29509
+          - aegis_312841    # 312841
+    Script: |
+      autobonus3 "{}",30,100,"SC_TRIANGLESHOT","{ sc_start SC_UNLIMIT,20000,5; }";
+    UnEquipScript: |
+      sc_end SC_UNLIMIT;
+  - Combos:
+      - Combo:
+          - Hero    # 29509
+          - aegis_312842    # 312842
+    Script: |
+      bonus2 bSkillCooldown,"SR_ASSIMILATEPOWER",-3000;
+      autobonus3 "{ bonus bFlee2,95; }",1000,3000,"SR_SKYNETBLOW";
+  - Combos:
+      - Combo:
+          - Hero    # 29509
+          - aegis_312843    # 312843
+    Script: |
+      bonus2 bSkillCooldown,"SJ_NEWMOONKICK",-200;
+      bonus2 bSkillFixedCast,"SJ_FULLMOONKICK",-1000;
+  - Combos:
+      - Combo:
+          - Release_Of_Magic    # 29371
+          - aegis_312844    # aegis_312844
+    Script: |
+      bonus2 bFixedCastrate,"SP_SPA",-100;
+      bonus2 bFixedCastrate,"SP_SWHOO",-100;
+      bonus2 bSkillCooldown,"SP_CURSEEXPLOSION",-500;
+  - Combos:
+      - Combo:
+          - Hero    # 29509
+          - aegis_312845    # aegis_312845
+    Script: |
+      bonus2 bSkillCooldown,"KO_IZAYOI",-30000;
+      bonus2 bSkillCooldown,"KO_HUUMARANKA",-200;
+  - Combos:
+      - Combo:
+          - Hero    # 29509
+          - aegis_312846    # aegis_312846
+    Script: |
+      bonus2 bSkillCooldown,"RL_R_TRIP",-200;
+      bonus2 bSkillCooldown,"RL_RICHS_COIN",-3000;
+  - Combos:
+      - Combo:
+          - Release_Of_Magic    # 29371
+          - aegis_312847    # aegis_312847
+    Script: |
+      autobonus3 "{ bonus2 bSkillUseSP,\"SU_CN_METEOR\",79; bonus2 bSkillUseSP,\"SU_SV_STEMSPEAR\",29; }",1000,10000,"SU_NYANGGRASS";
+  - Combos:
+      - Combo:
+          - aegis_450336    # 450336
+          - aegis_470241    # 470241
+          - aegis_480390    # 480390
+    Script: |
+      bonus bFlee,250;
+      bonus bPerfectHitAddRate,50;
+  - Combos:
+      - Combo:
+          - aegis_450333    # 450333
+          - aegis_470239   # 470239
+          - aegis_480389    # 480389
+    Script: |
+      bonus bCritical,100;
+      bonus bCritAtkRate,50;
+  - Combos:
+      - Combo:
+          - Wild_Beast    # 400409
+          - aegis_450333    # 450333
+          - aegis_470239   # 470239
+          - aegis_480389    # 480389
+      - Combo:
+          - Wild_Beast    # 400409
+          - aegis_450335    # 450335
+          - aegis_470240    # 470240
+          - aegis_480388    # 480388
+    Script: |
+      bonus2 bSubEle,Ele_Ghost,20;
+      bonus2 bResEff,Eff_Freeze,10000;
+  - Combos:
+      - Combo:
+          - aegis_450335    # 450335
+          - aegis_470240    # 470240
+          - aegis_480388    # 480388
+    Script: |
+      bonus bVariableCastrate,-100;
+      bonus bNoGemStone;
+  - Combos:
+      - Combo:
+          - aegis_450337    # 450337
+          - aegis_470242    # 470242
+          - aegis_480391    # 480391
+    Script: |
+      bonus bFlee,250;
+      bonus bFixedCastrate,-70;
+  - Combos:
+      - Combo:
+          - aegis_490454    # 490454
+          - aegis_490456    # 490456
+      - Combo:
+          - aegis_490458    # 490458
+          - aegis_490460    # 490460
+    Script: |
+      bonus bIgnoreDefRace,RC_All;
+  - Combos:
+      - Combo:
+          - Wild_Beast    # 400409
+          - aegis_490454    # 490454
+      - Combo:
+          - Wild_Beast    # 400409
+          - aegis_490456    # 490456
+    Script: |
+      bonus bAtkRate,15;
+  - Combos:
+      - Combo:
+          - aegis_490455    # 490455
+          - aegis_490457    # 490457
+      - Combo:
+          - aegis_490459    # 490459
+          - aegis_490461    # 490461
+    Script: |
+      bonus bIgnoreMDefRace,RC_All;
+  - Combos:
+      - Combo:
+          - Wild_Beast    # 400409
+          - aegis_490455    # 490455
+      - Combo:
+          - Wild_Beast    # 400409
+          - aegis_490457    # 490457
+    Script: |
+      bonus bMatkRate,15;
+  - Combos:
+      - Combo:
+          - Illusion_Box_Garden    # 311075
+          - aegis_470254    # 470254
+    Script: |
+      bonus bCritical,25;
+      bonus bCritAtkRate,30;
+  - Combos:
+      - Combo:
+          - Hero    # 29509
+          - aegis_312396    # 312396
+    Script: |
+      autobonus "{ bonus2 bSkillUseSP,\"SHC_IMPACT_CRATER\",209; bonus2 bSkillUseSP,\"SHC_SAVAGE_IMPACT\",209; }",30,20000,BF_WEAPON;
+  - Combos:
+      - Combo:
+          - Hero    # 29509
+          - aegis_312474    # 312474
+    Script: |
+      autobonus "{ bonus2 bSkillUseSP,\"DK_HACKANDSLASHER\",189; bonus2 bSkillUseSP,\"DK_MADNESS_CRUSHER\",189; }",30,20000,BF_WEAPON;
+  - Combos:
+      - Combo:
+          - Hero    # 29509
+          - aegis_312647    # 312647
+    Script: |
+      autobonus "{ bonus2 bSkillUseSP,\"ABC_CHAIN_REACTION_SHOT\",169; bonus2 bSkillUseSP,\"ABC_FRENZY_SHOT\",109; }",30,20000,BF_WEAPON;
+  - Combos:
+      - Combo:
+          - Release_Of_Magic    # 29371
+          - aegis_312927    # 312927
+    Script: |
+      bonus2 bSkillFixedCast,"AG_ALL_BLOOM",-500;
+      bonus2 bSkillFixedCast,"AG_CRYSTAL_IMPACT",-500;
+      bonus2 bSkillFixedCast,"AG_DESTRUCTIVE_HURRICANE",-500;
+      bonus2 bSkillFixedCast,"AG_VIOLENT_QUAKE",-500;
+  - Combos:
+      - Combo:
+          - Hero    # 29509
+          - aegis_312932    # 312932
+    Script: |
+      bonus2 bSkillCooldown,"IQ_MASSIVE_F_BLASTER",-100;
+  - Combos:
+      - Combo:
+          - Hero    # 29509
+          - aegis_312935    # 312935
+    Script: |
+      autobonus "{ bonus2 bSkillUseSP,\"IG_OVERSLASH\",239; bonus2 bSkillUseSP,\"IG_GRAND_JUDGEMENT\",429; bonus2 bSkillUseSP,\"IG_SHIELD_SHOOTING\",159; }",30,20000,BF_WEAPON;
+  - Combos:
+      - Combo:
+          - Hero    # 29509
+          - aegis_312938    # 312938
+    Script: |
+      autobonus "{ bonus2 bSkillUseSP,\"WH_CRESCIVE_BOLT\",119; bonus2 bSkillUseSP,\"WH_GALESTORM\",169; }",30,20000,BF_WEAPON;
+  - Combos:
+      - Combo:
+          - Release_Of_Magic    # 29371
+          - aegis_312941    # 312941
+    Script: |
+      bonus2 bSkillFixedCast,"EM_CONFLAGRATION",-1000;
+      bonus2 bSkillFixedCast,"EM_LIGHTNING_LAND",-1000;
+      bonus2 bSkillFixedCast,"EM_VENOM_SWAMP",-1000;
+  - Combos:
+      - Combo:
+          - Release_Of_Magic    # 29371
+          - aegis_312944    # 312944
+    Script: |
+      autobonus "{ bonus2 bSkillUseSP,\"CD_ARBITRIUM\",439; bonus2 bSkillUseSP,\"CD_PNEUMATICUS_PROCELLA\",659; bonus2 bSkillUseSP,\"CD_FRAMEN\",439; }",30,20000,BF_MAGIC;
+  - Combos:
+      - Combo:
+          - Hero    # 29509
+          - aegis_312951    # 312951
+    Script: |
+      autobonus "{ bonus2 bSkillUseSP,\"TR_RHYTHMSHOOTING\",109; bonus2 bSkillUseSP,\"TR_ROSEBLOSSOM\",229; }",30,20000,BF_WEAPON;
+  - Combos:
+      - Combo:
+          - Hero    # 29509
+          - aegis_312955    # 312955
+    Script: |
+      autobonus "{ bonus2 bSkillUseSP,\"BO_ACIDIFIED_ZONE_FIRE\",539; bonus2 bSkillUseSP,\"BO_ACIDIFIED_ZONE_WIND\",539; bonus2 bSkillUseSP,\"BO_ACIDIFIED_ZONE_WATER\",479; bonus2 bSkillUseSP,\"BO_ACIDIFIED_ZONE_GROUND\",479; }",30,20000,BF_WEAPON;
+  - Combos:
+      - Combo:
+          - Hero    # 29509
+          - aegis_312958    # 312958
+    Script: |
+      autobonus "{ bonus2 bSkillUseSP,\"MT_AXE_STOMP\",299; bonus2 bSkillUseSP,\"MT_RUSH_QUAKE\",439; }",30,20000,BF_WEAPON;
+  - Combos:
+      - Combo:
+          - Release_Of_Magic    # 29371
+          - aegis_312960    # 312960
+    Script: |
+      bonus2 bSkillFixedCast,"HN_METEOR_STORM_BUSTER",-1500;
+  - Combos:
+      - Combo:
+          - Release_Of_Magic    # 29371
+          - aegis_312961    # 312961
+    Script: |
+      autobonus "{ bonus2 bSkillUseSP,\"HN_JUPITEL_THUNDER_STORM\",79; bonus2 bSkillUseSP,\"HN_HELLS_DRIVE\",69; }",30,20000,BF_MAGIC;
+  - Combos:
+      - Combo:
+          - aegis_311883    # 311883
+          - aegis_410302    # 410302
+    Script: |
+      bonus bSpeedRate,25;
+      bonus2 bSubRace,RC_Player_Human,5;
+      bonus2 bSubRace,RC_Player_Doram,5;
+  - Combos:
+      - Combo:
+          - Shecil_Memory    # 29600
+          - aegis_470263    # 470263
+      - Combo:
+          - Shecil_Memory    # 29600
+          - aegis_470264    # 470264
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HAND_R);
+      bonus2 bSkillCooldown,"RA_ARROWSTORM",-700;
+      bonus bFixedCast,-200*(.@r/4);
+      bonus bDelayrate,-5*(.@r/4);
+      bonus2 bVariableCastrate,"RA_ARROWSTORM",-35*(.@r/4);
+      bonus2 bVariableCastrate,"RA_AIMEDBOLT",-35*(.@r/4);
+  - Combos:
+      - Combo:
+          - Tren_Memory    # 29606
+          - aegis_470263    # 470263
+      - Combo:
+          - Alpho_Memory    # 29607
+          - aegis_470263    # 470263
+      - Combo:
+          - Tren_Memory    # 29606
+          - aegis_470264    # 470264
+      - Combo:
+          - Alpho_Memory    # 29607
+          - aegis_470264    # 470264
+    Script: |
+      bonus2 bSkillCooldown,"WM_METALICSOUND",-500;
+      bonus2 bMagicAtkEle,Ele_Neutral,15*(getequiprefinerycnt(EQI_HAND_R)/4);
+  - Combos:
+      - Combo:
+          - Shecil_Memory    # 29600
+          - BioWeapon_Helm_RA    # 400116
+          - aegis_470263    # 470263
+      - Combo:
+          - Shecil_Memory    # 29600
+          - BioWeapon_Helm_RA    # 400116
+          - aegis_470264    # 470264
+    Script: |
+      .@sum = getequiprefinerycnt(EQI_HEAD_TOP) + getequiprefinerycnt(EQI_HAND_R) + getequiprefinerycnt(EQI_SHOES);
+      if (.@sum >= 33) {
+         autobonus3 "{ bonus2 bSkillAtk,\"RA_AIMEDBOLT\",250; }",1000,30000,"RA_UNLIMIT";
+         if (.@sum >= 35) {
+              bonus2 bIgnoreDefRaceRate,RC_All,40;
+              bonus2 bIgnoreDefRaceRate,RC_Player_Doram,-40;
+              bonus2 bIgnoreDefRaceRate,RC_Player_Human,-40;
+         }
+      }
+  - Combos:
+      - Combo:
+          - Tren_Memory    # 29606
+          - BioWeapon_Helm_WM    # 400117
+          - aegis_470263    # 470263
+      - Combo:
+          - Alpho_Memory    # 29607
+          - BioWeapon_Helm_WM    # 400117
+          - aegis_470263    # 470263
+      - Combo:
+          - Tren_Memory    # 29606
+          - BioWeapon_Helm_WM    # 400117
+          - aegis_470264    # 470264
+      - Combo:
+          - Alpho_Memory    # 29607
+          - BioWeapon_Helm_WM    # 400117
+          - aegis_470264    # 470264
+    Script: |
+      .@sum = getequiprefinerycnt(EQI_HEAD_TOP) + getequiprefinerycnt(EQI_HAND_R) + getequiprefinerycnt(EQI_SHOES);
+      if (.@sum >= 33) {
+         bonus4 bAutoSpellOnSkill,"WM_METALICSOUND","WM_METALICSOUND",10,350;
+         if (.@sum >= 35) {
+              bonus2 bIgnoreDefRaceRate,RC_All,40;
+              bonus2 bIgnoreDefRaceRate,RC_Player_Doram,-40;
+              bonus2 bIgnoreDefRaceRate,RC_Player_Human,-40;
+         }
+      }
+  - Combos:
+      - Combo:
+          - aegis_490515    # 490515
+          - Up_Sword_Of_Bluefire    # 500013
+      - Combo:
+          - aegis_490516    # 490516
+          - Up_Sword_Of_Bluefire    # 500013
+    Script: |
+      bonus bLongAtkRate,8;
+      if (getequiprefinerycnt(EQI_HAND_R)>=11)
+         bonus2 bSkillAtk,"GN_CARTCANNON",(readparam(bStr)+readparam(bDex))/12;
+  - Combos:
+      - Combo:
+          - aegis_490515    # 490515
+          - Up_Slate_Sword    # 500014
+      - Combo:
+          - aegis_490516    # 490516
+          - Up_Slate_Sword    # 500014
+    Script: |
+      bonus2 bAddRace,RC_All,8;
+      if (getequiprefinerycnt(EQI_HAND_R)>=11)
+         bonus2 bSkillAtk,"GN_CART_TORNADO",(readparam(bStr)+readparam(bDex))/12;
+  - Combos:
+      - Combo:
+          - Hero    # 29509
+          - aegis_312959    # 312959
+    Script: |
+      bonus2 bSkillCooldown,"MT_SPARK_BLASTER",-100;
+      bonus2 bSkillCooldown,"MT_TRIPLE_LASER",-100;
+  - Combos:
+      - Combo:
+          - Hero    # 29509
+          - aegis_312959    # 312971
+    Script: |
+      bonus2 bSkillCooldown,"NW_THE_VIGILANTE_AT_NIGHT",-300;

File diff suppressed because it is too large
+ 833 - 21
db/re/item_db_equip.yml


File diff suppressed because it is too large
+ 799 - 26
db/re/item_db_etc.yml


+ 113 - 94
db/re/item_db_usable.yml

@@ -2284,7 +2284,7 @@ Body:
       getgroupitem(IG_E_LIFE_POTION_PACK);
   - Id: 9588
     AegisName: E_DEF_Scroll_Box
-    Name: "[NotForSale] Brilliant Protection Box(20)"
+    Name: "[Not For Sale] Brilliant Protection Box (20)"
     Type: Usable
     Flags:
       Container: true
@@ -2299,7 +2299,7 @@ Body:
       getgroupitem(IG_E_DEF_SCROLL_BOX);
   - Id: 9589
     AegisName: E_Almighty_Box
-    Name: "[NotForSale] Almighty Box (10)"
+    Name: "[Not For Sale] Almighty Box (10)"
     Type: Usable
     Flags:
       Container: true
@@ -2314,7 +2314,7 @@ Body:
       getgroupitem(IG_E_ALMIGHTY_BOX);
   - Id: 9590
     AegisName: E_LimitPowerBooster
-    Name: "[NotForSale] Power Booster Box (10)"
+    Name: "[Not For Sale] Power Booster Box (10)"
     Type: Usable
     Flags:
       Container: true
@@ -2350,6 +2350,23 @@ Body:
     Weight: 10
     Script: |
       laphine_upgrade();
+  - Id: 9862
+    AegisName: Comp_Job_Manual50
+    Name: "[Not For Sale] JOB Battle Manual"
+    Type: Usable
+    Weight: 10
+    NoUse:
+      Sitting: true
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoSell: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+    Script: |
+      sc_start SC_JEXPBOOST,1800000,50;
   - Id: 9894
     AegisName: DF_Adrenaline_Scroll
     Name: "[Scroll] Adrenaline Lv.5 Scroll"
@@ -2850,7 +2867,7 @@ Body:
       getitembound 23919,1,Bound_Account;
   - Id: 9991
     AegisName: Boarding_Halter_Box_7d
-    Name: "[Not for Sale] Boarding Halter 7D Box"
+    Name: "[Not For Sale] Boarding Halter 7D Box"
     Type: Cash
     Weight: 10
     Flags:
@@ -14675,67 +14692,67 @@ Body:
       NoAuction: true
   - Id: 12889
     AegisName: Weapon_Box_Spear
-    Name: Weapon Box(Spear)
+    Name: Weapon Box (Spear)
     Type: Usable
     Buy: 10
     Weight: 200
   - Id: 12890
     AegisName: Weapon_Box_Mace
-    Name: Weapon Box(Mace)
+    Name: Weapon Box (Mace)
     Type: Usable
     Buy: 10
     Weight: 200
   - Id: 12891
     AegisName: Weapon_Box_Dagger
-    Name: Weapon Box(Dagger)
+    Name: Weapon Box (Dagger)
     Type: Usable
     Buy: 10
     Weight: 200
   - Id: 12892
     AegisName: Weapon_Box_Axe
-    Name: Weapon Box(Axe)
+    Name: Weapon Box (Axe)
     Type: Usable
     Buy: 10
     Weight: 200
   - Id: 12893
     AegisName: Weapon_Box_Bow
-    Name: Weapon Box(Bow)
+    Name: Weapon Box (Bow)
     Type: Usable
     Buy: 10
     Weight: 200
   - Id: 12894
     AegisName: Weapon_Box_Sword
-    Name: Weapon Box(Sword)
+    Name: Weapon Box (Sword)
     Type: Usable
     Buy: 10
     Weight: 200
   - Id: 12895
     AegisName: Weapon_Box_Fist
-    Name: Weapon Box(Knuckle)
+    Name: Weapon Box (Knuckle)
     Type: Usable
     Buy: 10
     Weight: 200
   - Id: 12896
     AegisName: Weapon_Box_Book
-    Name: Weapon Box(Book)
+    Name: Weapon Box (Book)
     Type: Usable
     Buy: 10
     Weight: 200
   - Id: 12897
     AegisName: Weapon_Box_Guitar
-    Name: Weapon Box(Guitar)
+    Name: Weapon Box (Guitar)
     Type: Usable
     Buy: 10
     Weight: 200
   - Id: 12898
     AegisName: Weapon_Box_Whip
-    Name: Weapon Box(Whip)
+    Name: Weapon Box (Whip)
     Type: Usable
     Buy: 10
     Weight: 200
   - Id: 12899
     AegisName: Weapon_Box_Wand
-    Name: Weapon Box(Staff)
+    Name: Weapon Box (Staff)
     Type: Usable
     Buy: 10
     Weight: 200
@@ -29831,7 +29848,7 @@ Body:
       getitem 12202,20;
   - Id: 14237
     AegisName: Agi_Dish20_Box
-    Name: Steamed Desert Scorpions Box(20)
+    Name: Steamed Desert Scorpions Box (20)
     Type: Cash
     Buy: 20
     Weight: 10
@@ -37157,7 +37174,7 @@ Body:
       sc_start SC_ULTIMATECOOK,1800000,10;
   - Id: 14908
     AegisName: Korea_Rice_Cake_B
-    Name: "[Not for Sale] Songpyeon"    # !todo check english name
+    Name: "[Not For Sale] Korean Rice Cake"
     Type: Healing
     Trade:
       NoDrop: true
@@ -42183,7 +42200,7 @@ Body:
       getgroupitem(IG_F_POLE_AXE_BOX);
   - Id: 16432
     AegisName: BM_Pack_Box_A
-    Name: Battle Manual Package Box(A)
+    Name: Battle Manual Package Box (A)
     Type: Cash
     Buy: 20
     Weight: 10
@@ -42201,7 +42218,7 @@ Body:
       getgroupitem(IG_BM_PACK_BOX_A);
   - Id: 16433
     AegisName: F_BM_Pack_Box_A
-    Name: Battle Manual Package Box(A)
+    Name: Battle Manual Package Box (A)
     Type: Cash
     Buy: 20
     Weight: 10
@@ -42219,7 +42236,7 @@ Body:
       getgroupitem(IG_F_BM_PACK_BOX_A);
   - Id: 16434
     AegisName: BM_Pack_Box_B
-    Name: Battle Manual Package Box(B)
+    Name: Battle Manual Package Box (B)
     Type: Cash
     Buy: 20
     Weight: 10
@@ -42237,7 +42254,7 @@ Body:
       getgroupitem(IG_BM_PACK_BOX_B);
   - Id: 16435
     AegisName: F_BM_Pack_Box_B
-    Name: Battle Manual Package Box(B)
+    Name: Battle Manual Package Box (B)
     Type: Cash
     Buy: 20
     Weight: 10
@@ -42722,7 +42739,7 @@ Body:
       getitem 12209,10;
   - Id: 16504
     AegisName: E_Bubble_Gum_Box
-    Name: Bubble Gum Box(10)
+    Name: Bubble Gum Box (10)
     Type: Cash
     Buy: 10
     Weight: 10
@@ -43964,7 +43981,7 @@ Body:
       getgroupitem(IG_RAPID_LIFE_WATER_BOX);
   - Id: 16656
     AegisName: F_Rapid_Life_Water_Box
-    Name: Rapid Life Potion Box(10)
+    Name: Rapid Life Potion Box (10)
     Type: Usable
     Buy: 20
     Weight: 10
@@ -43998,7 +44015,7 @@ Body:
       getitem 12578,10; /* Rapid Life Water */
   - Id: 16658
     AegisName: F_Rapid_Life_Water_Box2
-    Name: Rapid Water Box(10)
+    Name: Rapid Water Box (10)
     Type: Cash
     Buy: 10
     Weight: 10
@@ -44121,7 +44138,7 @@ Body:
       /*getitem Magic_Candy,10;*/
   - Id: 16667
     AegisName: F_Magic_Candy_Box10
-    Name: Magic Candy Box(10)
+    Name: Magic Candy Box (10)
     Type: Usable
     Buy: 20
     Weight: 10
@@ -46087,7 +46104,7 @@ Body:
       getgroupitem(IG_C_ABRASIVE_BOX10);
   - Id: 16821
     AegisName: C_Dun_Tele_Scroll_Box5
-    Name: Dungeon Teleport Scroll Box(5)
+    Name: Dungeon Teleport Scroll Box (5)
     Type: Usable
     Buy: 20
     Weight: 10
@@ -46101,7 +46118,7 @@ Body:
       NoAuction: true
   - Id: 16822
     AegisName: C_Dun_Tele_Scroll_Box10
-    Name: Dungeon Teleport Scroll Box(10)
+    Name: Dungeon Teleport Scroll Box (10)
     Type: Usable
     Buy: 20
     Weight: 10
@@ -46345,7 +46362,7 @@ Body:
       getgroupitem(IG_C_HOLY_ARMOR_S_BOX30);
   - Id: 16837
     AegisName: C_Dun_Tele_Scroll2_Box5
-    Name: Dungeon Teleport Scroll II Box(5)
+    Name: Dungeon Teleport Scroll II Box (5)
     Type: Usable
     Buy: 20
     Weight: 10
@@ -46359,7 +46376,7 @@ Body:
       NoAuction: true
   - Id: 16838
     AegisName: C_Dun_Tele_S2_Box10
-    Name: Dungeon Teleport Scroll II Box(10)
+    Name: Dungeon Teleport Scroll II Box (10)
     Type: Usable
     Buy: 20
     Weight: 10
@@ -46405,7 +46422,7 @@ Body:
       getitem 529,10; /* Candy */
   - Id: 16841
     AegisName: C_Repair_Scroll_Box
-    Name: Weapon Repair Scroll Box(5)
+    Name: Weapon Repair Scroll Box (5)
     Type: Cash
     Buy: 20
     Weight: 10
@@ -46423,7 +46440,7 @@ Body:
       getgroupitem(IG_C_REPAIR_SCROLL_BOX);
   - Id: 16842
     AegisName: C_Repair_Scroll_Box10
-    Name: Weapon Repair Scroll Box(10)
+    Name: Weapon Repair Scroll Box (10)
     Type: Cash
     Buy: 20
     Weight: 10
@@ -46797,7 +46814,7 @@ Body:
       getgroupitem(IG_C_JOB_MANUAL25_BOX10);
   - Id: 16864
     AegisName: C_Siege_Scroll_Box1_10
-    Name: Siege Map Teleport Scroll Box(10)
+    Name: Siege Map Teleport Scroll Box (10)
     Type: Cash
     Buy: 20
     Weight: 10
@@ -46833,7 +46850,7 @@ Body:
       getgroupitem(IG_C_SIEGE_SCROLL_BOX1_30);
   - Id: 16866
     AegisName: C_Siege_Scroll_Box2_10
-    Name: Siege Map Teleport Scroll II Box(10)
+    Name: Siege Map Teleport Scroll II Box (10)
     Type: Cash
     Buy: 20
     Weight: 10
@@ -46849,7 +46866,7 @@ Body:
       getitem 14591,10;
   - Id: 16867
     AegisName: C_Siege_Scroll_Box2_30
-    Name: Siege Map Teleport Scroll II Box(30)
+    Name: Siege Map Teleport Scroll II Box (30)
     Type: Cash
     Buy: 20
     Weight: 10
@@ -48161,7 +48178,7 @@ Body:
       getgroupitem(IG_C_LOVE_ANGEL_BOX);
   - Id: 16940
     AegisName: C_Love_Angel_Box_1m
-    Name: Love Angel Magic Powder Box(30 days)
+    Name: Love Angel Magic Powder Box (30 days)
     Type: Cash
     Buy: 20
     Weight: 10
@@ -48233,7 +48250,7 @@ Body:
       getgroupitem(IG_C_PICTURE_DIARY_BOX);
   - Id: 16944
     AegisName: C_Picture_Diary_Box_1m
-    Name: Diary Magic Powder Box(30 days)
+    Name: Diary Magic Powder Box (30 days)
     Type: Cash
     Buy: 20
     Weight: 10
@@ -48269,7 +48286,7 @@ Body:
       getgroupitem(IG_C_MINI_HEART_BOX);
   - Id: 16946
     AegisName: C_Mini_Heart_Box_1m
-    Name: Mini Heart Magic Powder Box(30 days)
+    Name: Mini Heart Magic Powder Box (30 days)
     Type: Cash
     Buy: 20
     Weight: 10
@@ -48305,7 +48322,7 @@ Body:
       getgroupitem(IG_C_NEWCOMER_BOX);
   - Id: 16948
     AegisName: C_Newcomer_Box_1m
-    Name: Freshman Powder Box(30 days)
+    Name: Freshman Powder Box (30 days)
     Type: Cash
     Buy: 20
     Weight: 10
@@ -48341,7 +48358,7 @@ Body:
       getgroupitem(IG_C_KID_BOX);
   - Id: 16950
     AegisName: C_Kid_Box_1m
-    Name: Freshman Powder Box(30 days)
+    Name: Freshman Powder Box (30 days)
     Type: Cash
     Buy: 20
     Weight: 10
@@ -48377,7 +48394,7 @@ Body:
       getgroupitem(IG_C_MAGIC_CASTLE_BOX);
   - Id: 16952
     AegisName: C_Magic_Castle_Box_1m
-    Name: Magic Magic Powder Box(30 days)
+    Name: Magic Magic Powder Box (30 days)
     Type: Cash
     Buy: 20
     Weight: 10
@@ -48413,7 +48430,7 @@ Body:
       getgroupitem(IG_C_BULGING_HEAD_BOX);
   - Id: 16954
     AegisName: C_Bulging_Head_Box_1m
-    Name: JJangu Magic Powder Box(30 days)
+    Name: JJangu Magic Powder Box (30 days)
     Type: Cash
     Buy: 20
     Weight: 10
@@ -50753,7 +50770,7 @@ Body:
       getitem 5319,1; /* Hello Mother Hat */
   - Id: 17171
     AegisName: EC_Battle_Manual_Box
-    Name: Battle Manual Box(10)
+    Name: Battle Manual Box (10)
     Type: Cash
     Buy: 20
     Weight: 10
@@ -50771,7 +50788,7 @@ Body:
       getgroupitem(IG_EC_BATTLE_MANUAL_BOX);
   - Id: 17172
     AegisName: EC_Job_Manual25_Box10
-    Name: JOB Battle Manual Box(10)
+    Name: JOB Battle Manual Box (10)
     Type: Cash
     Buy: 20
     Weight: 10
@@ -50879,7 +50896,7 @@ Body:
       getgroupitem(IG_MADE_DISH_BOX1);
   - Id: 17178
     AegisName: Mysterious_Water_Box50
-    Name: Mysterious Life Potion Box(Undead)
+    Name: Mysterious Life Potion Box (Undead)
     Type: Cash
     Buy: 20
     Weight: 10
@@ -50915,7 +50932,7 @@ Body:
       getgroupitem(IG_C_MYST_WATER_BOX50);
   - Id: 17180
     AegisName: Mysterious_Water_Box50_
-    Name: Mysterious Life Potion Box(Girl)
+    Name: Mysterious Life Potion Box (Girl)
     Type: Cash
     Buy: 20
     Weight: 10
@@ -52229,7 +52246,7 @@ Body:
       getgroupitem(IG_C_WING_OF_FLY_1DAY_BOX);
   - Id: 17315
     AegisName: Silvervine_Box10_
-    Name: Lucky Silvervine Fruit Box(10)
+    Name: Lucky Silvervine Fruit Box (10)
     Type: Cash
     Buy: 20
     Weight: 10
@@ -52247,7 +52264,7 @@ Body:
       getgroupitem(IG_SILVERVINE_BOX10_);
   - Id: 17316
     AegisName: Silvervine_Box110
-    Name: Lucky Silvervine Fruit Box(110)
+    Name: Lucky Silvervine Fruit Box (110)
     Type: Cash
     Buy: 20
     Weight: 10
@@ -52352,7 +52369,7 @@ Body:
       getgroupitem(IG_Event_Almighty_Box);
   - Id: 17332
     AegisName: Almighty100_Box
-    Name: Event Almighty Box(100)
+    Name: Event Almighty Box (100)
     Type: Cash
     Buy: 10
     Weight: 10
@@ -53040,7 +53057,7 @@ Body:
       getgroupitem(IG_REFINE_ORE_BOX6_SET10);
   - Id: 17467
     AegisName: C_Siegfried_Box50
-    Name: (Limited) Token of Ziegfried Box(50)
+    Name: (Limited) Token of Ziegfried Box (50)
     Type: Cash
     Buy: 10
     Weight: 10
@@ -53170,7 +53187,7 @@ Body:
       getgroupitem(IG_C_WING_OF_FLY_5DAY_BOX);
   - Id: 17475
     AegisName: LC_Max_Weight_Up_10Box
-    Name: (Limited)Gym Membership Card Box(10)
+    Name: (Limited)Gym Membership Card Box (10)
     Type: Cash
     Buy: 10
     Weight: 10
@@ -53887,7 +53904,7 @@ Body:
       getitem 22895,1;
   - Id: 17549
     AegisName: LI_HD_BradiumBox30
-    Name: (Limited)High Density Bradium Box(30)
+    Name: (Limited)High Density Bradium Box (30)
     Type: Usable
     Buy: 20
     Weight: 10
@@ -53903,7 +53920,7 @@ Body:
       getitem 6327,30;
   - Id: 17550
     AegisName: LI_HD_CarniumBox30
-    Name: (Limited)High Density Kalunium Box(30)
+    Name: (Limited)High Density Kalunium Box (30)
     Type: Usable
     Buy: 20
     Weight: 10
@@ -53946,7 +53963,7 @@ Body:
       getgroupitem(IG_ALMIGHTY_BOX4);
   - Id: 17568
     AegisName: Almighty100_Box2
-    Name: Event Almighty Box(100)
+    Name: Event Almighty Box (100)
     Type: Cash
     Buy: 20
     Weight: 10
@@ -54009,7 +54026,7 @@ Body:
       getgroupitem(IG_Erzulie_Lucky_Scroll);
   - Id: 17573
     AegisName: Nyangvine_Box10_
-    Name: Lucky Silvervine Cat Fruit Box(10)
+    Name: Lucky Silvervine Cat Fruit Box (10)
     Type: Cash
     Buy: 20
     Weight: 10
@@ -54027,7 +54044,7 @@ Body:
       getgroupitem(IG_NYANGVINE_BOX10_);
   - Id: 17574
     AegisName: Nyangvine_Box100
-    Name: Lucky Silvervine Cat Fruit Box(100)
+    Name: Lucky Silvervine Cat Fruit Box (100)
     Type: Cash
     Buy: 20
     Weight: 10
@@ -54263,7 +54280,7 @@ Body:
       getgroupitem(IG_C_GREED_1HOUR_BOX);
   - Id: 17600
     AegisName: C_CatPaw_1Day_Box
-    Name: Infinite Cat's Hand Ticket Box(1 day)
+    Name: Infinite Cat's Hand Ticket Box (1 day)
     Type: Cash
     Weight: 10
     Flags:
@@ -54427,7 +54444,7 @@ Body:
       getgroupitem(IG_ALMIGHTY_PLUS_BOX);
   - Id: 17632
     AegisName: Almighty100_PlusBox
-    Name: Almighty Plus Box(10)
+    Name: Almighty Plus Box (10)
     Type: Cash
     Weight: 10
     Flags:
@@ -55031,7 +55048,7 @@ Body:
       getgroupitem(IG_DEF_SCROLL_BOX);
   - Id: 17743
     AegisName: DEF_Scroll_Box_Set
-    Name: Defense Scroll Box(10)
+    Name: Defense Scroll Box (10)
     Type: Cash
     Weight: 10
     Flags:
@@ -55099,7 +55116,7 @@ Body:
       getgroupitem(IG_HD_HIGH_REFINE_BOX);
   - Id: 17759
     AegisName: Refine_Ore_Box15_Set10
-    Name: Refine Ore XV Box(10)
+    Name: Refine Ore XV Box (10)
     Type: Cash
     Weight: 10
     Flags:
@@ -55184,7 +55201,7 @@ Body:
       getgroupitem(IG_VIGORGRA_PLUS_SET3);
   - Id: 17766
     AegisName: C_CatPaw_7Day_Box
-    Name: Infinite Cat's Hand Ticket Box(7 days)
+    Name: Infinite Cat's Hand Ticket Box (7 days)
     Type: Cash
     Weight: 10
     Flags:
@@ -55549,7 +55566,7 @@ Body:
       getgroupitem(IG_INFINITY_BOX);
   - Id: 17887
     AegisName: Infinity_10_Box
-    Name: Infinity Box(10)
+    Name: Infinity Box (10)
     Type: Cash
     Weight: 10
     Flags:
@@ -55566,7 +55583,7 @@ Body:
       getgroupitem(IG_INFINITY_10_BOX);
   - Id: 17888
     AegisName: Comp_Kafra_Card_Box
-    Name: "[NotForSale] Kafra Card Box(10)"
+    Name: "[Not For Sale] Kafra Card Box (10)"
     Type: Cash
     Weight: 10
     Script: |
@@ -56268,7 +56285,7 @@ Body:
       getgroupitem(IG_A_INFINITY_BOX);
   - Id: 17983
     AegisName: A_DEF_Scroll_Box_Set
-    Name: Defense Scroll Box(10)
+    Name: Defense Scroll Box (10)
     Type: Cash
     Weight: 10
     Flags:
@@ -56302,7 +56319,7 @@ Body:
       getgroupitem(IG_A_DEF_SCROLL_BOX);
   - Id: 17985
     AegisName: A_Unlimited_10_Box
-    Name: Unlimited Box(10)
+    Name: Unlimited Box (10)
     Type: Cash
     Weight: 10
     Flags:
@@ -56503,7 +56520,7 @@ Body:
       getgroupitem(IG_80LVUP);
   - Id: 22522
     AegisName: 100LVUP
-    Name: Level Up Box(100)
+    Name: Level Up Box (100)
     Type: Cash
     Buy: 10
     EquipLevelMin: 100
@@ -56522,7 +56539,7 @@ Body:
       getgroupitem(IG_Level_Up_Box100);
   - Id: 22523
     AegisName: 120LVUP
-    Name: Level Up Box(120)
+    Name: Level Up Box (120)
     Type: Cash
     Buy: 10
     EquipLevelMin: 120
@@ -56541,7 +56558,7 @@ Body:
       getgroupitem(IG_Level_Up_Box120);
   - Id: 22524
     AegisName: 130LVUP
-    Name: Level Up Box(130)
+    Name: Level Up Box (130)
     Type: Cash
     Buy: 10
     EquipLevelMin: 130
@@ -56560,7 +56577,7 @@ Body:
       getgroupitem(IG_Level_Up_Box130);
   - Id: 22525
     AegisName: 140LVUP
-    Name: Level Up Box(140)
+    Name: Level Up Box (140)
     Type: Cash
     Buy: 10
     EquipLevelMin: 140
@@ -56579,7 +56596,7 @@ Body:
       getgroupitem(IG_Level_Up_Box140);
   - Id: 22526
     AegisName: 150LVUP
-    Name: Level Up Box(150)
+    Name: Level Up Box (150)
     Type: Cash
     Buy: 10
     EquipLevelMin: 150
@@ -56598,7 +56615,7 @@ Body:
       getgroupitem(IG_Level_Up_Box150);
   - Id: 22527
     AegisName: 160LVUP
-    Name: Level Up Box(160)
+    Name: Level Up Box (160)
     Type: Cash
     Buy: 10
     EquipLevelMin: 160
@@ -60431,7 +60448,7 @@ Body:
       getitem 526,100; /* Royal Jelly */
   - Id: 23042
     AegisName: Seed_Of_Yggdrasil_
-    Name: "[NotForSale]Yggdrasil Seed"
+    Name: "[Not For Sale]Yggdrasil Seed"
     Type: Healing
     Weight: 300
     Delay:
@@ -60886,7 +60903,7 @@ Body:
       getitem 25185,1;
   - Id: 23094
     AegisName: Comp_Glass_Of_Illusion
-    Name: "[NotForSale] Glass of Illusion"
+    Name: "[Not For Sale] Glass of Illusion"
     Type: Usable
     Weight: 10
     Delay:
@@ -62749,7 +62766,7 @@ Body:
       getgroupitem(IG_PORINGSPRECIOUSBOX);
   - Id: 23303
     AegisName: C_CatPaw_1Day_Para
-    Name: Infinite Cat Hand Ticket Box(1 Day)
+    Name: Infinite Cat Hand Ticket Box (1 Day)
     Type: Cash
     Weight: 10
     Flags:
@@ -62758,7 +62775,7 @@ Body:
       getgroupitem(IG_C_CATPAW_1DAY_PARA);
   - Id: 23304
     AegisName: C_Wing_Of_Fly_1Day_Para
-    Name: Infinite Fly Wing Box(1 Day)
+    Name: Infinite Fly Wing Box (1 Day)
     Type: Cash
     Weight: 10
     Flags:
@@ -62784,7 +62801,7 @@ Body:
       getgroupitem(IG_CAT_SCROLL);
   - Id: 23307
     AegisName: Comp_M_DEFScroll
-    Name: "[Not for Sale] Shining Defense Scroll"
+    Name: "[Not For Sale] Shining Defense Scroll"
     Type: Usable
     Weight: 10
     Trade:
@@ -62947,7 +62964,7 @@ Body:
 #     /* TODO */
   - Id: 23329
     AegisName: C_Wing_Of_Fly_5Day_Box_
-    Name: Infinite Fly Wing Box(5 Days)
+    Name: Infinite Fly Wing Box (5 Days)
     Type: Cash
     Weight: 10
     Flags:
@@ -62957,7 +62974,7 @@ Body:
       getgroupitem(IG_C_WING_OF_FLY_5DAY_BOX_);
   - Id: 23330
     AegisName: C_Giant_Fly_1Day_Box_
-    Name: Infinite Giant Fly Wing Box(1 Day)
+    Name: Infinite Giant Fly Wing Box (1 Day)
     Type: Cash
     Weight: 10
     Flags:
@@ -62967,7 +62984,7 @@ Body:
       getgroupitem(IG_C_GIANT_FLY_1DAY_BOX_);
   - Id: 23331
     AegisName: C_Wing_Of_Fly_Box_
-    Name: Infinite Fly Wing Box(1 Week)
+    Name: Infinite Fly Wing Box (1 Week)
     Type: Cash
     Weight: 10
     Flags:
@@ -64268,7 +64285,7 @@ Body:
       getgroupitem(IG_REBEGINER_S_BOX);
   - Id: 23585
     AegisName: Rebeginer_Box_100
-    Name: Beginner Support Box(100)
+    Name: Beginner Support Box (100)
     Type: Usable
     EquipLevelMin: 100
     Trade:
@@ -64287,7 +64304,7 @@ Body:
       getitem 23586,1;
   - Id: 23586
     AegisName: Rebeginer_Box_110
-    Name: Beginner Support Box(110)
+    Name: Beginner Support Box (110)
     Type: Usable
     EquipLevelMin: 110
     Trade:
@@ -64305,7 +64322,7 @@ Body:
       getitem 23587,1;
   - Id: 23587
     AegisName: Rebeginer_Box_120
-    Name: Beginner Support Box(120)
+    Name: Beginner Support Box (120)
     Type: Usable
     EquipLevelMin: 120
     Trade:
@@ -64871,7 +64888,7 @@ Body:
 #     /* TODO */
   - Id: 23751
     AegisName: Comp_AID_Buff_Box
-    Name: "[NotForSale] Premium Buff Box"
+    Name: "[Not For Sale] Premium Buff Box"
     Type: Usable
     Flags:
       Container: true
@@ -66882,7 +66899,9 @@ Body:
       NoMail: true
       NoAuction: true
     Script: |
-      /* TODO */
+      specialeffect2 EF_POTION_BERSERK;
+      sc_start SC_2011RWC_SCROLL,600000,0;
+      showscript "Oh My GOODNESS!!! I FEEL AWESOMELY STRONG!!! WOWOW";
   - Id: 100065
     AegisName: WL_MB_SG
     Name: Spell Book (Storm Gust)
@@ -67055,7 +67074,7 @@ Body:
       percentheal 10,10;
   - Id: 100081
     AegisName: Kr_B_Special01
-    Name: "[Not for Sale] Advanced Combat Manual"
+    Name: "[Not For Sale] Advanced Combat Manual"
     Type: Usable
     Trade:
       NoDrop: true
@@ -67078,7 +67097,7 @@ Body:
       getitem callfunc("F_Rand",31754,31755,31756,31757,31758,31759,31760,31761),1;
   - Id: 100087
     AegisName: Boarding_Halter_Box30_Z
-    Name: "[NotForSale] Boarding Halter (30 Days)"
+    Name: "[Not For Sale] Boarding Halter (30 Days)"
     Type: Cash
     Flags:
       Container: true
@@ -70813,7 +70832,7 @@ Body:
       getgroupitem(IG_E_POTION_BOX);
   - Id: 100934
     AegisName: Buff_Scroll_Box
-    Name: "[NotForSale] Buff Scroll Box"
+    Name: "[Not For Sale] Buff Scroll Box"
     Type: Usable
     Weight: 10
     Flags:
@@ -74365,7 +74384,7 @@ Body:
       getgroupitem(IG_Ancient_Hero_Box_1);
   - Id: 101513
     AegisName: aegis_101513
-    Name: "[Scroll] STR Biscuit Stick"    # !todo check english name
+    Name: "[Scroll] STR Biscuit Stick"
     Type: Usable
     Weight: 10
     Script: |
@@ -74373,7 +74392,7 @@ Body:
       sc_start SC_ATKPOTION,600000,rand(11,111);
   - Id: 101514
     AegisName: aegis_101514
-    Name: "[Scroll] INT Biscuit Stick"    # !todo check english name
+    Name: "[Scroll] INT Biscuit Stick"
     Type: Usable
     Weight: 10
     Script: |
@@ -78433,7 +78452,7 @@ Body:
       getitem 25793,10; /* Inventory Expansion Coupon */
   - Id: 200003
     AegisName: LI_HD_Oridecon_Box2
-    Name: (Limited) HD Oridecon Box(Blacksmith)(30)
+    Name: (Limited) HD Oridecon Box (Blacksmith)(30)
     Type: Cash
     Weight: 10
     Flags:
@@ -78450,7 +78469,7 @@ Body:
       getgroupitem(IG_LI_HD_ORIDECON_BOX2);
   - Id: 200004
     AegisName: LI_HD_Elunium_Box2
-    Name: (Limited) HD Elunium Box(Blacksmith)(30)
+    Name: (Limited) HD Elunium Box (Blacksmith)(30)
     Type: Cash
     Weight: 10
     Flags:
@@ -78467,7 +78486,7 @@ Body:
       getgroupitem(IG_LI_HD_ELUNIUM_BOX2);
   - Id: 200005
     AegisName: LI_HD_BradiumBox2
-    Name: (Limited) HD Bradium Box(Blacksmith)(30)
+    Name: (Limited) HD Bradium Box (Blacksmith)(30)
     Type: Cash
     Weight: 10
     Flags:
@@ -78484,7 +78503,7 @@ Body:
       getgroupitem(IG_LI_HD_BRADIUMBOX2);
   - Id: 200006
     AegisName: LI_HD_CarniumBox2
-    Name: (Limited) HD Carnium Box(Blacksmith)(30)
+    Name: (Limited) HD Carnium Box (Blacksmith)(30)
     Type: Cash
     Weight: 10
     Flags:
@@ -78764,7 +78783,7 @@ Body:
       getgroupitem(IG_LI_NYANGVINE_BOX_III);
   - Id: 200093
     AegisName: LI_HD_Oridecon_Box3
-    Name: (Limited) HD Oridecon Box(Hollgrehenn)(30)
+    Name: (Limited) HD Oridecon Box (Hollgrehenn)(30)
     Type: Cash
     Weight: 10
     Flags:
@@ -78781,7 +78800,7 @@ Body:
       getgroupitem(IG_LI_HD_ORIDECON_BOX3);
   - Id: 200094
     AegisName: LI_HD_Elunium_Box3
-    Name: (Limited) HD Elunium Box(Hollgrehenn)(30)
+    Name: (Limited) HD Elunium Box (Hollgrehenn)(30)
     Type: Cash
     Weight: 10
     Flags:

Some files were not shown because too many files changed in this diff