[untested] add races 0~10

5 files changed, 99 insertions, 35 deletions

diff --git a/db/constants.conf b/db/constants.conf
index 78f4ade7..2d75f8cb 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -3975,12 +3975,16 @@ constants_db: {
 
     comment__: "races"
     Human:        0
-    Ukar:         1
+    DarkUkar:     1
     FireKralog:   2
     LightRaijin:  3
     FrostKralog:  4
     DarkRaijin:   5
-    Tritan:       6
+    BlueTritan:   6
+    MediumHuman:  7
+    DarkHuman:    8
+    PurpleTritan: 9
+    PinkUkar:     10
 
     comment__: "getraceflags"
     GETRACE_RACE: 0
diff --git a/db/job_db2.txt b/db/job_db2.txt
index ee5a6a8e..c6ddf494 100644
--- a/db/job_db2.txt
+++ b/db/job_db2.txt
@@ -14,7 +14,7 @@
 //
 // Human
 0,0,6,5,0,2,3,0,1,4,0
-// Ukar
+// Cave Ukar
 1,0,6,5,0,2,3,0,1,4,0
 // Fire Kralog
 2,0,6,5,0,2,3,0,1,4,0
@@ -24,5 +24,15 @@
 4,0,6,5,0,2,3,0,1,4,0
 // Dark Raijin
 5,0,6,5,0,2,3,0,1,4,0
-// Tritan
+// Sea Tritan
 6,0,6,5,0,2,3,0,1,4,0
+// Argaes Human
+7,0,6,5,0,2,3,0,1,4,0
+// Tonori Human
+8,0,6,5,0,2,3,0,1,4,0
+// Lake Tritan
+9,0,6,5,0,2,3,0,1,4,0
+// Mountain Ukar
+10,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 acd33dc5..a513cd99 100644
--- a/db/re/job_db.conf
+++ b/db/re/job_db.conf
@@ -102,7 +102,7 @@ Human: {
              1510, 1520, 1530, 1540, 1550, 1560, 1570, 1580, 1590, 160]    // 151 - 160
 }
 
