diff options
Diffstat (limited to 'db/re')
| -rw-r--r-- | db/re/item_db.conf | 51 | ||||
| -rw-r--r-- | db/re/skill_db.conf | 28 |
2 files changed, 68 insertions, 11 deletions
diff --git a/db/re/item_db.conf b/db/re/item_db.conf index 5540ad025..cf2bd7da2 100644 --- a/db/re/item_db.conf +++ b/db/re/item_db.conf @@ -88273,7 +88273,7 @@ item_db: ( Nouse: { sitting: true } - Script: <" itemskill(AL_INCAGI, 10, ISF_INSTANTCAST | ISF_CASTONSELF); "> + Script: <" itemskill(AL_INCAGI, 10, ISF_CHECKCONDITIONS | ISF_INSTANTCAST | ISF_CASTONSELF); "> }, { Id: 12217 @@ -88294,7 +88294,7 @@ item_db: ( Nouse: { sitting: true } - Script: <" itemskill(PR_ASPERSIO, 5, ISF_INSTANTCAST | ISF_CASTONSELF); "> + Script: <" itemskill(PR_ASPERSIO, 5, ISF_CHECKCONDITIONS | ISF_INSTANTCAST | ISF_CASTONSELF); "> }, { Id: 12218 @@ -88357,7 +88357,7 @@ item_db: ( Nouse: { sitting: true } - Script: <" itemskill(BS_ADRENALINE, 5, ISF_INSTANTCAST | ISF_CASTONSELF); "> + Script: <" itemskill(BS_ADRENALINE, 5, ISF_CHECKCONDITIONS | ISF_INSTANTCAST | ISF_CASTONSELF); "> }, { Id: 12221 @@ -89349,7 +89349,7 @@ item_db: ( } Script: <" percentheal(0, 5); - itemskill(AL_INCAGI, 5, ISF_INSTANTCAST | ISF_CASTONSELF); + itemskill(AL_INCAGI, 5, ISF_CHECKCONDITIONS | ISF_INSTANTCAST | ISF_CASTONSELF); "> }, { @@ -90747,7 +90747,7 @@ item_db: ( } Script: <" if(strcharinfo(PC_MAP)=="job3_rune02") { - itemskill RK_CRUSHSTRIKE,1; + itemskill(RK_CRUSHSTRIKE, 1, ISF_CHECKCONDITIONS); } "> }, @@ -91547,6 +91547,10 @@ item_db: ( Name: "Medium Life Potion" Type: "IT_USABLE" Weight: 10 + Script: <" + specialeffect(EF_HEAL3, AREA, playerattached()); + sc_start2(SC_M_LIFEPOTION, 600000, -7, 4); + "> }, { Id: 12460 @@ -91554,6 +91558,11 @@ item_db: ( Name: "Small Life Potion" Type: "IT_USABLE" Weight: 10 + Script: <" + specialeffect(EF_HEAL3, AREA, playerattached()); + /* Probably it should be 5% instead of 7%, but we'll follow the client side description... */ + sc_start2(SC_S_LIFEPOTION, 600000, -7, 4); + "> }, { Id: 12461 @@ -91561,6 +91570,10 @@ item_db: ( Name: "Regeneration Potion" Type: "IT_USABLE" Weight: 10 + Script: <" + specialeffect(EF_LIGHTSPHERE, AREA, playerattached()); + sc_start(SC_HEALPLUS, 1800000, 20); + "> }, { Id: 12462 @@ -91568,6 +91581,10 @@ item_db: ( Name: "Big Magic Defense Potion" Type: "IT_USABLE" Weight: 10 + Script: <" + specialeffect(EF_SPELLBREAKER, AREA, playerattached()); + sc_start(SC_PROTECT_MDEF, 180000, 3); + "> }, { Id: 12463 @@ -91575,6 +91592,10 @@ item_db: ( Name: "Small Magic Defense Potion" Type: "IT_USABLE" Weight: 10 + Script: <" + specialeffect(EF_SPELLBREAKER, AREA, playerattached()); + sc_start(SC_PROTECT_MDEF, 60000, 3); + "> }, { Id: 12464 @@ -91582,6 +91603,10 @@ item_db: ( Name: "Big Defense Potion" Type: "IT_USABLE" Weight: 10 + Script: <" + specialeffect(EF_GUARD, AREA, playerattached()); + sc_start(SC_PROTECT_DEF, 180000, 3); + "> }, { Id: 12465 @@ -91589,6 +91614,10 @@ item_db: ( Name: "Small Defense Potion" Type: "IT_USABLE" Weight: 10 + Script: <" + specialeffect(EF_GUARD, AREA, playerattached()); + sc_start(SC_PROTECT_DEF, 60000, 3); + "> }, { Id: 12466 @@ -94826,7 +94855,7 @@ item_db: ( sitting: true } Stack: [60, 1] - Script: <" itemskill RK_CRUSHSTRIKE, 1; "> + Script: <" itemskill(RK_CRUSHSTRIKE, 1, ISF_CHECKCONDITIONS); "> }, { Id: 12727 @@ -121774,7 +121803,7 @@ item_db: ( nomail: true noauction: true } - Script: <" itemskill(AM_CP_HELM, 5); "> + Script: <" itemskill(AM_CP_HELM, 5, ISF_CHECKCONDITIONS); "> }, { Id: 14518 @@ -121791,7 +121820,7 @@ item_db: ( nomail: true noauction: true } - Script: <" itemskill(AM_CP_SHIELD, 5); "> + Script: <" itemskill(AM_CP_SHIELD, 5, ISF_CHECKCONDITIONS); "> }, { Id: 14519 @@ -121808,7 +121837,7 @@ item_db: ( nomail: true noauction: true } - Script: <" itemskill(AM_CP_ARMOR, 5); "> + Script: <" itemskill(AM_CP_ARMOR, 5, ISF_CHECKCONDITIONS); "> }, { Id: 14520 @@ -121825,7 +121854,7 @@ item_db: ( nomail: true noauction: true } - Script: <" itemskill(AM_CP_WEAPON, 5); "> + Script: <" itemskill(AM_CP_WEAPON, 5, ISF_CHECKCONDITIONS); "> }, { Id: 14521 @@ -123144,7 +123173,7 @@ item_db: ( nomail: true noauction: true } - Script: <" itemskill(CASH_INCAGI, 10, ISF_INSTANTCAST | ISF_CASTONSELF); "> + Script: <" itemskill(CASH_INCAGI, 10, ISF_CHECKCONDITIONS | ISF_INSTANTCAST | ISF_CASTONSELF); "> }, { Id: 14590 diff --git a/db/re/skill_db.conf b/db/re/skill_db.conf index 8866f1742..376fba179 100644 --- a/db/re/skill_db.conf +++ b/db/re/skill_db.conf @@ -18162,6 +18162,9 @@ skill_db: ( Lv10: 240000 } FixedCastTime: -1 + Requirements: { + HPCost: 15 + } }, { Id: 691 @@ -19183,6 +19186,31 @@ skill_db: ( FixedCastTime: 1000 Requirements: { SPCost: 1 + WeaponTypes: { + Daggers: true + 1HSwords: true + 2HSwords: true + 1HSpears: true + 2HSpears: true + 1HAxes: true + 2HAxes: true + Maces: true + 2HMaces: true + Staves: true + Bows: true + Knuckles: true + Instruments: true + Whips: true + Books: true + Katars: true + Revolvers: true + Rifles: true + GatlingGuns: true + Shotguns: true + GrenadeLaunchers: true + FuumaShurikens: true + 2HStaves: true + } } }, { |