From 6814e3349a810a52bc605af01b0e7f899ba5b614 Mon Sep 17 00:00:00 2001 From: Asheraf Date: Fri, 30 Aug 2019 23:56:14 +0100 Subject: change formatting in some item combo scripts --- db/pre-re/item_combo_db.conf | 24 ++++--- db/re/item_combo_db.conf | 165 ++++++++++++++++++++++++++++--------------- 2 files changed, 124 insertions(+), 65 deletions(-) diff --git a/db/pre-re/item_combo_db.conf b/db/pre-re/item_combo_db.conf index fdc42f37d..e2ed5d486 100644 --- a/db/pre-re/item_combo_db.conf +++ b/db/pre-re/item_combo_db.conf @@ -266,7 +266,8 @@ combo_db: ( Script: <" bonus bLongAtkRate, 25; bonus3 bAutoSpell, "NJ_HUUJIN", 5, 100; - if (readparam(bInt) > 39) bonus3 bAutoSpell, "NJ_HUUJIN", 5, 200; + if (readparam(bInt) > 39) + bonus3 bAutoSpell, "NJ_HUUJIN", 5, 200; "> }, { @@ -314,7 +315,8 @@ combo_db: ( bonus bStr, 2; bonus bDef, 5; bonus bMdef, 5; - if (BaseClass == Job_Swordman) bonus bDef, 6; + if (BaseClass == Job_Swordman) + bonus bDef, 6; "> }, { @@ -440,13 +442,15 @@ combo_db: ( { Items: ["Odins_Blessing", "Ulle_Cap"] Script: <" - if (readparam(bDex) > 69) bonus bUseSPrate, -10; + if (readparam(bDex) > 69) + bonus bUseSPrate, -10; "> }, { Items: ["Odins_Blessing", "Ulle_Cap_I"] Script: <" - if (readparam(bDex) > 69) bonus bUseSPrate, -10; + if (readparam(bDex) > 69) + bonus bUseSPrate, -10; "> }, { @@ -969,7 +973,8 @@ combo_db: ( bonus bStr, 6; bonus bAgi, 4; bonus2 bSkillAtk, "RG_BACKSTAP", 10; - if (getskilllv("RG_STRIPARMOR") == 5) bonus3 bAutoSpell, "RG_STRIPARMOR", 5, 50; + if (getskilllv("RG_STRIPARMOR") == 5) + bonus3 bAutoSpell, "RG_STRIPARMOR", 5, 50; if (BaseJob == Job_Rogue) { bonus bUseSPrate, -20; bonus3 bAutoSpell, "RG_INTIMIDATE", 1, -20; @@ -1023,7 +1028,8 @@ combo_db: ( bonus bAspdRate, 5; bonus bSpeedRate, 25; bonus2 bSPDrainValue, 1, 0; - if (BaseClass == Job_Thief) bonus bNoGemStone, 0; + if (BaseClass == Job_Thief) + bonus bNoGemStone, 0; "> }, { @@ -1046,7 +1052,8 @@ combo_db: ( bonus2 bSkillAtk, "CG_ARROWVULCAN", 5; bonus2 bSkillAtk, "DC_THROWARROW", 10; bonus2 bSkillAtk, "BA_MUSICALSTRIKE", 10; - if (BaseJob == Job_Bard || BaseJob == Job_Dancer) bonus3 bAutoSpellWhenHit, "CG_TAROTCARD", 2, 50; + if (BaseJob == Job_Bard || BaseJob == Job_Dancer) + bonus3 bAutoSpellWhenHit, "CG_TAROTCARD", 2, 50; "> }, { @@ -1180,7 +1187,8 @@ combo_db: ( bonus2 bSkillAtk, "PA_SHIELDCHAIN", 10; bonus2 bSkillAtk, "PA_SACRIFICE", 10; bonus bCastrate, -10; - if (BaseJob == Job_Crusader) bonus bDefEle, Ele_Holy; + if (BaseJob == Job_Crusader) + bonus bDefEle, Ele_Holy; "> }, { diff --git a/db/re/item_combo_db.conf b/db/re/item_combo_db.conf index 4f4b05e3e..66e553c32 100644 --- a/db/re/item_combo_db.conf +++ b/db/re/item_combo_db.conf @@ -346,7 +346,8 @@ combo_db: ( Items: ["Survival_Rod_", "Survive_Circlet"] Script: <" bonus bMatk, getequiprefinerycnt(EQI_HAND_R) * 10; - if (getequiprefinerycnt(EQI_HAND_R) >= 10) autobonus "{ bonus bVariableCastrate,-50; }", 50, 5000, BF_MAGIC, "{ specialeffect(EF_SUFFRAGIUM, AREA, playerattached()); }"; + if (getequiprefinerycnt(EQI_HAND_R) >= 10) + autobonus "{ bonus bVariableCastrate,-50; }", 50, 5000, BF_MAGIC, "{ specialeffect(EF_SUFFRAGIUM, AREA, playerattached()); }"; "> }, { @@ -485,7 +486,8 @@ combo_db: ( Script: <" bonus bLongAtkRate, 25; bonus3 bAutoSpell, NJ_HUUJIN, 5, 100; - if (readparam(bInt) > 39) bonus3 bAutoSpell, NJ_HUUJIN, 5, 200; + if (readparam(bInt) > 39) + bonus3 bAutoSpell, NJ_HUUJIN, 5, 200; "> }, { @@ -760,7 +762,7 @@ combo_db: ( { Items: ["Lapine_Shield", "KarduiEar"] Script: <" - if (isequipped(4441)) {} else { + if (!isequipped(Fallen_Bishop_Card)) { if (getequiprefinerycnt(EQI_HAND_L) > 6) { bonus2 bSkillCooldown, WL_COMET, -20000; } @@ -892,13 +894,15 @@ combo_db: ( { Items: ["Odins_Blessing", "Ulle_Cap"] Script: <" - if (readparam(bDex) > 69) bonus bUseSPrate, -10; + if (readparam(bDex) > 69) + bonus bUseSPrate, -10; "> }, { Items: ["Odins_Blessing", "Ulle_Cap_I"] Script: <" - if (readparam(bDex) > 69) bonus bUseSPrate, -10; + if (readparam(bDex) > 69) + bonus bUseSPrate, -10; "> }, { @@ -1669,7 +1673,8 @@ combo_db: ( bonus bStr, 6; bonus bAgi, 4; bonus2 bSkillAtk, RG_BACKSTAP, 10; - if (getskilllv(RG_STRIPARMOR) == 5) bonus3 bAutoSpell, RG_STRIPARMOR, 5, 50; + if (getskilllv(RG_STRIPARMOR) == 5) + bonus3 bAutoSpell, RG_STRIPARMOR, 5, 50; if (BaseJob == Job_Rogue) { bonus bUseSPrate, -20; bonus3 bAutoSpell, RG_INTIMIDATE, 1, -20; @@ -1711,7 +1716,8 @@ combo_db: ( Items: ["Knight_Of_Abyss_Card", "Lord_of_Death"] Script: <" bonus2 bAddRace, RC_Boss, 5; - if (getequiprefinerycnt(EQI_HEAD_TOP) >= 11) bonus2 bSubRace, RC_NonBoss, 5; + if (getequiprefinerycnt(EQI_HEAD_TOP) >= 11) + bonus2 bSubRace, RC_NonBoss, 5; "> }, { @@ -1741,8 +1747,9 @@ combo_db: ( bonus bAspdRate, 3; bonus bAspd, 1; bonus bAtkRate, -5; - if (getiteminfo(getequipid(EQI_HAND_R), 11) == 11) { - if (getequiprefinerycnt(EQI_HAND_R) > 8) bonus bAspd, 1; + if (getiteminfo(getequipid(EQI_HAND_R), ITEMINFO_SUBTYPE) == W_BOW) { + if (getequiprefinerycnt(EQI_HAND_R) > 8) + bonus bAspd, 1; } "> }, @@ -1762,7 +1769,8 @@ combo_db: ( bonus bAspdRate, 5; bonus bSpeedRate, 25; bonus2 bSPDrainValue, 1, 0; - if (BaseClass == Job_Thief) bonus bNoGemStone, 0; + if (BaseClass == Job_Thief) + bonus bNoGemStone, 0; "> }, { @@ -1785,7 +1793,8 @@ combo_db: ( bonus2 bSkillAtk, CG_ARROWVULCAN, 5; bonus2 bSkillAtk, DC_THROWARROW, 10; bonus2 bSkillAtk, BA_MUSICALSTRIKE, 10; - if (BaseJob == Job_Bard || BaseJob == Job_Dancer) bonus3 bAutoSpellWhenHit, CG_TAROTCARD, 2, 50; + if (BaseJob == Job_Bard || BaseJob == Job_Dancer) + bonus3 bAutoSpellWhenHit, CG_TAROTCARD, 2, 50; "> }, { @@ -1919,7 +1928,8 @@ combo_db: ( bonus2 bSkillAtk, PA_SHIELDCHAIN, 10; bonus2 bSkillAtk, PA_SACRIFICE, 10; bonus bVariableCastrate, -10; - if (BaseJob == Job_Crusader) bonus bDefEle, Ele_Holy; + if (BaseJob == Job_Crusader) + bonus bDefEle, Ele_Holy; "> }, { @@ -1967,7 +1977,9 @@ combo_db: ( { Items: ["Tendrilion_Card", "KarduiEar"] Script: <" - if (getiteminfo(getequipid(EQI_HAND_R), 11) == 5 || getiteminfo(getequipid(EQI_HAND_R), 11) == 23 || getiteminfo(getequipid(EQI_HAND_R), 11) == 10) { + if (getiteminfo(getequipid(EQI_HAND_R), ITEMINFO_SUBTYPE) == W_2HSPEAR + || getiteminfo(getequipid(EQI_HAND_R), ITEMINFO_SUBTYPE) == W_2HSTAFF + || getiteminfo(getequipid(EQI_HAND_R), ITEMINFO_SUBTYPE) == W_STAFF) { bonus2 bMagicAddRace, RC_DemiPlayer, getequipid(EQI_HAND_R) * 2; bonus2 bMagicAddRace, RC_Player, getequipid(EQI_HAND_R) * 2; } @@ -2126,8 +2138,10 @@ combo_db: ( Items: ["Feather_Beret", "Protect_Feathers"] Script: <" bonus bAspdRate, 5; - if (getequiprefinerycnt(EQI_HEAD_TOP) > 6) bonus bAspdRate, 5; - if (getequiprefinerycnt(EQI_HEAD_TOP) > 8) bonus bMaxHPrate, 5; + if (getequiprefinerycnt(EQI_HEAD_TOP) > 6) + bonus bAspdRate, 5; + if (getequiprefinerycnt(EQI_HEAD_TOP) > 8) + bonus bMaxHPrate, 5; "> }, { @@ -2186,7 +2200,8 @@ combo_db: ( { Items: ["Heaven_Cage", "Ixion_Wing"] Script: <" - if (Class == Job_Ranger || Class == Job_Ranger_T) skill HT_BLITZBEAT, 5 * getequiprefinerycnt(EQI_HAND_R); + if (Class == Job_Ranger || Class == Job_Ranger_T) + skill HT_BLITZBEAT, 5 * getequiprefinerycnt(EQI_HAND_R); "> }, { @@ -2798,7 +2813,8 @@ combo_db: ( { Items: ["S_Gemstone_Armor", "S_Gemstone_Shoes", "S_Gemstone_Shield", "S_Gemstone_Weapon", "S_Gemstone_Earring", "S_Gemstone_Pendent"] Script: <" - bonus bAllStats, 1;.@r = getequiprefinerycnt(EQI_SHADOW_ARMOR, EQI_SHADOW_WEAPON, EQI_SHADOW_SHIELD, EQI_SHADOW_SHOES, EQI_SHADOW_ACC_R, EQI_SHADOW_ACC_L); + bonus bAllStats, 1; + .@r = getequiprefinerycnt(EQI_SHADOW_ARMOR, EQI_SHADOW_WEAPON, EQI_SHADOW_SHIELD, EQI_SHADOW_SHOES, EQI_SHADOW_ACC_R, EQI_SHADOW_ACC_L); if (.@r >= 45) { bonus bNoGemStone, 1; } @@ -2809,56 +2825,64 @@ combo_db: ( Items: ["S_Stability_Shield", "S_Plasterers_Armor", "S_Plasterers_Shoes"] Script: <" bonus bDef, 5; - if (getequiprefinerycnt(EQI_SHADOW_SHIELD, EQI_SHADOW_ARMOR, EQI_SHADOW_SHOES) >= 20) bonus2 bResEff, Eff_Stone, 100; + if (getequiprefinerycnt(EQI_SHADOW_SHIELD, EQI_SHADOW_ARMOR, EQI_SHADOW_SHOES) >= 20) + bonus2 bResEff, Eff_Stone, 100; "> }, { Items: ["S_Stability_Shield", "S_Insomniac_Armor", "S_Insomniac_Shoes"] Script: <" bonus bDef, 5; - if (getequiprefinerycnt(EQI_SHADOW_SHIELD, EQI_SHADOW_ARMOR, EQI_SHADOW_SHOES) >= 20) bonus2 bResEff, Eff_Sleep, 100; + if (getequiprefinerycnt(EQI_SHADOW_SHIELD, EQI_SHADOW_ARMOR, EQI_SHADOW_SHOES) >= 20) + bonus2 bResEff, Eff_Sleep, 100; "> }, { Items: ["S_Stability_Shield", "S_Peerless_Armor", "S_Peerless_Shoes"] Script: <" bonus bDef, 5; - if (getequiprefinerycnt(EQI_SHADOW_SHIELD, EQI_SHADOW_ARMOR, EQI_SHADOW_SHOES) >= 20) bonus2 bResEff, Eff_Silence, 100; + if (getequiprefinerycnt(EQI_SHADOW_SHIELD, EQI_SHADOW_ARMOR, EQI_SHADOW_SHOES) >= 20) + bonus2 bResEff, Eff_Silence, 100; "> }, { Items: ["S_Stability_Shield", "S_Adurate_Armor", "S_Adurate_Shoes"] Script: <" bonus bDef, 5; - if (getequiprefinerycnt(EQI_SHADOW_SHIELD, EQI_SHADOW_ARMOR, EQI_SHADOW_SHOES) >= 20) bonus2 bResEff, Eff_Blind, 100; + if (getequiprefinerycnt(EQI_SHADOW_SHIELD, EQI_SHADOW_ARMOR, EQI_SHADOW_SHOES) >= 20) + bonus2 bResEff, Eff_Blind, 100; "> }, { Items: ["S_Stability_Shield", "Unfreez_Weapon_S", "Unfreeze_Earing_S", "Unfreeze_Pendent_S"] Script: <" bonus bDef, 4; - if (getequiprefinerycnt(EQI_SHADOW_SHIELD, EQI_SHADOW_WEAPON, EQI_SHADOW_ACC_L, EQI_SHADOW_ACC_R) >= 30) bonus2 bResEff, Eff_Freeze, 100; + if (getequiprefinerycnt(EQI_SHADOW_SHIELD, EQI_SHADOW_WEAPON, EQI_SHADOW_ACC_L, EQI_SHADOW_ACC_R) >= 30) + bonus2 bResEff, Eff_Freeze, 100; "> }, { Items: ["S_Stability_Shield", "Vitality_Earing_S", "Vitality_Pendant_S"] Script: <" bonus bDef, 5; - if (getequiprefinerycnt(EQI_SHADOW_SHIELD, EQI_SHADOW_ACC_L, EQI_SHADOW_ACC_R) >= 20) bonus2 bResEff, Eff_Bleeding, 100; + if (getequiprefinerycnt(EQI_SHADOW_SHIELD, EQI_SHADOW_ACC_L, EQI_SHADOW_ACC_R) >= 20) + bonus2 bResEff, Eff_Bleeding, 100; "> }, { Items: ["S_Stability_Shield", "S_Neutral_Weapon", "S_Neutral_Earring", "S_Neutral_Pendent"] Script: <" bonus bDef, 4; - if (getequiprefinerycnt(EQI_SHADOW_SHIELD, EQI_SHADOW_WEAPON, EQI_SHADOW_ACC_L, EQI_SHADOW_ACC_R) >= 30) bonus2 bResEff, Eff_Stun, 100; + if (getequiprefinerycnt(EQI_SHADOW_SHIELD, EQI_SHADOW_WEAPON, EQI_SHADOW_ACC_L, EQI_SHADOW_ACC_R) >= 30) + bonus2 bResEff, Eff_Stun, 100; "> }, { Items: ["S_Stability_Shield", "S_Curse_Lift_Earring", "S_Curse_Lift_Pendent"] Script: <" bonus bDef, 5; - if (getequiprefinerycnt(EQI_SHADOW_SHIELD, EQI_SHADOW_ACC_L, EQI_SHADOW_ACC_R) >= 20) bonus2 bResEff, Eff_Curse, 100; + if (getequiprefinerycnt(EQI_SHADOW_SHIELD, EQI_SHADOW_ACC_L, EQI_SHADOW_ACC_R) >= 20) + bonus2 bResEff, Eff_Curse, 100; "> }, { @@ -2879,161 +2903,184 @@ combo_db: ( Items: ["S_Infinity_Earring", "S_Infinity_Pendant"] Script: <" bonus bAtkRate, 1; - if (getequiprefinerycnt(EQI_SHADOW_ACC_R, EQI_SHADOW_ACC_L) >= 15) bonus bNoSizeFix, 1; + if (getequiprefinerycnt(EQI_SHADOW_ACC_R, EQI_SHADOW_ACC_L) >= 15) + bonus bNoSizeFix, 1; "> }, { Items: ["S_Solid_Weapon", "S_Solid_Earring"] Script: <" bonus bAtk, getequiprefinerycnt(EQI_SHADOW_WEAPON); - if (getequiprefinerycnt(EQI_SHADOW_WEAPON, EQI_SHADOW_ACC_R) >= 15) bonus bUnbreakableWeapon, 1; + if (getequiprefinerycnt(EQI_SHADOW_WEAPON, EQI_SHADOW_ACC_R) >= 15) + bonus bUnbreakableWeapon, 1; "> }, { Items: ["S_Immortal_Armor", "S_Immortal_Pendant"] Script: <" bonus bDef, getequiprefinerycnt(EQI_SHADOW_ARMOR); - if (getequiprefinerycnt(EQI_SHADOW_ARMOR, EQI_SHADOW_ACC_L) >= 15) bonus bUnbreakableArmor, 1; + if (getequiprefinerycnt(EQI_SHADOW_ARMOR, EQI_SHADOW_ACC_L) >= 15) + bonus bUnbreakableArmor, 1; "> }, { Items: ["S_Executioner_Weapon", "S_Penetration_Earring", "S_Penetration_Pendent"] Script: <" bonus bBaseAtk, 5; - if (getequiprefinerycnt(EQI_SHADOW_WEAPON, EQI_SHADOW_ACC_R, EQI_SHADOW_ACC_L) >= 25) bonus bIgnoreDefRace, RC_DemiPlayer; + if (getequiprefinerycnt(EQI_SHADOW_WEAPON, EQI_SHADOW_ACC_R, EQI_SHADOW_ACC_L) >= 25) + bonus bIgnoreDefRace, RC_DemiPlayer; "> }, { Items: ["S_Exorcist_Weapon", "S_Penetration_Earring", "S_Penetration_Pendent"] Script: <" bonus bBaseAtk, 5; - if (getequiprefinerycnt(EQI_SHADOW_WEAPON, EQI_SHADOW_ACC_R, EQI_SHADOW_ACC_L) >= 25) bonus bIgnoreDefRace, RC_Demon; + if (getequiprefinerycnt(EQI_SHADOW_WEAPON, EQI_SHADOW_ACC_R, EQI_SHADOW_ACC_L) >= 25) + bonus bIgnoreDefRace, RC_Demon; "> }, { Items: ["S_Hunting_Weapon", "S_Penetration_Earring", "S_Penetration_Pendent"] Script: <" bonus bBaseAtk, 5; - if (getequiprefinerycnt(EQI_SHADOW_WEAPON, EQI_SHADOW_ACC_R, EQI_SHADOW_ACC_L) >= 25) bonus bIgnoreDefRace, RC_Brute; + if (getequiprefinerycnt(EQI_SHADOW_WEAPON, EQI_SHADOW_ACC_R, EQI_SHADOW_ACC_L) >= 25) + bonus bIgnoreDefRace, RC_Brute; "> }, { Items: ["S_Insect_Net_Weapon", "S_Penetration_Earring", "S_Penetration_Pendent"] Script: <" bonus bBaseAtk, 5; - if (getequiprefinerycnt(EQI_SHADOW_WEAPON, EQI_SHADOW_ACC_R, EQI_SHADOW_ACC_L) >= 25) bonus bIgnoreDefRace, RC_Insect; + if (getequiprefinerycnt(EQI_SHADOW_WEAPON, EQI_SHADOW_ACC_R, EQI_SHADOW_ACC_L) >= 25) + bonus bIgnoreDefRace, RC_Insect; "> }, { Items: ["S_Fishing_Weapon", "S_Penetration_Earring", "S_Penetration_Pendent"] Script: <" bonus bBaseAtk, 5; - if (getequiprefinerycnt(EQI_SHADOW_WEAPON, EQI_SHADOW_ACC_R, EQI_SHADOW_ACC_L) >= 25) bonus bIgnoreDefRace, RC_Fish; + if (getequiprefinerycnt(EQI_SHADOW_WEAPON, EQI_SHADOW_ACC_R, EQI_SHADOW_ACC_L) >= 25) + bonus bIgnoreDefRace, RC_Fish; "> }, { Items: ["S_Dragon_Killer_Weapon", "S_Penetration_Earring", "S_Penetration_Pendent"] Script: <" bonus bBaseAtk, 5; - if (getequiprefinerycnt(EQI_SHADOW_WEAPON, EQI_SHADOW_ACC_R, EQI_SHADOW_ACC_L) >= 25) bonus bIgnoreDefRace, RC_Dragon; + if (getequiprefinerycnt(EQI_SHADOW_WEAPON, EQI_SHADOW_ACC_R, EQI_SHADOW_ACC_L) >= 25) + bonus bIgnoreDefRace, RC_Dragon; "> }, { Items: ["S_Corrupt_Weapon", "S_Penetration_Earring", "S_Penetration_Pendent"] Script: <" bonus bBaseAtk, 5; - if (getequiprefinerycnt(EQI_SHADOW_WEAPON, EQI_SHADOW_ACC_R, EQI_SHADOW_ACC_L) >= 25) bonus bIgnoreDefRace, RC_Angel; + if (getequiprefinerycnt(EQI_SHADOW_WEAPON, EQI_SHADOW_ACC_R, EQI_SHADOW_ACC_L) >= 25) + bonus bIgnoreDefRace, RC_Angel; "> }, { Items: ["S_Vibration_Weapon", "S_Penetration_Earring", "S_Penetration_Pendent"] Script: <" bonus bBaseAtk, 5; - if (getequiprefinerycnt(EQI_SHADOW_WEAPON, EQI_SHADOW_ACC_R, EQI_SHADOW_ACC_L) >= 25) bonus bIgnoreDefRace, RC_Formless; + if (getequiprefinerycnt(EQI_SHADOW_WEAPON, EQI_SHADOW_ACC_R, EQI_SHADOW_ACC_L) >= 25) + bonus bIgnoreDefRace, RC_Formless; "> }, { Items: ["S_Holy_Water_Weapon", "S_Penetration_Earring", "S_Penetration_Pendent"] Script: <" bonus bBaseAtk, 5; - if (getequiprefinerycnt(EQI_SHADOW_WEAPON, EQI_SHADOW_ACC_R, EQI_SHADOW_ACC_L) >= 25) bonus bIgnoreDefRace, RC_Undead; + if (getequiprefinerycnt(EQI_SHADOW_WEAPON, EQI_SHADOW_ACC_R, EQI_SHADOW_ACC_L) >= 25) + bonus bIgnoreDefRace, RC_Undead; "> }, { Items: ["S_Scissors_Weapon", "S_Penetration_Earring", "S_Penetration_Pendent"] Script: <" bonus bBaseAtk, 5; - if (getequiprefinerycnt(EQI_SHADOW_WEAPON, EQI_SHADOW_ACC_R, EQI_SHADOW_ACC_L) >= 25) bonus bIgnoreDefRace, RC_Plant; + if (getequiprefinerycnt(EQI_SHADOW_WEAPON, EQI_SHADOW_ACC_R, EQI_SHADOW_ACC_L) >= 25) + bonus bIgnoreDefRace, RC_Plant; "> }, { Items: ["S_Tempest_Earring", "S_Tempest_Pendent", "S_M_Executioner_Weapon"] Script: <" bonus bMatk, 5; - if (getequiprefinerycnt(EQI_SHADOW_WEAPON, EQI_SHADOW_ACC_R, EQI_SHADOW_ACC_L) >= 25) bonus bIgnoreMdefRace, RC_DemiPlayer; + if (getequiprefinerycnt(EQI_SHADOW_WEAPON, EQI_SHADOW_ACC_R, EQI_SHADOW_ACC_L) >= 25) + bonus bIgnoreMdefRace, RC_DemiPlayer; "> }, { Items: ["S_Tempest_Earring", "S_Tempest_Pendent", "S_M_Exorcist_Weapon"] Script: <" bonus bMatk, 5; - if (getequiprefinerycnt(EQI_SHADOW_WEAPON, EQI_SHADOW_ACC_R, EQI_SHADOW_ACC_L) >= 25) bonus bIgnoreMdefRace, RC_Demon; + if (getequiprefinerycnt(EQI_SHADOW_WEAPON, EQI_SHADOW_ACC_R, EQI_SHADOW_ACC_L) >= 25) + bonus bIgnoreMdefRace, RC_Demon; "> }, { Items: ["S_Tempest_Earring", "S_Tempest_Pendent", "S_M_Hunting_Weapon"] Script: <" bonus bMatk, 5; - if (getequiprefinerycnt(EQI_SHADOW_WEAPON, EQI_SHADOW_ACC_R, EQI_SHADOW_ACC_L) >= 25) bonus bIgnoreMdefRace, RC_Brute; + if (getequiprefinerycnt(EQI_SHADOW_WEAPON, EQI_SHADOW_ACC_R, EQI_SHADOW_ACC_L) >= 25) + bonus bIgnoreMdefRace, RC_Brute; "> }, { Items: ["S_Tempest_Earring", "S_Tempest_Pendent", "S_M_Insect_Net_Weapon"] Script: <" bonus bMatk, 5; - if (getequiprefinerycnt(EQI_SHADOW_WEAPON, EQI_SHADOW_ACC_R, EQI_SHADOW_ACC_L) >= 25) bonus bIgnoreMdefRace, RC_Insect; + if (getequiprefinerycnt(EQI_SHADOW_WEAPON, EQI_SHADOW_ACC_R, EQI_SHADOW_ACC_L) >= 25) + bonus bIgnoreMdefRace, RC_Insect; "> }, { Items: ["S_Tempest_Earring", "S_Tempest_Pendent", "S_M_Fishing_Weapon"] Script: <" bonus bMatk, 5; - if (getequiprefinerycnt(EQI_SHADOW_WEAPON, EQI_SHADOW_ACC_R, EQI_SHADOW_ACC_L) >= 25) bonus bIgnoreMdefRace, RC_Fish; + if (getequiprefinerycnt(EQI_SHADOW_WEAPON, EQI_SHADOW_ACC_R, EQI_SHADOW_ACC_L) >= 25) + bonus bIgnoreMdefRace, RC_Fish; "> }, { Items: ["S_Tempest_Earring", "S_Tempest_Pendent", "S_M_Dragon_K_Weapon"] Script: <" bonus bMatk, 5; - if (getequiprefinerycnt(EQI_SHADOW_WEAPON, EQI_SHADOW_ACC_R, EQI_SHADOW_ACC_L) >= 25) bonus bIgnoreMdefRace, RC_Dragon; + if (getequiprefinerycnt(EQI_SHADOW_WEAPON, EQI_SHADOW_ACC_R, EQI_SHADOW_ACC_L) >= 25) + bonus bIgnoreMdefRace, RC_Dragon; "> }, { Items: ["S_Tempest_Earring", "S_Tempest_Pendent", "S_M_Corrupt_Weapon"] Script: <" bonus bMatk, 5; - if (getequiprefinerycnt(EQI_SHADOW_WEAPON, EQI_SHADOW_ACC_R, EQI_SHADOW_ACC_L) >= 25) bonus bIgnoreMdefRace, RC_Angel; + if (getequiprefinerycnt(EQI_SHADOW_WEAPON, EQI_SHADOW_ACC_R, EQI_SHADOW_ACC_L) >= 25) + bonus bIgnoreMdefRace, RC_Angel; "> }, { Items: ["S_Tempest_Earring", "S_Tempest_Pendent", "S_M_Vibration_Weapon"] Script: <" bonus bMatk, 5; - if (getequiprefinerycnt(EQI_SHADOW_WEAPON, EQI_SHADOW_ACC_R, EQI_SHADOW_ACC_L) >= 25) bonus bIgnoreMdefRace, RC_Formless; + if (getequiprefinerycnt(EQI_SHADOW_WEAPON, EQI_SHADOW_ACC_R, EQI_SHADOW_ACC_L) >= 25) + bonus bIgnoreMdefRace, RC_Formless; "> }, { Items: ["S_Tempest_Earring", "S_Tempest_Pendent", "S_M_Holy_Water_Weapon"] Script: <" bonus bMatk, 5; - if (getequiprefinerycnt(EQI_SHADOW_WEAPON, EQI_SHADOW_ACC_R, EQI_SHADOW_ACC_L) >= 25) bonus bIgnoreMdefRace, RC_Undead; + if (getequiprefinerycnt(EQI_SHADOW_WEAPON, EQI_SHADOW_ACC_R, EQI_SHADOW_ACC_L) >= 25) + bonus bIgnoreMdefRace, RC_Undead; "> }, { Items: ["S_Tempest_Earring", "S_Tempest_Pendent", "S_M_Scissors_Weapon"] Script: <" bonus bMatk, 5; - if (getequiprefinerycnt(EQI_SHADOW_WEAPON, EQI_SHADOW_ACC_R, EQI_SHADOW_ACC_L) >= 25) bonus bIgnoreMdefRace, RC_Plant; + if (getequiprefinerycnt(EQI_SHADOW_WEAPON, EQI_SHADOW_ACC_R, EQI_SHADOW_ACC_L) >= 25) + bonus bIgnoreMdefRace, RC_Plant; "> }, { @@ -3051,7 +3098,8 @@ combo_db: ( Items: ["S_Hasty_Shoes", "S_Hasty_Armor"] Script: <" bonus bFlee, 5; - if (getequiprefinerycnt(EQI_SHADOW_SHOES, EQI_SHADOW_ARMOR) >= 15) bonus bSpeedAddRate, 3; + if (getequiprefinerycnt(EQI_SHADOW_SHOES, EQI_SHADOW_ARMOR) >= 15) + bonus bSpeedAddRate, 3; "> }, { @@ -3081,16 +3129,17 @@ combo_db: ( { Items: ["S_Blitz_Earring", "S_Blitz_Pendent"] Script: <" - if (getequiprefinerycnt(EQI_SHADOW_ACC_R, EQI_SHADOW_ACC_L) >= 15) bonus bAspd, 1; + if (getequiprefinerycnt(EQI_SHADOW_ACC_R, EQI_SHADOW_ACC_L) >= 15) + bonus bAspd, 1; "> }, { Items: ["S_Force_Weapon", "S_Force_Earring", "S_Force_Pendant"] Script: <" .@refine = getequiprefinerycnt(EQI_SHADOW_WEAPON, EQI_SHADOW_ACC_R, EQI_SHADOW_ACC_L); - if (.@refine) >= 25 { + if (.@refine >= 25) { bonus bAtkRate, 2; - } else if (.@refine) >= 20 { + } else if (.@refine >= 20) { bonus bAtkRate, 1; } bonus bAtk2, 10; @@ -3100,9 +3149,9 @@ combo_db: ( Items: ["S_Spirit_Weapon", "S_Spirit_Earring", "S_Spirit_Pendant"] Script: <" .@refine = getequiprefinerycnt(EQI_SHADOW_WEAPON, EQI_SHADOW_ACC_R, EQI_SHADOW_ACC_L); - if (.@refine) >= 25 { + if (.@refine >= 25) { bonus bMatkRate, 2; - } else if (.@refine) >= 20 { + } else if (.@refine >= 20) { bonus bMatkRate, 1; } bonus bMatk, 10; @@ -3147,9 +3196,10 @@ combo_db: ( { Items: ["S_Caster_Shoes", "S_Caster_Shield", "S_Caster_Armor"] Script: <" - bonus bUseSPrate, -1;.@refine = getequiprefinerycnt(EQI_SHADOW_SHIELD, EQI_SHADOW_ARMOR, EQI_SHADOW_SHOES); + bonus bUseSPrate, -1; + .@refine = getequiprefinerycnt(EQI_SHADOW_SHIELD, EQI_SHADOW_ARMOR, EQI_SHADOW_SHOES); bonus bVariableCastrate, (.@refine) / 5; - if (.@refine) >= 25 { + if (.@refine >= 25) { bonus bUseSPrate, -1; } "> @@ -3158,7 +3208,8 @@ combo_db: ( Items: ["S_Reload_Shoes", "S_Reload_Shield", "S_Reload_Armor"] Script: <" bonus bDelayrate, -1; - if (getequiprefinerycnt(EQI_SHADOW_SHIELD, EQI_SHADOW_ARMOR, EQI_SHADOW_SHOES) >= 25) bonus bDelayrate, -5; + if (getequiprefinerycnt(EQI_SHADOW_SHIELD, EQI_SHADOW_ARMOR, EQI_SHADOW_SHOES) >= 25) + bonus bDelayrate, -5; "> }, { -- cgit v1.2.3-60-g2f50