From 7e0f53eefe1f1eaf8accd9692a2538daa07e3d06 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Fri, 19 Jul 2019 03:19:35 -0300
Subject: Magic Reconfiguration - rewrite skill DB and skill tree

---
 db/re/skill_db.conf   | 519 +++++++++++++++++++++++++-------------------------
 db/re/skill_tree.conf | 131 +++++++------
 2 files changed, 333 insertions(+), 317 deletions(-)

(limited to 'db')

diff --git a/db/re/skill_db.conf b/db/re/skill_db.conf
index ba5fcd4d1..5b349c0ce 100644
--- a/db/re/skill_db.conf
+++ b/db/re/skill_db.conf
@@ -306,16 +306,16 @@ skill_db: (
 	Element: "Ele_Weapon"
 	Requirements: {
 		SPCost: {
-			Lv1: 70
-			Lv2: 80
-			Lv3: 90
-			Lv4: 100
-			Lv5: 110
-			Lv6: 120
-			Lv7: 130
-			Lv8: 140
-			Lv9: 150
-			Lv10: 160
+			Lv1: 60
+			Lv2: 70
+			Lv3: 80
+			Lv4: 90
+			Lv5: 100
+			Lv6: 110
+			Lv7: 120
+			Lv8: 130
+			Lv9: 140
+			Lv10: 150
 		}
 		WeaponTypes: {
 			NoWeapon: true
@@ -328,7 +328,6 @@ skill_db: (
 			2HAxes: true
 			Maces: true
 			2HMaces: true
-			Staves: true
 			Knuckles: true
 			Instruments: true
 			Whips: true
@@ -649,21 +648,21 @@ skill_db: (
 		Lv7: 2400
 		Lv8: 2400
 		Lv9: 2800
-		Lv10: 2500
+		Lv10: 3000
 	}
 	FixedCastTime: 100
 	Requirements: {
 		SPCost: {
-			Lv1: 18
-			Lv2: 14
-			Lv3: 24
-			Lv4: 20
-			Lv5: 30
-			Lv6: 26
-			Lv7: 36
-			Lv8: 32
-			Lv9: 42
-			Lv10: 38
+			Lv1: 70
+			Lv2: 80
+			Lv3: 90
+			Lv4: 100
+			Lv5: 110
+			Lv6: 120
+			Lv7: 130
+			Lv8: 140
+			Lv9: 150
+			Lv10: 160
 		}
 	}
 },
@@ -730,16 +729,16 @@ skill_db: (
 	}
 	Requirements: {
 		SPCost: {
-			Lv1: 100
-			Lv2: 120
-			Lv3: 140
-			Lv4: 160
-			Lv5: 180
-			Lv6: 200
-			Lv7: 220
-			Lv8: 240
-			Lv9: 260
-			Lv10: 300
+			Lv1: 80
+			Lv2: 100
+			Lv3: 120
+			Lv4: 140
+			Lv5: 160
+			Lv6: 180
+			Lv7: 200
+			Lv8: 220
+			Lv9: 240
+			Lv10: 260
 		}
 	}
 },
@@ -760,29 +759,29 @@ skill_db: (
 	AfterCastActDelay: 1500
 	SkillData2: {
 		Lv1: 3000
-		Lv2: 6000
-		Lv3: 9000
-		Lv4: 12000
-		Lv5: 15000
-		Lv6: 18000
-		Lv7: 21000
-		Lv8: 24000
-		Lv9: 27000
-		Lv10: 30000
+		Lv2: 3500
+		Lv3: 4000
+		Lv4: 4500
+		Lv5: 5000
+		Lv6: 5500
+		Lv7: 6000
+		Lv8: 6500
+		Lv9: 7000
+		Lv10: 7500
 	}
 	FixedCastTime: 160
 	Requirements: {
 		SPCost: {
-			Lv1: 25
-			Lv2: 24
-			Lv3: 23
-			Lv4: 22
-			Lv5: 21
-			Lv6: 20
-			Lv7: 19
-			Lv8: 18
-			Lv9: 17
-			Lv10: 16
+			Lv1: 200
+			Lv2: 210
+			Lv3: 220
+			Lv4: 230
+			Lv5: 240
+			Lv6: 250
+			Lv7: 260
+			Lv8: 270
+			Lv9: 280
+			Lv10: 290
 		}
 	}
 },
@@ -943,7 +942,7 @@ skill_db: (
 		Lv10: 140
 	}
 	Requirements: {
-		SPCost: 40
+		SPCost: 140
 	}
 	Unit: {
 		Id: 0x7f
@@ -1018,16 +1017,16 @@ skill_db: (
 	}
 	Requirements: {
 		SPCost: {
-			Lv1: 100
-			Lv2: 120
-			Lv3: 140
-			Lv4: 160
-			Lv5: 180
-			Lv6: 200
-			Lv7: 220
-			Lv8: 240
-			Lv9: 260
-			Lv10: 300
+			Lv1: 80
+			Lv2: 100
+			Lv3: 120
+			Lv4: 140
+			Lv5: 160
+			Lv6: 180
+			Lv7: 200
+			Lv8: 220
+			Lv9: 240
+			Lv10: 260
 		}
 	}
 },
@@ -1094,16 +1093,16 @@ skill_db: (
 	}
 	Requirements: {
 		SPCost: {
-			Lv1: 100
-			Lv2: 120
-			Lv3: 140
-			Lv4: 160
-			Lv5: 180
-			Lv6: 200
-			Lv7: 220
-			Lv8: 240
-			Lv9: 260
-			Lv10: 300
+			Lv1: 80
+			Lv2: 100
+			Lv3: 120
+			Lv4: 140
+			Lv5: 160
+			Lv6: 180
+			Lv7: 200
+			Lv8: 220
+			Lv9: 240
+			Lv10: 260
 		}
 	}
 },
@@ -1425,16 +1424,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: 60
+			Lv2: 80
+			Lv3: 100
+			Lv4: 120
+			Lv5: 140
+			Lv6: 160
+			Lv7: 180
+			Lv8: 200
+			Lv9: 220
+			Lv10: 240
 		}
 	}
 },
