Merge branch 'jesusalva/selfmadeproblems001' into 'master'

Self Made Problems™ - Races, Guilds and Genders

See merge request evol/clientdata!156

1 files changed, 44 insertions, 40 deletions

diff --git a/items.xml b/items.xml
index 976cb4dd..76f30e0a 100644
--- a/items.xml
+++ b/items.xml
@@ -118,69 +118,73 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
     </item>
 
     <!-- Races -->
-    <item id="-100" type="racesprite" name="Human">
+    <item id="-100" type="racesprite" name="Kaizei Viro">
         <sprite gender="unisex">races/human-male.xml</sprite>
         <sprite gender="female">races/human-female.xml</sprite>
         <sound event="hit">weapons/barehands/hit1.ogg</sound>
         <sound event="miss">weapons/barehands/miss1.ogg</sound>
     </item>
-    <item id="-101" type="racesprite" name="Ukar">
-        <sprite gender="unisex">races/ukar-male.xml</sprite>
-        <sprite gender="female">races/ukar-female.xml</sprite>
+    <item id="-101" type="racesprite" name="Argaes Viro">
+        <sprite gender="unisex">races/human-male-medium.xml</sprite>
+        <sprite gender="female">races/human-female-medium.xml</sprite>
         <sound event="hit">weapons/barehands/hit1.ogg</sound>
         <sound event="miss">weapons/barehands/miss1.ogg</sound>
     </item>
-    <item id="-102" type="racesprite" name="Fire Kralog">
-        <sprite gender="unisex">races/demon-male.xml</sprite>
-        <sprite gender="female">races/demon-female.xml</sprite>
+    <item id="-102" type="racesprite" name="Tonori Viro">
+        <sprite gender="unisex">races/human-male-dark.xml</sprite>
+        <sprite gender="female">races/human-female-dark.xml</sprite>
         <sound event="hit">weapons/barehands/hit1.ogg</sound>
         <sound event="miss">weapons/barehands/miss1.ogg</sound>
     </item>
-    <item id="-103" type="racesprite" name="Light Raijin">
-        <sprite gender="unisex">races/elven-male.xml</sprite>
-        <sprite gender="female">races/elven-female.xml</sprite>
+
+    <item id="-103" type="racesprite" name="Cave Ukar">
+        <sprite gender="unisex">races/ukar-male.xml</sprite>
+        <sprite gender="female">races/ukar-female.xml</sprite>
         <sound event="hit">weapons/barehands/hit1.ogg</sound>
         <sound event="miss">weapons/barehands/miss1.ogg</sound>
     </item>
-    <item id="-104" type="racesprite" name="Frost Kralog">
-        <sprite gender="unisex">races/orc-male.xml</sprite>
-        <sprite gender="female">races/orc-female.xml</sprite>
+    <item id="-104" type="racesprite" name="Mountain Ukar">
+        <sprite gender="unisex">races/ukar-male-pink.xml</sprite>
+        <sprite gender="female">races/ukar-female-pink.xml</sprite>
         <sound event="hit">weapons/barehands/hit1.ogg</sound>
         <sound event="miss">weapons/barehands/miss1.ogg</sound>
     </item>
-    <item id="-105" type="racesprite" name="Dark Raijin">
-        <sprite gender="unisex">races/raijin-male.xml</sprite>
-        <sprite gender="female">races/raijin-female.xml</sprite>
+
+    <item id="-105" type="racesprite" name="Sea Tritan">
+        <sprite gender="unisex">races/tritan-male.xml</sprite>
+        <sprite gender="female">races/tritan-female.xml</sprite>
         <sound event="hit">weapons/barehands/hit1.ogg</sound>
         <sound event="miss">weapons/barehands/miss1.ogg</sound>
     </item>
-    <item id="-106" type="racesprite" name="Tritan">
-        <sprite gender="unisex">races/tritan-male.xml</sprite>
-        <sprite gender="female">races/tritan-female.xml</sprite>
+    <item id="-106" type="racesprite" name="Lake Tritan">
+        <sprite gender="unisex">races/tritan-male-purple.xml</sprite>
+        <sprite gender="female">races/tritan-female-purple.xml</sprite>
         <sound event="hit">weapons/barehands/hit1.ogg</sound>
         <sound event="miss">weapons/barehands/miss1.ogg</sound>
     </item>
-    <item id="-107" type="racesprite" name="Medium Human">
-        <sprite gender="unisex">races/human-male-medium.xml</sprite>
-        <sprite gender="female">races/human-female-medium.xml</sprite>
+
+    <item id="-107" type="racesprite" name="Light Raijin">
+        <sprite gender="unisex">races/elven-male.xml</sprite>
+        <sprite gender="female">races/elven-female.xml</sprite>
         <sound event="hit">weapons/barehands/hit1.ogg</sound>
         <sound event="miss">weapons/barehands/miss1.ogg</sound>
     </item>
-    <item id="-108" type="racesprite" name="Dark Human">
-        <sprite gender="unisex">races/human-male-dark.xml</sprite>
-        <sprite gender="female">races/human-female-dark.xml</sprite>
+    <item id="-108" type="racesprite" name="Dark Raijin">
+        <sprite gender="unisex">races/raijin-male.xml</sprite>
+        <sprite gender="female">races/raijin-female.xml</sprite>
         <sound event="hit">weapons/barehands/hit1.ogg</sound>
         <sound event="miss">weapons/barehands/miss1.ogg</sound>
     </item>
-    <item id="-109" type="racesprite" name="Purple Tritan">
-        <sprite gender="unisex">races/tritan-male-purple.xml</sprite>
-        <sprite gender="female">races/tritan-female-purple.xml</sprite>
+
+    <item id="-109" type="racesprite" name="Fire Kralog">
+        <sprite gender="unisex">races/demon-male.xml</sprite>
+        <sprite gender="female">races/demon-female.xml</sprite>
         <sound event="hit">weapons/barehands/hit1.ogg</sound>
         <sound event="miss">weapons/barehands/miss1.ogg</sound>
     </item>
-    <item id="-110" type="racesprite" name="Pink Ukar">
-        <sprite gender="unisex">races/ukar-male-pink.xml</sprite>
-        <sprite gender="female">races/ukar-female-pink.xml</sprite>
+    <item id="-110" type="racesprite" name="Frost Kralog">
+        <sprite gender="unisex">races/orc-male.xml</sprite>
+        <sprite gender="female">races/orc-female.xml</sprite>
         <sound event="hit">weapons/barehands/hit1.ogg</sound>
         <sound event="miss">weapons/barehands/miss1.ogg</sound>
     </item>
@@ -839,11 +843,12 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         type="generic"
         weight="1250"/>
     <item id="714"
-        image="generic/box-aquada.png"
-        name="Aquada Box"
-        description="Contains 50 aquadas."
+        image="generic/letter-stamp.png"
+        name="Guild Certification"
+        description="This piece of paper grants you official permission to found a guild."
         type="generic"
-        weight="850"/>
+        weight="1"
+        maxFloorOffset="4"/>
     <item id="715"
         image="generic/box-croconut.png"
         name="Croconut Box"
@@ -948,12 +953,11 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         weight="2"
         maxFloorOffset="8"/>
     <item id="730"
-        image="generic/letter-stamp.png"
-        name="Clan Certification"
-        description="This piece of paper grants you official permission to found a clan."
+        image="generic/box-aquada.png"
+        name="Aquada Box"
+        description="Contains 50 aquadas."
         type="generic"
-        weight="1"
-        maxFloorOffset="4"/>
+        weight="850"/>
     <item id="731"
         image="generic/bottle-empty.png"
         name="Empty Bottle"