Merge branch 'master' into testserver

Conflicts solved with -X theirs

1 files changed, 93 insertions, 69 deletions

diff --git a/db/re/skill_db.conf b/db/re/skill_db.conf
index acfd0c5ef..8dd019385 100644
--- a/db/re/skill_db.conf
+++ b/db/re/skill_db.conf
@@ -886,16 +886,16 @@ skill_db: (
 	}
 	Requirements: {
 		SPCost: {
-			Lv1: 100
-			Lv2: 125
-			Lv3: 150
-			Lv4: 175
-			Lv5: 200
-			Lv6: 250
-			Lv7: 300
-			Lv8: 350
-			Lv9: 400
-			Lv10: 450
+			Lv1: 80
+			Lv2: 100
+			Lv3: 120
+			Lv4: 145
+			Lv5: 160
+			Lv6: 180
+			Lv7: 200
+			Lv8: 220
+			Lv9: 240
+			Lv10: 250
 		}
 	}
 },
@@ -911,44 +911,44 @@ skill_db: (
 	}
 	AttackType: "Magic"
 	Element: "Ele_Nature"
-	InterruptCast: true
+	InterruptCast: false
 	SkillInstances: 3
 	KnockBackTiles: 2
 	CastTime: {
-		Lv1: 1600
-		Lv2: 1440
-		Lv3: 1280
-		Lv4: 1120
-		Lv5: 960
-		Lv6: 880
-		Lv7: 800
-		Lv8: 720
-		Lv9: 640
-		Lv10: 560
+		Lv1: 1300
+		Lv2: 1140
+		Lv3: 1080
+		Lv4: 920
+		Lv5: 860
+		Lv6: 780
+		Lv7: 600
+		Lv8: 520
+		Lv9: 440
+		Lv10: 360
 	}
 	SkillData1: {
-		Lv1: 5000
-		Lv2: 6000
-		Lv3: 7000
-		Lv4: 8000
-		Lv5: 9000
-		Lv6: 10000
-		Lv7: 11000
-		Lv8: 12000
-		Lv9: 13000
-		Lv10: 14000
+		Lv1: 7500
+		Lv2: 10000
+		Lv3: 12000
+		Lv4: 14000
+		Lv5: 16000
+		Lv6: 18000
+		Lv7: 20000
+		Lv8: 22000
+		Lv9: 24000
+		Lv10: 26000
 	}
 	FixedCastTime: {
-		Lv1: 400
-		Lv2: 360
-		Lv3: 320
-		Lv4: 280
-		Lv5: 240
-		Lv6: 220
-		Lv7: 200
-		Lv8: 180
-		Lv9: 160
-		Lv10: 140
+		Lv1: 300
+		Lv2: 260
+		Lv3: 220
+		Lv4: 180
+		Lv5: 140
+		Lv6: 120
+		Lv7: 100
+		Lv8: 80
+		Lv9: 60
+		Lv10: 40
 	}
 	Requirements: {
 		SPCost: 140
@@ -1052,15 +1052,15 @@ skill_db: (
 	AttackType: "Magic"
 	Element: "Ele_Wind"
 	NumberOfHits: {
-		Lv1: 1
-		Lv2: 2
-		Lv3: 3
-		Lv4: 4
-		Lv5: 5
-		Lv6: 6
-		Lv7: 7
-		Lv8: 8
-		Lv9: 9
+		Lv1: 2
+		Lv2: 3
+		Lv3: 4
+		Lv4: 5
+		Lv5: 6
+		Lv6: 7
+		Lv7: 8
+		Lv8: 9
+		Lv9: 10
 		Lv10: 10
 	}
 	InterruptCast: true
@@ -1966,7 +1966,7 @@ skill_db: (
 		NoDamage: true
 	}
 	Requirements: {
-		SPCost: 30
+		SPCost: 15
 	}
 },
 {
@@ -3411,9 +3411,10 @@ skill_db: (
 	Name: "WZ_FROSTNOVA"
 	Description: "Frost Nova"
 	MaxLevel: 10
+	Range: 9
 	Hit: "BDT_SKILL"
 	SkillType: {
-		Self: true
+		Place: true
 	}
 	AttackType: "Magic"
 	Element: "Ele_Water"
@@ -11062,9 +11063,9 @@ skill_db: (
 	}
 	Requirements: {
 		SPCost: {
-			Lv1: 44
-			Lv2: 58
-			Lv3: 72
+			Lv1: 24
+			Lv2: 38
+			Lv3: 52
 			Lv4: 86
 			Lv5: 100
 			Lv6: 114
@@ -12400,16 +12401,16 @@ skill_db: (
 	FixedCastTime: 350
 	Requirements: {
 		SPCost: {
-			Lv1: 100
-			Lv2: 120
-			Lv3: 140
-			Lv4: 160
-			Lv5: 180
-			Lv6: 200
-			Lv7: 220
-			Lv8: 240
-			Lv9: 260
-			Lv10: 280
+			Lv1: 95
+			Lv2: 100
+			Lv3: 110
+			Lv4: 120
+			Lv5: 130
+			Lv6: 140
+			Lv7: 150
+			Lv8: 160
+			Lv9: 170
+			Lv10: 180
 		}
 	}
 },
@@ -28107,6 +28108,18 @@ skill_db: (
 		Lv10: 26
 	}
 	CastTime: 1000
+	CoolDown:  {
+		Lv1: 10000
+		Lv2: 13000
+		Lv3: 16000
+		Lv4: 19000
+		Lv5: 20000
+		Lv6: 20000
+		Lv7: 20000
+		Lv8: 20000
+		Lv9: 20000
+		Lv10: 20000
+	}
 	AfterCastActDelay: 1000
 	SkillData1: 12000
 	FixedCastTime: -1
@@ -28126,7 +28139,7 @@ skill_db: (
 	}
 	Unit: {
 		Id: 0xdc
-		Interval: 300
+		Interval: 500
 		Target: "Enemy"
 		Flag: {
 			UF_NOREITERATION: true
@@ -34286,7 +34299,18 @@ skill_db: (
 	}
 	FixedCastTime: -1
 	Requirements: {
-		SPCost: 120
+		SPCost: {
+			Lv1: 80
+			Lv2: 120
+			Lv3: 150
+			Lv4: 200
+			Lv5: 220
+			Lv6: 240
+			Lv7: 260
+			Lv8: 280
+			Lv9: 300
+			Lv10: 400
+		}
 	}
 },
 {
@@ -38520,8 +38544,8 @@ skill_db: (
 },
 {
 	Id: 20027
-	Name: "TMW2_MKPOT"
-	Description: "Make Potion"
+	Name: "TMW2_TRANSMIGRATION"
+	Description: "Transmutation"
 	MaxLevel: 20
 	SkillType: {
 		Self: true