Correct minor issues

2 files changed, 22 insertions, 19 deletions

diff --git a/npcs.xml b/npcs.xml
index cec2d629..7697ed38 100644
--- a/npcs.xml
+++ b/npcs.xml
@@ -17,7 +17,7 @@ IDs 900-999 = Special
         <menu name="Take" command="talk 'NAME'"/>
     </npc>
     <npc id="101" nameOffsetX="-7" nameOffsetY="-1" targetOffsetX="-8" targetOffsetY="-1">
-        <!-- Demon Man, sitting on a chair. -->
+        <!-- Redy Man, sitting on a chair. -->
         <sprite variant="0">npcs/xml/unanimated.xml</sprite>
         <menu name="Talk" command="talk 'NAME'"/>
     </npc>
@@ -36,7 +36,7 @@ IDs 900-999 = Special
         <sprite variant="2">npcs/xml/unanimated.xml</sprite>
     </npc>
     <npc id="105" nameOffsetX="-1" nameOffsetY="-11" targetOffsetY="-7">
-        <!-- Demon Man, sitting sailor with his boots near him. (Ship quest) -->
+        <!-- Redy Man, sitting sailor with his boots near him. (Ship quest) -->
         <sprite variant="3">npcs/xml/unanimated.xml</sprite>
         <menu name="Talk" command="talk 'NAME'"/>
     </npc>
@@ -85,12 +85,12 @@ IDs 900-999 = Special
         <menu name="Talk" command="talk 'NAME'"/>
     </npc>
     <npc id="114">
-        <!-- Demon Man, sitting sailor with his boots near him. -->
+        <!-- Redy Man, sitting sailor with his boots near him. -->
         <sprite variant="3">npcs/xml/unanimated.xml</sprite>
         <menu name="Talk" command="talk 'NAME'"/>
     </npc>
     <npc id="115" nameOffsetX="-1" nameOffsetY="-11" targetOffsetY="-7">
-        <!-- Demon Man, sitting under a tree. -->
+        <!-- Redy Man, sitting under a tree. -->
         <sprite variant="9">npcs/xml/unanimated.xml</sprite>
         <menu name="Talk" command="talk 'NAME'"/>
     </npc>
@@ -118,7 +118,7 @@ IDs 900-999 = Special
         <menu name="Talk" command="talk 'NAME'"/>
     </npc>
     <npc id="120" nameOffsetX="-7" targetOffsetX="-7">
-        <!-- Demon Male, sword trainer. -->
+        <!-- Redy Male, sword trainer. -->
         <sprite variant="12">npcs/xml/unanimated.xml</sprite>
         <menu name="Talk" command="talk 'NAME'"/>
     </npc>
@@ -344,7 +344,7 @@ IDs 900-999 = Special
         <menu name="Talk" command="talk 'NAME'"/>
     </npc>
     <npc id="404" nameOffsetX="1" targetOffsetX="-1">
-        <!-- Demon Woman, taking care of the ship. -->
+        <!-- Redy Woman, taking care of the ship. -->
         <sprite>npcs/xml/julia.xml</sprite>
         <menu name="Talk" command="talk 'NAME'"/>
     </npc>
@@ -503,8 +503,8 @@ IDs 900-999 = Special
         <menu name="Talk" command="talk 'NAME'"/>
     </npc>
     <npc id="432">
-        <!-- Demon Male, walking sprite for guard NPC. -->
-        <sprite>races/demon-male.xml</sprite>
+        <!-- Redy Male, walking sprite for guard NPC. -->
+        <sprite>races/Redy-male.xml</sprite>
         <sprite>equipment/legs/trousers-male.xml</sprite>
         <sprite>equipment/feet/boots-male.xml|#40332d,5e4a3d,705740,a1825d,b59767,dbbf88</sprite>
         <sprite>equipment/chest/trainingshirt-male.xml</sprite>
@@ -594,13 +594,13 @@ IDs 900-999 = Special
         <sprite>npcs/xml/bacchus.xml</sprite>
     </npc>
     <npc id="444">
-        <!-- Demon Male, Stat reseter NPC -->
+        <!-- Redy Male, Stat reseter NPC -->
         <sprite>npcs/xml/rumly.xml</sprite>
         <menu name="Talk" command="talk 'NAME'"/>
     </npc>
     <npc id="445">
