Corrected script for some item (#6440)

Thanks to @RagnaWay and @laziem

db/re/item_combo_db.txt

@@ -2702,9 +2702,9 @@
 490076:29436,{ bonus bAspdRate,15; bonus bPerfectHitAddRate,35; }
 490076:29371,{ bonus2 bMagicAtkEle,Ele_Wind,50; bonus2 bMagicAtkEle,Ele_Holy,50; bonus2 bMagicAtkEle,Ele_Neutral,50; bonus bFixedCastrate,-70; }
 490079:29371,{ if (eaclass()&EAJL_THIRD && BaseJob == Job_Wizard) { bonus2 bIgnoreMdefRaceRate,RC_All,100; } }
-490083:29371,{ autobonus "{ bonus4 bAutoSpellOnSkill,\"LG_RAYOFGENESIS\",\"AB_HIGHNESSHEAL\",3,1000; }",50,3000,BF_MAGIC; /*Unknow Rate*/ }
+490083:29371,{ if (eaclass()&EAJL_THIRD && BaseJob == Job_Crusader) { autobonus "{ bonus4 bAutoSpellOnSkill,\"LG_RAYOFGENESIS\",\"AB_HIGHNESSHEAL\",3,1000; }",50,3000,BF_MAGIC; } }
 490102:29371,{ if (eaclass()&EAJL_THIRD && BaseJob == JOB_SOUL_LINKER) { skill "MG_FIREWALL",10; bonus2 bIgnoreMdefRaceRate,RC_All,100; } }
-490110:29436,{ bonus2 bSkillUseSP,"SR_RAMPAGEBLASTER",130; bonus2 bSkillCooldown,"SR_RAMPAGEBLASTER",-500; }
+490110:29436,{ if (eaclass()&EAJL_THIRD && BaseJob == Job_Monk) { bonus2 bSkillUseSP,"SR_RAMPAGEBLASTER",130; bonus2 bSkillCooldown,"SR_RAMPAGEBLASTER",-500; } }
 490118:29371,{ if (eaclass()&EAJL_THIRD && BaseJob == JOB_PRIEST) { bonus2 bIgnoreMdefRaceRate,RC_All,100; } }
 490119:310655,{ bonus bAllStats,10; bonus bAspdRate,10; }
 490130:29509,{ if (eaclass()&EAJL_THIRD && BaseJob == JOB_MONK) { bonus2 bSkillCooldown,"SR_SKYNETBLOW",-200; autobonus3 "{ bonus bFlee2,100; }",50,3000,"SR_SKYNETBLOW"; } /*Unknow Rate*/ }
@@ -2892,3 +2892,20 @@
 700045:470094,{ bonus bPAtk,2; bonus2 bAddClass,Class_All,10; }
 700046:470094,{ bonus bPAtk,2; bonus2 bAddClass,Class_All,10; }
 700049:470094,{ bonus bPAtk,2; bonus2 bAddClass,Class_All,10; }
+29436:310655,{ autobonus "{ bonus bStr,200; }",50,5000,BF_WEAPON,"{ active_transform 2221,5000 }"; }
+22234:28615,{ .@eq = getequiprefinerycnt(EQI_SHOES); .@weapon = getequiprefinerycnt(EQI_HAND_R); bonus bDelayrate,-20; if (.@eq>=7) { bonus2 bMagicAtkEle,Ele_Fire,.@weapon*3; bonus2 bMagicAtkEle,Ele_Earth,.@weapon*3; bonus2 bMagicAtkEle,Ele_Water,.@weapon*3; bonus2 bMagicAtkEle,Ele_Wind,.@weapon*3; } }
+22234:28127,{ .@eq = getequiprefinerycnt(EQI_SHOES); .@weapon = getequiprefinerycnt(EQI_HAND_R); bonus2 bSkillCooldown,"NC_AXETORNADO",-500; if (.@eq>=7 && .@weapon>=7) { bonus2 bSubClass,Class_Boss,30; } if (.@weapon>=9) { bonus2 bSubClass,Class_Boss,20; } }
+22234:18163,{ .@r = getequiprefinerycnt(EQI_SHOES); .@a = readparam(bInt); bonus2 bResEff,Eff_Bleeding,10000; bonus2 bResEff,Eff_Sleep,10000; if (.@r>=7) { bonus bAgi,6*(.@a/40); bonus bAspdRate,6*(.@a/40); if (.@a>=120 ) { bonus bFlee,100; bonus2 bSkillAtk,"WM_SEVERE_RAINSTORM",50; bonus2 bSkillAtk,"SC_TRIANGLESHOT",50; } } }
+22234:1948,{ .@eq = getequiprefinerycnt(EQI_SHOES); .@weapon = getequiprefinerycnt(EQI_HAND_R); bonus2 bSubRace,RC_DemiHuman,10; bonus2 bSubRace,RC_Player_Human,20; bonus2 bSubRace,RC_Player_Doram,20; if (.@eq>=7 && .@weapon>=7) { bonus bMaxHPrate,10; bonus bMaxSPrate,10; } if (.@weapon>=9) { bonus2 bSubClass,Class_Normal,10; } }
+22234:26204,{ .@eq = getequiprefinerycnt(EQI_SHOES); .@weapon = getequiprefinerycnt(EQI_HAND_R); bonus2 bSubRace,RC_DemiHuman,10; bonus2 bSubRace,RC_Player_Human,20; bonus2 bSubRace,RC_Player_Doram,20; if (.@eq>=7 && .@weapon>=7) { bonus bMaxHPrate,10; bonus bMaxSPrate,10; } if (.@weapon>=9) { bonus2 bSubClass,Class_Normal,10; } }
+22234:28738,{ .@r = getequiprefinerycnt(EQI_SHOES); bonus2 bSkillUseSP,"NJ_KIRIKAGE",10; if (.@r>=7) { bonus2 bAddRace,RC_All,30; bonus bCritAtkRate,30; } if (.@r>=9) { bonus bAspdRate,20; bonus bCritAtkRate,20; } }
+22234:13340,{ .@eq = getequiprefinerycnt(EQI_SHOES); .@weapon = getequiprefinerycnt(EQI_HAND_R); bonus2 bSkillCooldown,"KO_HUUMARANKA",-300; if (.@eq>=7 && .@weapon>=7) { bonus2 bSubClass,Class_Boss,30; } if (.@weapon>=9) { bonus2 bSubClass,Class_Boss,20; } }
+22174:1746,{ .@eq = getequiprefinerycnt(EQI_SHOES); .@weapon = getequiprefinerycnt(EQI_HAND_R); if (.@eq>=7) { bonus2 bSkillCooldown,"WM_SEVERE_RAINSTORM",-2000; } if (.@eq>=7 && .@weapon>=8) { bonus2 bAddClass,Class_Boss,20; bonus2 bSkillAtk,"WM_SEVERE_RAINSTORM",8; } if (.@eq>=7 && .@weapon>=10) { bonus2 bAddClass,Class_Boss,30; bonus2 bSkillAtk,"WM_SEVERE_RAINSTORM",12; } }
+22174:16003,{ .@r = getequiprefinerycnt(EQI_HAND_R); bonus bNoCastCancel; if (.@r>=7) { bonus bMaxSP,400; bonus2 bAddClass,Class_Boss,20; } if (.@r>=9) { bonus bMaxSP,600; bonus2 bAddClass,Class_Boss,30; } }
+22174:1287,{ .@r = getequiprefinerycnt(EQI_HAND_R); bonus2 bIgnoreDefClassRate,Class_Boss,100; if (.@r>=7) { bonus2 bAddClass,Class_Boss,20; bonus2 bSkillAtk,"GC_ROLLINGCUTTER",8; } if (.@r>=9) { bonus2 bAddClass,Class_Boss,30; bonus2 bSkillAtk,"GC_ROLLINGCUTTER",12; } }
+22174:1679,{ .@eq = getequiprefinerycnt(EQI_SHOES); .@weapon = getequiprefinerycnt(EQI_HAND_R); if (.@eq>=7) { bonus bVariableCastrate,-20; } if (.@eq>=7 && .@weapon>=8) { bonus2 bMagicAddClass,Class_Boss,30; bonus2 bIgnoreMdefRaceRate,RC_All,20; } if (.@eq>=7 && .@weapon>=10) { bonus2 bMagicAddClass,Class_Boss,40; bonus2 bIgnoreMdefRaceRate,RC_All,30; } }
+22174:480064:1746,{ .@r = getequiprefinerycnt(EQI_SHOES); if (.@r>=7) { if (getskilllv("WM_GLOOMYDAY") == 5) { bonus2 bSkillCooldown,"WM_SEVERE_RAINSTORM",2000; } } }
+22174:450092:1746,{ .@r = getequiprefinerycnt(EQI_SHOES); if (.@r>=7) { if (getskilllv("WM_GLOOMYDAY") == 5) { bonus2 bSkillCooldown,"WM_SEVERE_RAINSTORM",2000; } } }
+22174:450092,{ if (getskilllv("WM_GLOOMYDAY") == 5) { bonus2 bSkillCooldown,"WM_SEVERE_RAINSTORM",2000; } }
+22174:1649,{ .@eq = getequiprefinerycnt(EQI_SHOES); .@weapon = getequiprefinerycnt(EQI_HAND_R); if (.@eq>=7) { bonus bVariableCastrate,-20; } if (.@eq>=7 && .@weapon>=8) { bonus2 bMagicAddClass,Class_Boss,30; bonus2 bIgnoreMdefRaceRate,RC_All,20; } if (.@eq>=7 && .@weapon>=10) { bonus2 bMagicAddClass,Class_Boss,40; bonus2 bIgnoreMdefRaceRate,RC_All,30; } }
+18123:450092,{ if (getskilllv("WM_GLOOMYDAY") == 5) { bonus2 bSkillCooldown,"WM_SEVERE_RAINSTORM",2000; } }

db/re/item_db_etc.yml

@@ -37418,6 +37418,7 @@ Body:
     AegisName: M_M_Defense
     Name: Modification Module (Defense)
     Type: Card
+    SubType: Enchant
     Buy: 20
     Weight: 10
     Script: |
@@ -37433,6 +37434,7 @@ Body:
     AegisName: M_M_Magic_Defense
     Name: Modification Module (Magic Defense)
     Type: Card
+    SubType: Enchant
     Buy: 20
     Weight: 10
     Script: |
@@ -37448,6 +37450,7 @@ Body:
     AegisName: M_M_Vit
     Name: Modification Module (Vit)
     Type: Card
+    SubType: Enchant
     Buy: 20
     Weight: 10
     Script: |
@@ -37456,6 +37459,7 @@ Body:
     AegisName: M_M_Luk
     Name: Modification Module (Luk)
     Type: Card
+    SubType: Enchant
     Buy: 20
     Weight: 10
     Script: |
@@ -37464,6 +37468,7 @@ Body:
     AegisName: M_M_Str
     Name: Modification Module (Str)
     Type: Card
+    SubType: Enchant
     Buy: 20
     Weight: 10
     Script: |
@@ -37472,6 +37477,7 @@ Body:
     AegisName: M_M_Agi
     Name: Modification Module (Agi)
     Type: Card
+    SubType: Enchant
     Buy: 20
     Weight: 10
     Script: |
@@ -37480,6 +37486,7 @@ Body:
     AegisName: M_M_Int
     Name: Modification Module (Int)
     Type: Card
+    SubType: Enchant
     Buy: 20
     Weight: 10
     Script: |
@@ -37488,6 +37495,7 @@ Body:
     AegisName: M_M_Dex
     Name: Modification Module (Dex)
     Type: Card
+    SubType: Enchant
     Buy: 20
     Weight: 10
     Script: |
@@ -37496,6 +37504,7 @@ Body:
     AegisName: M_M_HP_recovery
     Name: Modification Module (HP recovery)
     Type: Card
+    SubType: Enchant
     Buy: 20
     Weight: 10
     Script: |
@@ -37504,6 +37513,7 @@ Body:
     AegisName: M_M_SP_recovery
     Name: Modification Module (SP recovery)
     Type: Card
+    SubType: Enchant
     Buy: 20
     Weight: 10
     Script: |
@@ -37512,6 +37522,7 @@ Body:
     AegisName: M_M_Spell5
     Name: Modification Module (Spell)
     Type: Card
+    SubType: Enchant
     Buy: 20
     Weight: 10
     Script: |
@@ -37521,6 +37532,7 @@ Body:
     AegisName: M_M_Attack_Delay_4
     Name: Modification Module (Attack Speed)
     Type: Card
+    SubType: Enchant
     Buy: 20
     Weight: 10
     Script: |
@@ -37529,6 +37541,7 @@ Body:
     AegisName: M_M_Fatal4
     Name: Modification Module (Fatal)
     Type: Card
+    SubType: Enchant
     Buy: 20
     Weight: 10
     Script: |
@@ -37538,6 +37551,7 @@ Body:
     AegisName: M_M_Expert_Archer5
     Name: Modification Module (Expert Archer)
     Type: Card
+    SubType: Enchant
     Buy: 20
     Weight: 10
     Script: |
@@ -37546,6 +37560,7 @@ Body:
     AegisName: M_M_Vital
     Name: Modification Module (Vital)
     Type: Card
+    SubType: Enchant
     Buy: 20
     Weight: 10
     Script: |
@@ -37560,6 +37575,7 @@ Body:
     AegisName: M_M_Mental
     Name: Modification Module (Mental)
     Type: Card
+    SubType: Enchant
     Buy: 20
     Weight: 10
     Script: |
@@ -37574,6 +37590,7 @@ Body:
     AegisName: M_M_Heal
     Name: Modification Module (Heal)
     Type: Card
+    SubType: Enchant
     Buy: 20
     Weight: 10
     Script: |
@@ -37589,6 +37606,7 @@ Body:
     AegisName: M_M_Power
     Name: Modification Module (Power)
     Type: Card
+    SubType: Enchant
     Buy: 20
     Weight: 10
     Script: |
@@ -37603,6 +37621,7 @@ Body:
     AegisName: M_M_Magic
     Name: Modification Module (Magic)
     Type: Card
+    SubType: Enchant
     Buy: 20
     Weight: 10
     Script: |
@@ -37617,6 +37636,7 @@ Body:
     AegisName: M_M_Shooter
     Name: Modification Module (Shooter)
     Type: Card
+    SubType: Enchant
     Buy: 20
     Weight: 10
     Script: |
@@ -37632,6 +37652,7 @@ Body:
     AegisName: M_M_Fast
     Name: Modification Module (Fast)
     Type: Card
+    SubType: Enchant
     Buy: 20
     Weight: 10
     Script: |
@@ -37646,6 +37667,7 @@ Body:
     AegisName: M_M_Caster
     Name: Modification Module (Caster)
     Type: Card
+    SubType: Enchant
     Buy: 20
     Weight: 10
     Script: |
@@ -37661,6 +37683,7 @@ Body:
     AegisName: M_M_Critical
     Name: Modification Module (Critical)
     Type: Card
+    SubType: Enchant
     Buy: 20
     Weight: 10
     Script: |
@@ -37675,6 +37698,7 @@ Body:
     AegisName: M_M_Delay_After_skill
     Name: Modification Module (Delay after skill)
     Type: Card
+    SubType: Enchant
     Buy: 20
     Weight: 10
     Script: |
@@ -37690,6 +37714,7 @@ Body:
     AegisName: M_M_Fixed_Casting
     Name: Modification Module (Fixed Casting)
     Type: Card
+    SubType: Enchant
     Buy: 20
     Weight: 10
     Script: |
@@ -37705,6 +37730,7 @@ Body:
     AegisName: M_M_Above_All
     Name: Modification Module (Above All)
     Type: Card
+    SubType: Enchant
     Buy: 20
     Weight: 10
     Script: |
@@ -37720,6 +37746,7 @@ Body:
     AegisName: M_M_Drain_Life
     Name: Modification Module (Drain Life)
     Type: Card
+    SubType: Enchant
     Buy: 20
     Weight: 10
     Script: |
@@ -37728,6 +37755,7 @@ Body:
     AegisName: M_M_Drain_Soul
     Name: Modification Module (Drain Soul)
     Type: Card
+    SubType: Enchant
     Buy: 20
     Weight: 10
     Script: |
@@ -37736,6 +37764,7 @@ Body:
     AegisName: M_M_Magic_Healing
     Name: Modification Module (Magic Healing)
     Type: Card
+    SubType: Enchant
     Buy: 20
     Weight: 10
     Script: |
@@ -37744,6 +37773,7 @@ Body:
     AegisName: M_M_Magic_Soul
     Name: Modification Module (Magic Soul)
     Type: Card
+    SubType: Enchant
     Buy: 20
     Weight: 10
     Script: |
@@ -37752,6 +37782,7 @@ Body:
     AegisName: M_M_Unlimited_Vital
     Name: Modification Module (Unlimited Vital)
     Type: Card
+    SubType: Enchant
     Buy: 20
     Weight: 10
     Script: |
@@ -37761,6 +37792,7 @@ Body:
     AegisName: M_M_Spell_Buster
     Name: Modification Module (Spell Buster)
     Type: Card
+    SubType: Enchant
     Buy: 20
     Weight: 10
     Script: |
@@ -37770,6 +37802,7 @@ Body:
     AegisName: M_M_Firing_Shot
     Name: Modification Module (Firing Shot)
     Type: Card
+    SubType: Enchant
     Buy: 20
     Weight: 10
     Script: |
@@ -37779,6 +37812,7 @@ Body:
     AegisName: M_M_Overpower
     Name: Modification Module (Overpower)
     Type: Card
+    SubType: Enchant
     Buy: 20
     Weight: 10
     Script: |
@@ -37788,6 +37822,7 @@ Body:
     AegisName: M_M_Fatal_Flash
     Name: Modification Module (Fatal Flash)
     Type: Card
+    SubType: Enchant
     Buy: 20
     Weight: 10
     Script: |
@@ -37797,6 +37832,7 @@ Body:
     AegisName: M_M_Lucky_Strike
     Name: Modification Module (Lucky Strike)
     Type: Card
+    SubType: Enchant
     Buy: 20
     Weight: 10
     Script: |
@@ -45591,8 +45627,10 @@ Body:
          bonus bHit,20;
       }
       bonus bShortAtkRate,.@r;
