From 249c69921c47d42091b1d690cc1b7be5306fbc75 Mon Sep 17 00:00:00 2001 From: idk-whoami <60462533+idk-whoami@users.noreply.github.com> Date: Mon, 7 Mar 2022 06:41:27 -0800 Subject: [PATCH] Corrected script for some item #3 (#6614) Thanks to @attackjom --- db/re/item_combos.yml | 317 +++++++++++++++++++++++----- db/re/item_db_equip.yml | 456 ++++++++++++++++++++++++++++++++++------ db/re/item_db_etc.yml | 50 +++-- 3 files changed, 685 insertions(+), 138 deletions(-) diff --git a/db/re/item_combos.yml b/db/re/item_combos.yml index 8db4353fa7..5ddaa5b8ae 100644 --- a/db/re/item_combos.yml +++ b/db/re/item_combos.yml @@ -3085,12 +3085,11 @@ Body: bonus bIntravision; - Combos: - Combo: - - Giant_Protection - - Giant_Axe + - Giant_Protection # 28521 + - Giant_Axe # 1387 Script: | .@r = getequiprefinerycnt(EQI_HAND_R); bonus2 bSubRace,RC_DemiHuman,3; - bonus2 bSubRace,RC_Player_Human,3; if (.@r >= 7) { bonus2 bAddClass,Class_Boss,5; bonus2 bSkillAtk,"WS_CARTTERMINATION",5; @@ -10331,14 +10330,13 @@ Body: bonus2 bSkillAtk,"WZ_WATERBALL",(30*.@c)+(20*.@r); - Combos: - Combo: - - Giant_Boots - - Giant_Axe + - Giant_Boots # 22106 + - Giant_Axe # 1387 Script: | .@r = getequiprefinerycnt(EQI_SHOES); .@b = getequiprefinerycnt(EQI_HAND_R); if (.@r >= 7) { bonus2 bSubRace,RC_DemiHuman,30; - bonus2 bSubRace,RC_Player_Human,30; if (.@b >= 7) { bonus2 bSkillAtk,"WS_CARTTERMINATION",8; bonus2 bAddClass,Class_Boss,20; @@ -19753,77 +19751,77 @@ Body: bonus2 bAddEle,Ele_Water,15; - Combos: - Combo: - - Variant_Axe - - Labyrinth_Doppelganger_Card + - Variant_Axe # 1331 + - Labyrinth_Doppelganger_Card # 27301 - Combo: - - Variant_Huuma - - Labyrinth_Doppelganger_Card + - Variant_Huuma # 13343 + - Labyrinth_Doppelganger_Card # 27301 - Combo: - - Abyss_Blade - - Labyrinth_Doppelganger_Card + - Abyss_Blade # 13492 + - Labyrinth_Doppelganger_Card # 27301 - Combo: - - Variant_Mace - - Labyrinth_Doppelganger_Card + - Variant_Mace # 16087 + - Labyrinth_Doppelganger_Card # 27301 - Combo: - - Variant_Wing - - Labyrinth_Doppelganger_Card + - Variant_Wing # 18177 + - Labyrinth_Doppelganger_Card # 27301 - Combo: - - Variant_Claw - - Labyrinth_Doppelganger_Card + - Variant_Claw # 1861 + - Labyrinth_Doppelganger_Card # 27301 - Combo: - - Abyss_Staff - - Labyrinth_Doppelganger_Card + - Abyss_Staff # 2053 + - Labyrinth_Doppelganger_Card # 27301 - Combo: - - Variant_Claymore - - Labyrinth_Doppelganger_Card + - Variant_Claymore # 21046 + - Labyrinth_Doppelganger_Card # 27301 - Combo: - - Variant_Lance - - Labyrinth_Doppelganger_Card + - Variant_Lance # 26021 + - Labyrinth_Doppelganger_Card # 27301 - Combo: - - Variant_Wand - - Labyrinth_Doppelganger_Card + - Variant_Wand # 26149 + - Labyrinth_Doppelganger_Card # 27301 - Combo: - - Variant_Foxtail - - Labyrinth_Doppelganger_Card + - Variant_Foxtail # 26150 + - Labyrinth_Doppelganger_Card # 27301 - Combo: - - Variant_Katar - - Labyrinth_Doppelganger_Card + - Variant_Katar # 28037 + - Labyrinth_Doppelganger_Card # 27301 - Combo: - - Variant_Twohand_Axe - - Labyrinth_Doppelganger_Card + - Variant_Twohand_Axe # 28135 + - Labyrinth_Doppelganger_Card # 27301 - Combo: - - Variant_Rifle - - Labyrinth_Doppelganger_Card + - Variant_Rifle # 28249 + - Labyrinth_Doppelganger_Card # 27301 - Combo: - - Variant_Gatling_Gun - - Labyrinth_Doppelganger_Card + - Variant_Gatling_Gun # 28250 + - Labyrinth_Doppelganger_Card # 27301 - Combo: - - Variant_Shotgun - - Labyrinth_Doppelganger_Card + - Variant_Shotgun # 28251 + - Labyrinth_Doppelganger_Card # 27301 - Combo: - - Variant_Launcher - - Labyrinth_Doppelganger_Card + - Variant_Launcher # 28252 + - Labyrinth_Doppelganger_Card # 27301 - Combo: - - Variant_Book - - Labyrinth_Doppelganger_Card + - Variant_Book # 28627 + - Labyrinth_Doppelganger_Card # 27301 - Combo: - - Variant_Dagger - - Labyrinth_Doppelganger_Card + - Variant_Dagger # 28753 + - Labyrinth_Doppelganger_Card # 27301 - Combo: - - Variant_Spear - - Labyrinth_Doppelganger_Card + - Variant_Spear # 32017 + - Labyrinth_Doppelganger_Card # 27301 - Combo: - - Variant_Viollin - - Labyrinth_Doppelganger_Card + - Variant_Viollin # 32105 + - Labyrinth_Doppelganger_Card # 27301 - Combo: - - Variant_Blade_Whip - - Labyrinth_Doppelganger_Card + - Variant_Blade_Whip # 32106 + - Labyrinth_Doppelganger_Card # 27301 - Combo: - - Variant_Handgun - - Labyrinth_Doppelganger_Card + - Variant_Handgun # 32300 + - Labyrinth_Doppelganger_Card # 27301 Script: | bonus bAspdRate,10; - bonus2 bAddRace,RC_All,10; + bonus2 bAddClass,Class_All,10; - Combos: - Combo: - Angel_Egg @@ -21314,11 +21312,11 @@ Body: bonus2 bSkillAtk,"GN_CARTCANNON",10*(.@r_weapon/2); - Combos: - Combo: - - Thanos_Helm_2 - - Thanos_Bow_AD + - Thanos_Helm_2 # 400141 + - Thanos_Bow_AD # 700029 Script: | .@r_weapon = getequiprefinerycnt(EQI_HAND_R); - bonus2 bAddRace,RC_All,10; + bonus2 bAddClass,Class_All,10; bonus2 bSkillAtk,"SN_SHARPSHOOTING",10*(.@r_weapon/2); - Combos: - Combo: @@ -23891,7 +23889,7 @@ Body: - Strong_Blow5 # 29370 Script: | if (BaseClass == Job_Novice || BaseClass == Job_Swordman || BaseClass == Job_Archer || BaseClass == Job_Acolyte || BaseClass == Job_Archer || BaseClass == Job_Merchant || BaseClass == Job_Taekwon || BaseClass == Job_Gunslinger || BaseClass == Job_Summoner) { - bonus2 bAddRace,RC_All,10; + bonus2 bAddClass,Class_All,10; bonus bPerfectHitAddRate,30; } - Combos: @@ -24504,3 +24502,208 @@ Body: Script: | bonus bBaseAtk,BaseLevel*2; bonus bMatk,BaseLevel*2; + - Combos: + - Combo: + - Staff_Of_Puffy_jp # 26152 + - Siroma_Card # 4416 + Script: | + bonus2 bSkillFixedCast,"MG_COLDBOLT",10000; + - Combos: + - Combo: + - Staff_Of_Puffy_jp # 26152 + - Imp_Card # 4433 + Script: | + bonus2 bSkillFixedCast,"MG_FIREBOLT",10000; + - Combos: + - Combo: + - Staff_Of_Puffy_jp # 26152 + - Elvira_Card_J # 31002 + Script: | + bonus2 bSkillFixedCast,"MG_LIGHTNINGBOLT",10000; + - Combos: + - Combo: + - Elvira_Card_J # 31002 + - Circuit_Board_OS # 28629 + Script: | + bonus2 bSkillFixedCast,"MG_LIGHTNINGBOLT",10000; + - Combos: + - Combo: + - Cor_Core_Headset # 410014 + - Cannon_Rapier_OS # 13493 + - Combo: + - Cor_Core_Headset # 410014 + - Saphir_Hall_OS # 16088 + - Combo: + - Cor_Core_Headset # 410014 + - Ultio_Spes_OS # 16089 + - Combo: + - Cor_Core_Headset # 410014 + - Virtual_Bow_OS # 18178 + - Combo: + - Cor_Core_Headset # 410014 + - MH_P89_OS # 18179 + - Combo: + - Cor_Core_Headset # 410014 + - AC_B44_OS # 18180 + - Combo: + - Cor_Core_Headset # 410014 + - Burning_Knuckle_OS # 1862 + - Combo: + - Cor_Core_Headset # 410014 + - Beam_Claymore_OS # 21047 + - Combo: + - Cor_Core_Headset # 410014 + - Rutilus_Stick_OS # 26151 + - Combo: + - Cor_Core_Headset # 410014 + - ElectricFox_OS # 26164 + - Combo: + - Cor_Core_Headset # 410014 + - Meuchler_OS # 28038 + - Combo: + - Cor_Core_Headset # 410014 + - Blasti_OS # 28136 + - Combo: + - Cor_Core_Headset # 410014 + - HR_S55_OS # 28253 + - Combo: + - Cor_Core_Headset # 410014 + - Circuit_Board_OS # 28629 + - Combo: + - Cor_Core_Headset # 410014 + - Kuroiro_OS # 28755 + - Combo: + - Cor_Core_Headset # 410014 + - Boost_Lance_OS # 32019 + - Combo: + - Cor_Core_Headset_ # 410015 + - Cannon_Rapier_OS # 13493 + - Combo: + - Cor_Core_Headset_ # 410015 + - Saphir_Hall_OS # 16088 + - Combo: + - Cor_Core_Headset_ # 410015 + - Ultio_Spes_OS # 16089 + - Combo: + - Cor_Core_Headset_ # 410015 + - Virtual_Bow_OS # 18178 + - Combo: + - Cor_Core_Headset_ # 410015 + - MH_P89_OS # 18179 + - Combo: + - Cor_Core_Headset_ # 410015 + - AC_B44_OS # 18180 + - Combo: + - Cor_Core_Headset_ # 410015 + - Burning_Knuckle_OS # 1862 + - Combo: + - Cor_Core_Headset_ # 410015 + - Beam_Claymore_OS # 21047 + - Combo: + - Cor_Core_Headset_ # 410015 + - Rutilus_Stick_OS # 26151 + - Combo: + - Cor_Core_Headset_ # 410015 + - ElectricFox_OS # 26164 + - Combo: + - Cor_Core_Headset_ # 410015 + - Meuchler_OS # 28038 + - Combo: + - Cor_Core_Headset_ # 410015 + - Blasti_OS # 28136 + - Combo: + - Cor_Core_Headset_ # 410015 + - HR_S55_OS # 28253 + - Combo: + - Cor_Core_Headset_ # 410015 + - Circuit_Board_OS # 28629 + - Combo: + - Cor_Core_Headset_ # 410015 + - Kuroiro_OS # 28755 + - Combo: + - Cor_Core_Headset_ # 410015 + - Boost_Lance_OS # 32019 + Script: | + bonus bBaseAtk,200; + bonus bMatk,200; + - Combos: + - Combo: + - aegis_470080 # 470080 + - Bear's_Power # 4875 + - Combo: + - aegis_470081 # 470081 + - Bear's_Power # 4875 + Script: | + bonus bStr,40; + bonus bMaxHPrate,40; + - Combos: + - Combo: + - aegis_470080 # 470080 + - Argen_Blanco_J # 32028 + - Combo: + - aegis_470081 # 470081 + - Argen_Blanco_J # 32028 + Script: | + bonus2 bSkillAtk,"RK_IGNITIONBREAK",BaseLevel/2; + bonus2 bSkillAtk,"KN_PIERCE",BaseLevel*8; + - Combos: + - Combo: + - aegis_470080 # 470080 + - Harve_J # 32029 + - Combo: + - aegis_470081 # 470081 + - Harve_J # 32029 + Script: | + bonus2 bSkillAtk,"LG_OVERBRAND",BaseLevel/2; + bonus2 bSkillAtk,"PA_SHIELDCHAIN",BaseLevel; + - Combos: + - Combo: + - aegis_470080 # 470080 + - Fortrage_J # 32030 + - Combo: + - aegis_470081 # 470081 + - Fortrage_J # 32030 + Script: | + bonus2 bSkillAtk,"LG_CANNONSPEAR",4*(BaseLevel/5); + bonus2 bSkillAtk,"LG_PINPOINTATTACK",BaseLevel*2; + - Combos: + - Combo: + - Orcish_Hero_Of_Anger # 29140 + - Orcish_Axe # 1304 + - Orcish_Sword # 1124 + - Combo: + - Orcish_Hero_Of_Anger # 29140 + - Orcish_Axe # 1304 + - Orcish_Sword_ # 13437 + - Combo: + - Orcish_Hero_Of_Anger # 29140 + - Orcish_Axe_ # 1309 + - Orcish_Sword # 1124 + - Combo: + - Orcish_Hero_Of_Anger # 29140 + - Orcish_Axe_ # 1309 + - Orcish_Sword_ # 13437 + Script: | + .@r = getequiprefinerycnt(EQI_HAND_L); + .@weapon = getequiprefinerycnt(EQI_HAND_R); + bonus3 bAutoSpell,"ASC_BREAKER",getskilllv("ASC_BREAKER"),400; + bonus bBaseAtk,15*(.@r+.@weapon/2); + bonus bAspdRate,5*(.@r+.@weapon/2); + if ((.@r + .@weapon) >= 20) + bonus2 bResEff,Eff_Stun,10000; + - Combos: + - Combo: + - Principles_Of_Magic # 1572 + - Librarian_Glove # 2716 + - Pocket_Watch # 2971 + Script: | + bonus bInt,5; + bonus bMaxHP,700; + bonus bAspdRate,5; + - Combos: + - Combo: + - Royal_Guardian_Ring # 28483 + - Lich_Lord_Card # 27025 + Script: | + bonus2 bAddClass,Class_All,5; + bonus bMatkRate,5; diff --git a/db/re/item_db_equip.yml b/db/re/item_db_equip.yml index 0034c866c4..6075354e2d 100644 --- a/db/re/item_db_equip.yml +++ b/db/re/item_db_equip.yml @@ -1355,7 +1355,7 @@ Body: bonus bUnbreakableWeapon; if (BaseJob == Job_Rune_Knight) { bonus bDelayrate,-10; - bonus2 bAddRace,RC_All,50; + bonus2 bAddClass,Class_All,50; bonus bLongAtkRate,25; bonus2 bSubClass,Class_Boss,50; bonus2 bSkillUseSP,"LK_SPIRALPIERCE",15; @@ -5878,33 +5878,7 @@ Body: Range: 1 Slots: 1 Jobs: - Acolyte: true - Archer: true - Assassin: true - BardDancer: true - Blacksmith: true - Crusader: true - Gunslinger: true - Hunter: true - KagerouOboro: true - Knight: true - Mage: true - Merchant: true - Monk: true - Ninja: true - Novice: true - Priest: true - Rebellion: true - Rogue: true - Sage: true - SoulLinker: true - StarGladiator: true - Summoner: true - SuperNovice: true - Swordman: true - Taekwon: true - Thief: true - Wizard: true + Alchemist: true Classes: All_Third: true Fourth: true @@ -6092,12 +6066,14 @@ Body: .@r = getrefine(); bonus bUnbreakableWeapon; if (.@r>=7) { - bonus2 bAddRace,RC_All,5; + bonus2 bAddClass,Class_All,5; bonus2 bSubRace,RC_Player_Human,5; + bonus2 bSubRace,RC_Player_Doram,5; } if (.@r>=9) { - bonus2 bAddRace,RC_All,5; + bonus2 bAddClass,Class_All,5; bonus2 bSubRace,RC_Player_Human,5; + bonus2 bSubRace,RC_Player_Doram,5; } - Id: 1333 AegisName: Golden_Wrench @@ -6158,7 +6134,7 @@ Body: bonus bBaseAtk,80+BaseLevel; bonus bAspdRate,10; if (eaclass()&EAJL_THIRD && BaseJob == Job_Blacksmith) { - bonus2 bAddRace,RC_All,50; + bonus2 bAddClass,Class_All,50; bonus bSPDrainValue,2; bonus2 bSkillCooldown,"NC_AXETORNADO",-1000; if (.@r>=7) @@ -7423,7 +7399,9 @@ Body: Script: | bonus bUnbreakableWeapon; bonus2 bAddRace,RC_Player_Human,40; + bonus2 bAddRace,RC_Player_Doram,40; bonus2 bIgnoreDefRaceRate,RC_Player_Human,30; + bonus2 bIgnoreDefRaceRate,RC_Player_Doram,30; .@r = getrefine(); if (.@r>=6) { bonus2 bSkillAtk,"NC_AXEBOOMERANG",80; @@ -7431,6 +7409,7 @@ Body: } if (.@r>=9) { bonus2 bAddRace,RC_Player_Human,60; + bonus2 bAddRace,RC_Player_Doram,60; } - Id: 1397 AegisName: Bradium_Stonehammer_ @@ -7444,6 +7423,8 @@ Body: Slots: 2 Jobs: Blacksmith: true + Classes: + All_Upper: true Locations: Both_Hand: true WeaponLevel: 4 @@ -8368,8 +8349,7 @@ Body: Refineable: true Script: | bonus bMaxSP,-100; - bonus2 bSkillAtk,"LG_CANNONSPEAR",10; - bonus2 bSkillAtk,"LG_CANNONSPEAR",(getrefine()/3); + bonus2 bSkillAtk,"LG_CANNONSPEAR",10+(getrefine()/3*3); - Id: 1436 AegisName: Velum_Spear Name: Vellum Spear @@ -8511,7 +8491,7 @@ Body: skill "KN_PIERCE",3; - Id: 1441 AegisName: Ru_Blue_Spear - Name: Blue Spear + Name: Ru Blue Spear Type: Weapon SubType: 1hSpear Buy: 10 @@ -9637,8 +9617,9 @@ Body: NoMail: true NoAuction: true Script: | - bonus3 bAddEffOnSkill,"KN_PIERCE",Eff_Bleeding,1000; - bonus3 bAddEffOnSkill,"LK_SPIRALPIERCE",Eff_Bleeding,1000; + bonus3 bAddEffOnSkill,"KN_PIERCE",Eff_Bleeding,150; + bonus3 bAddEffOnSkill,"LK_SPIRALPIERCE",Eff_Bleeding,150; + bonus2 bAddEff2,Eff_Freezing,100; bonus2 bSkillAtk,"LK_SPIRALPIERCE",100; bonus2 bSkillAtk,"LG_INSPIRATION",50; if (BaseLevel>99) { @@ -11727,10 +11708,6 @@ Body: WeaponLevel: 3 EquipLevelMin: 70 Refineable: true - Script: | - bonus bMdef,8; - bonus bMaxSPrate,10; - bonus bInt,4; - Id: 1574 AegisName: BF_Book1 Name: Brave Battle Strategy Book @@ -23185,7 +23162,7 @@ Body: bonus bMagicDamageReturn,.@val; - Id: 2186 AegisName: Encyclopedia_Revision - Name: Great Encyclopedia Revision + Name: Revised Encyclopedia Type: Armor Buy: 10 Weight: 200 @@ -31219,6 +31196,17 @@ Body: EquipLevelMin: 20 Script: | bonus bAgi,2; + - Id: 2606 + AegisName: Whike_Black_Tail_L + Name: Rental Whike Black Tail # !todo check english name + Type: Armor + Locations: + Both_Accessory: true + ArmorLevel: 1 + EquipLevelMin: 1 + Script: | + bonus bCritical,7; + bonus bAspdRate,3; - Id: 2607 AegisName: Clip Name: Clip @@ -69002,6 +68990,43 @@ Body: Costume_Head_Top: true ArmorLevel: 1 View: 808 + - Id: 15892 + AegisName: aegis_15892 + Name: Crown of Justice + Type: Armor + View: 2099 + Weight: 500 + Defense: 10 + Slots: 1 + Locations: + Head_Top: true + ArmorLevel: 1 + EquipLevelMin: 100 + Refineable: true + Script: | + .@r = getrefine(); + bonus bMdef,10; + bonus bDef,.@r*30; + bonus bDelayrate,-10; + bonus bMatkRate,25; + if (getskilllv("LG_INSPIRATION") == 5) { + bonus bDelayrate,-15; + bonus2 bSkillCooldown,"LG_INSPIRATION",-10000; + } + if (getskilllv("CR_DEVOTION") == 5) { + bonus bMaxHPrate,15; + bonus bAspdRate,10; + } + if (getskilllv("LG_HESPERUSLIT") == 5) + bonus4 bAutoSpellOnSkill,"PA_PRESSURE","LG_RAYOFGENESIS",getskilllv("LG_RAYOFGENESIS"),500; + if (.@r>=7) { + bonus bHealPower,15; + bonus2 bSkillAtk,"LG_RAYOFGENESIS",15; + } + if (.@r>=9) { + bonus bHealPower,35; + bonus2 bSkillAtk,"LG_RAYOFGENESIS",35; + } - Id: 16000 AegisName: Erde Name: Erde @@ -116906,6 +116931,38 @@ Body: } } } + - Id: 26152 + AegisName: Staff_Of_Puffy_jp + Name: Staff of Puffy + Type: Weapon + SubType: Staff + Weight: 300 + Attack: 70 + MagicAttack: 150 + Range: 5 + Slots: 1 + Jobs: + Priest: true + Sage: true + Classes: + All_Third: true + Fourth: true + Locations: + Right_Hand: true + WeaponLevel: 4 + EquipLevelMin: 100 + Refineable: true + Script: | + .@r = getrefine(); + if (getskilllv("SO_SPELLFIST")>=5) { + bonus2 bSkillAtk,"MG_FIREBOLT",.@r*3; + bonus2 bSkillAtk,"MG_COLDBOLT",.@r*3; + bonus2 bSkillAtk,"MG_LIGHTNINGBOLT",.@r*3; + } + if (.@r>=10) { + skill "TF_DOUBLE",3; + bonus bDoubleRate,15; + } - Id: 26154 AegisName: SoulWeight Name: Spirit Pendulum @@ -122597,12 +122654,13 @@ Body: ArmorLevel: 1 EquipLevelMin: 130 Script: | - if (getequipid(EQI_ACC_L) == 28552) { + .@p = getitempos(); + if (.@p == EQP_ACC_L) { bonus bMaxHPrate,15; bonus bVariableCastrate,-15; bonus2 bSkillCooldown,"RK_DRAGONBREATH",-500; } - if (getequipid(EQI_ACC_R) == 28552) { + if (.@p == EQP_ACC_R) { bonus bMaxSPrate,15; bonus bDelayrate,-15; bonus2 bSkillCooldown,"RK_DRAGONBREATH_WATER",-500; @@ -134131,14 +134189,14 @@ Body: bonus bDex,5; bonus2 bSkillAtk,"RK_DRAGONBREATH",50; bonus2 bSkillAtk,"RK_DRAGONBREATH_WATER",50; - bonus2 bHPDrainRate,50,1; + bonus2 bHPDrainRate,1000,1; bonus2 bAddRace,RC_All,2*.@r; bonus bAspdRate,2*.@r; bonus bDelayrate,-.@r; if (.@r>=7) - bonus2 bHPDrainRate,50,2; + bonus2 bHPDrainRate,1000,2; if (.@r>=9) - bonus2 bHPDrainRate,50,3; + bonus2 bHPDrainRate,1000,3; if (.@r>=10) bonus bFixedCastrate,-70; - Id: 32013 @@ -134489,6 +134547,72 @@ Body: bonus2 bAddRace,RC_Undead,20; bonus2 bAddRace,RC_Angel,20; } + - Id: 32028 + AegisName: Argen_Blanco_J + Name: Argen Blanco + Type: Weapon + SubType: 1hSpear + Weight: 1800 + Attack: 150 + MagicAttack: 110 + Range: 3 + Slots: 1 + Jobs: + Knight: true + Classes: + All_Third: true + Fourth: true + Locations: + Right_Hand: true + WeaponLevel: 4 + EquipLevelMin: 100 + Refineable: true + Script: | + bonus2 bSkillAtk,"RK_IGNITIONBREAK",30; + - Id: 32029 + AegisName: Harve_J + Name: Harvest + Type: Weapon + SubType: 1hSpear + Weight: 1800 + Attack: 150 + MagicAttack: 110 + Range: 3 + Slots: 1 + Jobs: + Crusader: true + Classes: + All_Third: true + Fourth: true + Locations: + Right_Hand: true + WeaponLevel: 4 + EquipLevelMin: 100 + Refineable: true + Script: | + bonus2 bSkillAtk,"PA_SHIELDCHAIN",30; + - Id: 32030 + AegisName: Fortrage_J + Name: Fortrage + Type: Weapon + SubType: 1hSpear + Weight: 1800 + Attack: 150 + MagicAttack: 110 + Range: 3 + Slots: 1 + Jobs: + Crusader: true + Classes: + All_Third: true + Fourth: true + Locations: + Right_Hand: true + WeaponLevel: 4 + EquipLevelMin: 100 + Refineable: true + Script: | + bonus2 bSkillAtk,"LG_CANNONSPEAR",30; - Id: 32105 AegisName: Variant_Viollin Name: Abyss Violin @@ -135149,8 +135273,9 @@ Body: ArmorLevel: 1 EquipLevelMin: 100 Script: | + .@p = getitempos(); skill "AL_BLESSING",5; - if (getequipid(EQI_ACC_R) == 32258) { + if (.@p == EQP_ACC_R) { bonus bBaseAtk,15*(readparam(bLuk)/10); bonus bMatk,15*(readparam(bLuk)/10); if (readparam(bLuk) >= 125) { @@ -135158,7 +135283,7 @@ Body: bonus2 bMagicAddClass,Class_Boss,15; } } - if (getequipid(EQI_ACC_L) == 32258) { + if (.@p == EQP_ACC_L) { bonus bMaxHPRate,2*(readparam(bVit)/10); bonus bMaxSPRate,2*(readparam(bVit)/10); if (readparam(bVit) >= 125) { @@ -138820,6 +138945,35 @@ Body: View: 1266 Script: | bonus2 bExpAddRace,RC_All,1; + - Id: 410014 + AegisName: Cor_Core_Headset + Name: Cor Core Headphone + Type: Armor + View: 2017 + Weight: 100 + Defense: 5 + Locations: + Head_Mid: true + ArmorLevel: 1 + EquipLevelMin: 100 + Script: | + bonus bMdef,3; + bonus bDelayrate,-10; + - Id: 410015 + AegisName: Cor_Core_Headset_ + Name: Cor Core Headphone + Type: Armor + View: 2017 + Weight: 100 + Defense: 5 + Slots: 1 + Locations: + Head_Mid: true + ArmorLevel: 1 + EquipLevelMin: 100 + Script: | + bonus bMdef,3; + bonus bDelayrate,-10; - Id: 410016 AegisName: aegis_410016 Name: Battle Processor @@ -145257,6 +145411,95 @@ Body: bonus bMaxSPrate,10; bonus bLongAtkRate,5; } + - Id: 470008 + AegisName: Fluffy_DandelionShoes_J + Name: Fluffy Dandelion Shoes + Type: Armor + Weight: 100 + Defense: 12 + Locations: + Shoes: true + ArmorLevel: 1 + EquipLevelMin: 100 + Refineable: true + Script: | + .@r = getrefine(); + bonus bMdef,10; + bonus bMaxHPrate,3; + bonus bMaxSPrate,3; + bonus bAspdRate,getskilllv("SU_CHATTERING")*5; + bonus2 bSkillAtk,"SU_CN_METEOR",getskilllv("SU_MEOWMEOW")*15; + if (getskilllv("SU_NYANGGRASS") == 5) + bonus2 bIgnoreMdefRaceRate,RC_All,100; + if (getskilllv("SU_SPIRITOFLAND") == 1) { + if (getskilllv("SU_CN_POWDERING") == 5) { + bonus2 bResEff,Eff_Curse,10000; + bonus2 bSkillUseSP,"SU_CN_METEOR",50; + } + if (getskilllv("SU_CN_METEOR") == 5) + bonus2 bSkillAtk,"SU_SV_STEMSPEAR",20; + if (getskilllv("SU_NYANGGRASS") == 5) + bonus bMatk,50; + if (getskilllv("SU_SV_STEMSPEAR") == 5) + bonus bSpeedAddRate,25; + if (getskilllv("SU_SV_ROOTTWIST") == 5) + bonus bMatk,50; + } + if (.@r>=5) { + bonus bMaxHPrate,7; + bonus bMaxSPrate,7; + bonus bDelayrate,-10; + } + if (.@r>=7) { + bonus bMaxHPrate,10; + bonus bMaxSPrate,10; + bonus bDelayrate,-10; + } + - Id: 470009 + AegisName: Fluffy_DandeShoes_J_ + Name: Fluffy Dandelion Shoes + Type: Armor + Weight: 100 + Defense: 12 + Slots: 1 + Locations: + Shoes: true + ArmorLevel: 1 + EquipLevelMin: 100 + Refineable: true + Script: | + .@r = getrefine(); + bonus bMdef,10; + bonus bMaxHPrate,3; + bonus bMaxSPrate,3; + bonus bAspdRate,getskilllv("SU_CHATTERING")*5; + bonus2 bSkillAtk,"SU_CN_METEOR",getskilllv("SU_MEOWMEOW")*15; + if (getskilllv("SU_NYANGGRASS") == 5) + bonus2 bIgnoreMdefRaceRate,RC_All,100; + if (getskilllv("SU_SPIRITOFLAND") == 1) { + if (getskilllv("SU_CN_POWDERING") == 5) { + bonus2 bResEff,Eff_Curse,10000; + bonus2 bSkillUseSP,"SU_CN_METEOR",50; + } + if (getskilllv("SU_CN_METEOR") == 5) + bonus2 bSkillAtk,"SU_SV_STEMSPEAR",20; + if (getskilllv("SU_NYANGGRASS") == 5) + bonus bMatk,50; + if (getskilllv("SU_SV_STEMSPEAR") == 5) + bonus bSpeedAddRate,25; + if (getskilllv("SU_SV_ROOTTWIST") == 5) + bonus bMatk,50; + } + if (.@r>=5) { + bonus bMaxHPrate,7; + bonus bMaxSPrate,7; + bonus bDelayrate,-10; + } + if (.@r>=7) { + bonus bMaxHPrate,10; + bonus bMaxSPrate,10; + bonus bDelayrate,-10; + } - Id: 470016 AegisName: Noblesse_Attack_Boots Name: Noblesse Attack Boots @@ -146100,6 +146343,59 @@ Body: } } } + - Id: 470080 + AegisName: aegis_470080 + Name: Mindform Shoes of Arrogance + Type: Armor + Weight: 200 + Defense: 12 + Locations: + Shoes: true + ArmorLevel: 1 + EquipLevelMin: 100 + Refineable: true + Script: | + .@r = getrefine(); + bonus bMdef,10; + bonus bMaxHPrate,20; + bonus bMaxSPrate,20; + if (.@r>=7) { + bonus bDef,150; + bonus bMdef,15; + bonus2 bIgnoreDefRaceRate,RC_All,50; + } + if (.@r>=9) { + bonus bDef,150; + bonus bMdef,15; + bonus2 bIgnoreDefRaceRate,RC_All,50; + } + - Id: 470081 + AegisName: aegis_470081 + Name: Mindform Shoes of Arrogance + Type: Armor + Weight: 200 + Defense: 12 + Slots: 1 + Locations: + Shoes: true + ArmorLevel: 1 + EquipLevelMin: 100 + Refineable: true + Script: | + .@r = getrefine(); + bonus bMdef,10; + bonus bMaxHPrate,20; + bonus bMaxSPrate,20; + if (.@r>=7) { + bonus bDef,150; + bonus bMdef,15; + bonus2 bIgnoreDefRaceRate,RC_All,50; + } + if (.@r>=9) { + bonus bDef,150; + bonus bMdef,15; + bonus2 bIgnoreDefRaceRate,RC_All,50; + } - Id: 470082 AegisName: aegis_470082 Name: Mindform Shoes of Regeneration @@ -146959,6 +147255,39 @@ Body: autobonus2 "{ bonus bAspdRate,20; }",50,30000,BF_WEAPON|BF_MAGIC,"{ specialeffect2 EF_HASTEUP; }"; else if (.@r>=7) autobonus2 "{ bonus bAspdRate,10; }",50,30000,BF_WEAPON|BF_MAGIC,"{ specialeffect2 EF_HASTEUP; }"; + - Id: 480045 + AegisName: Guardian_Soul + Name: Guardian of Soul + Type: Armor + Weight: 300 + Defense: 25 + Locations: + Garment: true + ArmorLevel: 1 + EquipLevelMin: 100 + Refineable: true + Script: | + .@a = (readparam(bStr)+readparam(bLuk))/18; + .@b = (readparam(bAgi)+readparam(bVit))/18; + .@c = (readparam(bInt)+readparam(bDex))/18; + bonus bMdef,10; + skill "WZ_HEAVENDRIVE",3; + bonus2 bSubRace,RC_Player_Human,5; + bonus2 bSubRace,RC_Player_Doram,5; + bonus2 bSubEle,Ele_Holy,7; + bonus2 bSubEle,Ele_Ghost,7; + bonus bBaseAtk,.@a*15; + bonus bDelayrate,-.@a; + bonus2 bSubEle,Ele_Dark,.@a*7; + bonus2 bSubEle,Ele_Undead,.@a*7; + bonus bAspdRate,.@b*2; + bonus bMaxHPrate,.@b*2; + bonus2 bSubEle,Ele_Water,.@b*7; + bonus2 bSubEle,Ele_Fire,.@b*7; + bonus bMatk,.@c*15; + bonus bVariableCastrate,-.@c; + bonus2 bSubEle,Ele_Earth,.@c*7; + bonus2 bSubEle,Ele_Wind,.@c*7; - Id: 480052 AegisName: C_Sakura_Fes_TW Name: Costume Sakura Ribbon # !todo check english name @@ -148886,32 +149215,27 @@ Body: ArmorLevel: 1 EquipLevelMin: 100 Script: | - .@equip_count = 0; - if(getequipid(EQI_ACC_L) == 490068) - .@equip_count++; - if(getequipid(EQI_ACC_R) == 490068) - .@equip_count++; + .@p = getitempos(); .@a = readparam(bAgi); .@d = readparam(bDex); - if (getequipid(EQI_ACC_L) == 490068) { - bonus2 bAddRace,RC_All,(.@a / 10) / .@equip_count; + if (.@p == EQP_ACC_L) { + bonus2 bAddRace,RC_All,.@a / 10; if (.@a>=125) { - bonus bSpeedAddRate,25 / .@equip_count; - bonus bDelayrate,-25 / .@equip_count; + bonus bSpeedAddRate,25; + bonus bDelayrate,-25; } } - if (getequipid(EQI_ACC_R) == 490068) { - bonus bLongAtkRate,(.@d / 10) / .@equip_count; - bonus2 bResEff,Eff_Stun,(3*(.@d/10)) / .@equip_count; + if (.@p == EQP_ACC_R) { + bonus bLongAtkRate,.@d / 10; + bonus2 bResEff,Eff_Stun,3*(.@d/10); if (.@d>=125) { - bonus bFixedCastrate,-70 / .@equip_count; - bonus2 bSubEle,Ele_Earth,5 / .@equip_count; - bonus2 bSubEle,Ele_Water,5 / .@equip_count; - bonus2 bSubEle,Ele_Wind,5 / .@equip_count; - bonus2 bSubEle,Ele_Fire,5 / .@equip_count; + bonus bFixedCastrate,-70; + bonus2 bSubEle,Ele_Earth,5; + bonus2 bSubEle,Ele_Water,5; + bonus2 bSubEle,Ele_Wind,5; + bonus2 bSubEle,Ele_Fire,5; } } - /*TODO: Please convert to getequipidx when available*/ - Id: 490069 AegisName: Morrigane's_Belt_IL Name: Illusion Morrigane's Belt diff --git a/db/re/item_db_etc.yml b/db/re/item_db_etc.yml index 0610df060e..b0d3198875 100644 --- a/db/re/item_db_etc.yml +++ b/db/re/item_db_etc.yml @@ -37922,10 +37922,6 @@ Body: bonus bDef,30; bonus bMdef,10; bonus2 bAddEff,Eff_Silence,900; - if (getequipid() == 28483) { - bonus2 bAddClass,Class_All,5; - bonus bMatkRate,5; - } /* TODO: Confirm Mob ID to transform */ autobonus "{ bonus bIgnoreDefClass,Class_All; bonus bIgnoreMdefRace,RC_All; }",20,7000,BF_WEAPON|BF_MAGIC,"{ active_transform 1875,7000; }"; - Id: 27026 @@ -40447,6 +40443,30 @@ Body: DropEffect: CLIENT Script: | bonus bDelayrate,-4; + - Id: 27345 + AegisName: Dragon_Zilant_Card + Name: Ancient Dragon Zilant Card + Type: Card + Buy: 20 + Weight: 10 + Locations: + Both_Accessory: true + Flags: + DropEffect: CLIENT + Script: | + .@p = getitempos(); + bonus bMaxHPrate,50; + if (eaclass()&EAJL_THIRD && BaseJob == Job_knight) { + if (.@p == EQP_ACC_L) { + bonus2 bSkillAtk,"RK_DRAGONBREATH",50; + bonus4 bAddEff,Eff_Heat,1000,ATF_WEAPON|ATF_MAGIC,3000; + } + if (.@p == EQP_ACC_R) { + bonus2 bSkillAtk,"RK_DRAGONBREATH_WATER",50; + autobonus2 "{ sc_start SC_CHILL; bonus2 bResEff,Eff_Heat,10000; }",100,3000,BF_WEAPON|BF_MAGIC; + } + } + /*Unknow Rate*/ - Id: 27346 AegisName: Rigid_Muspellskoll_Card Name: Rigid Muspellskoll Card @@ -41899,6 +41919,13 @@ Body: Script: | bonus bLongAtkRate,10; bonus bCritical,10; + - Id: 29140 + AegisName: Orcish_Hero_Of_Anger + Name: Anger of the Brave + Type: Card + SubType: Enchant + Script: | + autobonus "{ bonus3 bAutoSpell,\"NPC_EARTHQUAKE\",3,1000; }",5,5000,BF_NORMAL,"{ active_transform 1850,5000; }"; - Id: 29142 AegisName: Electric_Effect Name: Electric Effect @@ -59309,18 +59336,11 @@ Body: Script: | .@r = getrefine(); bonus2 bMagicAddRace,RC_All,10; - bonus2 bMagicAddRace,RC_Brute,-10; - bonus2 bMagicAddRace,RC_Player_Doram,-10; if (.@r>=9) { - bonus2 bMagicAddRace,RC_All,10; - bonus2 bMagicAddRace,RC_Brute,-10; - bonus2 bMagicAddRace,RC_Player_Doram,-10; - .@i = getiteminfo(getequipid(EQI_HAND_R), ITEMINFO_VIEW); - if (.@i == W_2HSWORD || .@i == W_2HSPEAR || .@i == W_2HSTAFF || .@i == W_2HAXE || .@i == W_KATAR || .@i == W_BOW || .@i == W_HUUMA || .@i == W_REVOLVER || .@i == W_RIFLE || .@i == W_GATLING || .@i == W_SHOTGUN || .@i == W_GRENADE) { - bonus2 bMagicAddRace,RC_All,15; - bonus2 bMagicAddRace,RC_Brute,-15; - bonus2 bMagicAddRace,RC_Player_Doram,-15; - } + bonus2 bMagicAddRace,RC_All,10; + .@i = getiteminfo(getequipid(EQI_HAND_R), ITEMINFO_VIEW); + if (.@i == W_2HSWORD || .@i == W_2HSPEAR || .@i == W_2HSTAFF || .@i == W_2HAXE || .@i == W_KATAR || .@i == W_BOW || .@i == W_HUUMA || .@i == W_REVOLVER || .@i == W_RIFLE || .@i == W_GATLING || .@i == W_SHOTGUN || .@i == W_GRENADE) + bonus2 bMagicAddRace,RC_All,15; } - Id: 311350 AegisName: Glacier_F_Orb_158