-        <!-- Demon Female, walking sprite for villager NPC. -->
-        <sprite>races/demon-female.xml</sprite>
+        <!-- Redy Female, walking sprite for villager NPC. -->
+        <sprite>races/Redy-female.xml</sprite>
         <sprite>equipment/legs/trousers-female.xml</sprite>
         <sprite>equipment/feet/boots-female.xml|#594d36,b49b6c,f4d293</sprite>
         <sprite>equipment/chest/vneckjumper-female.xml|#683c57,75405b,b75a76,db7b88,ff9b9b,ffd7b9,fffff8</sprite>
diff --git a/quests.xml b/quests.xml
index 79a55416..12006d1c 100644
--- a/quests.xml
+++ b/quests.xml
@@ -4,7 +4,7 @@ Copyright (C) 2012-2013 Evol Online -->
 
 <quests>
     <var id="0">
-        <effect map="000-2-0.tmx" npc="404" value="0,1" effect="12"/>
+        <effect map="002-3.tmx" npc="404" value="0,1" effect="12"/>
         <quest name="Abide by the Rules" group="Ship" incomplete="1">
             <name>Abide by the Rules</name>
             <text>Before resuming your adventure and exploration, you need to register on the boarding list of the ship by signing its rules.</text>
@@ -27,8 +27,8 @@ Copyright (C) 2012-2013 Evol Online -->
         </quest>
     </var>
     <var id="1">
-        <effect map="000-2-1.tmx" npc="407" value="0" effect="12"/>
-        <effect map="000-2-1.tmx" npc="407" value="1,2" effect="13"/>
+        <effect map="002-1.tmx" npc="407" value="0" effect="12"/>
+        <effect map="002-1.tmx" npc="407" value="1,2" effect="13"/>
         <quest name="Warm Smelly Clothes" group="Ship" incomplete="0">
             <name>Warm Smelly Clothes</name>
             <text>Magic Arpan is waiting for you. Go speak to him.</text>
@@ -73,8 +73,8 @@ Copyright (C) 2012-2013 Evol Online -->
         </quest>
     </var>
     <var id="2">
-        <effect map="000-2-1.tmx" npc="401" value="0,1" effect="14"/>
-        <effect map="000-2-1.tmx" npc="401" value="2" effect="15"/>
+        <effect map="002-1.tmx" npc="401" value="0,1" effect="14"/>
+        <effect map="002-1.tmx" npc="401" value="2" effect="15"/>
         <quest name="Piberries Lover" group="Ship" incomplete="1">
             <name>Piberries Lover</name>
             <text>A mysterious stowaway needs your help. He hides at the bottom level of the ship, in the storage room.</text>
@@ -109,8 +109,8 @@ Copyright (C) 2012-2013 Evol Online -->
         </quest>
     </var>
     <var id="3">
-        <effect map="000-2-1.tmx" npc="403" value="0,6" effect="12"/>
-        <effect map="000-2-1.tmx" npc="403" value="1,2,4" effect="13"/>
+        <effect map="002-1.tmx" npc="403" value="0,6" effect="12"/>
+        <effect map="002-1.tmx" npc="403" value="1,2,4" effect="13"/>
         <quest name="Ratto Extermination" group="Ship" incomplete="6">
             <name>Ratto Extermination</name>
             <text>Peter needs your help to clear La Johanne's hold of some rattos.</text>
@@ -204,6 +204,7 @@ Copyright (C) 2012-2013 Evol Online -->
             <reward text1="[Fishing Rod]">{@@1}.</reward>
         </quest>
     </var>
+    <!--
     <var id="25">
         <effect map="001-1.tmx" npc="442" value="0" effect="12"/>
         <effect map="001-1.tmx" npc="442" value="1" effect="13"/>
@@ -225,8 +226,10 @@ Copyright (C) 2012-2013 Evol Online -->
             <reward text1="[Barrel]">{@@1}.</reward>
         </quest>
     </var>
+    -->
     <var id="30">
-        <effect map="001-2-19.tmx" npc="126" value="0" effect="12"/>
+        <effect map="005-5.tmx" npc="126" value="0" effect="12"/>
+        <effect map="003-3.tmx" npc="126" value="0" effect="12"/>
         <quest name="Worship of Money" group="Artis" complete="1">
             <name>Worship of Money</name>
             <text>You are now registered in the Merchant Guild.</text>