-      bonus2 bSkillAtk,"SJ_FALLINGSTAR_ATK",15*.@r;
-      bonus2 bSkillAtk,"SJ_FULLMOONKICK",15*.@r;
+      if (.@r>=10) {
+         bonus2 bSkillAtk,"SJ_FALLINGSTAR_ATK",15;
+         bonus2 bSkillAtk,"SJ_FULLMOONKICK",15;
+      }
   - Id: 300089
     AegisName: Verporta_Card
     Name: Verporta Card

db/re/item_db_usable.yml

@@ -47789,6 +47789,46 @@ Body:
     Script: |
       bonus_script "bonus bAddItemHealRate,20;",1800,9;
       /* fix me: unknown flag and specialeffect */
+  - Id: 23049
+    AegisName: Comp_Spark_Candy
+    Name: "[Not For Sale] Sparkling Candy"
+    Type: Usable
+    Weight: 10
+    Delay:
+      Duration: 180000
+      Status: Reuse_Limit_B
+    Trade:
+      Override: 100
+      NoDrop: true
+      NoTrade: true
+      NoSell: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+    Script: |
+      specialeffect2 EF_HASTEUP;
+      bonus_script "{ bonus2 bHPLossRate,100,10000; bonus bBaseAtk,20; bonus bAspdRate,25; bonus bNoWalkDelay; }",60,0,0,EFST_STEAMPACK;
+  - Id: 23050
+    AegisName: Comp_Magic_Candy
+    Name: "[Not For Sale] Magic Candy"
+    Type: Usable
+    Weight: 10
+    Delay:
+      Duration: 180000
+      Status: Reuse_Limit_B
+    Trade:
+      Override: 100
+      NoDrop: true
+      NoTrade: true
+      NoSell: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+    Script: |
+      specialeffect2 EF_HASTEUP;
+      bonus_script "{ bonus bMatk,30; bonus bFixedCastrate,-70; bonus bNoCastCancel; bonus2 bSPLossRate,90,10000; }",60,0,0,EFST_MAGIC_CANDY;
   - Id: 23058
     AegisName: Enchant_Stone_Box9
     Name: Costume Enchant Stone Box 9