Merge pull request #2648 from Kenpachi2k13/itemskill_fix

Fix itemskill() script command

4 files changed, 78 insertions, 22 deletions

diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf
index 3ce62a0fe..fa204f04b 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);
 		//}
 	">
 },
@@ -73530,7 +73530,7 @@ item_db: (
 		sitting: true
 	}
 	Stack: [20, 1]
-	Script: <" itemskill RK_CRUSHSTRIKE, 1; ">
+	Script: <" itemskill(RK_CRUSHSTRIKE, 1, ISF_CHECKCONDITIONS); ">
 },
 {
 	Id: 12727
@@ -92197,7 +92197,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
@@ -92205,7 +92205,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
@@ -92213,7 +92213,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
@@ -92221,7 +92221,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
@@ -93133,7 +93133,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/pre-re/skill_db.conf b/db/pre-re/skill_db.conf
index 4cd451e7f..1222aa1a0 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
@@ -18628,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/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
+		}
 	}
 },
 {