Adjust max weight to 23.5kg and simplify some code.

TMWA is 21kg but I added this extra as grace due to overweight 90%

1 files changed, 5 insertions, 189 deletions

diff --git a/db/pre-re/job_db.conf b/db/pre-re/job_db.conf
index 73e870ee..7a8a1af0 100644
--- a/db/pre-re/job_db.conf
+++ b/db/pre-re/job_db.conf
@@ -54,7 +54,7 @@ Talpan: {
 	BaseExpGroup: "EvolClasses"
 	JobExpGroup: "EvolClasses"
 	MoveSpeed: 150
-	Weight: 20000
+	Weight: 23500
 	BaseASPD: {
 		Fist: 400
 		Dagger: 550
@@ -105,211 +105,27 @@ CaveUkar: {
 	BaseExpGroup: "EvolClasses"
 	JobExpGroup: "EvolClasses"
 	MoveSpeed: 150
-	Weight: 20000
-	BaseASPD: {
-		Fist: 400
-		Dagger: 550
-		Sword: 570
-		Axe: 500
-		TwoHandAxe: 1000
-		TwoHandSpear: 1200
-		Mace: 500
-		TwoHandMace: 550
-		Rod: 650
-		TwoHandRod: 650
-		Bow: 800
-		Katar: 650
-	}
-	HPTable:[ 400,  450,  500,  550,  600,  650,  700,  750,  800,  850,    // 1 - 10
-			900,  950, 1000, 1050, 1100, 1150, 1200, 1250, 1300, 1350,    // 11 - 20
-			1400, 1450, 1500, 1550, 1600, 1650, 1700, 1750, 1800, 1850,    // 21 - 30
-			1900, 1950, 2000, 2050, 2100, 2150, 2200, 2250, 2300, 2350,    // 31 - 40
-			2400, 2450, 2500, 2550, 2600, 2650, 2700, 2750, 2800, 2850,    // 41 - 50
-			2900, 2950, 3000, 3050, 3100, 3150, 3200, 3250, 3300, 3350,    // 51 - 60
-			3400, 3450, 3500, 3550, 3600, 3650, 3700, 3750, 3800, 3850,    // 61 - 70
-			3900, 3950, 4000, 4050, 4100, 4150, 4200, 4250, 4300, 4350,    // 71 - 80
-			4400, 4450, 4500, 4550, 4600, 4650, 4700, 4750, 4800, 4850,    // 81 - 90
-			4900, 4950, 5000, 5050, 5100, 5150, 5200, 5250, 5300, 5350,    // 91 - 100
-			5400, 5450, 5500, 5550, 5600, 5650, 5700, 5750, 5800, 5850,    // 101 - 110
-			5900, 5950, 6000, 6050, 6100, 6150, 6200, 6250, 6300, 6350,    // 111 - 120
-			6400, 6450, 6500, 6550, 6600, 6650, 6700, 6750, 6800, 6850,    // 121 - 130
-			6900, 6950, 7000, 7050, 7100, 7150, 7200, 7250, 7300, 7350,    // 131 - 140
-			7400, 7450, 7500, 7550, 7600, 7650, 7700, 7750, 7800, 7850,    // 141 - 150
-			7900, 7950, 8000, 8050, 8100, 8150, 8200, 8250, 8300, 835]    // 151 - 160
-	SPTable:[ 15,  20,  25,  30,  35,  40,  45,  50,  55,  60,	// 1 - 10
-			  65,  70,  75,  80,  85,  90,  95, 100, 105, 110,	// 11 - 20
-			 115, 120, 125, 130, 135, 140, 145, 150, 155, 160,	// 21 - 30
-			 165, 170, 175, 180, 185, 190, 195, 200, 205, 210,	// 31 - 40
-			 215, 220, 225, 230, 235, 240, 245, 250, 255, 260,	// 41 - 50
-			 265, 270, 275, 280, 285, 290, 295, 300, 305, 310,	// 51 - 60
-			 315, 320, 325, 330, 335, 340, 345, 350, 355, 360,	// 61 - 70
-			 365, 370, 375, 380, 385, 390, 395, 400, 405, 410,	// 71 - 80
-			 415, 420, 425, 430, 435, 440, 445, 450, 455, 460,	// 81 - 90
-			 465, 470, 475, 480, 485, 490, 495, 500, 505, 510,	// 91 - 100
-			 515, 520, 525, 530, 535, 540, 545, 550, 555, 560,	// 101 - 110
-			 565, 570, 575, 580, 585, 590, 595, 600, 605, 610,	// 111 - 120
-			 615, 620, 625, 630, 635, 640, 645, 650, 655, 660,	// 121 - 130
-			 665, 670, 675, 680, 685, 690, 695, 700, 705, 710,	// 131 - 140
-			 715, 720, 725, 730, 735, 740, 745, 750, 755, 760,	// 141 - 150
-			 765, 770, 775, 780, 785, 790, 795, 800, 805, 810]	// 151 - 160
+	Inherit: ( "Talpan" );
 }
 FireKralog: {
 	BaseExpGroup: "EvolClasses"
 	JobExpGroup: "EvolClasses"
 	MoveSpeed: 150
-	Weight: 20000
-	BaseASPD: {
-		Fist: 400
-		Dagger: 550
-		Sword: 570
-		Axe: 500
-		TwoHandAxe: 1000
-		TwoHandSpear: 1200
-		Mace: 500
-		TwoHandMace: 550
-		Rod: 650
-		TwoHandRod: 650
-		Bow: 800
-		Katar: 650
-	}
-	HPTable:[ 400,  450,  500,  550,  600,  650,  700,  750,  800,  850,    // 1 - 10
-			900,  950, 1000, 1050, 1100, 1150, 1200, 1250, 1300, 1350,    // 11 - 20
-			1400, 1450, 1500, 1550, 1600, 1650, 1700, 1750, 1800, 1850,    // 21 - 30
-			1900, 1950, 2000, 2050, 2100, 2150, 2200, 2250, 2300, 2350,    // 31 - 40
-			2400, 2450, 2500, 2550, 2600, 2650, 2700, 2750, 2800, 2850,    // 41 - 50
-			2900, 2950, 3000, 3050, 3100, 3150, 3200, 3250, 3300, 3350,    // 51 - 60
-			3400, 3450, 3500, 3550, 3600, 3650, 3700, 3750, 3800, 3850,    // 61 - 70
-			3900, 3950, 4000, 4050, 4100, 4150, 4200, 4250, 4300, 4350,    // 71 - 80
-			4400, 4450, 4500, 4550, 4600, 4650, 4700, 4750, 4800, 4850,    // 81 - 90
-			4900, 4950, 5000, 5050, 5100, 5150, 5200, 5250, 5300, 5350,    // 91 - 100
-			5400, 5450, 5500, 5550, 5600, 5650, 5700, 5750, 5800, 5850,    // 101 - 110
-			5900, 5950, 6000, 6050, 6100, 6150, 6200, 6250, 6300, 6350,    // 111 - 120
-			6400, 6450, 6500, 6550, 6600, 6650, 6700, 6750, 6800, 6850,    // 121 - 130
-			6900, 6950, 7000, 7050, 7100, 7150, 7200, 7250, 7300, 7350,    // 131 - 140
-			7400, 7450, 7500, 7550, 7600, 7650, 7700, 7750, 7800, 7850,    // 141 - 150
-			7900, 7950, 8000, 8050, 8100, 8150, 8200, 8250, 8300, 835]    // 151 - 160
-	SPTable:[ 15,  20,  25,  30,  35,  40,  45,  50,  55,  60,	// 1 - 10
-			  65,  70,  75,  80,  85,  90,  95, 100, 105, 110,	// 11 - 20
-			 115, 120, 125, 130, 135, 140, 145, 150, 155, 160,	// 21 - 30
-			 165, 170, 175, 180, 185, 190, 195, 200, 205, 210,	// 31 - 40
-			 215, 220, 225, 230, 235, 240, 245, 250, 255, 260,	// 41 - 50
-			 265, 270, 275, 280, 285, 290, 295, 300, 305, 310,	// 51 - 60
-			 315, 320, 325, 330, 335, 340, 345, 350, 355, 360,	// 61 - 70
-			 365, 370, 375, 380, 385, 390, 395, 400, 405, 410,	// 71 - 80
-			 415, 420, 425, 430, 435, 440, 445, 450, 455, 460,	// 81 - 90
-			 465, 470, 475, 480, 485, 490, 495, 500, 505, 510,	// 91 - 100
-			 515, 520, 525, 530, 535, 540, 545, 550, 555, 560,	// 101 - 110
-			 565, 570, 575, 580, 585, 590, 595, 600, 605, 610,	// 111 - 120
-			 615, 620, 625, 630, 635, 640, 645, 650, 655, 660,	// 121 - 130
-			 665, 670, 675, 680, 685, 690, 695, 700, 705, 710,	// 131 - 140
-			 715, 720, 725, 730, 735, 740, 745, 750, 755, 760,	// 141 - 150
-			 765, 770, 775, 780, 785, 790, 795, 800, 805, 810]	// 151 - 160
+	Inherit: ( "Talpan" );
 }
 
 LightRaijin: {
 	BaseExpGroup: "EvolClasses"
 	JobExpGroup: "EvolClasses"
 	MoveSpeed: 150
-	Weight: 20000
-	BaseASPD: {
-		Fist: 400
-		Dagger: 550
-		Sword: 570
-		Axe: 500
-		TwoHandAxe: 1000
-		TwoHandSpear: 1200
-		Mace: 500
-		TwoHandMace: 550
-		Rod: 650
-		TwoHandRod: 650
-		Bow: 800
-		Katar: 650
-	}
-	HPTable:[ 400,  450,  500,  550,  600,  650,  700,  750,  800,  850,    // 1 - 10
-			900,  950, 1000, 1050, 1100, 1150, 1200, 1250, 1300, 1350,    // 11 - 20
-			1400, 1450, 1500, 1550, 1600, 1650, 1700, 1750, 1800, 1850,    // 21 - 30
-			1900, 1950, 2000, 2050, 2100, 2150, 2200, 2250, 2300, 2350,    // 31 - 40
-			2400, 2450, 2500, 2550, 2600, 2650, 2700, 2750, 2800, 2850,    // 41 - 50
-			2900, 2950, 3000, 3050, 3100, 3150, 3200, 3250, 3300, 3350,    // 51 - 60
-			3400, 3450, 3500, 3550, 3600, 3650, 3700, 3750, 3800, 3850,    // 61 - 70
-			3900, 3950, 4000, 4050, 4100, 4150, 4200, 4250, 4300, 4350,    // 71 - 80
-			4400, 4450, 4500, 4550, 4600, 4650, 4700, 4750, 4800, 4850,    // 81 - 90
-			4900, 4950, 5000, 5050, 5100, 5150, 5200, 5250, 5300, 5350,    // 91 - 100
-			5400, 5450, 5500, 5550, 5600, 5650, 5700, 5750, 5800, 5850,    // 101 - 110
-			5900, 5950, 6000, 6050, 6100, 6150, 6200, 6250, 6300, 6350,    // 111 - 120
-			6400, 6450, 6500, 6550, 6600, 6650, 6700, 6750, 6800, 6850,    // 121 - 130
-			6900, 6950, 7000, 7050, 7100, 7150, 7200, 7250, 7300, 7350,    // 131 - 140
-			7400, 7450, 7500, 7550, 7600, 7650, 7700, 7750, 7800, 7850,    // 141 - 150
-			7900, 7950, 8000, 8050, 8100, 8150, 8200, 8250, 8300, 835]    // 151 - 160
-	SPTable:[ 15,  20,  25,  30,  35,  40,  45,  50,  55,  60,	// 1 - 10
-			  65,  70,  75,  80,  85,  90,  95, 100, 105, 110,	// 11 - 20
-			 115, 120, 125, 130, 135, 140, 145, 150, 155, 160,	// 21 - 30
-			 165, 170, 175, 180, 185, 190, 195, 200, 205, 210,	// 31 - 40
-			 215, 220, 225, 230, 235, 240, 245, 250, 255, 260,	// 41 - 50
-			 265, 270, 275, 280, 285, 290, 295, 300, 305, 310,	// 51 - 60
-			 315, 320, 325, 330, 335, 340, 345, 350, 355, 360,	// 61 - 70
-			 365, 370, 375, 380, 385, 390, 395, 400, 405, 410,	// 71 - 80
-			 415, 420, 425, 430, 435, 440, 445, 450, 455, 460,	// 81 - 90
-			 465, 470, 475, 480, 485, 490, 495, 500, 505, 510,	// 91 - 100
-			 515, 520, 525, 530, 535, 540, 545, 550, 555, 560,	// 101 - 110
-			 565, 570, 575, 580, 585, 590, 595, 600, 605, 610,	// 111 - 120
-			 615, 620, 625, 630, 635, 640, 645, 650, 655, 660,	// 121 - 130
-			 665, 670, 675, 680, 685, 690, 695, 700, 705, 710,	// 131 - 140
-			 715, 720, 725, 730, 735, 740, 745, 750, 755, 760,	// 141 - 150
-			 765, 770, 775, 780, 785, 790, 795, 800, 805, 810]	// 151 - 160
+	Inherit: ( "Talpan" );
 }
 
 SeaTritan: {
 	BaseExpGroup: "EvolClasses"
 	JobExpGroup: "EvolClasses"
 	MoveSpeed: 150
-	Weight: 20000
-	BaseASPD: {
-		Fist: 400
-		Dagger: 550
-		Sword: 570
-		Axe: 500
-		TwoHandAxe: 1000
-		TwoHandSpear: 1200
-		Mace: 500
-		TwoHandMace: 550
-		Rod: 650
-		TwoHandRod: 650
-		Bow: 800
-		Katar: 650
-	}
-	HPTable:[ 400,  450,  500,  550,  600,  650,  700,  750,  800,  850,    // 1 - 10
-			900,  950, 1000, 1050, 1100, 1150, 1200, 1250, 1300, 1350,    // 11 - 20
-			1400, 1450, 1500, 1550, 1600, 1650, 1700, 1750, 1800, 1850,    // 21 - 30
-			1900, 1950, 2000, 2050, 2100, 2150, 2200, 2250, 2300, 2350,    // 31 - 40
-			2400, 2450, 2500, 2550, 2600, 2650, 2700, 2750, 2800, 2850,    // 41 - 50
-			2900, 2950, 3000, 3050, 3100, 3150, 3200, 3250, 3300, 3350,    // 51 - 60
-			3400, 3450, 3500, 3550, 3600, 3650, 3700, 3750, 3800, 3850,    // 61 - 70
-			3900, 3950, 4000, 4050, 4100, 4150, 4200, 4250, 4300, 4350,    // 71 - 80
-			4400, 4450, 4500, 4550, 4600, 4650, 4700, 4750, 4800, 4850,    // 81 - 90
-			4900, 4950, 5000, 5050, 5100, 5150, 5200, 5250, 5300, 5350,    // 91 - 100
-			5400, 5450, 5500, 5550, 5600, 5650, 5700, 5750, 5800, 5850,    // 101 - 110
-			5900, 5950, 6000, 6050, 6100, 6150, 6200, 6250, 6300, 6350,    // 111 - 120
-			6400, 6450, 6500, 6550, 6600, 6650, 6700, 6750, 6800, 6850,    // 121 - 130
-			6900, 6950, 7000, 7050, 7100, 7150, 7200, 7250, 7300, 7350,    // 131 - 140
-			7400, 7450, 7500, 7550, 7600, 7650, 7700, 7750, 7800, 7850,    // 141 - 150
-			7900, 7950, 8000, 8050, 8100, 8150, 8200, 8250, 8300, 835]    // 151 - 160
-	SPTable:[ 15,  20,  25,  30,  35,  40,  45,  50,  55,  60,	// 1 - 10
-			  65,  70,  75,  80,  85,  90,  95, 100, 105, 110,	// 11 - 20
-			 115, 120, 125, 130, 135, 140, 145, 150, 155, 160,	// 21 - 30
-			 165, 170, 175, 180, 185, 190, 195, 200, 205, 210,	// 31 - 40
-			 215, 220, 225, 230, 235, 240, 245, 250, 255, 260,	// 41 - 50
-			 265, 270, 275, 280, 285, 290, 295, 300, 305, 310,	// 51 - 60
-			 315, 320, 325, 330, 335, 340, 345, 350, 355, 360,	// 61 - 70
-			 365, 370, 375, 380, 385, 390, 395, 400, 405, 410,	// 71 - 80
-			 415, 420, 425, 430, 435, 440, 445, 450, 455, 460,	// 81 - 90
-			 465, 470, 475, 480, 485, 490, 495, 500, 505, 510,	// 91 - 100
-			 515, 520, 525, 530, 535, 540, 545, 550, 555, 560,	// 101 - 110
-			 565, 570, 575, 580, 585, 590, 595, 600, 605, 610,	// 111 - 120
-			 615, 620, 625, 630, 635, 640, 645, 650, 655, 660,	// 121 - 130
-			 665, 670, 675, 680, 685, 690, 695, 700, 705, 710,	// 131 - 140
-			 715, 720, 725, 730, 735, 740, 745, 750, 755, 760,	// 141 - 150
-			 765, 770, 775, 780, 785, 790, 795, 800, 805, 810]	// 151 - 160
+	Inherit: ( "Talpan" );
 }
 
 FrostKralog: {