Merge branch 'master' into kfahrkfahr

1 files changed, 11 insertions, 11 deletions

diff --git a/db/re/skill_tree.conf b/db/re/skill_tree.conf
index f604479d..20a4dd64 100644
--- a/db/re/skill_tree.conf
+++ b/db/re/skill_tree.conf
@@ -25,7 +25,7 @@ Job_Name: { // Job names as in src/map/pc.c (they are hardcoded at the moment so
 */
 //====================================================
 
-Human: {
+Viro: {
 	skills: {
         SM_SWORD: 0
         SM_TWOHAND: 0
@@ -89,7 +89,7 @@ Human: {
 	}
 }
 
-DarkUkar: {
+CaveUkar: {
 	skills: {
         SM_SWORD: 0
         SM_TWOHAND: 0
@@ -281,7 +281,7 @@ LightRaijin: {
 	}
 }
 
-BlueTritan: {
+SeaTritan: {
 	skills: {
         SM_SWORD: 0
         SM_TWOHAND: 0
@@ -354,19 +354,19 @@ DarkRaijin: {
 	inherit: ( "LightRaijin" );
 }
 
-PurpleTritan: {
-	inherit: ( "BlueTritan" );
+LakeTritan: {
+	inherit: ( "SeaTritan" );
 }
 
-PinkUkar: {
-	inherit: ( "DarkUkar" );
+MountainUkar: {
+	inherit: ( "CaveUkar" );
 }
 
-MediumHuman: {
-	inherit: ( "Human" );
+ArgaesViro: {
+	inherit: ( "Viro" );
 }
 
-DarkHuman: {
-	inherit: ( "Human" );
+TonoriViro: {
+	inherit: ( "Viro" );
 }