Ukar and Redy ID changed

4 files changed, 79 insertions, 11 deletions

diff --git a/db/constants.conf b/db/constants.conf
index 76b2b9e95..78d412bd9 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -3798,8 +3798,8 @@ constants_db: {
 	Orc:    4
 	Raijin: 5
 	Tritan: 6
-	Ukar:   1
-	Redy:   2
+	Ukar:   7
+	Redy:   8
 
 	comment__: "directions"
 	DOWN:           0
diff --git a/db/job_db2.txt b/db/job_db2.txt
index c254ef2f0..0ed45b431 100644
--- a/db/job_db2.txt
+++ b/db/job_db2.txt
@@ -14,12 +14,12 @@
 //
 // TMW2 default is: ,0,6,5,0,2,3,0,1,4,0
 // 
-// Human (max level = 100)
+// Kaizei Human (max level = 100)
 0,0,6,5,0,2,3,0,1,4,0,0,6,5,0,2,3,0,1,4,0,0,6,5,0,2,3,0,1,4,0,0,6,5,0,2,3,0,1,4,0,0,6,5,0,2,3,0,1,4,0,0,6,5,0,2,3,0,1,4,0,0,6,5,0,2,3,0,1,4,0,0,6,5,0,2,3,0,1,4,0,0,6,5,0,2,3,0,1,4,0,0,6,5,0,2,3,0,1,4,0
-// Ukar (max level = 20)
-1,0,6,5,0,2,3,0,1,4,0,0,6,5,0,2,3,0,1,4,0
-// Redy (max level = 20)
-2,0,6,5,0,2,3,0,1,4,0,0,6,5,0,2,3,0,1,4,0
+// Argaes Human (max level = 100)
+1,0,6,5,0,2,3,0,1,4,0,0,6,5,0,2,3,0,1,4,0,0,6,5,0,2,3,0,1,4,0,0,6,5,0,2,3,0,1,4,0,0,6,5,0,2,3,0,1,4,0,0,6,5,0,2,3,0,1,4,0,0,6,5,0,2,3,0,1,4,0,0,6,5,0,2,3,0,1,4,0,0,6,5,0,2,3,0,1,4,0,0,6,5,0,2,3,0,1,4,0
+// Tonori Human (max level = 100)
+2,0,6,5,0,2,3,0,1,4,0,0,6,5,0,2,3,0,1,4,0,0,6,5,0,2,3,0,1,4,0,0,6,5,0,2,3,0,1,4,0,0,6,5,0,2,3,0,1,4,0,0,6,5,0,2,3,0,1,4,0,0,6,5,0,2,3,0,1,4,0,0,6,5,0,2,3,0,1,4,0,0,6,5,0,2,3,0,1,4,0,0,6,5,0,2,3,0,1,4,0
 // Elven (max level = 20)
 3,0,6,5,0,2,3,0,1,4,0,0,6,5,0,2,3,0,1,4,0
 // Orc (max level = 20)
@@ -28,3 +28,8 @@
 5,0,6,5,0,2,3,0,1,4,0,0,6,5,0,2,3,0,1,4,0
 // Tritan (max level = 20)
 6,0,6,5,0,2,3,0,1,4,0,0,6,5,0,2,3,0,1,4,0
+// Ukar (max level = 20)
+7,0,6,5,0,2,3,0,1,4,0,0,6,5,0,2,3,0,1,4,0
+// Redy (max level = 20)
+8,0,6,5,0,2,3,0,1,4,0,0,6,5,0,2,3,0,1,4,0
+
diff --git a/db/re/job_db.conf b/db/re/job_db.conf
index 36ea3e904..37a701a96 100644
--- a/db/re/job_db.conf
+++ b/db/re/job_db.conf
@@ -108,7 +108,7 @@ Human: {
 			  1460, 1468, 1476, 1484, 1492, 1500, 1508, 1516, 1524, 1532] 	// 151 - 160
 }
 
-Ukar: {
+MedHu: {
 	BaseExpGroup: "EvolClasses"
 	JobExpGroup: "EvolClasses"
 	MoveSpeed: 150
@@ -135,7 +135,7 @@ Ukar: {
 	InheritSP: ( "Human" );
 }
 
-Redy: {
+DarkHu: {
 	BaseExpGroup: "EvolClasses"
 	JobExpGroup: "EvolClasses"
 	MoveSpeed: 150
@@ -264,3 +264,58 @@ Tritan: {
 	InheritSP: ( "Human" );
 
 }
+
+Ukar: {
+	BaseExpGroup: "EvolClasses"
+	JobExpGroup: "EvolClasses"
+	MoveSpeed: 150
+	Weight: 20500
+	BaseASPD: {
+		Fist: 40
+		Dagger: 55
+		Sword: 57
+		Axe: 50
+		Mace: 50
+		TwoHandMace: 75
+		TwoHandSpear: 69
+		Rod: 92
+		TwoHandRod: 92
+		Bow: 90
+		Knuckle: 20
+		Katar: 45
+		Revolver: 116
+		Rifle: 150
+		Shotgun: 120
+		GatlingGun: 40
+	}
+	InheritHP: ( "Human" );
+	InheritSP: ( "Human" );
+}
+
+Redy: {
+	BaseExpGroup: "EvolClasses"
+	JobExpGroup: "EvolClasses"
+	MoveSpeed: 150
+	Weight: 20500
+	BaseASPD: {
+		Fist: 40
+		Dagger: 55
+		Sword: 57
+		Axe: 50
+		Mace: 50
+		TwoHandMace: 75
+		TwoHandSpear: 69
+		Rod: 92
+		TwoHandRod: 92
+		Bow: 90
+		Knuckle: 20
+		Katar: 45
+		Revolver: 116
+		Rifle: 150
+		Shotgun: 120
+		GatlingGun: 40
+	}
+	InheritHP: ( "Human" );
+	InheritSP: ( "Human" );
+}
+
diff --git a/db/re/skill_tree.conf b/db/re/skill_tree.conf
index a4ba90a72..02474c4b9 100644
--- a/db/re/skill_tree.conf
+++ b/db/re/skill_tree.conf
@@ -202,11 +202,11 @@ Human: {
 	}
 }
 
-Ukar: {
+MedHu: {
 	inherit: ( "Human" );
 }
 
-Redy: {
+DarkHu: {
 	inherit: ( "Human" );
 }
 
@@ -225,3 +225,11 @@ Raijin: {
 Tritan: {
 	inherit: ( "Human" );
 }
+
+Ukar: {
+	inherit: ( "Human" );
+}
+
+Redy: {
+	inherit: ( "Human" );
+}