@@ -1734,14 +1733,14 @@ skill_db: (
 	Id: 43
 	Name: "AC_OWL"
 	Description: "Owl's Eye"
-	MaxLevel: 10
+	MaxLevel: 20
 	NumberOfHits: 0
 },
 {
 	Id: 44
 	Name: "AC_VULTURE"
 	Description: "Vulture's Eye"
-	MaxLevel: 10
+	MaxLevel: 1
 	NumberOfHits: 0
 },
 {
@@ -1764,26 +1763,26 @@ skill_db: (
 		Lv2: 80000
 		Lv3: 100000
 		Lv4: 120000
-		Lv5: 140000
-		Lv6: 160000
-		Lv7: 180000
-		Lv8: 200000
-		Lv9: 220000
-		Lv10: 240000
+		Lv5: 130000
+		Lv6: 140000
+		Lv7: 150000
+		Lv8: 160000
+		Lv9: 170000
+		Lv10: 180000
 	}
 	FixedCastTime: 0
 	Requirements: {
 		SPCost: {
-			Lv1: 25
-			Lv2: 30
-			Lv3: 35
-			Lv4: 40
-			Lv5: 45
-			Lv6: 50
-			Lv7: 55
-			Lv8: 60
-			Lv9: 65
-			Lv10: 70
+			Lv1: 65
+			Lv2: 70
+			Lv3: 75
+			Lv4: 80
+			Lv5: 85
+			Lv6: 90
+			Lv7: 95
+			Lv8: 100
+			Lv9: 105
+			Lv10: 110
 		}
 	}
 },
