Rebirth NPC ready, redesigned just now

2 files changed, 57 insertions, 35 deletions

diff --git a/db/re/job_db.conf b/db/re/job_db.conf
index ab1a45719..32cae5442 100644
--- a/db/re/job_db.conf
+++ b/db/re/job_db.conf
@@ -268,7 +268,7 @@ Tritan: {
 Ukar: {
 	BaseExpGroup: "EvolClasses"
 	JobExpGroup: "EvolClasses"
-	MoveSpeed: 150
+	MoveSpeed: 135
 	Weight: 20500
 	BaseASPD: {
 		Fist: 40
@@ -322,7 +322,7 @@ Redy: {
 Savior: {
 	BaseExpGroup: "EvolClasses"
 	JobExpGroup: "EvolClasses"
-	MoveSpeed: 140
+	MoveSpeed: 142
 	Weight: 22500
 	BaseASPD: {
 		Fist: 40
diff --git a/npc/025-2/phoenix.txt b/npc/025-2/phoenix.txt
index fa7cf39a9..6bee93270 100644
--- a/npc/025-2/phoenix.txt
+++ b/npc/025-2/phoenix.txt
@@ -102,55 +102,77 @@
     if (askyesno() != ASK_YES)
         close;
 
+    // Rebirth: 0
     mes "";
     mes ".:: "+l("Human")+" ::.";
     mesc l("The most widespread race in the continent, highly versatile, perfect all-rounders.");
     mesc l("Strength: NONE"), 2;
     mesc l("Weakness: NONE"), 1;
 
-    mes "";
-    mes ".:: "+l("Elven")+" ::.";
-    mesc l("Less common. They are highly intelligent, and have higher magical affinity, and live longer, but lacks creativity.");
-    mesc l("Strength: INT++, DEX+"), 2;
-    mesc l("Weakness: STR--, LUK-"), 1;
 
-    mes "";
-    mes ".:: "+l("Raijin")+" ::.";
-    mesc l("Disguise as humans. Make better soldiers, but terrible mages.");
-    mesc l("Strength: AGI++, LUK+"), 2;
-    mesc l("Weakness: INT--, VIT-"), 1;
+    // Rebirth: 1
+    if (REBIRTH >= 1) {
+        mes "";
+        mes ".:: "+l("Elven")+" ::.";
+        mesc l("They are highly intelligent, and have higher magical affinity, and live longer, but lacks creativity.");
+        mesc l("Strength: INT+"), 2;
+        mesc l("Weakness: STR-"), 1;
+        mes "";
+        mes ".:: "+l("Tritan")+" ::.";
+        mesc l("Blue from sea, learned how to hunt. But unfortunately, not how to withstand attacks.");
+        mesc l("Strength: DEX+"), 2;
+        mesc l("Weakness: 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;
+    // Rebirth: 2
+    if (REBIRTH >= 2) {
+        mes "";
+        mes ".:: "+l("Raijin")+" ::.";
+        mesc l("Lives undercover in human society. Luck led them to surviving this far.");
+        mesc l("Strength: LUK+"), 2;
+        mesc l("Weakness: DEX-"), 1;
+        mes "";
+        mes ".:: "+l("Orc")+" ::.";
+        mesc l("Highly strong and bulky, faces their foes head-on.");
+        mesc l("Strength: STR+, Carry Weight +"), 2;
+        mesc l("Weakness: AGI-"), 1;
+    }
 
-    mes "";
-    mes ".:: "+l("Redy")+" ::.";
-    mesc l("Harsh environment");
-    mesc l("Strength: "), 2;
-    mesc l("Weakness: "), 1;
 
-    if (REBIRTH > 1) {
+    // Rebirth: 3
+    if (REBIRTH >= 3) {
         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--, LUK-"), 1;
+        mes ".:: "+l("Ukar")+" ::.";
+        mesc l("Superb stealth, and quick on their toes.");
+        mesc l("Strength: AGI+, Walk Speed +"), 2;
+        mesc l("Weakness: LUK-"), 1;
+        mes "";
+        mes ".:: "+l("Redy")+" ::.";
+        mesc l("Grown in harsh environments, withstand anything.");
+        mesc l("Strength: VIT++"), 2;
+        mesc l("Weakness: INT-"), 1;
+    }
+
+
+    // Rebirth: 5
+    if (REBIRTH >= 5) {
+        mes "";
+        mes ".:: "+l("Savior")+" ::.";
+        mesc l("Unparelled, strength without precedents. Ancient beings of pure mana, rumored to be immortal.");
+        mesc l("Strength: ALL"), 2;
+        mesc l("Weakness: NONE"), 1;
     }
     next;
     menuint
         l("Human"), 0,
-        l("Elven"), 3,
-        l("Raijin"), 5,
-        rif(REBIRTH > 1, l("Orc")), 4;
+        rif(REBIRTH >= 1, l("Elven")), 3,
+        rif(REBIRTH >= 1, l("Tritan")), 6,
+        rif(REBIRTH >= 2, l("Raijin")), 5,
+        rif(REBIRTH >= 2, l("Orc")), 4,
+        rif(REBIRTH >= 3, l("Ukar")), 7,
+        rif(REBIRTH >= 3, l("Redy")), 8,
+        rif(REBIRTH >= 5, l("Savior")), 9;
 
     jobchange max(0, @menuret);
     close;