Warriors and Rangers skills sets

2 files changed, 118 insertions, 78 deletions

diff --git a/db/re/skill_db.conf b/db/re/skill_db.conf
index 6fc3d3845..11a081b2c 100644
--- a/db/re/skill_db.conf
+++ b/db/re/skill_db.conf
@@ -438,7 +438,18 @@ skill_db: (
 	CoolDown: 10000
 	FixedCastTime: 0
 	Requirements: {
-		SPCost: 10
+		SPCost:  {
+			Lv1: 60
+			Lv2: 80
+			Lv3: 100
+			Lv4: 120
+			Lv5: 140
+			Lv6: 160
+			Lv7: 180
+			Lv8: 200
+			Lv9: 220
+			Lv10: 240
+		}
 	}
 },
 {
@@ -1530,30 +1541,30 @@ skill_db: (
 	CastTime: 350
 	AfterCastActDelay: 3500
 	SkillData1: {
-		Lv1: 30000
-		Lv2: 60000
-		Lv3: 90000
-		Lv4: 120000
-		Lv5: 150000
-		Lv6: 180000
-		Lv7: 210000
-		Lv8: 240000
-		Lv9: 270000
-		Lv10: 300000
+		Lv1: 15000
+		Lv2: 30000
+		Lv3: 45000
+		Lv4: 60000
+		Lv5: 75000
+		Lv6: 90000
+		Lv7: 105000
+		Lv8: 120000
+		Lv9: 135000
+		Lv10: 150000
 	}
 	FixedCastTime: 150
 	Requirements: {
 		SPCost: {
-			Lv1: 23
-			Lv2: 26
-			Lv3: 29
-			Lv4: 32
-			Lv5: 35
-			Lv6: 38
-			Lv7: 41
-			Lv8: 44
-			Lv9: 47
-			Lv10: 50
+			Lv1: 100
+			Lv2: 150
+			Lv3: 200
+			Lv4: 250
+			Lv5: 300
+			Lv6: 350
+			Lv7: 400
+			Lv8: 450
+			Lv9: 500
+			Lv10: 550
 		}
 	}
 },
@@ -1828,19 +1839,30 @@ skill_db: (
 		Lv9: 3
 		Lv10: 3
 	}
-	KnockBackTiles: 2
+	KnockBackTiles: 1
 	AfterCastActDelay: 100
 	SkillData1: 100
 	FixedCastTime: 0
 	Requirements: {
-		SPCost: 15
+		SPCost: {
+			Lv1: 250
+			Lv2: 300
+			Lv3: 350
+			Lv4: 400
+			Lv5: 450
+			Lv6: 500
+			Lv7: 550
+			Lv8: 600
+			Lv9: 650
+			Lv10: 700
+		}
 		WeaponTypes: {
 			Bows: true
 		}
 		AmmoTypes: {
 			A_ARROW: true
 		}
-		AmmoAmount: 1
+		AmmoAmount: 5
 	}
 	Unit: {
 		Id: 0x86
@@ -2210,20 +2232,20 @@ skill_db: (
 		IgnoreDefense: true
 	}
 	SkillData1: {
-		Lv1: 400
-		Lv2: 800
-		Lv3: 1200
-		Lv4: 1600
-		Lv5: 2000
-		Lv6: 2400
-		Lv7: 2800
-		Lv8: 3200
-		Lv9: 3600
-		Lv10: 4000
+		Lv1: 500
+		Lv2: 1000
+		Lv3: 1500
+		Lv4: 2000
+		Lv5: 2500
+		Lv6: 3000
+		Lv7: 3500
+		Lv8: 4000
+		Lv9: 4500
+		Lv10: 5000
 	}
 	FixedCastTime: 0
 	Requirements: {
-		SPCost: 3
+		SPCost: 100
 		WeaponTypes: {
 			NoWeapon: true
 			Daggers: true
@@ -7296,16 +7318,16 @@ skill_db: (
 	FixedCastTime: 0
 	Requirements: {
 		SPCost: {
-			Lv1: 12
-			Lv2: 14
-			Lv3: 16
-			Lv4: 18
-			Lv5: 20
-			Lv6: 22
-			Lv7: 24
-			Lv8: 26
-			Lv9: 28
-			Lv10: 30
+			Lv1: 120
+			Lv2: 124
+			Lv3: 126
+			Lv4: 128
+			Lv5: 130
+			Lv6: 132
+			Lv7: 134
+			Lv8: 136
+			Lv9: 138
+			Lv10: 140
 		}
 		State: "Shield"
 	}
@@ -11610,16 +11632,16 @@ skill_db: (
 	}
 	Requirements: {
 		SPCost: {
-			Lv1: 46
-			Lv2: 52
-			Lv3: 58
-			Lv4: 64
-			Lv5: 70
-			Lv6: 76
-			Lv7: 82
-			Lv8: 88
-			Lv9: 94
-			Lv10: 100
+			Lv1: 146
+			Lv2: 252
+			Lv3: 358
+			Lv4: 464
+			Lv5: 570
+			Lv6: 676
+			Lv7: 782
+			Lv8: 888
+			Lv9: 994
+			Lv10: 1100
 		}
 	}
 },
@@ -15423,7 +15445,13 @@ skill_db: (
 	SkillData1: 60000
 	FixedCastTime: 0
 	Requirements: {
-		SPCost: 30
+		SPCost: 180
+	}
+	WeaponTypes: {
+		Revolvers: true
+		Rifles: true
+		GatlingGuns: true
+		Shotguns: true
 	}
 },
 {
@@ -15439,8 +15467,13 @@ skill_db: (
 	AttackType: "Weapon"
 	Element: "Ele_Ghost"
 	Requirements: {
-		SPCost: 7
-		SpiritSphereCost: 1
+		SPCost: 70
+	}
+	WeaponTypes: {
+		Revolvers: true
+		Rifles: true
+		GatlingGuns: true
+		Shotguns: true
 	}
 },
 {
@@ -15492,6 +15525,12 @@ skill_db: (
 	AttackType: "Weapon"
 	Element: "Ele_Weapon"
 	NumberOfHits: 2
+	WeaponTypes: {
+		Revolvers: true
+		Rifles: true
+		GatlingGuns: true
+		Shotguns: true
+	}
 },
 {
 	Id: 512
@@ -37138,16 +37177,16 @@ skill_db: (
 	CastTime: 1000
 	AfterCastActDelay: 1000
 	SkillData1: {
-		Lv1: 60000
-		Lv2: 80000
-		Lv3: 100000
-		Lv4: 120000
-		Lv5: 140000
-		Lv6: 160000
-		Lv7: 180000
-		Lv8: 200000
-		Lv9: 220000
-		Lv10: 240000
+		Lv1: 20000
+		Lv2: 40000
+		Lv3: 60000
+		Lv4: 80000
+		Lv5: 100000
+		Lv6: 120000
+		Lv7: 140000
+		Lv8: 160000
+		Lv9: 180000
+		Lv10: 200000
 	}
 	FixedCastTime: 0
 	CastTimeOptions: {
@@ -37158,16 +37197,16 @@ skill_db: (
 	Requirements: {
 		HPCost: 15
 		SPCost: {
-			Lv1: 18
-			Lv2: 21
-			Lv3: 24
-			Lv4: 27
-			Lv5: 30
-			Lv6: 33
-			Lv7: 36
-			Lv8: 39
-			Lv9: 42
-			Lv10: 45
+			Lv1: 180
+			Lv2: 210
+			Lv3: 240
+			Lv4: 270
+			Lv5: 300
+			Lv6: 330
+			Lv7: 360
+			Lv8: 390
+			Lv9: 420
+			Lv10: 450
 		}
 	}
 },
diff --git a/db/re/skill_tree.conf b/db/re/skill_tree.conf
index d1c235493..72a207e75 100644
--- a/db/re/skill_tree.conf
+++ b/db/re/skill_tree.conf
@@ -83,6 +83,7 @@ Human: {
 		GS_SINGLEACTION: 0
 		GS_INCREASING: 0
 		GS_CHAINACTION: 0
+		GS_MAGICALBULLET: 0
 
 		// Wizards
 		MG_COLDBOLT: 0