Merge branch 'master' into kfahrkfahr

4 files changed, 60 insertions, 60 deletions

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" );
 }