diff --git a/db/re/item_combo_db.txt b/db/re/item_combo_db.txt index 410d53f410..b5d8876de5 100644 --- a/db/re/item_combo_db.txt +++ b/db/re/item_combo_db.txt @@ -147,9 +147,8 @@ 2123:2881,{ bonus bMatk,getequiprefinerycnt(EQI_HAND_L)*2; } 2124:2702,{ bonus bAspdRate,10; bonus bShortWeaponDamageReturn,5; } 2124:22064,{ .@r = getequiprefinerycnt(EQI_HAND_L)/3; bonus bAspdRate,.@r*6; } -2125:5782,{ bonus bDef,2; bonus2 bSubEle,Ele_Neutral,5; bonus2 bSubEle,Ele_Fire,5; bonus2 bSubEle,Ele_Water,5; bonus2 bSubEle,Ele_Wind,5; bonus2 bSubEle,Ele_Earth,5; bonus2 bSubEle,Ele_Dark,5; bonus2 bSubEle,Ele_Holy,5; bonus2 bSubEle,Ele_Ghost,5; } -2135:2426,{ bonus2 bAddEff,Eff_Blind,500; autobonus "{ bonus bFlee,20; }",200,10000,BF_WEAPON,"{ specialeffect2 EF_INCAGILITY; }"; } -2137:2353:5124,{ bonus bDef,2-getequiprefinerycnt(EQI_HAND_L)-getequiprefinerycnt(EQI_HEAD_TOP); bonus bMdef,5+getequiprefinerycnt(EQI_HAND_L)+getequiprefinerycnt(EQI_HEAD_TOP); } +2125:5782,{ bonus bDef,2; bonus2 bSubEle,Ele_All,5; } +2135:2426,{ bonus2 bAddEffWhenHit,Eff_Blind,500; autobonus2 "{ bonus bFlee,20; }",200,10000,BF_WEAPON,"{ specialeffect2 EF_INCAGILITY; }"; } 2153:28372,{ .@r = getequiprefinerycnt(EQI_HAND_L); bonus2 bSkillAtk,"LG_SHIELDPRESS",.@r > 5 ? (.@r - 5) * 8 : 0; } 2157:2905,{ .@r = getequiprefinerycnt(EQI_ARMOR); bonus2 bSubRace,RC_Insect,10; if(.@r>=8){ bonus2 bMagicAddRace,RC_Insect,4; bonus2 bSubRace,RC_Insect,20; } } 2160:19021,{ bonus2 bSubSize,Size_Large,5+(getequiprefinerycnt(EQI_HAND_L)*2); } @@ -2005,8 +2004,8 @@ 24658:24659:24660,{ .@sum = getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L)+getequiprefinerycnt(EQI_SHADOW_SHOES); bonus2 bSkillAtk,"SP_CURSEEXPLOSION",.@sum; } 24661:24662,{ .@sum = getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L); bonus2 bAddClass,Class_All,2; if (.@sum>=18) { bonus bIgnoreDefRace,RC_All; bonus2 bIgnoreDefRaceRate,RC_Player_Human,-100; bonus2 bIgnoreDefRaceRate,RC_Player_Doram,-100; } } 24663:24664,{ .@sum = getequiprefinerycnt(EQI_SHADOW_ARMOR)+getequiprefinerycnt(EQI_SHADOW_SHOES); bonus2 bAddClass,Class_All,2; if (.@sum>=18) { bonus bIgnoreDefRace,RC_All; bonus2 bIgnoreDefRaceRate,RC_Player_Human,-100; bonus2 bIgnoreDefRaceRate,RC_Player_Doram,-100; } } -2595:2164,{ .@r_garment = getequiprefinerycnt(EQI_GARMENT); bonus2 bSubRace,RC_Undead,.@r_garment; } -2596:2159,{ .@r_garment = getequiprefinerycnt(EQI_GARMENT); bonus2 bSubRace,RC_Demon,.@r_garment; } +2595:2164,{ bonus2 bSubRace,RC_Undead,getequiprefinerycnt(EQI_GARMENT); bonus2 bAddEle,Ele_Dark,getequiprefinerycnt(EQI_HAND_L); } +2596:2159,{ bonus2 bSubRace,RC_Demon,getequiprefinerycnt(EQI_GARMENT); bonus2 bAddEle,Ele_Fire,getequiprefinerycnt(EQI_HAND_L); } 15210:19275,{ bonus bVariableCastrate,-30; bonus bFlee2,15; } 15246:20902:22168,{ bonus bDelayrate,-7; if (getequiprefinerycnt(EQI_ARMOR)+getequiprefinerycnt(EQI_GARMENT)+getequiprefinerycnt(EQI_SHOES)>=9) { bonus bDelayrate,-8; } } 15247:20903:22169,{ bonus bDelayrate,-5; } @@ -2367,7 +2366,7 @@ 29028:4819,{ bonus2 bAddClass,Class_All,2; } 29030:4883,{ bonus bMatkRate,2; } 29033:29026,{ bonus bHit,5; bonus bFlee,5; } -2593:2163,{ bonus2 bSubRace,RC_Brute,getequiprefinerycnt(EQI_GARMENT); bonus2 bAddEle,Ele_Water,getequiprefinerycnt(EQI_HAND_L); } +2593:2163,{ bonus2 bSubRace,RC_Brute,getequiprefinerycnt(EQI_GARMENT); bonus2 bSubRace,RC_Player_Doram,getequiprefinerycnt(EQI_GARMENT); bonus2 bAddEle,Ele_Water,getequiprefinerycnt(EQI_HAND_L); } 2598:2158,{ bonus2 bSubRace,RC_DemiHuman,getequiprefinerycnt(EQI_GARMENT); bonus2 bAddEle,Ele_Undead,getequiprefinerycnt(EQI_HAND_L); } 18541:1745,{ if (getequiprefinerycnt(EQI_HAND_R) >= 10) bonus2 bVariableCastrate,"SN_SHARPSHOOTING",-50; } 1688:490022,{ bonus2 bAddRace,RC_Fish,20; bonus2 bAddEle,Ele_Water,20; bonus2 bMagicAddRace,RC_Fish,20; bonus2 bMagicAddEle,Ele_Water,20; } @@ -2742,3 +2741,16 @@ 24742:24584:24585:24586:24587:24588,{ bonus2 bIgnoreDefRaceRate,RC_All,70; bonus2 bIgnoreMDefRaceRate,RC_All,70; bonus2 bIgnoreDefRaceRate,RC_Player_Human,-70; bonus2 bIgnoreMdefRaceRate,RC_Player_Human,-70; bonus2 bIgnoreDefRaceRate,RC_Player_Doram,-70; bonus2 bIgnoreMdefRaceRate,RC_Player_Doram,-70; bonus bLongAtkRate,15; bonus bDelayrate,-15; bonus bVariableCastrate,-10; bonus2 bSkillCooldown,"RL_HEAT_BARREL",-5000; bonus2 bSkillAtk,"RL_FIREDANCE",15; bonus2 bSkillAtk,"RL_R_TRIP",15; bonus2 bSkillAtk,"RL_FIRE_RAIN",15; } 24743:24584:24585:24586:24587:24588,{ bonus2 bSkillCooldown,"SP_SOULCURSE",-1500; bonus2 bMagicAtkEle,Ele_All,15; bonus2 bIgnoreDefRaceRate,RC_All,70; bonus2 bIgnoreMdefRaceRate,RC_All,70; bonus2 bIgnoreDefRaceRate,RC_Player_Human,-70; bonus2 bIgnoreMdefRaceRate,RC_Player_Human,-70; bonus2 bIgnoreDefRaceRate,RC_Player_Doram,-70; bonus2 bIgnoreMdefRaceRate,RC_Player_Doram,-70; bonus bVariableCastrate,-10; bonus2 bSkillCooldown,"SP_SOULREAPER",-5000; bonus2 bSkillAtk,"SP_CURSEEXPLOSION",15; bonus2 bSkillAtk,"SP_SPA",15; bonus2 bSkillAtk,"SP_SWHOO",15; } 24744:24584:24585:24586:24587:24588,{ bonus2 bMagicAtkEle,Ele_All,15; bonus2 bIgnoreDefRaceRate,RC_All,70; bonus2 bIgnoreMdefRaceRate,RC_All,70; bonus2 bIgnoreDefRaceRate,RC_Player_Human,-70; bonus2 bIgnoreMdefRaceRate,RC_Player_Human,-70; bonus2 bIgnoreDefRaceRate,RC_Player_Doram,-70; bonus2 bIgnoreMdefRaceRate,RC_Player_Doram,-70; bonus bShortAtkRate,15; bonus bDelayrate,-15; bonus bVariableCastrate,-10; bonus2 bSkillAtk,"RK_IGNITIONBREAK",15; bonus2 bSkillAtk,"SO_PSYCHIC_WAVE",15; } +2114:15001:5122,{ bonus bStr,2; bonus bDef,5; bonus bMdef,5; if(BaseClass==Job_Swordman) bonus bDef,6; } +2114:15001:5124,{ bonus bDef,2-getequiprefinerycnt(EQI_HAND_L)-getequiprefinerycnt(EQI_HEAD_TOP); bonus bMdef,5+getequiprefinerycnt(EQI_HAND_L)+getequiprefinerycnt(EQI_HEAD_TOP); } +// Confirm: Hidden bonus 2455:2559:5544:15007,{ bonus bBaseAtk,20; bonus bMatk,20; bonus bAspdRate,10; } +2166:1631,{ bonus2 bSkillAtk,"PR_MAGNUS",20; bonus3 bAutoSpellWhenHit,"PR_TURNUNDEAD",1,20; } +2193:2374,{ bonus bDelayrate,-10; } +470036:1326,{ bonus2 bAddClass,Class_Boss,70; bonus2 bSubClass,Class_Boss,15; } +470037:1326,{ bonus2 bAddClass,Class_Boss,70; bonus2 bSubClass,Class_Boss,15; } +480064:1752,{ bonus2 bSubEle,Ele_Fire,75; } +480064:1754,{ bonus2 bSubEle,Ele_Water,75; } +480064:1755,{ bonus2 bSubEle,Ele_Wind,75; } +480064:1756,{ bonus2 bSubEle,Ele_Earth,75; } +480064:18123,{ if (getskilllv("WM_GLOOMYDAY") == 5) bonus2 bSkillCooldown,"WM_SEVERE_RAINSTORM",2000; } +480064:450092,{ if (getskilllv("WM_GLOOMYDAY") == 5) bonus2 bSkillCooldown,"WM_SEVERE_RAINSTORM",2000; } diff --git a/db/re/item_db_equip.yml b/db/re/item_db_equip.yml index 2a30448bb8..b8eef2b057 100644 --- a/db/re/item_db_equip.yml +++ b/db/re/item_db_equip.yml @@ -21587,8 +21587,6 @@ Body: Script: | bonus2 bSubEle,Ele_All,20; bonus2 bSubEle,Ele_Neutral,-20; - bonus2 bSubEle,Ele_Holy,-20; - bonus2 bSubEle,Ele_Dark,-20; - Id: 2114 AegisName: Stone_Buckler Name: Stone Buckler @@ -22055,7 +22053,7 @@ Body: autobonus2 "{ bonus bShortWeaponDamageReturn,("+.@r+"*3); }",10,5000,BF_WEAPON,"{ specialeffect2 EF_GUARD; }"; } else { - autobonus2 "{ bonus bShortWeaponDamageReturn,("+.@r+"*3); }",10,5000+(.@r/2*1000),BF_WEAPON,"{ specialeffect2 EF_GUARD; }"; + autobonus2 "{ bonus bShortWeaponDamageReturn,30; }",10,5000+(.@r/2*1000),BF_WEAPON,"{ specialeffect2 EF_GUARD; }"; } - Id: 2135 AegisName: Shadow_Guard @@ -22128,9 +22126,8 @@ Body: Script: | bonus2 bSubEle,Ele_Water,20; bonus2 bSubEle,Ele_Fire,20; - bonus2 bSubEle,Ele_Dark,20; - bonus2 bSubEle,Ele_Undead,20; - bonus bMdef,5; + bonus2 bSubRace,RC_DemiHuman,30; + bonus bMaxHPrate,5; - Id: 2138 AegisName: Bradium_Shield Name: Bradium Shield @@ -22433,7 +22430,6 @@ Body: NoAuction: true Script: | bonus2 bSubRace,RC_DemiHuman,25; - bonus2 bSubRace,RC_Player_Human,25; bonus2 bSubRace,RC_Demon,25; bonus bMaxHP,400; - Id: 2153 @@ -22536,9 +22532,8 @@ Body: Refineable: true View: 3 Script: | - bonus2 bSubDefEle,Ele_Undead,5; - bonus2 bMagicSubDefEle,Ele_Undead,5; - bonus2 bSubRace,RC_DemiHuman,5; + bonus2 bSubRace,RC_DemiHuman,-5; + bonus2 bSubEle,Ele_Undead,5; - Id: 2159 AegisName: Sharel_Shield Name: Sharel Shield @@ -22554,9 +22549,8 @@ Body: Refineable: true View: 3 Script: | - bonus2 bSubDefEle,Ele_Fire,5; - bonus2 bMagicSubDefEle,Ele_Fire,5; - bonus2 bSubRace,RC_Demon,5; + bonus2 bSubEle,Ele_Fire,5; + bonus2 bSubRace,RC_Demon,-5; - Id: 2160 AegisName: Giant_Shield Name: Giant Shield @@ -22610,7 +22604,7 @@ Body: AegisName: Bible_Of_Promise2 Name: Bible of Promise(2nd Vol.) Type: Armor - Buy: 20 + Buy: 56000 Weight: 500 Defense: 20 Slots: 1 @@ -22643,9 +22637,9 @@ Body: Refineable: true View: 3 Script: | - bonus2 bSubDefEle,Ele_Water,5; - bonus2 bMagicSubDefEle,Ele_Water,5; + bonus2 bSubEle,Ele_Water,5; bonus2 bSubRace,RC_Brute,-5; + bonus2 bSubRace,RC_Player_Doram,-5; - Id: 2164 AegisName: Sombre_Shield Name: Sombre Shield @@ -22661,8 +22655,7 @@ Body: Refineable: true View: 3 Script: | - bonus2 bSubDefEle,Ele_Dark,5; - bonus2 bMagicSubDefEle,Ele_Dark,5; + bonus2 bSubEle,Ele_Dark,5; bonus2 bSubRace,RC_Undead,-5; - Id: 2165 AegisName: Sol_Shield @@ -22718,8 +22711,7 @@ Body: Refineable: true View: 3 Script: | - bonus2 bSubDefEle,Ele_Poison,5; - bonus2 bMagicSubDefEle,Ele_Poison,5; + bonus2 bSubEle,Ele_Poison,5; bonus2 bSubRace,RC_Plant,-5; - Id: 2168 AegisName: Immuned_Shield @@ -22853,8 +22845,7 @@ Body: Refineable: true View: 3 Script: | - bonus2 bSubDefEle,Ele_Holy,5; - bonus2 bMagicSubDefEle,Ele_Holy,5; + bonus2 bSubEle,Ele_Holy,5; bonus2 bSubRace,RC_Dragon,-5; - Id: 2175 AegisName: Esprit_Shield @@ -22871,8 +22862,7 @@ Body: Refineable: true View: 3 Script: | - bonus2 bSubDefEle,Ele_Ghost,5; - bonus2 bMagicSubDefEle,Ele_Ghost,5; + bonus2 bSubEle,Ele_Ghost,5; bonus2 bSubRace,RC_Angel,-5; - Id: 2176 AegisName: Dark_Book @@ -22891,7 +22881,12 @@ Body: Script: | bonus bMdef,5; .@r = getrefine(); - bonus3 bAutoSpellWhenHit,"NPC_DRAGONFEAR",1,(.@r<=6)?(10):((.@r<=8)?(20):(30)); + if (.@r>=9) + bonus3 bAutoSpellWhenHit,"NPC_DRAGONFEAR",3,30; + else if (.@r>=7) + bonus3 bAutoSpellWhenHit,"NPC_DRAGONFEAR",2,20; + else + bonus3 bAutoSpellWhenHit,"NPC_DRAGONFEAR",1,10; - Id: 2177 AegisName: Shield_Of_Death Name: Shield Of Death @@ -23051,7 +23046,7 @@ Body: bonus2 bSubRace,RC_All,30; bonus bUnbreakableShield; /*todo instead of autobonus2 bonus4 bAutoSpellWhenHit,"ALL_RAY_OF_PROTECTION",1,50,0;*/ - autobonus2 "{ sc_end SC_STUN; sc_end SC_SLEEP; sc_end SC_CURSE; sc_end SC_STONE; sc_end SC_POISON; sc_end SC_BLIND; sc_end SC_SILENCE; sc_end SC_BLEEDING; sc_end SC_CONFUSION; sc_end SC_FREEZE; bonus2 bResEff,Eff_Stun,10000; bonus2 bResEff,Eff_Sleep,10000; bonus2 bResEff,Eff_Curse,10000; bonus2 bResEff,Eff_Stone,10000; bonus2 bResEff,Eff_Poison,10000; bonus2 bResEff,Eff_Blind,10000; bonus2 bResEff,Eff_Silence,10000; bonus2 bResEff,Eff_Bleeding,10000; bonus2 bResEff,Eff_Confusion,10000; bonus2 bResEff,Eff_Freeze,10000; }",1,50000,BF_SHORT; + autobonus2 "{ sc_end SC_STUN; sc_end SC_SLEEP; sc_end SC_CURSE; sc_end SC_STONE; sc_end SC_POISON; sc_end SC_BLIND; sc_end SC_SILENCE; sc_end SC_BLEEDING; sc_end SC_CONFUSION; sc_end SC_FREEZE; bonus2 bResEff,Eff_Stun,10000; bonus2 bResEff,Eff_Sleep,10000; bonus2 bResEff,Eff_Curse,10000; bonus2 bResEff,Eff_Stone,10000; bonus2 bResEff,Eff_Poison,10000; bonus2 bResEff,Eff_Blind,10000; bonus2 bResEff,Eff_Silence,10000; bonus2 bResEff,Eff_Bleeding,10000; bonus2 bResEff,Eff_Confusion,10000; bonus2 bResEff,Eff_Freeze,10000; }",50,60000,BF_SHORT; - Id: 2183 AegisName: Impr_Angel's_Safeguard Name: Advanced Angelic Guard @@ -23138,8 +23133,7 @@ Body: bonus bDex,2; .@r = getrefine(); bonus bCritical,3+((.@r >= 7) ? 2 : 0); - if (.@r >= 9) - bonus bMatk,5; + bonus bMatk,5+((.@r >= 9) ? 5 : 0); - Id: 2187 AegisName: Shield_Of_Gray Name: Shield of Gray @@ -23237,14 +23231,7 @@ Body: Refineable: true View: 2 Script: | - bonus2 bSubEle,Ele_Neutral,10; - bonus2 bSubEle,Ele_Fire,10; - bonus2 bSubEle,Ele_Water,10; - bonus2 bSubEle,Ele_Wind,10; - bonus2 bSubEle,Ele_Earth,10; - bonus2 bSubEle,Ele_Dark,10; - bonus2 bSubEle,Ele_Holy,10; - bonus2 bSubEle,Ele_Ghost,10; + bonus2 bSubEle,Ele_All,10; bonus bMaxHP,500; bonus bMaxSP,50; if (getrefine()>=14) @@ -23265,6 +23252,40 @@ Body: Script: | bonus bInt,2; bonus bMatk,(readparam(bInt) >= 120 ? 30 : 5); + - Id: 2192 + AegisName: Rose_Of_Eden + Name: Rose of Eden + Type: Armor + View: 3 + Weight: 300 + Defense: 70 + Slots: 1 + Locations: + Left_Hand: true + ArmorLevel: 1 + EquipLevelMin: 70 + Refineable: true + Script: | + bonus bHealPower,10; + - Id: 2193 + AegisName: Fallen_Angel_Shield + Name: Fallen Angel Shield + Type: Armor + View: 4 + Weight: 500 + Defense: 100 + Slots: 1 + Locations: + Left_Hand: true + ArmorLevel: 1 + EquipLevelMin: 60 + Refineable: true + Script: | + .@r = getrefine(); + if (.@r >=7) + autobonus2 "{ .@r = getrefine(); bonus bDelayrate,-10-(5*(.@r-6)); }",50,5000,BF_MAGIC; + else + autobonus2 "{ bonus bDelayrate,-10; }",50,5000,BF_MAGIC; - Id: 2194 AegisName: Rouban_Shield Name: Levain Shield @@ -23314,6 +23335,25 @@ Body: Script: | bonus5 bAutoSpellWhenHit,"NPC_MAGICMIRROR",6,150,BF_MAGIC,0; bonus bUnbreakableShield; + - Id: 2197 + AegisName: Iron_Shield + Name: Iron Shield + Type: Armor + View: 4 + Weight: 2800 + Defense: 80 + Slots: 1 + Locations: + Left_Hand: true + ArmorLevel: 1 + EquipLevelMin: 90 + Refineable: true + Script: | + bonus bUnbreakableShield; + if (getrefine()>=8) { + bonus bAspdRate,-3; + bonus bNoKnockback; + } - Id: 2198 AegisName: Lapine_Shield Name: Lapine Shield @@ -23360,10 +23400,11 @@ Body: skill "ECL_SEQUOIADUST",1; bonus bMaxHPrate,200; bonus bNoKnockback; - bonus bDelayrate,-20; + bonus bDelayrate,-100; bonus bSpeedRate,25; bonus bIntravision; bonus bNoWalkDelay; + bonus bNoGemStone; - Id: 2201 AegisName: Sunglasses Name: Sunglasses @@ -54861,6 +54902,7 @@ Body: ArmorLevel: 1 EquipLevelMin: 1 Refineable: true + view: 1347 Script: | .@r = getrefine(); bonus bInt,3; @@ -65693,7 +65735,7 @@ Body: bonus bMaxSPrate,-30; - Id: 15055 AegisName: Tenebris_Latitantes - Name: Armor of Nothingness + Name: Tenebris Latitantes Type: Armor Buy: 10000 Weight: 1500 @@ -79502,7 +79544,7 @@ Body: Name: Bear Balloon Type: Armor View: 1038 - Weight: 50 + Weight: 200 Defense: 5 Locations: Head_Low: true @@ -85887,6 +85929,35 @@ Body: bonus bAllStats,10; /*bonus2 bAddRace2,RC2_TEMPLE_DEMON,30; bonus2 bMagicAddRace2,RC2_TEMPLE_DEMON,30;*/ + - Id: 19498 + AegisName: CitrusRibbon + Name: Citrus Ribbon + Type: Armor + View: 1900 + Weight: 500 + Defense: 5 + Locations: + Head_Mid: true + ArmorLevel: 1 + EquipLevelMin: 90 + Script: | + bonus bMdef,3; + bonus bPerfectHitAddRate,20; + bonus2 bAddClass,Class_Boss,7; + - Id: 19499 + AegisName: FortunetellinSealed + Name: Fortunetelling Sealed + Type: Armor + View: 1901 + Weight: 300 + Locations: + Head_Low: true + ArmorLevel: 1 + EquipLevelMin: 70 + Script: | + .@a = (readparam(bInt)+readparam(bDex))/50; + bonus bAspdRate,2*.@a; + bonus2 bMagicAddSize,Size_All,4*.@a; - Id: 19500 AegisName: T_Mr_Smile Name: T Mr Smile @@ -95860,7 +95931,7 @@ Body: bonus bAgi,(.@r-5)*2; } - Id: 20716 - AegisName: Spirit_Manteau + AegisName: Esprit_Manteau Name: Spirit Manteau Type: Armor Buy: 20 @@ -100966,7 +101037,7 @@ Body: bonus2 bExpAddRace,RC_Plant,5+getrefine(); - Id: 22051 AegisName: Ramor_Shoes - Name: L'Amour Shoes + Name: Ramor Shoes Type: Armor Buy: 20 Weight: 250 @@ -100998,7 +101069,7 @@ Body: bonus2 bExpAddRace,RC_Undead,5+getrefine(); - Id: 22055 AegisName: Sharel_Shoes - Name: Charel Shoes + Name: Sharel Shoes Type: Armor Buy: 20 Weight: 250 @@ -101016,7 +101087,7 @@ Body: bonus bMaxSPrate,.@r; - Id: 22057 AegisName: Flow_Shoes - Name: Flower Shoes + Name: Flow Shoes Type: Armor Buy: 20 Weight: 250 @@ -101161,7 +101232,7 @@ Body: bonus bMaxHPrate,.@r; bonus bMaxSPrate,.@r; - Id: 22066 - AegisName: Spirit_Shoes + AegisName: Esprit_Shoes Name: Spirit Shoes Type: Armor Buy: 10 @@ -103104,6 +103175,30 @@ Body: Script: | bonus bMatk,15; bonus bBaseAtk,15; + - Id: 22234 + AegisName: FrontiaBoots + Name: Frontier Boots + Type: Armor + Weight: 500 + Defense: 5 + Slots: 1 + Locations: + Shoes: true + ArmorLevel: 1 + EquipLevelMin: 100 + Refineable: true + Script: | + .@r = getrefine(); + bonus bBaseAtk,50; + bonus bMatk,50; + bonus bMaxHPrate,10; + bonus bMaxSPrate,10; + if (.@r>=9) { + bonus bBaseAtk,50; + bonus bMatk,50; + bonus bMaxHPrate,10; + bonus bMaxSPrate,10; + } - Id: 22238 AegisName: Great_Hero_Boots Name: Great Hero Boots @@ -138193,6 +138288,77 @@ Body: bonus2 bMagicAtkEle,Ele_Water,10; bonus2 bMagicAtkEle,Ele_Wind,10; } + - Id: 470036 + AegisName: Military_Boots_IL + Name: Illusion Military Boots + Type: Armor + Weight: 400 + Defense: 12 + Locations: + Shoes: true + ArmorLevel: 1 + EquipLevelMin: 100 + Refineable: true + Script: | + .@r = getrefine(); + .@lvl = getskilllv("NC_AXEBOOMERANG"); + bonus bMdef,10; + bonus bMaxHPrate,3; + bonus bMaxSPrate,3; + skill "SM_MAGNUM",3; + bonus2 bSkillAtk,"NC_AXETORNADO",30*.@lvl; + bonus2 bSkillAtk,"NC_AXEBOOMERANG",20*.@lvl; + bonus bIgnoreDefRace,20*getskilllv("NC_MAGMA_ERUPTION"); + if (getskilllv("NC_MAGICDECOY") == 5) { + bonus bAspdRate,10; + bonus bMaxHP,150*BaseLevel; + } + if (.@r>=5) { + bonus bMaxHPrate,7; + bonus bMaxSPrate,7; + bonus bBaseAtk,50; + } + if (.@r>=7) { + bonus bMaxHPrate,10; + bonus bMaxSPrate,10; + bonus bBaseAtk,50; + } + - Id: 470037 + AegisName: Military_Boots_IL_ + Name: Illusion Military Boots + Type: Armor + Weight: 400 + Defense: 12 + Slots: 1 + Locations: + Shoes: true + ArmorLevel: 1 + EquipLevelMin: 100 + Refineable: true + Script: | + .@r = getrefine(); + .@lvl = getskilllv("NC_AXEBOOMERANG"); + bonus bMdef,10; + bonus bMaxHPrate,3; + bonus bMaxSPrate,3; + skill "SM_MAGNUM",3; + bonus2 bSkillAtk,"NC_AXETORNADO",30*.@lvl; + bonus2 bSkillAtk,"NC_AXEBOOMERANG",20*.@lvl; + bonus bIgnoreDefRace,20*getskilllv("NC_MAGMA_ERUPTION"); + if (getskilllv("NC_MAGICDECOY") == 5) { + bonus bAspdRate,10; + bonus bMaxHP,150*BaseLevel; + } + if (.@r>=5) { + bonus bMaxHPrate,7; + bonus bMaxSPrate,7; + bonus bBaseAtk,50; + } + if (.@r>=7) { + bonus bMaxHPrate,10; + bonus bMaxSPrate,10; + bonus bBaseAtk,50; + } - Id: 470048 AegisName: Striking_Shoes Name: Striking Shoes @@ -138916,6 +139082,43 @@ Body: if (.@r>=7) { bonus bVariableCastrate,-5; } + - Id: 480064 + AegisName: Storm_Muffler + Name: Storm Muffler + Type: Armor + Defense: 12 + Locations: + Garment: true + ArmorLevel: 1 + EquipLevelMin: 100 + Refineable: true + Script: | + .@r = getrefine(); + .@lvl = getskilllv("WM_FRIGG_SONG"); + bonus bMaxHPrate,2; + bonus bMaxSPrate,2; + bonus2 bSubRace,RC_Player_Human,5; + bonus2 bSubRace,RC_Player_Doram,5; + bonus bLongAtkRate,2+(4*.@lvl); + bonus2 bSkillAtk,"WM_SEVERE_RAINSTORM",2*.@lvl; + if (.@r>=5) { + bonus bMaxHPrate,3; + bonus bMaxSPrate,3; + bonus bLongAtkRate,3; + } + if (.@r>=7) { + bonus bMaxHPrate,5; + bonus bMaxSPrate,5; + bonus bLongAtkRate,5; + } + if (getskilllv("WM_UNLIMITED_HUMMING_VOICE") == 5) { + bonus bPerfectHitAddRate,20; + bonus bSPDrainValue,2; + } + if (getskilllv("WM_GLOOMYDAY") == 5) { + bonus bDelayrate,-10; + bonus2 bSkillCooldown,"WM_SEVERE_RAINSTORM",-2000; + } - Id: 480069 AegisName: C_Wing_Of_Angel_Move Name: Costume Heavenly Angel Wings @@ -139293,6 +139496,31 @@ Body: bonus bVariableCastrate,-10; bonus bMaxHPrate,3; bonus bLongAtkRate,2; + - Id: 490013 + AegisName: Devil_Ring + Name: Devil Ring + Type: Armor + Weight: 100 + Slots: 1 + Locations: + Both_Accessory: true + ArmorLevel: 1 + EquipLevelMin: 100 + Script: | + bonus2 bAddRace,RC_All,10; + bonus2 bSkillCooldown,"SR_ASSIMILATEPOWER",-3000; + if (getskilllv("SR_EARTHSHAKER") == 5) { + bonus2 bSkillUseSP,"SR_HOWLINGOFLION",35; + bonus2 bSkillUseSP,"SR_KNUCKLEARROW",4; + } + if (getskilllv("SR_RAMPAGEBLASTER") == 5) { + bonus2 bSkillAtk,"SR_HOWLINGOFLION",30; + bonus2 bSkillAtk,"SR_KNUCKLEARROW",100; + } + if (getskilllv("SR_RIDEINLIGHTNING") == 5) { + bonus bAspdRate,10; + bonus bPerfectHitAddRate,15; + } - Id: 490014 AegisName: Noblesse_Attack_Ring Name: Noblesse Attack Ring diff --git a/db/re/item_db_etc.yml b/db/re/item_db_etc.yml index eb1cef62dc..94520543fa 100644 --- a/db/re/item_db_etc.yml +++ b/db/re/item_db_etc.yml @@ -21537,7 +21537,7 @@ Body: Flags: BuyingStore: true - Id: 6697 - AegisName: Costumes_Exchange_Coupons + AegisName: Costume_Exchange Name: Costumes Exchange Coupons Type: Etc Buy: 10 diff --git a/db/re/item_db_usable.yml b/db/re/item_db_usable.yml index 4ee65a258b..da2256c9ba 100644 --- a/db/re/item_db_usable.yml +++ b/db/re/item_db_usable.yml @@ -35476,6 +35476,25 @@ Body: NoAuction: true Script: | sc_start SC_2011RWC_SCROLL,1800000,10; + - Id: 14887 + AegisName: EF_UltimateCook + Name: "[Not For Sale] Ultimate Cook" + Type: Usable + Weight: 10 + NoUse: + Override: 100 + Sitting: true + Trade: + Override: 100 + NoDrop: true + NoTrade: true + NoSell: true + NoCart: true + NoGuildStorage: true + NoMail: true + NoAuction: true + Script: | + sc_start SC_2011RWC_SCROLL,1800000,10; - Id: 16131 AegisName: Lady_Tanee_Doll_Box Name: Lady Tanee Doll Box @@ -42732,7 +42751,7 @@ Body: Script: | rentitem 15023,86400; - Id: 17314 - AegisName: Infinite_Giant_Fly_Wing_Box + AegisName: C_Wing_Of_Fly_1Day_Box Name: Infinite Giant Fly Wing Box Type: Cash Buy: 10 @@ -43628,7 +43647,7 @@ Body: Script: | getgroupitem(IG_Support_Package_III_10); - Id: 17474 - AegisName: Infinite_Giant_Fly_Wing_Box_V + AegisName: C_Wing_Of_Fly_5Day_Box Name: Infinite Giant Fly Wing Box V Type: Cash Buy: 10 @@ -43643,7 +43662,7 @@ Body: NoMail: true NoAuction: true Script: | - rentitem 12212,86400; + rentitem 12212,432000; - Id: 17475 AegisName: Limited_Gym_Membership_Card_Box_10 Name: (Limited)Gym Membership Card Box(10) @@ -46853,7 +46872,7 @@ Body: Script: | /*No Info*/ - Id: 22828 - AegisName: Sealed_Album_Scroll + AegisName: Sealed_Scroll Name: Sealed Album Scroll Type: Usable Buy: 10 @@ -46869,9 +46888,9 @@ Body: NoMail: true NoAuction: true Script: | - getitem callfunc("F_Rand",22829,6232,6228,24208,24209,17474/*,Enchanted Letter*/),1; + getgroupitem(IG_SEALED_SCROLL); - Id: 22829 - AegisName: Sealed_Card_Album + AegisName: Sealed_Card Name: Sealed Card Album Type: Usable Buy: 10 @@ -48063,6 +48082,66 @@ Body: NoAuction: true Script: | getgroupitem(IG_Agust_Lucky_Scroll); + - Id: 23221 + AegisName: EF_DEX_Biscuit_Stick + Name: "[Not For Sale] DEX Biscuit Stick" + Type: Usable + Weight: 10 + Trade: + Override: 100 + Script: | + sc_start SC_FOOD_DEX_CASH,1800000,15; + sc_start SC_HITFOOD,600000,rand(11,33); + - Id: 23222 + AegisName: EF_LUK_Biscuit_Stick + Name: "[Not For Sale] LUK Biscuit Stick" + Type: Usable + Weight: 10 + Trade: + Override: 100 + Script: | + sc_start SC_FOOD_LUK_CASH,1800000,15; + sc_start SC_CRIFOOD,600000,rand(11,33); + - Id: 23223 + AegisName: EF_STR_Biscuit_Stick + Name: "[Not For Sale] STR Biscuit Stick" + Type: Usable + Weight: 10 + Trade: + Override: 100 + Script: | + sc_start SC_FOOD_STR_CASH,1800000,15; + sc_start SC_ATKPOTION,600000,rand(11,111); + - Id: 23224 + AegisName: EF_VIT_Biscuit_Stick + Name: "[Not For Sale] VIT Biscuit Stick" + Type: Usable + Weight: 10 + Trade: + Override: 100 + Script: | + sc_start SC_FOOD_VIT_CASH,1800000,15; + bonus_script "{ bonus bHPRecovRate,rand(11,33); }",1800,1; + - Id: 23225 + AegisName: EF_AGI_Biscuit_Stick + Name: "[Not For Sale] AGI Biscuit Stick" + Type: Usable + Weight: 10 + Trade: + Override: 100 + Script: | + sc_start SC_FOOD_AGI_CASH,1800000,15; + sc_start SC_FLEEFOOD,600000,rand(11,33); + - Id: 23226 + AegisName: EF_INT_Biscuit_Stick + Name: "[Not For Sale] INT Biscuit Stick" + Type: Usable + Weight: 10 + Trade: + Override: 100 + Script: | + sc_start SC_FOOD_INT_CASH,1800000,15; + sc_start SC_MATKPOTION,600000,rand(11,111); - Id: 23228 AegisName: HazyMooncake Name: Hazy Mooncake @@ -49275,6 +49354,23 @@ Body: Weight: 10 Script: | /*synthesisui 23894;*/ + - Id: 23899 + AegisName: Comp_Almighty + Name: "[Not For Sale] Almighty" + Type: Usable + Weight: 10 + Trade: + Override: 100 + NoDrop: true + NoTrade: true + NoSell: true + NoCart: true + NoGuildStorage: true + NoMail: true + NoAuction: true + Script: | + bonus_script "{ bonus bAllStats,10; bonus bBaseAtk,30; bonus bMatk,30; }",3600; + sc_start SC_SPEEDUP0,600000,25; - Id: 23926 AegisName: Shadow_9_Refine_Hammer Name: Shadow 9 Refine Hammer diff --git a/db/re/item_group_db.yml b/db/re/item_group_db.yml index 744cfc6f79..431231f4aa 100644 --- a/db/re/item_group_db.yml +++ b/db/re/item_group_db.yml @@ -23715,4 +23715,48 @@ Body: Rate: 235 - Item: S_Archer_earring Rate: 235 + - Group: SEALED_SCROLL + SubGroups: + - SubGroup: 1 + List: + - Item: Guarantee_Weapon_9Up + Rate: 13 + - Item: Guarantee_Armor_9Up + Rate: 13 + - Item: Sealed_Card + Rate: 13 + - Item: Gold + Rate: 63 + - Item: Guarantee_Weapon_7Up + Rate: 125 + - Item: Guarantee_Armor_7Up + Rate: 125 + - Item: C_Wing_Of_Fly_5Day_Box + Rate: 125 + - Item: S_Expert_Shoes + Rate: 138 + - Item: S_Expert_Shield + Rate: 138 + - Item: S_Beginner_Shoes + Rate: 500 + - Item: S_Beginner_Shield + Rate: 500 + - Item: S_Rookie_Shoes + Rate: 500 + - Item: S_Rookie_Shield + Rate: 500 + - Item: S_Advanced_Shoes + Rate: 500 + - Item: S_Advanced_Shield + Rate: 500 + - Item: Treasure_Box + Rate: 1247 + - Item: Enchant_Book + Rate: 1250 + - Item: Costume_Exchange + Rate: 1250 + - Item: Poison_Bottle_Box2 + Rate: 1250 + - Item: C_Wing_Of_Fly_1Day_Box + Rate: 1250 diff --git a/src/map/itemdb.hpp b/src/map/itemdb.hpp index 4c44648413..1a0eef440a 100644 --- a/src/map/itemdb.hpp +++ b/src/map/itemdb.hpp @@ -762,6 +762,7 @@ enum e_random_item_group { IG_PITAPAT_BOX, IG_HAPPY_BOX_J, IG_CLASS_SHADOW_CUBE, + IG_SEALED_SCROLL, IG_MAX, }; diff --git a/src/map/script_constants.hpp b/src/map/script_constants.hpp index d985f1fddb..e08bc5f05f 100644 --- a/src/map/script_constants.hpp +++ b/src/map/script_constants.hpp @@ -5326,6 +5326,7 @@ export_constant(IG_PITAPAT_BOX); export_constant(IG_HAPPY_BOX_J); export_constant(IG_CLASS_SHADOW_CUBE); + export_constant(IG_SEALED_SCROLL); /* unit stop walking */ export_constant(USW_NONE);