diff options
author | Haru <haru@dotalux.com> | 2020-03-09 00:38:45 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-09 00:38:45 +0100 |
commit | 2ec28927c81008a0e17d7e95e70d207de0954d83 (patch) | |
tree | e4b9042e09e60861726d8b3faae9f6bb400bf97b /db/re | |
parent | f80d9a72ae9e266d123d5f12ea751645691887ce (diff) | |
parent | 5baef19736fbe26f8b0ac23e61059c14afb6211c (diff) | |
download | hercules-2ec28927c81008a0e17d7e95e70d207de0954d83.tar.gz hercules-2ec28927c81008a0e17d7e95e70d207de0954d83.tar.bz2 hercules-2ec28927c81008a0e17d7e95e70d207de0954d83.tar.xz hercules-2ec28927c81008a0e17d7e95e70d207de0954d83.zip |
Merge pull request #2648 from Kenpachi2k13/itemskill_fix
Fix itemskill() script command
Diffstat (limited to 'db/re')
-rw-r--r-- | db/re/item_db.conf | 22 | ||||
-rw-r--r-- | db/re/skill_db.conf | 28 |
2 files changed, 39 insertions, 11 deletions
diff --git a/db/re/item_db.conf b/db/re/item_db.conf index ed77cadc6..dbe3531b0 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); "> }, { @@ -90735,7 +90735,7 @@ item_db: ( } Script: <" if(strcharinfo(PC_MAP)=="job3_rune02") { - itemskill RK_CRUSHSTRIKE,1; + itemskill(RK_CRUSHSTRIKE, 1, ISF_CHECKCONDITIONS); } "> }, @@ -94787,7 +94787,7 @@ item_db: ( sitting: true } Stack: [60, 1] - Script: <" itemskill RK_CRUSHSTRIKE, 1; "> + Script: <" itemskill(RK_CRUSHSTRIKE, 1, ISF_CHECKCONDITIONS); "> }, { Id: 12727 @@ -121708,7 +121708,7 @@ item_db: ( nomail: true noauction: true } - Script: <" itemskill(AM_CP_HELM, 5); "> + Script: <" itemskill(AM_CP_HELM, 5, ISF_CHECKCONDITIONS); "> }, { Id: 14518 @@ -121725,7 +121725,7 @@ item_db: ( nomail: true noauction: true } - Script: <" itemskill(AM_CP_SHIELD, 5); "> + Script: <" itemskill(AM_CP_SHIELD, 5, ISF_CHECKCONDITIONS); "> }, { Id: 14519 @@ -121742,7 +121742,7 @@ item_db: ( nomail: true noauction: true } - Script: <" itemskill(AM_CP_ARMOR, 5); "> + Script: <" itemskill(AM_CP_ARMOR, 5, ISF_CHECKCONDITIONS); "> }, { Id: 14520 @@ -121759,7 +121759,7 @@ item_db: ( nomail: true noauction: true } - Script: <" itemskill(AM_CP_WEAPON, 5); "> + Script: <" itemskill(AM_CP_WEAPON, 5, ISF_CHECKCONDITIONS); "> }, { Id: 14521 @@ -123078,7 +123078,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 + } } }, { |