Merge branch 'jesusalva/racefix' into 'master'

Server-Side pretty fix for Race System

See merge request evol/serverdata!185

6 files changed, 158 insertions, 246 deletions

diff --git a/db/constants.conf b/db/constants.conf
index 0451b262..2d75f8cb 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -3974,13 +3974,22 @@ constants_db: {
     G_OTHER:        3
 
     comment__: "races"
-    Human:  0
-    Ukar:   1
-    Demon:  2
-    Elven:  3
-    Orc:    4
-    Raijin: 5
-    Tritan: 6
+    Human:        0
+    DarkUkar:     1
+    FireKralog:   2
+    LightRaijin:  3
+    FrostKralog:  4
+    DarkRaijin:   5
+    BlueTritan:   6
+    MediumHuman:  7
+    DarkHuman:    8
+    PurpleTritan: 9
+    PinkUkar:     10
+
+    comment__: "getraceflags"
+    GETRACE_RACE: 0
+    GETRACE_SKIN: 1
+    GETRACE_FULL: 2
 
     comment__: "directions"
     DOWN:           0
diff --git a/db/job_db2.txt b/db/job_db2.txt
index e15f683f..a8d71ed4 100644
--- a/db/job_db2.txt
+++ b/db/job_db2.txt
@@ -12,17 +12,43 @@
 //  5 = DEX increased by 1 at this job level
 //  6 = LUK increased by 1 at this job level
 //
-// Human
-0,0,6,5,0,2,3,0,1,4,0
-// Ukar
-1,0,6,5,0,2,3,0,1,4,0
-// Demon
-2,0,6,5,0,2,3,0,1,4,0
-// Elven
-3,0,6,5,0,2,3,0,1,4,0
-// Orc
-4,0,6,5,0,2,3,0,1,4,0
-// Raijin
-5,0,6,5,0,2,3,0,1,4,0
-// Tritan
-6,0,6,5,0,2,3,0,1,4,0
+// See also: https://gitlab.com/evol/evol-all/issues/67
+//
+
+// .:: HUMANS ::.
+// Kaizei Human
+0,0,0,0,0,3,0,0,0,0,2,0,0,0,0,1,0,0,0,0,4,0,0,0,0,5,0,0,0,0,6,0,0,0,0,2,0,0,0,0,1,0,0,0,0,5,0,0,0,0,4,0,0,0,0,3,0,0,0,0,2,0,0,0,0,1,0,0,0,0,4,0,0,0,0,5,0,0,0,0,6,0,0,0,0,2,0,0,0,0,1
+// Argaes Human
+0,0,0,0,0,3,0,0,0,0,2,0,0,0,0,1,0,0,0,0,4,0,0,0,0,5,0,0,0,0,6,0,0,0,0,2,0,0,0,0,1,0,0,0,0,5,0,0,0,0,4,0,0,0,0,3,0,0,0,0,2,0,0,0,0,1,0,0,0,0,4,0,0,0,0,5,0,0,0,0,6,0,0,0,0,2,0,0,0,0,1
+// Tonori Human
+0,0,0,0,0,3,0,0,0,0,2,0,0,0,0,1,0,0,0,0,4,0,0,0,0,5,0,0,0,0,6,0,0,0,0,2,0,0,0,0,1,0,0,0,0,5,0,0,0,0,4,0,0,0,0,3,0,0,0,0,2,0,0,0,0,1,0,0,0,0,4,0,0,0,0,5,0,0,0,0,6,0,0,0,0,2,0,0,0,0,1
+
+
+// .:: RAIJINS ::.
+// Light Raijin
+3,0,0,0,0,4,0,0,0,0,5,0,0,0,0,2,0,0,0,0,4,0,0,0,0,6,0,0,0,0,2,0,0,0,0,4,0,0,0,0,5,0,0,0,0,6,0,0,0,0,4,0,0,0,0,4,0,0,0,0,5,0,0,0,0,2,0,0,0,0,4,0,0,0,0,6,0,0,0,0,2,0,0,0,0,4,0,0,0,0,5
+// Dark Raijin
+5,0,0,0,0,4,0,0,0,0,5,0,0,0,0,2,0,0,0,0,4,0,0,0,0,6,0,0,0,0,2,0,0,0,0,4,0,0,0,0,5,0,0,0,0,6,0,0,0,0,4,0,0,0,0,4,0,0,0,0,5,0,0,0,0,2,0,0,0,0,4,0,0,0,0,6,0,0,0,0,2,0,0,0,0,4,0,0,0,0,5
+
+
+// .:: KRALOGS ::.
+// Fire Kralog
+2,0,0,0,0,1,0,0,0,0,6,0,0,0,0,3,0,0,0,0,5,0,0,0,0,1,0,0,0,0,3,0,0,0,0,2,0,0,0,0,1,0,0,0,0,6,0,0,0,0,4,0,0,0,0,1,0,0,0,0,6,0,0,0,0,3,0,0,0,0,5,0,0,0,0,1,0,0,0,0,3,0,0,0,0,2,0,0,0,0,1
+// Frost Kralog
+4,0,0,0,0,1,0,0,0,0,6,0,0,0,0,3,0,0,0,0,5,0,0,0,0,1,0,0,0,0,3,0,0,0,0,2,0,0,0,0,1,0,0,0,0,6,0,0,0,0,4,0,0,0,0,1,0,0,0,0,6,0,0,0,0,3,0,0,0,0,5,0,0,0,0,1,0,0,0,0,3,0,0,0,0,2,0,0,0,0,1
+
+
+// .:: UKARS ::.
+// Cave Ukar
+1,0,0,0,0,3,0,0,0,0,1,0,0,0,0,2,0,0,0,0,3,0,0,0,0,5,0,0,0,0,6,0,0,0,0,1,0,0,0,0,3,0,0,0,0,5,0,0,0,0,2,0,0,0,0,3,0,0,0,0,1,0,0,0,0,2,0,0,0,0,3,0,0,0,0,5,0,0,0,0,6,0,0,0,0,1,0,0,0,0,3
+// Mountain Ukar
+10,0,0,0,0,3,0,0,0,0,1,0,0,0,0,2,0,0,0,0,3,0,0,0,0,5,0,0,0,0,6,0,0,0,0,1,0,0,0,0,3,0,0,0,0,5,0,0,0,0,2,0,0,0,0,3,0,0,0,0,1,0,0,0,0,2,0,0,0,0,3,0,0,0,0,5,0,0,0,0,6,0,0,0,0,1,0,0,0,0,3
+
+
+// .:: TRITANS ::.
+// Sea Tritan
+6,0,0,0,0,2,0,0,0,0,5,0,0,0,0,4,0,0,0,0,6,0,0,0,0,3,0,0,0,0,5,0,0,0,0,2,0,0,0,0,4,0,0,0,0,2,0,0,0,0,1,0,0,0,0,2,0,0,0,0,5,0,0,0,0,4,0,0,0,0,6,0,0,0,0,3,0,0,0,0,5,0,0,0,0,2,0,0,0,0,4,0,0,0,0,2,0,0,0,0,1
+// Lake Tritan
+9,0,0,0,0,2,0,0,0,0,5,0,0,0,0,4,0,0,0,0,6,0,0,0,0,3,0,0,0,0,5,0,0,0,0,2,0,0,0,0,4,0,0,0,0,2,0,0,0,0,1,0,0,0,0,2,0,0,0,0,5,0,0,0,0,4,0,0,0,0,6,0,0,0,0,3,0,0,0,0,5,0,0,0,0,2,0,0,0,0,4,0,0,0,0,2,0,0,0,0,1
+
+
diff --git a/db/re/job_db.conf b/db/re/job_db.conf
index 7e3365af..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
@@ -152,8 +152,7 @@ Ukar: {
              1410, 1420, 1430, 1440, 1450, 1460, 1470, 1480, 1490, 1500,    // 141 - 150
              1510, 1520, 1530, 1540, 1550, 1560, 1570, 1580, 1590, 160]    // 151 - 160
 }
