New Race: Savior

5 files changed, 56 insertions, 4 deletions

diff --git a/db/constants.conf b/db/constants.conf
index 78d412bd9..a26faca57 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -3800,6 +3800,7 @@ constants_db: {
 	Tritan: 6
 	Ukar:   7
 	Redy:   8
+	Savior: 9
 
 	comment__: "directions"
 	DOWN:           0
diff --git a/db/job_db2.txt b/db/job_db2.txt
index b14aa9490..165302fc8 100644
--- a/db/job_db2.txt
+++ b/db/job_db2.txt
@@ -23,7 +23,7 @@
 // Elven (max level = 100)
 3,0,5,5,0,2,3,0,4,4,0,0,6,5,0,2,3,0,4,4,0,0,5,5,0,2,3,0,4,4,0,0,6,5,0,2,3,0,4,4,0,0,5,5,0,2,3,0,4,4,0,0,6,5,0,2,3,0,4,4,0,0,5,5,0,2,3,0,4,4,0,0,6,5,0,2,3,0,4,4,0,0,5,5,0,2,3,0,4,4,0,0,6,5,0,2,3,0,4,4,0
 // Orc (max level = 100)
-4,0,6,1,0,2,3,0,1,3,0,0,6,1,0,2,3,0,1,3,0,0,6,1,0,2,3,0,1,3,0,0,6,1,0,2,3,0,1,3,0,0,6,1,0,2,3,0,1,3,0,0,6,1,0,2,3,0,1,3,0,0,6,1,0,2,3,0,1,3,0,0,6,1,0,2,3,0,1,3,0,0,6,1,0,2,3,0,1,3,0,0,6,1,0,2,3,0,1,3,0
+4,0,1,1,0,2,3,0,1,3,0,0,6,1,0,2,3,0,1,3,0,0,1,1,0,2,3,0,1,3,0,0,6,1,0,2,3,0,1,3,0,0,1,1,0,2,3,0,1,3,0,0,6,1,0,2,3,0,1,3,0,0,1,1,0,2,3,0,1,3,0,0,6,1,0,2,3,0,1,3,0,0,1,1,0,2,3,0,1,3,0,0,6,1,0,2,3,0,1,3,0
 // Raijin (max level = 100)
 5,0,6,5,0,2,6,0,1,2,0,0,6,5,0,2,3,0,1,2,0,0,6,5,0,2,6,0,1,2,0,0,6,5,0,2,3,0,1,2,0,0,6,5,0,2,6,0,1,2,0,0,6,5,0,2,3,0,1,2,0,0,6,5,0,2,6,0,1,2,0,0,6,5,0,2,3,0,1,2,0,0,6,5,0,2,6,0,1,2,0,0,6,5,0,2,3,0,1,2,0
 // Tritan (max level = 20)
@@ -32,11 +32,13 @@
 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
+// Savior (max level = 20)
+9,0,6,5,0,2,3,0,1,4,0,0,6,5,0,2,3,0,1,4,0
 
 // Particles
 // Human: ,0,6,5,0,2,3,0,1,4,0,0,6,5,0,2,3,0,1,4,0
 // Elf: ,0,5,5,0,2,3,0,4,4,0,0,6,5,0,2,3,0,4,4,0
-// Orc: ,0,6,1,0,2,3,0,1,3,0,0,6,1,0,2,3,0,1,3,0
+// Orc: ,0,1,1,0,2,3,0,1,3,0,0,6,1,0,2,3,0,1,3,0
 // Raijin: ,0,6,5,0,2,6,0,1,2,0,0,6,5,0,2,3,0,1,2,0
 
 
diff --git a/db/re/job_db.conf b/db/re/job_db.conf
index 37a701a96..ab1a45719 100644
--- a/db/re/job_db.conf
+++ b/db/re/job_db.conf
@@ -319,3 +319,30 @@ Redy: {
 	InheritSP: ( "Human" );
 }
 
+Savior: {
+	BaseExpGroup: "EvolClasses"
+	JobExpGroup: "EvolClasses"
+	MoveSpeed: 140
+	Weight: 22500
+	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 02474c4b9..ae19fa576 100644
--- a/db/re/skill_tree.conf
+++ b/db/re/skill_tree.conf
@@ -233,3 +233,7 @@ Ukar: {
 Redy: {
 	inherit: ( "Human" );
 }
+
+Savior: {
+	inherit: ( "Human" );
+}
diff --git a/npc/025-2/phoenix.txt b/npc/025-2/phoenix.txt
index c1242971c..fa7cf39a9 100644
--- a/npc/025-2/phoenix.txt
+++ b/npc/025-2/phoenix.txt
@@ -120,12 +120,30 @@
     mesc l("Strength: AGI++, LUK+"), 2;
     mesc l("Weakness: INT--, VIT-"), 1;
 
+    mes "";
+    mes ".:: "+l("Tritan")+" ::.";
+    mesc l("Blue from sea");
+    mesc l("Strength: "), 2;
+    mesc l("Weakness: "), 1;
+
+    mes "";
+    mes ".:: "+l("Ukar")+" ::.";
+    mesc l("Superb stealth");
+    mesc l("Strength: "), 2;
+    mesc l("Weakness: VIT--"), 1;
+
+    mes "";
+    mes ".:: "+l("Redy")+" ::.";
+    mesc l("Harsh environment");
+    mesc l("Strength: "), 2;
+    mesc l("Weakness: "), 1;
+
     if (REBIRTH > 1) {
         mes "";
         mes ".:: "+l("Orc")+" ::.";
         mesc l("Less common. They are highly strong and bulky. That's everything.");
-        mesc l("Strength: Carry Weight++, STR++, VIT++"), 2;
-        mesc l("Weakness: INT--, DEX--"), 1;
+        mesc l("Strength: Carry Weight++, STR+++, VIT++"), 2;
+        mesc l("Weakness: INT--, DEX--, LUK-"), 1;
     }
     next;
     menuint