Merge branch 'master' into kfahrkfahr

7 files changed, 130 insertions, 126 deletions

diff --git a/db/clans.conf b/db/clans.conf
index 3167ce6b..0c73ca41 100644
--- a/db/clans.conf
+++ b/db/clans.conf
@@ -56,86 +56,82 @@ clans: (
 	**************************************************************************/
 	{
 		Id: 1
-		Const: "SWORDCLAN"
-		Name: "Sword Clan"
-		Leader: "Raffam Oranpere"
-		Map: "001-1"
+		Const: "FACTION_LEGION"
+		Name: "Legion of Aemil"
+		Leader: "Q'Anon"
+		Map: "001-2-39"
 		Buff: {
 			Icon: "SI_SWORDCLAN"
 			Script: <"
-				bonus(bStr, 1);
+				bonus(bStr, 2);
 				bonus(bVit, 1);
 				bonus(bMaxHP, 30);
 				bonus(bMaxSP, 10);
 			">
 		}
-		Allies: [
-			"GOLDENMACECLAN",
+		Antagonists: [
+			"FACTION_BROTHERHOOD",
 		]
 	},
 	{
 		Id: 2
-		Const: "ARCWANDCLAN"
-		Name: "Arc Wand Clan"
-		Leader: "Devon Aire"
+		Const: "FACTION_BROTHERHOOD"
+		Name: "Brotherhood of Argaes"
+		Leader: "Jonatas"
 		Map: "001-1"
 		Buff: {
 			Icon: "SI_ARCWANDCLAN"
 			Script: <"
-				bonus(bInt, 1);
-				bonus(bDex, 1);
+				bonus(bDex, 2);
+				bonus(bAgi, 1);
 				bonus(bMaxHP, 30);
 				bonus(bMaxSP, 10);
 			">
 		}
-		Allies: [
-			"GOLDENMACECLAN",
-		]
 		Antagonists: [
-			"CROSSBOWCLAN",
+			"FACTION_LEGION",
 		]
 	},
 	{
 		Id: 3
-		Const: "GOLDENMACECLAN"
-		Name: "Golden Mace Clan"
-		Leader: "Berman Aire"
+		Const: "FACTION_THIEF"
+		Name: "The Thieves"
+		Leader: "Tanveer"
 		Map: "001-1"
 		Buff: {
 			Icon: "SI_GOLDENMACECLAN"
 			Script: <"
-				bonus(bInt, 1);
-				bonus(bLuk, 1);
+				bonus(bLuk, 2);
+				bonus(bDex, 1);
 				bonus(bMaxHP, 30);
 				bonus(bMaxSP, 10);
 			">
 		}
 		Allies: [
-			"SWORDCLAN",
-			"ARCWANDCLAN",
-			"CROSSBOWCLAN",
+			"FACTION_LEGION",
+			"FACTION_BROTHERHOOD",
+		]
+		Antagonists: [
+			"FACTION_MAGES",
 		]
 	},
 	{
 		Id: 4
-		Const: "CROSSBOWCLAN"
-		Name: "Crossbow Clan"
-		Leader: "Shaam Rumi"
+		Const: "FACTION_MAGES"
+		Name: "The Magic Guild"
+		Leader: "Hocus Pocus Fidibus"
 		Map: "001-1"
 		Buff: {
 			Icon: "SI_CROSSBOWCLAN"
 			Script: <"
-				bonus(bDex, 1);
+				bonus(bInt, 2);
 				bonus(bAgi, 1);
 				bonus(bMaxHP, 30);
 				bonus(bMaxSP, 10);
 			">
 		}
-		Allies: [
-			"GOLDENMACECLAN",
-		]
 		Antagonists: [
-			"ARCWANDCLAN",
+			"FACTION_THIEF",
 		]
 	},
 )
diff --git a/db/constants.conf b/db/constants.conf
index 192fb7fa..59dce74b 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -3912,17 +3912,25 @@ constants_db: {
     G_OTHER:        3
 
     comment__: "races"
-    Human:        0
-    DarkUkar:     1
-    FireKralog:   2
-    LightRaijin:  3
-    FrostKralog:  4
-    DarkRaijin:   5
-    BlueTritan:   6
-    MediumHuman:  7
-    DarkHuman:    8
-    PurpleTritan: 9
-    PinkUkar:     10
+    KaizeiViro:     0
+    ArgaesViro:     1
+    TonoriViro:     2
+    CaveUkar:       3
+    MountainUkar:   4
+    SeaTritan:      5
+    LakeTritan:     6
+    LightRaijin:    7
+    DarkRaijin:     8
+    FireKralog:     9
+    FrostKralog:    10
+
+    // DEPRECATED: Kept for compatibility
+    Human:      0
+    Viro:       0
+    Ukar:       3
+    Tritan:     5
+    Raijin:     7
+    Kralog:     9
 
     comment__: "getraceflags"
     GETRACE_RACE: 0
diff --git a/db/job_db2.txt b/db/job_db2.txt
index a8d71ed4..cd75322e 100644
--- a/db/job_db2.txt
+++ b/db/job_db2.txt
@@ -16,39 +16,39 @@
 //
 
 // .:: HUMANS ::.
-// Kaizei Human
+// Kaizei Viro
 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
+// Argaes Viro
+1,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 Viro
+2,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
 
 
 // .:: 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
+3,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
+4,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
+5,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
+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
+
+
+
+// .:: RAIJINS ::.
+// Light Raijin
+7,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
+8,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
+9,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
+10,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
 
diff --git a/db/re/attr_fix.txt b/db/re/attr_fix.txt
index b79ff7fe..37e7bd44 100644
--- a/db/re/attr_fix.txt
+++ b/db/re/attr_fix.txt
@@ -1,14 +1,14 @@
 // Elemental attribute damage adjustment tables
 //
-// Row: target's defense element
-// Column: attacker's weapon element
+// Row: attacker's weapon element
+// Column: target's defense element
 
 1,10	// lv1 Attribute table
 //Neut Watr Natr Fire NYI  NYI Holy Shdw  NYI  NYI
   100, 100, 100, 100, 100, 100, 100, 100, 100, 100,  // Neutral
-  100,  90, 120,  80, 100, 100, 100, 100, 100, 100,  // Water
-  100,  80,  90, 120, 100, 100, 100, 100, 100, 100,  // Nature
-  100, 120,  80,  90, 100, 100, 100, 100, 100, 100,  // Fire
+  100,  90,  80, 120, 100, 100, 100, 100, 100, 100,  // Water
+  100, 120,  90,  80, 100, 100, 100, 100, 100, 100,  // Nature
+  100,  80, 120,  90, 100, 100, 100, 100, 100, 100,  // Fire
   100, 100, 100, 100,  90, 100, 100, 100, 100, 100,  // UNUSED
   100, 100, 100, 100, 100,  90, 100, 100, 100, 100,  // UNUSED
   100, 100, 100, 100, 100, 100,  90, 120, 100, 100,  // Holy
@@ -19,9 +19,9 @@
 2,10	// lv2 Attribute table
 //Neut Watr Natr Fire NYI  NYI Holy Shdw  NYI  NYI
   100, 100, 100, 100, 100, 100, 100, 100, 100, 100,  // Neutral
-  100,  90, 130,  70, 100, 100, 100, 100, 100, 100,  // Water
-  100,  70,  90, 130, 100, 100, 100, 100, 100, 100,  // Nature
-  100, 130,  70,  90, 100, 100, 100, 100, 100, 100,  // Fire
+  100,  90,  70, 130, 100, 100, 100, 100, 100, 100,  // Water
+  100, 130,  90,  70, 100, 100, 100, 100, 100, 100,  // Nature
+  100,  70, 130,  90, 100, 100, 100, 100, 100, 100,  // Fire
   100, 100, 100, 100,  90, 100, 100, 100, 100, 100,  // UNUSED
   100, 100, 100, 100, 100,  90, 100, 100, 100, 100,  // UNUSED
   100, 100, 100, 100, 100, 100,  90, 130, 100, 100,  // Holy
@@ -32,9 +32,9 @@
 3,10	// lv3 Attribute table
 //Neut Watr Natr Fire NYI  NYI Holy Shdw  NYI  NYI
   100, 100, 100, 100, 100, 100, 100, 100, 100, 100,  // Neutral
-  100,  90, 140,  60, 100, 100, 100, 100, 100, 100,  // Water
-  100,  60,  90, 140, 100, 100, 100, 100, 100, 100,  // Nature
-  100, 140,  60,  90, 100, 100, 100, 100, 100, 100,  // Fire
+  100,  90,  60, 140, 100, 100, 100, 100, 100, 100,  // Water
+  100, 140,  90,  60, 100, 100, 100, 100, 100, 100,  // Nature
+  100,  60, 140,  90, 100, 100, 100, 100, 100, 100,  // Fire
   100, 100, 100, 100,  90, 100, 100, 100, 100, 100,  // UNUSED
   100, 100, 100, 100, 100,  90, 100, 100, 100, 100,  // UNUSED
   100, 100, 100, 100, 100, 100,  90, 140, 100, 100,  // Holy
@@ -45,9 +45,9 @@
 4,10	// lv4 Attribute table
 //Neut Watr Natr Fire NYI  NYI Holy Shdw  NYI  NYI
   100, 100, 100, 100, 100, 100, 100, 100, 100, 100,  // Neutral
-  100,  90, 150,  50, 100, 100, 100, 100, 100, 100,  // Water
-  100,  50,  90, 150, 100, 100, 100, 100, 100, 100,  // Nature
-  100, 150,  50,  90, 100, 100, 100, 100, 100, 100,  // Fire
+  100,  90,  50, 150, 100, 100, 100, 100, 100, 100,  // Water
+  100, 150,  90,  50, 100, 100, 100, 100, 100, 100,  // Nature
+  100,  50, 150,  90, 100, 100, 100, 100, 100, 100,  // Fire
   100, 100, 100, 100,  90, 100, 100, 100, 100, 100,  // UNUSED
   100, 100, 100, 100, 100,  90, 100, 100, 100, 100,  // UNUSED
   100, 100, 100, 100, 100, 100,  90, 150, 100, 100,  // Holy
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 5594ee93..b9537c14 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -1336,16 +1336,11 @@ item_db: (
 },
 {
     Id: 714
-    AegisName: "AquadaBox"
-    Name: "Aquada Box"
+    AegisName: "GuildCertification"
+    Name: "Guild Certification"
     Type: "IT_ETC"
-    Buy: 2
-    Sell: 1
-    Weight: 850
-    Trade: {
-        nodrop: true
-        noselltonpc: true
-    }
+    Buy: 100000
+    Sell: 100
 },
 {
     Id: 715
@@ -1504,11 +1499,16 @@ item_db: (
 },
 {
     Id: 730
-    AegisName: "GuildCertification"
-    Name: "Guild Certification"
+    AegisName: "AquadaBox"
+    Name: "Aquada Box"
     Type: "IT_ETC"
-    Buy: 100000
-    Sell: 100
+    Buy: 2
+    Sell: 1
+    Weight: 850
+    Trade: {
+        nodrop: true
+        noselltonpc: true
+    }
 },
 {
     Id: 731
diff --git a/db/re/job_db.conf b/db/re/job_db.conf
index 02b4e16a..825ed1e4 100644
--- a/db/re/job_db.conf
+++ b/db/re/job_db.conf
@@ -51,10 +51,10 @@ Job_Name: { // Job names as in src/map/pc.c (they are hardcoded at the moment so
 }
 */
 //====================================================
-Human: {
+Viro: {
     BaseExpGroup: "EvolClasses"
     JobExpGroup: "EvolClasses"
-    MoveSpeed: 170
+    MoveSpeed: 150
     Weight: 20000
     BaseASPD: {
         Fist: 40
@@ -104,10 +104,10 @@ Human: {
              1510, 1520, 1530, 1540, 1550, 1560, 1570, 1580, 1590, 160]    // 151 - 160
 }
 
-DarkUkar: {
+CaveUkar: {
     BaseExpGroup: "EvolClasses"
     JobExpGroup: "EvolClasses"
-    MoveSpeed: 170
+    MoveSpeed: 150
     Weight: 20000
     BaseASPD: {
         Fist: 40
@@ -159,7 +159,7 @@ DarkUkar: {
 FireKralog: {
     BaseExpGroup: "EvolClasses"
     JobExpGroup: "EvolClasses"
-    MoveSpeed: 170
+    MoveSpeed: 150
     Weight: 20000
     BaseASPD: {
         Fist: 40
@@ -212,7 +212,7 @@ FireKralog: {
 LightRaijin: {
     BaseExpGroup: "EvolClasses"
     JobExpGroup: "EvolClasses"
-    MoveSpeed: 170
+    MoveSpeed: 150
     Weight: 20000
     BaseASPD: {
         Fist: 40
@@ -262,10 +262,10 @@ LightRaijin: {
              1510, 1520, 1530, 1540, 1550, 1560, 1570, 1580, 1590, 160]    // 151 - 160
 }
 
-BlueTritan: {
+SeaTritan: {
     BaseExpGroup: "EvolClasses"
     JobExpGroup: "EvolClasses"
-    MoveSpeed: 170
+    MoveSpeed: 150
     Weight: 20000
     BaseASPD: {
         Fist: 40
@@ -318,43 +318,43 @@ BlueTritan: {
 FrostKralog: {
     BaseExpGroup: "EvolClasses"
     JobExpGroup: "EvolClasses"
-    MoveSpeed: 170
+    MoveSpeed: 150
 	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
+    MoveSpeed: 150
 	Inherit: ( "LightRaijin" );	// Base job from which this job will inherit its max weight, base ASPD set and HP/SP table.
 }
 
-MediumHuman: {
+ArgaesViro: {
     BaseExpGroup: "EvolClasses"
     JobExpGroup: "EvolClasses"
-    MoveSpeed: 170
-	Inherit: ( "Human" );
+    MoveSpeed: 150
+	Inherit: ( "Viro" );
 }
 
-DarkHuman: {
+TonoriViro: {
     BaseExpGroup: "EvolClasses"
     JobExpGroup: "EvolClasses"
-    MoveSpeed: 170
-	Inherit: ( "Human" );
+    MoveSpeed: 150
+	Inherit: ( "Viro" );
 }
 
-PurpleTritan: {
+LakeTritan: {
     BaseExpGroup: "EvolClasses"
     JobExpGroup: "EvolClasses"
-    MoveSpeed: 170
-	Inherit: ( "BlueTritan" );
+    MoveSpeed: 150
+	Inherit: ( "SeaTritan" );
 }
 
-PinkUkar: {
+MountainUkar: {
     BaseExpGroup: "EvolClasses"
     JobExpGroup: "EvolClasses"
-    MoveSpeed: 170
-	Inherit: ( "DarkUkar" );
+    MoveSpeed: 150
+	Inherit: ( "CaveUkar" );
 }
 
 
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" );
 }