-
-Demon: {
+FireKralog: {
     BaseExpGroup: "EvolClasses"
     JobExpGroup: "EvolClasses"
     MoveSpeed: 170
@@ -204,7 +203,7 @@ Demon: {
              1510, 1520, 1530, 1540, 1550, 1560, 1570, 1580, 1590, 160]    // 151 - 160
 }
 
-Elven: {
+LightRaijin: {
     BaseExpGroup: "EvolClasses"
     JobExpGroup: "EvolClasses"
     MoveSpeed: 170
@@ -255,7 +254,7 @@ Elven: {
              1510, 1520, 1530, 1540, 1550, 1560, 1570, 1580, 1590, 160]    // 151 - 160
 }
 
-Orc: {
+BlueTritan: {
     BaseExpGroup: "EvolClasses"
     JobExpGroup: "EvolClasses"
     MoveSpeed: 170
@@ -306,104 +305,46 @@ Orc: {
              1510, 1520, 1530, 1540, 1550, 1560, 1570, 1580, 1590, 160]    // 151 - 160
 }
 
-Raijin: {
+FrostKralog: {
     BaseExpGroup: "EvolClasses"
     JobExpGroup: "EvolClasses"
     MoveSpeed: 170
-    Weight: 20000
-    BaseASPD: {
-        Fist: 40
-        Dagger: 55
-        Sword: 57
-        Axe: 50
-        Mace: 50
-        TwoHandMace: 55
-        Rod: 65
-        TwoHandRod: 65
-        Shield: 10
-        Bow: 80
-    }
-    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:[ 110,  120,  130,  140,  150,  160,  170,  180,  190,  200,    // 1 - 10
-              210,  220,  230,  240,  250,  260,  270,  280,  290,  300,    // 11 - 20
-              310,  320,  330,  340,  350,  360,  370,  380,  390,  400,    // 21 - 30
-              410,  420,  430,  440,  450,  460,  470,  480,  490,  500,    // 31 - 40
-              510,  520,  530,  540,  550,  560,  570,  580,  590,  600,    // 41 - 50
-              610,  620,  630,  640,  650,  660,  670,  680,  690,  700,    // 51 - 60
-              710,  720,  730,  740,  750,  760,  770,  780,  790,  800,    // 61 - 70
-              810,  820,  830,  840,  850,  860,  870,  880,  890,  900,    // 71 - 80
-              910,  920,  930,  940,  950,  960,  970,  980,  990, 1000,    // 81 - 90
-             1010, 1020, 1030, 1040, 1050, 1060, 1070, 1080, 1090, 1000,    // 91 - 100
-             1010, 1020, 1030, 1040, 1050, 1060, 1070, 1080, 1090, 1100,    // 101 - 110
-             1110, 1120, 1130, 1140, 1150, 1160, 1170, 1180, 1190, 1200,    // 111 - 120
-             1210, 1220, 1230, 1240, 1250, 1260, 1270, 1280, 1290, 1300,    // 121 - 130
-             1310, 1320, 1330, 1340, 1350, 1360, 1370, 1380, 1390, 1400,    // 131 - 140
-             1410, 1420, 1430, 1440, 1450, 1460, 1470, 1480, 1490, 1500,    // 141 - 150
-             1510, 1520, 1530, 1540, 1550, 1560, 1570, 1580, 1590, 160]    // 151 - 160
+	Inherit: ( "FireKralog" );	// Base job from which this job will inherit its max weight, base ASPD set and HP/SP table.
 }
 
-Tritan: {
+DarkRaijin: {
     BaseExpGroup: "EvolClasses"
     JobExpGroup: "EvolClasses"
     MoveSpeed: 170
-    Weight: 20000
-    BaseASPD: {
-        Fist: 40
-        Dagger: 55
-        Sword: 57
-        Axe: 50
-        Mace: 50
-        TwoHandMace: 55
-        Rod: 65
-        TwoHandRod: 65
-        Shield: 10
-        Bow: 80
-    }
-    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:[ 110,  120,  130,  140,  150,  160,  170,  180,  190,  200,    // 1 - 10
-              210,  220,  230,  240,  250,  260,  270,  280,  290,  300,    // 11 - 20
-              310,  320,  330,  340,  350,  360,  370,  380,  390,  400,    // 21 - 30
-              410,  420,  430,  440,  450,  460,  470,  480,  490,  500,    // 31 - 40
-              510,  520,  530,  540,  550,  560,  570,  580,  590,  600,    // 41 - 50
-              610,  620,  630,  640,  650,  660,  670,  680,  690,  700,    // 51 - 60
-              710,  720,  730,  740,  750,  760,  770,  780,  790,  800,    // 61 - 70
-              810,  820,  830,  840,  850,  860,  870,  880,  890,  900,    // 71 - 80
-              910,  920,  930,  940,  950,  960,  970,  980,  990, 1000,    // 81 - 90
-             1010, 1020, 1030, 1040, 1050, 1060, 1070, 1080, 1090, 1000,    // 91 - 100
-             1010, 1020, 1030, 1040, 1050, 1060, 1070, 1080, 1090, 1100,    // 101 - 110
-             1110, 1120, 1130, 1140, 1150, 1160, 1170, 1180, 1190, 1200,    // 111 - 120
-             1210, 1220, 1230, 1240, 1250, 1260, 1270, 1280, 1290, 1300,    // 121 - 130
-             1310, 1320, 1330, 1340, 1350, 1360, 1370, 1380, 1390, 1400,    // 131 - 140
-             1410, 1420, 1430, 1440, 1450, 1460, 1470, 1480, 1490, 1500,    // 141 - 150
-             1510, 1520, 1530, 1540, 1550, 1560, 1570, 1580, 1590, 160]    // 151 - 160
+	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 3d7128d2..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
@@ -151,7 +151,7 @@ Ukar: {
 	}
 }
 
-Demon: {
+FireKralog: {
 	skills: {
         SM_SWORD: 0
         SM_TWOHAND: 0
@@ -214,7 +214,7 @@ Demon: {
 	}
 }
 
-Elven: {
+LightRaijin: {
 	skills: {
         SM_SWORD: 0
         SM_TWOHAND: 0
@@ -277,7 +277,7 @@ Elven: {
 	}
 }
 
-Orc: {
+BlueTritan: {
 	skills: {
         SM_SWORD: 0
         SM_TWOHAND: 0
@@ -340,128 +340,28 @@ Orc: {
 	}
 }
 
-Raijin: {
-	skills: {
-        SM_SWORD: 0
-        SM_TWOHAND: 0
-        AC_OWL: 0
-		NV_BASIC: 0
-		NV_FIRSTAID: 0
-		NV_TRICKDEAD: 0
-		WE_BABY: 0
-		WE_CALLPARENT: 0
-		WE_CALLBABY: 0
-		ALL_INCCARRY: 0
-		MC_VENDING: 0
-		MC_PUSHCART: 0
-		ALL_BUYING_STORE: 0
-		AM_CALLHOMUN: 0
-		KN_RIDING: 0
-		SM_BASH: 0
-		TK_HIGHJUMP: 0
-		MG_THUNDERSTORM: 0
-		AS_CLOAKING: 0
-		TF_DOUBLE: 0
-		TF_HIDING: 0
-		WZ_VERMILION: 0
-		ST_CHASEWALK: 0
-		WS_CARTBOOST: 0
-		TK_RUN: 0
-		RA_RESEARCHTRAP: 0
-		SC_DIMENSIONDOOR: 0
-		WZ_STORMGUST: 0
-		WL_SUMMONFB: 0
-		WL_RELEASE: 0
-		WL_SUMMONSTONE: 0
-		SC_INVISIBILITY: 0
-		RG_GRAFFITI: 0
-		RG_CLEANER: 0
-		SA_COMA: 0
-		CH_SOULCOLLECT: 0
-		SL_STUN: 0
-		AL_BLESSING: 0
-		WL_STASIS: 0
-		RA_CAMOUFLAGE: 0
-		SC_MANHOLE: 0
-		AL_RUWACH: 0
-		AL_TELEPORT: 0
-		MG_SAFETYWALL: 0
-		WZ_QUAGMIRE: 0
-		WZ_FROSTNOVA: 0
-		MO_BODYRELOCATION: 0
-		MO_CALLSPIRITS: 0
-		GN_HELLS_PLANT: 0
-		GN_DEMONIC_FIRE: 0
-		GN_CRAZYWEED: 0
-		GN_WALLOFTHORN: 0
-		WE_MALE: 0
-		WE_FEMALE: 0
-		WE_CALLPARTNER: 0
-		MG_COLDBOLT: 0
-		EVOL_MASS_PROVOKE: 0
-		EVOL_PHYSICAL_SHIELD: 0
-	}
+
+FrostKralog: {
+	inherit: ( "FireKralog" );
 }
 
-Tritan: {
-	skills: {
-        SM_SWORD: 0
-        SM_TWOHAND: 0
-        AC_OWL: 0
-		NV_BASIC: 0
-		NV_FIRSTAID: 0
-		NV_TRICKDEAD: 0
-		WE_BABY: 0
-		WE_CALLPARENT: 0
-		WE_CALLBABY: 0
-		ALL_INCCARRY: 0
-		MC_VENDING: 0
-		MC_PUSHCART: 0
-		ALL_BUYING_STORE: 0
-		AM_CALLHOMUN: 0
-		KN_RIDING: 0
-		SM_BASH: 0
-		TK_HIGHJUMP: 0
-		MG_THUNDERSTORM: 0
-		AS_CLOAKING: 0
-		TF_DOUBLE: 0
-		TF_HIDING: 0
-		WZ_VERMILION: 0
-		ST_CHASEWALK: 0
-		WS_CARTBOOST: 0
-		TK_RUN: 0
-		RA_RESEARCHTRAP: 0
-		SC_DIMENSIONDOOR: 0
-		WZ_STORMGUST: 0
-		WL_SUMMONFB: 0
-		WL_RELEASE: 0
-		WL_SUMMONSTONE: 0
-		SC_INVISIBILITY: 0
-		RG_GRAFFITI: 0
-		RG_CLEANER: 0
-		SA_COMA: 0
-		CH_SOULCOLLECT: 0
-		SL_STUN: 0
-		AL_BLESSING: 0
-		WL_STASIS: 0
-		RA_CAMOUFLAGE: 0
-		SC_MANHOLE: 0
-		AL_RUWACH: 0
-		AL_TELEPORT: 0
-		MG_SAFETYWALL: 0
-		WZ_QUAGMIRE: 0
-		WZ_FROSTNOVA: 0
-		MO_BODYRELOCATION: 0
-		MO_CALLSPIRITS: 0
-		GN_HELLS_PLANT: 0
-		GN_DEMONIC_FIRE: 0
-		GN_CRAZYWEED: 0
-		GN_WALLOFTHORN: 0
-		WE_MALE: 0
-		WE_FEMALE: 0
-		WE_CALLPARTNER: 0
-		MG_COLDBOLT: 0
-		EVOL_MASS_PROVOKE: 0
-		EVOL_PHYSICAL_SHIELD: 0
-	}
+DarkRaijin: {
+	inherit: ( "LightRaijin" );
+}
+
+PurpleTritan: {
+	inherit: ( "BlueTritan" );
+}
+
+PinkUkar: {
+	inherit: ( "DarkUkar" );
+}
+
+MediumHuman: {
+	inherit: ( "Human" );
+}
+
+DarkHuman: {
+	inherit: ( "Human" );
 }
+
diff --git a/npc/commands/debug-look.txt b/npc/commands/debug-look.txt
index 79bf8699..4ab9ed44 100644
--- a/npc/commands/debug-look.txt
+++ b/npc/commands/debug-look.txt
@@ -41,7 +41,7 @@ function	script	BarberDebug	{
     function setRace {
         clear;
         setnpcdialogtitle l("Appearance Debug - Race");
-        mes l("Race") + ": " + Class;
+        mes l("Race") + ": " + Class + " (" + get_race(GETRACE_FULL) + ")";
         next;
         mes l("Please enter the desired race") + " (0-32767)";
         input .@r, 0, 0x7FFF;
@@ -60,7 +60,7 @@ function	script	BarberDebug	{
         mes l("Gender") + ": " + Sex;
         mes l("Hair style") + ": " + getlook(LOOK_HAIR);
         mes l("Hair color") + ": " + getlook(LOOK_HAIR_COLOR);
-        mes l("Race") + ": " + Class;
+        mes l("Race") + ": " + Class + " (" + get_race() + ")";;
         mes "---";
 
         next;
diff --git a/npc/functions/util.txt b/npc/functions/util.txt
index 2cb28573..d5fe8bc4 100644
--- a/npc/functions/util.txt
+++ b/npc/functions/util.txt
@@ -73,4 +73,40 @@ function	script	getmap	{
     return .@mapName$;
 }
 
+// Returns the player race in plain text
+// GETRACE_RACE - returns player race (default)
+// GETRACE_SKIN - returns player skin
+// GETRACE_FULL - returns player skin + race
+// Can take an optional 2nd param with the class
+// get_race( {Flag, {Class}} )
+function	script	get_race	{
+    .@m=getarg(0, GETRACE_RACE);
+    .@g=getarg(1, Class);
+
+    // We also allow this to run without player attached for... science.
+    if (getarg(1,-1) >= 0)
+    {
+        setarray .@allraces$, l("Human"), l("Ukar"), l("Kralog"),
+         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("Argaes"),
+         l("Tonori"), l("Lake"), l("Mountain");
+    }
+    else
+    {
+        setarray .@allraces$, "Human", "Ukar", "Kralog", "Raijin",
+        "Kralog", "Raijin", "Tritan", "Human", "Human", "Tritan", "Ukar";
+        setarray .@allskins$, "Kaizei", "Cave", "Fire", "Light",
+        "Frost", "Dark", "Sea", "Argaes", "Tonori", "Lake", "Mountain";
+    }
+
+    if (.@m == GETRACE_RACE)
+        return .@allraces$[.@g];
+    else if  (.@m == GETRACE_SKIN)
+        return .@allskins$[.@g];
+    else
+        return .@allskins$[.@g] + " " + .@allraces$[.@g];
+
+}