Merge branch 'master' into cell_noskill

1 files changed, 54 insertions, 6 deletions

diff --git a/db/pre-re/skill_db.conf b/db/pre-re/skill_db.conf
index 21a0f0e78..1222aa1a0 100644
--- a/db/pre-re/skill_db.conf
+++ b/db/pre-re/skill_db.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2014-2017  Hercules Dev Team
+//= Copyright (C) 2014-2020 Hercules Dev Team
 //=
 //= Hercules is free software: you can redistribute it and/or modify
 //= it under the terms of the GNU General Public License as published by
@@ -75,6 +75,8 @@
 							Works like FreeCastReduced, but not reduce speed.
 		ShowSkillScale: true/false              (boolean, defaults to false)
 		AllowReproduce: true/false              (boolean, defaults to false)
+		HiddenTrap: true/false                  (boolean, defaults to false)
+		IsCombo: true/false                     (boolean, defaults to false)
 	}
 	AttackType: "Attack Type"                   (string, defaults to "None")
 	                                            Types: "None", "Weapon", "Magic" or "Misc"
@@ -114,7 +116,7 @@
 	SkillData1: Skill Data/Duration (in ms)     (int, defaults to 0) (can be grouped by Levels)
 	SkillData2: Skill Data/Duration (in ms)     (int, defaults to 0) (can be grouped by Levels)
 	CoolDown: Skill Cooldown (in ms)            (int, defaults to 0) (can be grouped by Levels)
-	
+
 	CastTimeOptions: {
 		IgnoreDex: true/false                   (boolean, defaults to false)
 		IgnoreStatusEffect: true/false          (boolean, defaults to false)
@@ -385,9 +387,9 @@ skill_db: (
 	}
 	SplashRange: 2
 	KnockBackTiles: 2
-	SkillData1: 2000
 	SkillData2: 10000
-	CoolDown: 2000
+	AfterCastActDelay: 2000
+	CoolDown: 0
 	Requirements: {
 		HPCost: {
 			Lv1: 20
@@ -7734,6 +7736,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		AllowReproduce: true
+		IsCombo: true
 	}
 	AttackType: "Weapon"
 	DamageType: {
@@ -7810,6 +7813,7 @@ skill_db: (
 	SkillInfo: {
 		NoCastSelf: true
 		AllowReproduce: true
+		IsCombo: true
 	}
 	AttackType: "Weapon"
 	Element: "Ele_Weapon"
@@ -7870,6 +7874,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		NoCastSelf: true
+		IsCombo: true
 	}
 	AttackType: "Weapon"
 	Element: "Ele_Weapon"
@@ -10920,6 +10925,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		NoCastSelf: true
+		IsCombo: true
 	}
 	AttackType: "Weapon"
 	Element: "Ele_Weapon"
@@ -10968,6 +10974,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		NoCastSelf: true
+		IsCombo: true
 	}
 	AttackType: "Weapon"
 	Element: "Ele_Weapon"
@@ -12253,6 +12260,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		NoCastSelf: true
+		IsCombo: true
 	}
 	AttackType: "Weapon"
 	Element: "Ele_Weapon"
@@ -12305,6 +12313,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		NoCastSelf: true
+		IsCombo: true
 	}
 	AttackType: "Weapon"
 	Element: "Ele_Weapon"
@@ -12355,6 +12364,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		NoCastSelf: true
+		IsCombo: true
 	}
 	AttackType: "Weapon"
 	Element: "Ele_Weapon"
@@ -12410,6 +12420,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		NoCastSelf: true
+		IsCombo: true
 	}
 	AttackType: "Weapon"
 	Element: "Ele_Weapon"
@@ -12461,6 +12472,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		AllowReproduce: true
+		IsCombo: true
 	}
 	AttackType: "Weapon"
 	Element: "Ele_Weapon"
@@ -15020,6 +15032,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		Spirit: true
+		IsCombo: true
 	}
 	AttackType: "Weapon"
 	Element: "Ele_Weapon"
@@ -17681,6 +17694,9 @@ skill_db: (
 		Lv10: 240000
 	}
 	CoolDown: 0
+	Requirements: {
+		HPCost: 15
+	}
 },
 {
 	Id: 691
@@ -18615,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
+		}
 	}
 },
 {
@@ -19060,6 +19101,9 @@ skill_db: (
 	SkillType: {
 		Self: true
 	}
+	SkillInfo: {
+		IsCombo: true
+	}
 	AttackType: "Weapon"
 	Element: "Ele_Weapon"
 	DamageType: {
@@ -19096,6 +19140,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		NoCastSelf: true
+		IsCombo: true
 	}
 	AttackType: "Weapon"
 	Element: "Ele_Weapon"
@@ -25005,6 +25050,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		AllowReproduce: true
+		IsCombo: true
 	}
 	AttackType: "Weapon"
 	Element: "Ele_Weapon"
@@ -25128,6 +25174,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		NoCastSelf: true
+		IsCombo: true
 	}
 	AttackType: "Weapon"
 	Element: "Ele_Weapon"
@@ -25173,6 +25220,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		AllowReproduce: true
+		IsCombo: true
 	}
 	AttackType: "Weapon"
 	Element: "Ele_Weapon"
@@ -25641,6 +25689,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		AllowReproduce: true
+		IsCombo: true
 	}
 	AttackType: "Weapon"
 	NumberOfHits: -7
@@ -35237,8 +35286,7 @@ skill_db: (
 	}
 	SplashRange: 2
 	KnockBackTiles: 2
-	AfterCastWalkDelay: 2000
-	SkillData1: 2000
+	AfterCastActDelay: 2000
 	SkillData2: 10000
 	CoolDown: 0
 	Requirements: {