-Ukar: {
+DarkUkar: {
     BaseExpGroup: "EvolClasses"
     JobExpGroup: "EvolClasses"
     MoveSpeed: 170
@@ -254,21 +254,7 @@ LightRaijin: {
              1510, 1520, 1530, 1540, 1550, 1560, 1570, 1580, 1590, 160]    // 151 - 160
 }
 
-FrostKralog: {
-    BaseExpGroup: "EvolClasses"
-    JobExpGroup: "EvolClasses"
-    MoveSpeed: 170
-	Inherit: ( "FireKralog" );	// Base job from which this job will inherit its max weight, base ASPD set and HP/SP table.
-}
-
-DarkRaijin: {
-    BaseExpGroup: "EvolClasses"
-    JobExpGroup: "EvolClasses"
-    MoveSpeed: 170
-	Inherit: ( "LightRaijin" );	// Base job from which this job will inherit its max weight, base ASPD set and HP/SP table.
-}
-
-Tritan: {
+BlueTritan: {
     BaseExpGroup: "EvolClasses"
     JobExpGroup: "EvolClasses"
     MoveSpeed: 170
@@ -318,3 +304,47 @@ Tritan: {
              1410, 1420, 1430, 1440, 1450, 1460, 1470, 1480, 1490, 1500,    // 141 - 150
              1510, 1520, 1530, 1540, 1550, 1560, 1570, 1580, 1590, 160]    // 151 - 160
 }
+
+FrostKralog: {
+    BaseExpGroup: "EvolClasses"
+    JobExpGroup: "EvolClasses"
+    MoveSpeed: 170
+	Inherit: ( "FireKralog" );	// Base job from which this job will inherit its max weight, base ASPD set and HP/SP table.
+}
+
+DarkRaijin: {
+    BaseExpGroup: "EvolClasses"
+    JobExpGroup: "EvolClasses"
+    MoveSpeed: 170
+	Inherit: ( "LightRaijin" );	// Base job from which this job will inherit its max weight, base ASPD set and HP/SP table.
+}
+
+MediumHuman: {
+    BaseExpGroup: "EvolClasses"
+    JobExpGroup: "EvolClasses"
+    MoveSpeed: 170
+	Inherit: ( "Human" );
+}
+
+DarkHuman: {
+    BaseExpGroup: "EvolClasses"
+    JobExpGroup: "EvolClasses"
+    MoveSpeed: 170
+	Inherit: ( "Human" );
+}
+
+PurpleTritan: {
+    BaseExpGroup: "EvolClasses"
+    JobExpGroup: "EvolClasses"
+    MoveSpeed: 170
+	Inherit: ( "BlueTritan" );
+}
+
+PinkUkar: {
+    BaseExpGroup: "EvolClasses"
+    JobExpGroup: "EvolClasses"
+    MoveSpeed: 170
+	Inherit: ( "DarkUkar" );
+}
+
+
diff --git a/db/re/skill_tree.conf b/db/re/skill_tree.conf
index 2028747f..4927fb3e 100644
--- a/db/re/skill_tree.conf
+++ b/db/re/skill_tree.conf
@@ -88,7 +88,7 @@ Human: {
 	}
 }
 
-Ukar: {
+DarkUkar: {
 	skills: {
         SM_SWORD: 0
         SM_TWOHAND: 0
@@ -277,15 +277,7 @@ LightRaijin: {
 	}
 }
 
-FrostKralog: {
-	inherit: ( "FireKralog" );
-}
-
-DarkRaijin: {
-	inherit: ( "LightRaijin" );
-}
-
-Tritan: {
+BlueTritan: {
 	skills: {
         SM_SWORD: 0
         SM_TWOHAND: 0
@@ -347,3 +339,29 @@ Tritan: {
 		EVOL_PHYSICAL_SHIELD: 0
 	}
 }
+
+
+FrostKralog: {
+	inherit: ( "FireKralog" );
+}
+
+DarkRaijin: {
+	inherit: ( "LightRaijin" );
+}
+
+PurpleTritan: {
+	inherit: ( "BlueTritan" );
+}
+
+PinkUkar: {
+	inherit: ( "DarkUkar" );
+}
+
+MediumHuman: {
+	inherit: ( "Human" );
+}
+
+DarkHuman: {
+	inherit: ( "Human" );
+}
+
diff --git a/npc/functions/util.txt b/npc/functions/util.txt
index 942b5063..d5fe8bc4 100644
--- a/npc/functions/util.txt
+++ b/npc/functions/util.txt
@@ -84,19 +84,21 @@ function	script	get_race	{
     .@g=getarg(1, Class);
 
     // We also allow this to run without player attached for... science.
-    if (playerattached())
+    if (getarg(1,-1) >= 0)
     {
         setarray .@allraces$, l("Human"), l("Ukar"), l("Kralog"),
-         l("Raijin"), l("Kralog"), l("Raijin"), l("Tritan");
+         l("Raijin"), l("Kralog"), l("Raijin"), l("Tritan"),
+         l("Human"), l("Human"), l("Tritan"), l("Ukar");
         setarray .@allskins$, l("Kaizei"), l("Cave"), l("Fire"),
-         l("Light"), l("Frost"), l("Dark"), l("Sea");
+         l("Light"), l("Frost"), l("Dark"), l("Sea"), l("Argaes"),
+         l("Tonori"), l("Lake"), l("Mountain");
     }
     else
     {
         setarray .@allraces$, "Human", "Ukar", "Kralog", "Raijin",
-        "Kralog", "Raijin", "Tritan";
+        "Kralog", "Raijin", "Tritan", "Human", "Human", "Tritan", "Ukar";
         setarray .@allskins$, "Kaizei", "Cave", "Fire", "Light",
-        "Frost", "Dark", "Sea";
+        "Frost", "Dark", "Sea", "Argaes", "Tonori", "Lake", "Mountain";
     }
 
     if (.@m == GETRACE_RACE)