@@ -1850,22 +1849,27 @@ skill_db: (
 	FixedCastTime: 0
 	Requirements: {
 		SPCost: {
-			Lv1: 250
-			Lv2: 300
-			Lv3: 350
-			Lv4: 400
-			Lv5: 450
-			Lv6: 500
-			Lv7: 550
-			Lv8: 600
-			Lv9: 650
-			Lv10: 700
+			Lv1: 90
+			Lv2: 110
+			Lv3: 130
+			Lv4: 150
+			Lv5: 170
+			Lv6: 190
+			Lv7: 210
+			Lv8: 230
+			Lv9: 250
+			Lv10: 270
 		}
 		WeaponTypes: {
 			Bows: true
+			Revolvers: true
+			Rifles: true
+			GatlingGuns: true
+			Shotguns: true
 		}
 		AmmoTypes: {
 			A_ARROW: true
+			A_BULLET: true
 		}
 		AmmoAmount: 5
 	}
@@ -2031,7 +2035,7 @@ skill_db: (
 		Lv1: 4800
 		Lv2: 3200
 		Lv3: 1600
-		Lv4: 0
+		Lv4: 800
 		Lv5: 1
 		Lv6: 1
 		Lv7: 1
@@ -2042,8 +2046,8 @@ skill_db: (
 	AfterCastActDelay: {
 		Lv1: 500
 		Lv2: 1000
-		Lv3: 2000
-		Lv4: 3000
+		Lv3: 1500
+		Lv4: 2000
 		Lv5: 4000
 		Lv6: 5000
 		Lv7: 6000
@@ -2055,7 +2059,7 @@ skill_db: (
 		Lv1: 1200
 		Lv2: 800
 		Lv3: 400
-		Lv4: 0
+		Lv4: 100
 		Lv5: 1
 		Lv6: 1
 		Lv7: 1
@@ -2064,7 +2068,7 @@ skill_db: (
 		Lv10: 1
 	}
 	Requirements: {
-		SPCost: 60
+		SPCost: 200
 //		Items: {
 //			Blue_Gemstone: 1
 //		}
@@ -2244,7 +2248,7 @@ skill_db: (
 		IgnoreDefense: true
 	}
 	SkillData1: {
-		Lv1: 1000
+		Lv1: 1300
 		Lv2: 2000
 		Lv3: 3000
 		Lv4: 4000
@@ -2259,15 +2263,15 @@ skill_db: (
 	Requirements: {
 		SPCost: {
 			Lv1: 100
-			Lv2: 180
-			Lv3: 260
-			Lv4: 340
-			Lv5: 420
-			Lv6: 500
-			Lv7: 580
-			Lv8: 660
-			Lv9: 740
-			Lv10: 620
+			Lv2: 140
+			Lv3: 180
+			Lv4: 220
+			Lv5: 260
+			Lv6: 300
+			Lv7: 340
+			Lv8: 380
+			Lv9: 420
+			Lv10: 460
 		}
 		WeaponTypes: {
 			NoWeapon: true
@@ -2280,7 +2284,6 @@ skill_db: (
 			2HAxes: true
 			Maces: true
 			2HMaces: true
-			Staves: true
 			Knuckles: true
 			Instruments: true
 			Whips: true
@@ -3394,18 +3397,18 @@ skill_db: (
 		Lv9: 384
 		Lv10: 384
 	}
-	AfterCastActDelay: 200
+	AfterCastActDelay: 300
 	SkillData2: {
 		Lv1: 4000
 		Lv2: 5000
 		Lv3: 6000
-		Lv4: 8000
-		Lv5: 10000
-		Lv6: 12000
-		Lv7: 13000
-		Lv8: 15000
-		Lv9: 16000
-		Lv10: 17000
+		Lv4: 7000
+		Lv5: 8000
+		Lv6: 9000
+		Lv7: 10000
+		Lv8: 12000
+		Lv9: 14000
+		Lv10: 16000
 	}
 	FixedCastTime: {
 		Lv1: 160
@@ -3421,16 +3424,16 @@ skill_db: (
 	}
 	Requirements: {
 		SPCost: {
-			Lv1: 45
-			Lv2: 43
-			Lv3: 41
-			Lv4: 39
-			Lv5: 37
-			Lv6: 35
-			Lv7: 33
-			Lv8: 31
-			Lv9: 29
-			Lv10: 27
+			Lv1: 140
+			Lv2: 160
+			Lv3: 180
+			Lv4: 200
+			Lv5: 220
+			Lv6: 240
+			Lv7: 260
+			Lv8: 280
+			Lv9: 290
+			Lv10: 300
 		}
 	}
 },
@@ -3553,16 +3556,16 @@ skill_db: (
 	}
 	Requirements: {
 		SPCost: {
-			Lv1: 100
-			Lv2: 120
-			Lv3: 140
-			Lv4: 160
-			Lv5: 180
-			Lv6: 200
-			Lv7: 220
-			Lv8: 240
-			Lv9: 260
-			Lv10: 300
+			Lv1: 80
+			Lv2: 100
+			Lv3: 120
+			Lv4: 140
+			Lv5: 160
+			Lv6: 180
+			Lv7: 200
+			Lv8: 220
+			Lv9: 240
+			Lv10: 260
 		}
 	}
 },
@@ -5228,6 +5231,10 @@ skill_db: (
 		SPCost: 150
 		WeaponTypes: {
 			Bows: true
+			Revolvers: true
+			Rifles: true
+			GatlingGuns: true
+			Shotguns: true
 		}
 		AmmoTypes: {
 			A_ARROW: true
@@ -5275,7 +5282,7 @@ skill_db: (
 	}
 	KnockBackTiles: 5
 	Requirements: {
-		SPCost: 7
+		SPCost: 20
 	}
 },
 {
@@ -5413,7 +5420,7 @@ skill_db: (
 	CastTime: 1600
 	FixedCastTime: 400
 	Requirements: {
-		SPCost: 75
+		SPCost: 70
 	}
 },
 {
@@ -7650,7 +7657,7 @@ skill_db: (
 	Id: 257
 	Name: "CR_DEFENDER"
 	Description: "Defending Aura"
-	MaxLevel: 5
+	MaxLevel: 4
 	Hit: "BDT_SKILL"
 	SkillType: {
 		Self: true
@@ -11017,16 +11024,16 @@ skill_db: (
 	}
 	Requirements: {
 		SPCost: {
-			Lv1: 14
-			Lv2: 18
-			Lv3: 22
-			Lv4: 26
-			Lv5: 30
-			Lv6: 34
-			Lv7: 38
-			Lv8: 42
-			Lv9: 46
-			Lv10: 50
+			Lv1: 44
+			Lv2: 58
+			Lv3: 72
+			Lv4: 86
+			Lv5: 100
+			Lv6: 114
+			Lv7: 128
+			Lv8: 142
+			Lv9: 156
+			Lv10: 170
 		}
 	}
 },
@@ -11589,7 +11596,7 @@ skill_db: (
 	Id: 382
 	Name: "SN_SHARPSHOOTING"
 	Description: "Focused Arrow Strike"
-	MaxLevel: 5
+	MaxLevel: 1
 	Range: 7
 	Hit: "BDT_MULTIHIT"
 	SkillType: {
@@ -11660,16 +11667,16 @@ skill_db: (
 	}
 	AfterCastActDelay: 2000
 	SkillData1: {
-		Lv1: 130000
-		Lv2: 160000
-		Lv3: 190000
-		Lv4: 220000
-		Lv5: 250000
-		Lv6: 280000
-		Lv7: 310000
-		Lv8: 340000
-		Lv9: 370000
-		Lv10: 400000
+		Lv1: 60000
+		Lv2: 70000
+		Lv3: 80000
+		Lv4: 90000
+		Lv5: 100000
+		Lv6: 110000
+		Lv7: 120000
+		Lv8: 140000
+		Lv9: 160000
+		Lv10: 180000
 	}
 	FixedCastTime: {
 		Lv1: 500
@@ -11686,15 +11693,15 @@ skill_db: (
 	Requirements: {
 		SPCost: {
 			Lv1: 146
-			Lv2: 252
-			Lv3: 358
-			Lv4: 464
-			Lv5: 570
-			Lv6: 676
-			Lv7: 782
-			Lv8: 888
-			Lv9: 994
-			Lv10: 1100
+			Lv2: 167
+			Lv3: 188
+			Lv4: 209
+			Lv5: 330
+			Lv6: 351
+			Lv7: 372
+			Lv8: 393
+			Lv9: 414
+			Lv10: 425
 		}
 	}
 },
@@ -12338,33 +12345,33 @@ skill_db: (
 		IgnoreCards: true
 	}
 	SplashRange: 2
-	CastTime: 250
+	CastTime: 350
 	AfterCastActDelay: 500
 	SkillData2: {
 		Lv1: 10000
-		Lv2: 5000
-		Lv3: 120000
-		Lv4: 120000
-		Lv5: 120000
-		Lv6: 120000
-		Lv7: 120000
-		Lv8: 120000
-		Lv9: 120000
-		Lv10: 120000
+		Lv2: 20000
+		Lv3: 30000
+		Lv4: 40000
+		Lv5: 50000
+		Lv6: 60000
+		Lv7: 70000
+		Lv8: 80000
+		Lv9: 90000
+		Lv10: 100000
 	}
-	FixedCastTime: 250
+	FixedCastTime: 350
 	Requirements: {
 		SPCost: {
-			Lv1: 10
-			Lv2: 12
-			Lv3: 14
-			Lv4: 16
-			Lv5: 18
-			Lv6: 20
-			Lv7: 22
-			Lv8: 24
-			Lv9: 26
-			Lv10: 28
+			Lv1: 100
+			Lv2: 120
+			Lv3: 140
+			Lv4: 160
+			Lv5: 180
+			Lv6: 200
+			Lv7: 220
+			Lv8: 240
+			Lv9: 260
+			Lv10: 280
 		}
 	}
 },
@@ -18491,7 +18498,7 @@ skill_db: (
 	SkillData1: 17000
 	FixedCastTime: 200
 	Requirements: {
-		SPCost: 20
+		SPCost: 100
 	}
 },
 {
@@ -19396,16 +19403,16 @@ skill_db: (
 	FixedCastTime: -1
 	Requirements: {
 		SPCost: {
-			Lv1: 20
-			Lv2: 25
-			Lv3: 30
-			Lv4: 35
-			Lv5: 40
-			Lv6: 45
-			Lv7: 50
-			Lv8: 55
-			Lv9: 60
-			Lv10: 65
+			Lv1: 120
+			Lv2: 125
+			Lv3: 130
+			Lv4: 135
+			Lv5: 140
+			Lv6: 145
+			Lv7: 150
+			Lv8: 155
+			Lv9: 160
+			Lv10: 165
 		}
 	}
 },
@@ -20363,20 +20370,20 @@ skill_db: (
 	InterruptCast: true
 	CastTime: 1000
 	AfterCastActDelay: 1000
-	CoolDown: 3000
+	CoolDown: 5000
 	FixedCastTime: -1
 	Requirements: {
 		SPCost: {
-			Lv1: 100
-			Lv2: 130
-			Lv3: 160
-			Lv4: 190
-			Lv5: 220
-			Lv6: 250
-			Lv7: 280
-			Lv8: 310
-			Lv9: 340
-			Lv10: 370
+			Lv1: 50
+			Lv2: 60
+			Lv3: 70
+			Lv4: 80
+			Lv5: 90
+			Lv6: 100
+			Lv7: 110
+			Lv8: 120
+			Lv9: 130
+			Lv10: 140
 		}
 		Items: {
 			Lifestone: 1
@@ -28067,16 +28074,16 @@ skill_db: (
 	FixedCastTime: -1
 	Requirements: {
 		SPCost: {
-			Lv1: 30
-			Lv2: 34
-			Lv3: 38
-			Lv4: 42
-			Lv5: 46
-			Lv6: 50
-			Lv7: 54
-			Lv8: 58
-			Lv9: 62
-			Lv10: 66
+			Lv1: 130
+			Lv2: 134
+			Lv3: 138
+			Lv4: 142
+			Lv5: 146
+			Lv6: 150
+			Lv7: 154
+			Lv8: 158
+			Lv9: 162
+			Lv10: 166
 		}
 	}
 	Unit: {
@@ -32654,7 +32661,7 @@ skill_db: (
 	Id: 5001
 	Name: "GC_DARKCROW"
 	Description: "Dark Claw"
-	MaxLevel: 5
+	MaxLevel: 1
 	Range: 1
 	Hit: "BDT_MULTIHIT"
 	SkillType: {
@@ -32664,21 +32671,21 @@ skill_db: (
 	Element: "Ele_Weapon"
 	NumberOfHits: 3
 	AfterCastActDelay: 1500
-	SkillData1: 5000
+	SkillData1: 10000
 	CoolDown: 60000
-	FixedCastTime: -1
+	FixedCastTime: 2000
 	Requirements: {
 		SPCost: {
-			Lv1: 22
-			Lv2: 34
-			Lv3: 46
-			Lv4: 58
-			Lv5: 70
-			Lv6: 82
-			Lv7: 94
-			Lv8: 106
-			Lv9: 118
-			Lv10: 130
+			Lv1: 160
+			Lv2: 340
+			Lv3: 460
+			Lv4: 580
+			Lv5: 700
+			Lv6: 820
+			Lv7: 940
+			Lv8: 1060
+			Lv9: 1180
+			Lv10: 1300
 		}
 	}
 },
@@ -33153,7 +33160,7 @@ skill_db: (
 		Lv9: 50000
 		Lv10: 55000
 	}
-	SkillData2: 10000
+	SkillData2: 20000
 	CoolDown: 1800000
 	FixedCastTime: -1
 	Requirements: {
@@ -38376,12 +38383,12 @@ skill_db: (
 	InterruptCast: true
 	CastTime: 3000
 	AfterCastActDelay: 100
-	SkillData2: 9000
+	SkillData2: 15000
 	CoolDown: 1000
 	//FixedCastTime: -1
 	TargetMiscEffect: "EFFECT_PROVOKE"
 	Requirements: {
-		SPCost: 14
+		SPCost: 35
 	}
 },
 {
diff --git a/db/re/skill_tree.conf b/db/re/skill_tree.conf
index 96730bdc3..47d863694 100644
--- a/db/re/skill_tree.conf
+++ b/db/re/skill_tree.conf
@@ -36,16 +36,11 @@ Human: {
 		TMW2_SPEECH: 0
 		WE_MALE: 0
 		WE_FEMALE: 0
-		SN_SHARPSHOOTING: 0
 		GD_EXTENSION: 0
 		AM_CALLHOMUN: 0
 		AM_REST: 0
 		AM_RESURRECTHOMUN: 6
-
-		// Magical
-		AL_HEAL: 4
-		SM_PROVOKE: 5
-		EVOL_MASS_PROVOKE: 10
+		AL_DP: 0
 
 		// Mana Skills
 		TMW2_ZARKOR: 3
@@ -65,83 +60,97 @@ Human: {
 		TMW2_CUTEHEART: 5
 		TMW2_PLANTKINGDOM: 5
 
-		// Unrelated
+		// Thieves/Merchant-Police
 		ALL_INCCARRY: 0
 		TF_STEAL: 0
+		MC_PUSHCART: 0
 
-		///////////////// Main class
-		// Magic Warrior
-		MAGIC_WARRIOR: 0
-		NV_TRICKDEAD: 0
-		SM_BASH: 0
-
-		// Wizard Mage
-		WIZARD_MAGE: 0
+		///////////////// Wizard class
+		// Destructive Magic (AOE)
+		MG_NAPALMBEAT: 0
 		MG_FIREBALL: 0
-		AL_DP: 10
+		WZ_FROSTNOVA: 0
 
-		///////////////// Subclass
-		// Paladin
-		CR_TRUST: 0
-		AL_ANGELUS: 0
-		PR_REDEMPTIO: 0
-		MER_INCAGI: 0
+		// Destructive Magic (ST)
+		AL_HOLYLIGHT: 0
+		MG_SOULSTRIKE: 0
+		MG_COLDBOLT: 0
+		MG_FIREBOLT: 0
+		MG_LIGHTNINGBOLT: 0
+		WZ_EARTHSPIKE: 0
+		MG_FROSTDIVER: 0
 
-		// Tanker
-		//CR_TRUST already defined on Paladin
-		CR_AUTOGUARD: 0
-		CR_DEFENDER: 0
-		SM_RECOVERY: 0
 
-		// Berserker
+		///////////////// Assassin Class
+		// Physical Science (AOE)
+		ASC_METEORASSAULT: 0
+		AC_SHOWER: 0
+
+		// Physical Science (ST)
+		SM_BASH: 0
+		MC_MAMMONITE: 0
 		KN_AUTOCOUNTER: 0
-		SM_ENDURE: 0
-		SM_AUTOBERSERK: 0
-		KN_TWOHANDQUICKEN: 0
+		AC_CHARGEARROW: 0
+		SN_SHARPSHOOTING: 0
 
-		// Ranger
-		AC_VULTURE: 0
-		AC_OWL: 0
-		AC_SHOWER: 0
+		///////////////// Support Class
+		// Scholarship (SELF)
+		AC_OWL: 20
+		SA_DRAGONOLOGY: 0
+		TMW2_SAGE: 0
+		SM_RECOVERY: 0
+		MG_SRECOVERY: 0
+		//PF_HPCONVERSION: 0
+		//HP_MEDITATIO: 0
 		SN_WINDWALK: 0
+		CR_TRUST: 0
+		AC_VULTURE: 0
 
-		// Sniper
-		GS_SNAKEEYE: 0
-		GS_SINGLEACTION: 0
-		GS_INCREASING: 0
-		GS_CHAINACTION: 0
-		GS_MAGICALBULLET: 0
-
-		// Wizards
-		MG_COLDBOLT: 0
-		MG_LIGHTNINGBOLT: 0
-		WZ_EARTHSPIKE: 0
-		MG_NAPALMBEAT: 0
-		MG_ENERGYCOAT: 0
-		MG_FIREBOLT: 0
+		// Scholarship (MMO)
+		AL_HEAL: 0
+		AL_INCAGI: 0
+		HW_MAGICPOWER: 0
+		SM_PROVOKE: 0
+		AL_ANGELUS: 0
+		TF_DETOXIFY: 0
+		AC_CONCENTRATION: 0
+		AB_HIGHNESSHEAL: 0
+		ALL_RESURRECTION: 0
+		EVOL_MASS_PROVOKE: 0
+		GC_DARKCROW: 0
 
-		// Sages
-		SA_FREECAST: 0
+		// Scholarship (Weapon)
+		PR_ASPERSIO: 0
 		SA_FLAMELAUNCHER: 0
 		SA_FROSTWEAPON: 0
 		SA_LIGHTNINGLOADER: 0
 		SA_SEISMICWEAPON: 0
-		SA_DRAGONOLOGY: 0
 
-		// Priests
-		AL_PNEUMA: 0
-		AL_HOLYLIGHT: 0
-		MG_SRECOVERY: 10
-		ALL_RESURRECTION: 0
-		PR_ASPERSIO: 0
-		TF_DETOXIFY: 0
 
-		// Unused
+		///////////////// Trickster Class
+		// Trickmasters (INOFFENSIVE)
+		SA_FREECAST: 0
+		TF_BACKSLIDING: 0
+		NV_TRICKDEAD: 0
+
+		// Trickmasters (OFFENSIVE)
+		MG_FIREWALL: 0
+		SO_FIREWALK: 0
+		GC_DARKILLUSION: 0
+
+
+		//////////////////////////////////////////
+		///////////////// Unused /////////////////
+		//////////////////////////////////////////
+		ALL_FULL_THROTTLE: 0
+		BA_PANGVOICE: 0
+		SM_ENDURE: 0
+		CR_DEFENDER: 0
+
 		RG_GRAFFITI: 0
 		RG_CLEANER: 0
 		SC_INVISIBILITY: 0
 		MC_VENDING: 0
-		MC_PUSHCART: 0
 		ALL_BUYING_STORE: 0
 		KN_RIDING: 0
 		/*
-- 
cgit v1.2.3-70-g09d2