Ver código fonte

Corrected script for some item (#5692)

* SQL synchro
idk-whoami 4 anos atrás
pai
commit
dec0f8c1b6
2 arquivos alterados com 20 adições e 32 exclusões
  1. 13 25
      db/re/item_db_equip.yml
  2. 7 7
      sql-files/item_db_re_equip.sql

+ 13 - 25
db/re/item_db_equip.yml

@@ -67751,12 +67751,10 @@ Body:
       NoMail: true
       NoAuction: true
     Script: |
-      bonus bUnbreakableWeapon;
       bonus bLuk,3;
       bonus bCritAtkRate,50;
-      if (BaseLevel>99) {
+      if (BaseLevel>99)
          bonus bLongAtkRate,20;
-      }
   - Id: 18108
     AegisName: Brindle_Eel
     Name: Zebra Eel
@@ -67782,12 +67780,10 @@ Body:
       NoMail: true
       NoAuction: true
     Script: |
-      bonus bUnbreakableWeapon;
       bonus bAgi,3;
       autobonus "{ bonus bAspd,2; }",10,5000,BF_WEAPON,"{ specialeffect2 EF_HASTEUP; }";
-      if (BaseLevel>99) {
+      if (BaseLevel>99)
          bonus bLongAtkRate,20;
-      }
   - Id: 18109
     AegisName: Catapult
     Name: Thief Crossbow
@@ -68193,7 +68189,6 @@ Body:
       bonus2 bAddRace,RC_Player_Human,30;
       bonus2 bIgnoreDefRaceRate,RC_DemiHuman,10;
       bonus2 bIgnoreDefRaceRate,RC_Player_Human,10;
-      bonus bUnbreakableWeapon;
   - Id: 18125
     AegisName: Arcus_Daemonicus
     Name: Arcus Daemonicus
@@ -68579,9 +68574,8 @@ Body:
     Script: |
       bonus2 bSkillAtk,"WM_SEVERE_RAINSTORM",20;
       bonus bBaseAtk,6*(min(BaseLevel,160)/10);
-      if (getrefine()>=7) {
-         bonus bLongAtkRate,getskilllv("BA_MUSICALLESSON");
-      }
+      if (getrefine()>=7)
+         bonus bLongAtkRate,getskilllv("BA_MUSICALLESSON")+getskilllv("DC_DANCINGLESSON");
   - Id: 18164
     AegisName: Royal_Bow_K
     Name: Royal Bow
@@ -92875,18 +92869,12 @@ Body:
     Refineable: true
     Script: |
       .@r = getrefine();
-      if (.@r >= 2) {
-         bonus bBaseAtk,.@r/2;
-      }
-      if (.@r >= 3) {
-         bonus2 bSkillAtk,"RK_SONICWAVE",.@r/3*10;
-      }
-      if (.@r >= 9) {
-         bonus5 bAutoSpell,"RK_SONICWAVE",2,.@r/3*10,BF_SHORT|BF_WEAPON,1;
-      }
-      if (.@r >= 11) {
+      bonus bBaseAtk,10*(.@r/2);
+      bonus2 bSkillAtk,"RK_SONICWAVE",.@r/3*10;
+      if (.@r >= 9)
+         bonus5 bAutoSpell,"RK_SONICWAVE",max(2,getskilllv("RK_SONICWAVE")),100,BF_SHORT|BF_WEAPON,1;
+      if (.@r >= 11)
          bonus bUnbreakableWeapon;
-      }
   - Id: 21039
     AegisName: Royal_Knight's_Broadsword
     Name: Royal Knight's Broadsword
@@ -97869,8 +97857,8 @@ Body:
     Refineable: true
     Script: |
       .@r = getrefine();
-      bonus2 bIgnoreDefRaceRate,RC_All,5+(.@r/2);
-      bonus2 bIgnoreDefRaceRate,RC_Player_Human,-5-(.@r/2);
+      bonus bMaxHP,.@r*10;
+      bonus2 bIgnoreDefClassRate,Class_Normal,5+(.@r/2);
   - Id: 24167
     AegisName: S_Penetration_Pendent
     Name: Penetration Shadow Pendant
@@ -97881,8 +97869,8 @@ Body:
     Refineable: true
     Script: |
       .@r = getrefine();
-      bonus2 bIgnoreDefRaceRate,RC_All,5+(.@r/2);
-      bonus2 bIgnoreDefRaceRate,RC_Player_Human,-5-(.@r/2);
+      bonus bMaxHP,.@r*10;
+      bonus2 bIgnoreDefClassRate,Class_Normal,5+(.@r/2);
   - Id: 24168
     AegisName: S_Tempest_Earring
     Name: Tempest Shadow Earring

+ 7 - 7
sql-files/item_db_re_equip.sql

@@ -3285,8 +3285,8 @@ REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`we
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`attack`,`range`,`job_barddancer`,`job_hunter`,`location_left_hand`,`location_right_hand`,`weapon_level`,`equip_level_min`,`script`) VALUES (18104,'Adventure_Bow','Adventure Bow','Weapon','Bow',60,1,true,true,true,true,1,1,'bonus bUnbreakableWeapon;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`weight`,`attack`,`range`,`slots`,`job_barddancer`,`job_hunter`,`location_left_hand`,`location_right_hand`,`weapon_level`,`equip_level_min`,`refineable`) VALUES (18105,'Academy_Bow','Academy Bow','Weapon','Bow',1200,90,5,1,true,true,true,true,1,1,true);
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`attack`,`range`,`job_archer`,`job_barddancer`,`job_hunter`,`location_left_hand`,`location_right_hand`,`weapon_level`,`equip_level_min`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nocart`,`trade_nostorage`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`) VALUES (18106,'P_Bow3','Eden Bow III','Weapon','Bow',140,5,true,true,true,true,true,3,60,100,true,true,true,true,true,true,true);
-REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`attack`,`range`,`job_archer`,`job_barddancer`,`job_hunter`,`job_rogue`,`job_thief`,`location_left_hand`,`location_right_hand`,`weapon_level`,`equip_level_min`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_nostorage`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (18107,'Malang_Snow_Crab','Malangdo Crab','Weapon','Bow',120,5,true,true,true,true,true,true,true,1,50,100,true,true,true,true,true,true,true,true,'bonus bUnbreakableWeapon;\nbonus bLuk,3;\nbonus bCritAtkRate,50;\nif (BaseLevel>99) {\n   bonus bLongAtkRate,20;\n}');
-REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`attack`,`range`,`job_barddancer`,`job_hunter`,`location_left_hand`,`location_right_hand`,`weapon_level`,`equip_level_min`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_nostorage`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (18108,'Brindle_Eel','Zebra Eel','Weapon','Bow',180,5,true,true,true,true,1,50,100,true,true,true,true,true,true,true,true,'bonus bUnbreakableWeapon;\nbonus bAgi,3;\nautobonus "{ bonus bAspd,2; }",10,5000,BF_WEAPON,"{ specialeffect2 EF_HASTEUP; }";\nif (BaseLevel>99) {\n   bonus bLongAtkRate,20;\n}');
+REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`attack`,`range`,`job_archer`,`job_barddancer`,`job_hunter`,`job_rogue`,`job_thief`,`location_left_hand`,`location_right_hand`,`weapon_level`,`equip_level_min`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_nostorage`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (18107,'Malang_Snow_Crab','Malangdo Crab','Weapon','Bow',120,5,true,true,true,true,true,true,true,1,50,100,true,true,true,true,true,true,true,true,'bonus bLuk,3;\nbonus bCritAtkRate,50;\nif (BaseLevel>99)\n   bonus bLongAtkRate,20;');
+REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`attack`,`range`,`job_barddancer`,`job_hunter`,`location_left_hand`,`location_right_hand`,`weapon_level`,`equip_level_min`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_nostorage`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (18108,'Brindle_Eel','Zebra Eel','Weapon','Bow',180,5,true,true,true,true,1,50,100,true,true,true,true,true,true,true,true,'bonus bAgi,3;\nautobonus "{ bonus bAspd,2; }",10,5000,BF_WEAPON,"{ specialeffect2 EF_HASTEUP; }";\nif (BaseLevel>99)\n   bonus bLongAtkRate,20;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`range`,`slots`,`job_rogue`,`class_third`,`class_third_upper`,`class_third_baby`,`location_left_hand`,`location_right_hand`,`weapon_level`,`equip_level_min`,`refineable`,`script`) VALUES (18109,'Catapult','Thief Crossbow','Weapon','Bow',56000,1100,150,5,2,true,true,true,true,true,true,4,100,true,'.@r = getrefine();\nbonus2 bSkillAtk,"SC_TRIANGLESHOT",(.@r*2);\nbonus2 bSkillUseSP,"SC_TRIANGLESHOT",-(.@r*2);');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`range`,`slots`,`job_hunter`,`class_third`,`class_third_upper`,`class_third_baby`,`location_left_hand`,`location_right_hand`,`weapon_level`,`equip_level_min`,`refineable`,`script`) VALUES (18110,'Big_CrossBow','Giant Crossbow','Weapon','Bow',56000,900,160,5,2,true,true,true,true,true,true,4,110,true,'.@r = getrefine();\nbonus2 bSkillAtk,"RA_ARROWSTORM",(.@r*5);\nbonus2 bSkillUseSP,"RA_ARROWSTORM",-(.@r*5);\nif (readparam(bAgi)>=120) {\n   bonus bAspd,1;\n}');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`range`,`slots`,`job_barddancer`,`job_hunter`,`class_third`,`class_third_upper`,`class_third_baby`,`location_left_hand`,`location_right_hand`,`weapon_level`,`equip_level_min`,`refineable`,`script`) VALUES (18111,'Creeper_Bow','Creeper Bow','Weapon','Bow',56000,1500,150,5,2,true,true,true,true,true,true,true,3,120,true,'bonus bDex,1;\nbonus3 bAutoSpell,"PF_SPIDERWEB",1,200;');
@@ -3302,7 +3302,7 @@ REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`pr
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`range`,`slots`,`job_archer`,`job_barddancer`,`job_hunter`,`job_rogue`,`location_left_hand`,`location_right_hand`,`weapon_level`,`equip_level_min`,`refineable`,`script`) VALUES (18121,'Bow_of_Vicious_Mind','Bow of Vicious Mind','Weapon','Bow',20,1700,170,5,1,true,true,true,true,true,true,4,160,true,'bonus bAtk,pow(min(getrefine(),15),2);');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`range`,`slots`,`job_hunter`,`class_third`,`class_third_upper`,`class_third_baby`,`location_left_hand`,`location_right_hand`,`weapon_level`,`equip_level_min`,`refineable`,`script`) VALUES (18122,'Gigantic_Bow','Giant Bow','Weapon','Bow',20,3000,195,5,1,true,true,true,true,true,true,4,130,true,'bonus bLongAtkRate,40;\nbonus bAspdRate,-15;\nbonus bHit,-50;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`range`,`slots`,`job_barddancer`,`job_hunter`,`class_third`,`class_third_upper`,`class_third_baby`,`location_left_hand`,`location_right_hand`,`weapon_level`,`equip_level_min`,`refineable`,`script`) VALUES (18123,'Bow_Of_Storm','Bow of Storms','Weapon','Bow',20,1500,160,5,1,true,true,true,true,true,true,true,4,130,true,'bonus bLongAtkRate,30;\nbonus2 bSkillCooldown,"WM_SEVERE_RAINSTORM",-2000;\nbonus2 bSkillUseSP,"WM_SEVERE_RAINSTORM",15;');
-REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`attack`,`range`,`job_archer`,`job_barddancer`,`job_hunter`,`job_rogue`,`job_thief`,`location_left_hand`,`location_right_hand`,`weapon_level`,`equip_level_min`,`refineable`,`script`) VALUES (18124,'Half_BF_Bow1','Half BF Bow1','Weapon','Bow',20,100,5,true,true,true,true,true,true,true,3,80,true,'bonus bDex,2;\nbonus2 bAddRace,RC_DemiHuman,30;\nbonus2 bAddRace,RC_Player_Human,30;\nbonus2 bIgnoreDefRaceRate,RC_DemiHuman,10;\nbonus2 bIgnoreDefRaceRate,RC_Player_Human,10;\nbonus bUnbreakableWeapon;');
+REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`attack`,`range`,`job_archer`,`job_barddancer`,`job_hunter`,`job_rogue`,`job_thief`,`location_left_hand`,`location_right_hand`,`weapon_level`,`equip_level_min`,`refineable`,`script`) VALUES (18124,'Half_BF_Bow1','Half BF Bow1','Weapon','Bow',20,100,5,true,true,true,true,true,true,true,3,80,true,'bonus bDex,2;\nbonus2 bAddRace,RC_DemiHuman,30;\nbonus2 bAddRace,RC_Player_Human,30;\nbonus2 bIgnoreDefRaceRate,RC_DemiHuman,10;\nbonus2 bIgnoreDefRaceRate,RC_Player_Human,10;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`range`,`slots`,`job_archer`,`job_rogue`,`location_left_hand`,`location_right_hand`,`weapon_level`,`equip_level_min`,`refineable`,`script`) VALUES (18125,'Arcus_Daemonicus','Arcus Daemonicus','Weapon','Bow',20,1000,130,5,2,true,true,true,true,4,80,true,'/*Fix me: bonus2 bAddClass,Class_All,50; when equipped with shadow arrows*/\nif (getrefine()>9) {\n   bonus bAspd,1;\n   bonus bUseSPrate,-20;\n}');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`range`,`slots`,`job_hunter`,`class_third`,`class_third_upper`,`class_third_baby`,`location_left_hand`,`location_right_hand`,`weapon_level`,`equip_level_min`,`refineable`,`script`) VALUES (18126,'Ru_Blue_Bow','Blue Bow','Weapon','Bow',10,1200,150,5,1,true,true,true,true,true,true,3,100,true,'bonus bAgi,5;\nbonus bDex,5;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`weight`,`attack`,`range`,`slots`,`job_hunter`,`class_third`,`class_third_upper`,`class_third_baby`,`location_left_hand`,`location_right_hand`,`weapon_level`,`equip_level_min`,`refineable`,`script`) VALUES (18127,'Ru_Gold_Bow','Ru Gold Bow','Weapon','Bow',1200,150,5,2,true,true,true,true,true,true,3,120,true,'bonus bAgi,8;\nbonus bDex,8;');
@@ -3317,7 +3317,7 @@ REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`pr
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`weight`,`attack`,`range`,`slots`,`job_rogue`,`class_third`,`class_third_upper`,`class_third_baby`,`location_left_hand`,`location_right_hand`,`weapon_level`,`equip_level_min`,`refineable`,`script`) VALUES (18145,'Vigilante_Bow','Vigilante Bow','Weapon','Bow',1000,140,5,2,true,true,true,true,true,true,3,100,true,'.@r = getrefine();\n.@bonus = 5*(readparam(bDex)/20);\nif (.@r>=7) {\n   .@bonus += 10;\n}\nif (.@r>=9) {\n   bonus2 bSkillAtk,"AC_DOUBLE",50;\n}\nbonus bLongAtkRate,.@bonus;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`weight`,`attack`,`range`,`slots`,`job_archer`,`job_barddancer`,`job_hunter`,`class_upper`,`class_third_upper`,`location_left_hand`,`location_right_hand`,`weapon_level`,`equip_level_min`,`refineable`,`script`) VALUES (18149,'Illusion_Ballista','Illusion Ballista','Weapon','Bow',3500,200,5,2,true,true,true,true,true,true,true,4,100,true,'bonus bLongAtkRate,getrefine();');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`attack`,`range`,`slots`,`job_hunter`,`class_third`,`class_third_upper`,`class_third_baby`,`location_left_hand`,`location_right_hand`,`weapon_level`,`equip_level_min`,`refineable`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nocart`,`trade_nostorage`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (18150,'Probation_CrossBow','Trail Ranger\' Crossbow','Weapon','Bow',20,180,5,1,true,true,true,true,true,true,3,100,true,100,true,true,true,true,true,true,true,'bonus2 bSkillAtk,"RA_ARROWSTORM",20;\nbonus bBaseAtk,6*(min(BaseLevel,160)/10);\nif (getrefine()>=7) {\n   bonus bLongAtkRate,getskilllv("HT_BEASTBANE");\n}');
-REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`attack`,`range`,`slots`,`job_barddancer`,`class_third`,`class_third_upper`,`class_third_baby`,`location_left_hand`,`location_right_hand`,`weapon_level`,`equip_level_min`,`refineable`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nocart`,`trade_nostorage`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (18151,'Probation_Bow','Trail Wanderers & Minstrel\'s Bow','Weapon','Bow',20,160,5,1,true,true,true,true,true,true,3,100,true,100,true,true,true,true,true,true,true,'bonus2 bSkillAtk,"WM_SEVERE_RAINSTORM",20;\nbonus bBaseAtk,6*(min(BaseLevel,160)/10);\nif (getrefine()>=7) {\n   bonus bLongAtkRate,getskilllv("BA_MUSICALLESSON");\n}');
+REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`attack`,`range`,`slots`,`job_barddancer`,`class_third`,`class_third_upper`,`class_third_baby`,`location_left_hand`,`location_right_hand`,`weapon_level`,`equip_level_min`,`refineable`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nocart`,`trade_nostorage`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (18151,'Probation_Bow','Trail Wanderers & Minstrel\'s Bow','Weapon','Bow',20,160,5,1,true,true,true,true,true,true,3,100,true,100,true,true,true,true,true,true,true,'bonus2 bSkillAtk,"WM_SEVERE_RAINSTORM",20;\nbonus bBaseAtk,6*(min(BaseLevel,160)/10);\nif (getrefine()>=7)\n   bonus bLongAtkRate,getskilllv("BA_MUSICALLESSON")+getskilllv("DC_DANCINGLESSON");');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`weight`,`attack`,`range`,`slots`,`job_hunter`,`job_rogue`,`class_third`,`class_third_upper`,`class_third_baby`,`location_left_hand`,`location_right_hand`,`weapon_level`,`equip_level_min`,`refineable`,`script`) VALUES (18164,'Royal_Bow_K','Royal Bow','Weapon','Bow',1000,180,5,2,true,true,true,true,true,true,true,4,100,true,'.@r = getrefine();\nbonus bBaseAtk,.@r/2*10;\nbonus2 bSkillAtk,"RA_ARROWSTORM",.@r/3*12;\nif (.@r>=9)\n   bonus bAspdRate,10;\nif (.@r>=11) \n   bonus bLongAtkRate,5;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`attack`,`range`,`slots`,`job_hunter`,`class_third`,`class_third_upper`,`class_third_baby`,`location_left_hand`,`location_right_hand`,`weapon_level`,`equip_level_min`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nocart`,`trade_nostorage`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (18165,'Rebeginer_RN_Bow','Beginner Ranger\'s Bow','Weapon','Bow',170,5,1,true,true,true,true,true,true,3,100,100,true,true,true,true,true,true,true,'bonus bLongAtkRate,5;\nif (getrefine()>=7) {\n   bonus2 bSkillAtk,"RA_ARROWSTORM",15;\n}');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`attack`,`range`,`slots`,`job_barddancer`,`class_third`,`class_third_upper`,`class_third_baby`,`location_left_hand`,`location_right_hand`,`weapon_level`,`equip_level_min`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nocart`,`trade_nostorage`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (18166,'Rebeginer_WM_Bow','Beginner Wanderer & Minstrels\' Bow','Weapon','Bow',170,5,1,true,true,true,true,true,true,3,100,100,true,true,true,true,true,true,true,'bonus bLongAtkRate,5;\nif (getrefine()>=7) {\n   bonus2 bSkillAtk,"WM_SEVERE_RAINSTORM",15;\n}');
@@ -5034,7 +5034,7 @@ REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`we
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`attack`,`range`,`slots`,`job_crusader`,`job_knight`,`job_swordman`,`location_left_hand`,`location_right_hand`,`weapon_level`,`equip_level_min`,`refineable`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nocart`,`trade_nostorage`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (21023,'Toughen_Metal_TH_Sword','Enhanced Metal Two-Handed Sword','Weapon','2hSword',20,120,1,1,true,true,true,true,true,3,100,true,100,true,true,true,true,true,true,true,'.@r = getrefine();\nbonus2 bSkillAtk,"RK_IGNITIONBREAK",10;\nbonus bAspdRate,2*.@r;\nbonus bMatk,3*.@r;\nbonus bBaseAtk,(8*.@r)+7*(min(BaseLevel,150)/10);');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`attack`,`range`,`slots`,`job_knight`,`class_third`,`class_third_upper`,`class_third_baby`,`location_left_hand`,`location_right_hand`,`weapon_level`,`equip_level_min`,`refineable`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nocart`,`trade_nostorage`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (21030,'Probation_TH_Sword','Trial Rune Knight\'s Two-Handed Sword','Weapon','2hSword',20,200,1,1,true,true,true,true,true,true,3,100,true,100,true,true,true,true,true,true,true,'bonus bCritAtkRate,10;\nbonus bCritical,10;\nbonus bBaseAtk,6*(min(BaseLevel,160)/10);\nif (getrefine()>=7) {\n   bonus bAspdRate,getskilllv("KN_TWOHANDQUICKEN");\n}');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`attack`,`range`,`slots`,`job_knight`,`class_third`,`class_third_upper`,`class_third_baby`,`location_left_hand`,`location_right_hand`,`weapon_level`,`equip_level_min`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nocart`,`trade_nostorage`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (21037,'Rebeginer_RK_T_Sword','Beginner Rune Knight\'s Two-Handed Sword','Weapon','2hSword',170,1,1,true,true,true,true,true,true,3,100,100,true,true,true,true,true,true,true,'bonus bAspdRate,10;\nif (getrefine()>=7) {\n   bonus bCritAtkRate,7;\n}');
-REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`weight`,`attack`,`range`,`slots`,`location_left_hand`,`weapon_level`,`equip_level_min`,`refineable`,`script`) VALUES (21038,'Oriental_Sword','Oriental Sword','Weapon','2hSword',1000,180,1,2,true,4,100,true,'.@r = getrefine();\nif (.@r >= 2) {\n   bonus bBaseAtk,.@r/2;\n}\nif (.@r >= 3) {\n   bonus2 bSkillAtk,"RK_SONICWAVE",.@r/3*10;\n}\nif (.@r >= 9) {\n   bonus5 bAutoSpell,"RK_SONICWAVE",2,.@r/3*10,BF_SHORT|BF_WEAPON,1;\n}\nif (.@r >= 11) {\n   bonus bUnbreakableWeapon;\n}');
+REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`weight`,`attack`,`range`,`slots`,`location_left_hand`,`weapon_level`,`equip_level_min`,`refineable`,`script`) VALUES (21038,'Oriental_Sword','Oriental Sword','Weapon','2hSword',1000,180,1,2,true,4,100,true,'.@r = getrefine();\nbonus bBaseAtk,10*(.@r/2);\nbonus2 bSkillAtk,"RK_SONICWAVE",.@r/3*10;\nif (.@r >= 9)\n   bonus5 bAutoSpell,"RK_SONICWAVE",max(2,getskilllv("RK_SONICWAVE")),100,BF_SHORT|BF_WEAPON,1;\nif (.@r >= 11)\n   bonus bUnbreakableWeapon;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`range`,`slots`,`job_crusader`,`job_knight`,`class_third`,`class_third_upper`,`class_third_baby`,`location_left_hand`,`location_right_hand`,`weapon_level`,`equip_level_min`,`refineable`,`script`) VALUES (21039,'Royal_Knight\'s_Broadsword','Royal Knight\'s Broadsword','Weapon','2hSword',20,4000,280,1,2,true,true,true,true,true,true,true,4,175,true,'.@r = getrefine();\nbonus bBaseAtk,20*(.@r/2);\nif (.@r>=7)\n   bonus bCritAtkRate,10;\nif (.@r>=9)\n   bonus bUnbreakableWeapon;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`range`,`slots`,`job_crusader`,`job_knight`,`job_swordman`,`location_left_hand`,`location_right_hand`,`weapon_level`,`equip_level_min`,`refineable`,`script`) VALUES (21047,'Beam_Claymor-OS','Beam Claymor-OS','Weapon','2hSword',20,1800,250,1,2,true,true,true,true,true,4,130,true,'.@r = getrefine();\nbonus bUnbreakableWeapon;\nbonus bCritical,5;\nif (.@r >= 7) {\n   bonus bAspdRate,7;\n   if (.@r >= 9) {\n      bonus bCritAtkRate,15;\n      if (.@r >= 11) {\n         bonus2 bAddSize,Size_Small,20;\n         bonus2 bAddSize,Size_Medium,20;\n      }\n   }\n}');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`attack`,`range`,`slots`,`job_knight`,`class_third`,`class_third_upper`,`class_third_baby`,`location_left_hand`,`location_right_hand`,`weapon_level`,`equip_level_min`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nocart`,`trade_nostorage`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (21049,'Evt_Oriental_Sword','Sealed Eastern Sword','Weapon','2hSword',180,1,2,true,true,true,true,true,true,4,99,100,true,true,true,true,true,true,true,'.@r = getrefine();\nbonus bBaseAtk,10*(.@r/2);\nbonus2 bSkillAtk,"RK_SONICWAVE",10*(.@r/3);\nif (.@r>=7) {\n   bonus5 bAutoSpell,"RK_SONICWAVE",max(2,getskilllv("RK_SONICWAVE")),100,BF_SHORT|BF_WEAPON,1;\n}\nif (.@r>=9) {\n   bonus bUnbreakableWeapon;\n}');
@@ -5324,8 +5324,8 @@ REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`location_sha
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`location_shadow_weapon`,`equip_level_min`,`refineable`,`script`) VALUES (24163,'S_Vibration_Weapon','Formless Shadow Weapon','Shadowgear',true,1,true,'bonus2 bIgnoreDefRaceRate,RC_Formless,5+(getrefine()/2);');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`location_shadow_weapon`,`equip_level_min`,`refineable`,`script`) VALUES (24164,'S_Holy_Water_Weapon','Holy Water Shadow Weapon','Shadowgear',true,1,true,'bonus2 bIgnoreDefRaceRate,RC_Undead,5+(getrefine()/2);');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`location_shadow_weapon`,`equip_level_min`,`refineable`,`script`) VALUES (24165,'S_Scissors_Weapon','Plant Shadow Weapon','Shadowgear',true,1,true,'bonus2 bIgnoreDefRaceRate,RC_Plant,5+(getrefine()/2);');
-REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`location_shadow_right_accessory`,`equip_level_min`,`refineable`,`script`) VALUES (24166,'S_Penetration_Earring','Penetration Shadow Earring','Shadowgear',true,1,true,'.@r = getrefine();\nbonus2 bIgnoreDefRaceRate,RC_All,5+(.@r/2);\nbonus2 bIgnoreDefRaceRate,RC_Player_Human,-5-(.@r/2);');
-REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`location_shadow_left_accessory`,`equip_level_min`,`refineable`,`script`) VALUES (24167,'S_Penetration_Pendent','Penetration Shadow Pendant','Shadowgear',true,1,true,'.@r = getrefine();\nbonus2 bIgnoreDefRaceRate,RC_All,5+(.@r/2);\nbonus2 bIgnoreDefRaceRate,RC_Player_Human,-5-(.@r/2);');
+REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`location_shadow_right_accessory`,`equip_level_min`,`refineable`,`script`) VALUES (24166,'S_Penetration_Earring','Penetration Shadow Earring','Shadowgear',true,1,true,'.@r = getrefine();\nbonus bMaxHP,.@r*10;\nbonus2 bIgnoreDefClassRate,Class_Normal,5+(.@r/2);');
+REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`location_shadow_left_accessory`,`equip_level_min`,`refineable`,`script`) VALUES (24167,'S_Penetration_Pendent','Penetration Shadow Pendant','Shadowgear',true,1,true,'.@r = getrefine();\nbonus bMaxHP,.@r*10;\nbonus2 bIgnoreDefClassRate,Class_Normal,5+(.@r/2);');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`location_shadow_right_accessory`,`equip_level_min`,`refineable`,`script`) VALUES (24168,'S_Tempest_Earring','Tempest Shadow Earring','Shadowgear',true,1,true,'bonus2 bIgnoreMdefClassRate,Class_Normal,5+(getrefine()/2);');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`location_shadow_left_accessory`,`equip_level_min`,`refineable`,`script`) VALUES (24169,'S_Tempest_Pendent','Tempest Pendant Shadow','Shadowgear',true,1,true,'bonus2 bIgnoreMdefClassRate,Class_Normal,5+(getrefine()/2);');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`location_shadow_weapon`,`equip_level_min`,`refineable`,`script`) VALUES (24170,'S_M_Executioner_Weapon','Magic Demi-Human Shadow Weapon','Shadowgear',true,1,true,'bonus2 bIgnoreMdefRaceRate,RC_DemiHuman,5+(getrefine()/2);');