From 6fb95fff5b46efb05060283caeb512c8af8636ec Mon Sep 17 00:00:00 2001 From: Kenpachi Developer Date: Fri, 6 Mar 2020 12:48:45 +0100 Subject: Fix script of items which check and consume skill requirements --- db/pre-re/item_db.conf | 22 +++++++++++----------- db/re/item_db.conf | 22 +++++++++++----------- 2 files changed, 22 insertions(+), 22 deletions(-) (limited to 'db') diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf index 3e760b62a..1c319f687 100644 --- a/db/pre-re/item_db.conf +++ b/db/pre-re/item_db.conf @@ -68630,7 +68630,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 @@ -68651,7 +68651,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 @@ -68714,7 +68714,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 @@ -69687,7 +69687,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); "> }, { @@ -71124,7 +71124,7 @@ item_db: ( } Script: <" //if(strcharinfo(PC_MAP)=="job3_rune02") { - // itemskill RK_CRUSHSTRIKE,1; + // itemskill(RK_CRUSHSTRIKE, 1, ISF_CHECKCONDITIONS); //} "> }, @@ -73501,7 +73501,7 @@ item_db: ( sitting: true } Stack: [20, 1] - Script: <" itemskill RK_CRUSHSTRIKE, 1; "> + Script: <" itemskill(RK_CRUSHSTRIKE, 1, ISF_CHECKCONDITIONS); "> }, { Id: 12727 @@ -92168,7 +92168,7 @@ item_db: ( Name: "Chemical Protection Helm Scroll" Type: "IT_USABLE" Weight: 10 - Script: <" itemskill(AM_CP_HELM, 5); "> + Script: <" itemskill(AM_CP_HELM, 5, ISF_CHECKCONDITIONS); "> }, { Id: 14518 @@ -92176,7 +92176,7 @@ item_db: ( Name: "Chemical Protection Shield Scrol" Type: "IT_USABLE" Weight: 10 - Script: <" itemskill(AM_CP_SHIELD, 5); "> + Script: <" itemskill(AM_CP_SHIELD, 5, ISF_CHECKCONDITIONS); "> }, { Id: 14519 @@ -92184,7 +92184,7 @@ item_db: ( Name: "Chemical Protection Armor Scroll" Type: "IT_USABLE" Weight: 10 - Script: <" itemskill(AM_CP_ARMOR, 5); "> + Script: <" itemskill(AM_CP_ARMOR, 5, ISF_CHECKCONDITIONS); "> }, { Id: 14520 @@ -92192,7 +92192,7 @@ item_db: ( Name: "Chemical Protection Weapon Scroll" Type: "IT_USABLE" Weight: 10 - Script: <" itemskill(AM_CP_WEAPON, 5); "> + Script: <" itemskill(AM_CP_WEAPON, 5, ISF_CHECKCONDITIONS); "> }, { Id: 14521 @@ -93104,7 +93104,7 @@ item_db: ( noselltonpc: true nogstorage: 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/item_db.conf b/db/re/item_db.conf index 86bfe9f90..29b5dc1be 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); } "> }, @@ -94758,7 +94758,7 @@ item_db: ( sitting: true } Stack: [60, 1] - Script: <" itemskill RK_CRUSHSTRIKE, 1; "> + Script: <" itemskill(RK_CRUSHSTRIKE, 1, ISF_CHECKCONDITIONS); "> }, { Id: 12727 @@ -121679,7 +121679,7 @@ item_db: ( nomail: true noauction: true } - Script: <" itemskill(AM_CP_HELM, 5); "> + Script: <" itemskill(AM_CP_HELM, 5, ISF_CHECKCONDITIONS); "> }, { Id: 14518 @@ -121696,7 +121696,7 @@ item_db: ( nomail: true noauction: true } - Script: <" itemskill(AM_CP_SHIELD, 5); "> + Script: <" itemskill(AM_CP_SHIELD, 5, ISF_CHECKCONDITIONS); "> }, { Id: 14519 @@ -121713,7 +121713,7 @@ item_db: ( nomail: true noauction: true } - Script: <" itemskill(AM_CP_ARMOR, 5); "> + Script: <" itemskill(AM_CP_ARMOR, 5, ISF_CHECKCONDITIONS); "> }, { Id: 14520 @@ -121730,7 +121730,7 @@ item_db: ( nomail: true noauction: true } - Script: <" itemskill(AM_CP_WEAPON, 5); "> + Script: <" itemskill(AM_CP_WEAPON, 5, ISF_CHECKCONDITIONS); "> }, { Id: 14521 @@ -123049,7 +123049,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 -- cgit v1.2.3-70-g09d2 From 35461847740b20e474ad0f68c99512f4e8d94fc9 Mon Sep 17 00:00:00 2001 From: Kenpachi Developer Date: Fri, 6 Mar 2020 12:55:04 +0100 Subject: Add a 15 HPCost requirement to CASH_INCAGI skill According to my tests on AEGIS, the CASH_INCAGI skill requires 15 HP for casting and also consumes them. --- db/pre-re/skill_db.conf | 3 +++ db/re/skill_db.conf | 3 +++ 2 files changed, 6 insertions(+) (limited to 'db') diff --git a/db/pre-re/skill_db.conf b/db/pre-re/skill_db.conf index 4cd451e7f..1129645f8 100644 --- a/db/pre-re/skill_db.conf +++ b/db/pre-re/skill_db.conf @@ -17694,6 +17694,9 @@ skill_db: ( Lv10: 240000 } CoolDown: 0 + Requirements: { + HPCost: 15 + } }, { Id: 691 diff --git a/db/re/skill_db.conf b/db/re/skill_db.conf index 8866f1742..5c73267db 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 -- cgit v1.2.3-70-g09d2 From 5baef19736fbe26f8b0ac23e61059c14afb6211c Mon Sep 17 00:00:00 2001 From: Kenpachi Developer Date: Fri, 6 Mar 2020 12:58:09 +0100 Subject: Add the requirement to have a weapon equipped to RK_CRUSHSTRIKE skill According to my tests on AEGIS, the CRUSHSTRIKE skill requires an equipped weapon for casting. --- db/pre-re/skill_db.conf | 25 +++++++++++++++++++++++++ db/re/skill_db.conf | 25 +++++++++++++++++++++++++ 2 files changed, 50 insertions(+) (limited to 'db') diff --git a/db/pre-re/skill_db.conf b/db/pre-re/skill_db.conf index 1129645f8..1222aa1a0 100644 --- a/db/pre-re/skill_db.conf +++ b/db/pre-re/skill_db.conf @@ -18631,6 +18631,31 @@ skill_db: ( CoolDown: 0 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 + } } }, { diff --git a/db/re/skill_db.conf b/db/re/skill_db.conf index 5c73267db..376fba179 100644 --- a/db/re/skill_db.conf +++ b/db/re/skill_db.conf @@ -19186,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 + } } }, { -- cgit v1.2.3-70-g09d2