Convert a few Physical Skills from built-in to Magicv3

2 files changed, 232 insertions, 5 deletions

diff --git a/db/re/skill_db.conf b/db/re/skill_db.conf
index 6796230b6..dfb159ca1 100644
--- a/db/re/skill_db.conf
+++ b/db/re/skill_db.conf
@@ -40123,6 +40123,227 @@ skill_db: (
 		}
 	}
 },
+{
+	Id: 20071
+	Name: "TMW2_FALKONSTRIKE"
+	Description: "Falkon Strike"
+	MaxLevel: 10
+	Range: -1
+	Hit: "BDT_SKILL"
+	SkillType: {
+		Enemy: true
+	}
+	DamageType: {
+		NoDamage: true
+	}
+	AttackType: "Weapon"
+	Element: "Ele_Weapon"
+	Requirements: {
+		SPCost: 60
+		WeaponTypes: {
+			NoWeapon: true
+			Daggers: true
+			1HSwords: true
+			2HSwords: true
+			1HSpears: true
+			2HSpears: true
+			1HAxes: true
+			2HAxes: true
+			Maces: true
+			2HMaces: true
+			Knuckles: true
+			Instruments: true
+			Whips: true
+			Books: true
+			Katars: true
+			Revolvers: true
+			Rifles: true
+		}
+	}
+},
+{
+	Id: 20072
+	Name: "TMW2_GROUNDSTRIKE"
+	Description: "Ground Strike"
+	MaxLevel: 10
+	Hit: "BDT_SKILL"
+	SkillType: {
+		Self: true
+	}
+	AttackType: "Weapon"
+	Element: "Ele_Weapon"
+	DamageType: {
+		NoDamage: true
+	}
+	//SplashRange: 2
+	CastTime: 350
+	FixedCastTime: 350
+	AfterCastActDelay: 500
+	Requirements: {
+		SPCost: 90
+	}
+},
+{
+	Id: 20073
+	Name: "TMW2_SUPREMEATTACK"
+	Description: "Supreme Attack"
+	MaxLevel: 10
+	Range: -1
+	Hit: "BDT_SKILL"
+	SkillType: {
+		Enemy: true
+	}
+	AttackType: "Weapon"
+	Element: "Ele_Weapon"
+	DamageType: {
+		NoDamage: true
+	}
+	Requirements: {
+		SPCost: 55
+		HPRateCost: 2
+		WeaponTypes: {
+			NoWeapon: true
+			Daggers: true
+			1HSwords: true
+			2HSwords: true
+			1HSpears: true
+			2HSpears: true
+			1HAxes: true
+			2HAxes: true
+			Maces: true
+			2HMaces: true
+			Knuckles: true
+			Instruments: true
+			Whips: true
+			Books: true
+			Katars: true
+			Revolvers: true
+			Rifles: true
+		}
+	}
+},
+{
+	Id: 20074
+	Name: "TMW2_CHARGEDARROW"
+	Description: "Charged Shot"
+	MaxLevel: 10
+	Range: -9
+	Hit: "BDT_SKILL"
+	SkillType: {
+		Enemy: true
+	}
+	SkillInfo: {
+		Quest: true
+	}
+	AttackType: "Weapon"
+	Element: "Ele_Weapon"
+	DamageType: {
+		NoDamage: true
+	}
+	KnockBackTiles: 6
+	FixedCastTime: 1500
+	Requirements: {
+		SPCost: 150
+		WeaponTypes: {
+			Bows: true
+			Revolvers: true
+			Rifles: true
+			GatlingGuns: true
+			Shotguns: true
+		}
+		AmmoTypes: {
+			A_ARROW: true
+			A_BULLET: true
+		}
+		AmmoAmount: 1
+	}
+},
+{
+	Id: 20075
+	Name: "TMW2_ARROWSHOWER"
+	Description: "Arrow Shower"
+	MaxLevel: 10
+	Range: -9
+	Hit: "BDT_SKILL"
+	SkillType: {
+		Place: true
+	}
+	SkillInfo: {
+		IgnoreLandProtector: true
+	}
+	AttackType: "Weapon"
+	Element: "Ele_Weapon"
+	DamageType: {
+		NoDamage: true
+	}
+	/*SplashRange: {
+		Lv1: 1
+		Lv2: 2
+		Lv3: 3
+		Lv4: 3
+		Lv5: 3
+		Lv6: 3
+		Lv7: 3
+		Lv8: 3
+		Lv9: 3
+		Lv10: 3
+	}*/
+	KnockBackTiles: 1
+	AfterCastActDelay: 100
+	//SkillData1: 100
+	FixedCastTime: 0
+	Requirements: {
+		SPCost: 80
+		WeaponTypes: {
+			Bows: true
+			Revolvers: true
+			Rifles: true
+			GatlingGuns: true
+			Shotguns: true
+		}
+		AmmoTypes: {
+			A_ARROW: true
+			A_BULLET: true
+		}
+		AmmoAmount: {
+		Lv1: 3
+		Lv2: 5
+		Lv3: 5
+		Lv4: 5
+		Lv5: 5
+		Lv6: 5
+		Lv7: 5
+		Lv8: 5
+		Lv9: 5
+		Lv10: 5
+		}
+	}
+	/*Unit: {
+		Id: 0x86
+		Range: {
+			Lv1: 1
+			Lv2: 1
+			Lv3: 2
+			Lv4: 2
+			Lv5: 2
+			Lv6: 2
+			Lv7: 2
+			Lv8: 2
+			Lv9: 2
+			Lv10: 2
+		}
+		Interval: 1000
+		Target: "Enemy"
+		Flag: {
+			UF_SKILL: true
+		}
+	}*/
+},
+
+
+
+
+
 // Additional Homunculus Skills
 {
 	Id: 8044
diff --git a/db/re/skill_tree.conf b/db/re/skill_tree.conf
index 5b474e77d..072850f53 100644
--- a/db/re/skill_tree.conf
+++ b/db/re/skill_tree.conf
@@ -109,14 +109,14 @@ Human: {
 		TMW2_BRAWLING: 0
 		TMW2_BEARSTRIKE: 0
 		TMW2_ALLINONE: 0
+		TMW2_FALKONSTRIKE: 0
+		TMW2_GROUNDSTRIKE: 0
+		TMW2_SUPREMEATTACK: 0
+		TMW2_CHARGEDARROW: 0
+		TMW2_ARROWSHOWER: 0
 
 		///////////////// Magic v3 (Builtin)
-		ASC_METEORASSAULT: 0
-		AC_SHOWER: 0
-		SM_BASH: 0
-		MC_MAMMONITE: 0
 		KN_AUTOCOUNTER: 0
-		AC_CHARGEARROW: 0
 		SN_SHARPSHOOTING: 0
 		SN_WINDWALK: 0
 
@@ -180,6 +180,12 @@ Human: {
 		TMW2_GDP_MAXPOWER: 0
 		TMW2_GDP_SPREGEN: 0
 
+		// Deprecated
+		ASC_METEORASSAULT: 0
+		AC_SHOWER: 0
+		SM_BASH: 0
+		MC_MAMMONITE: 0
+		AC_CHARGEARROW: 0
 
 		//////////////////////////////////////////
 		///////////////// Unused /////////////////