Merge remote-tracking branch 'gumiko/fountain'

5 files changed, 12 insertions, 10 deletions

diff --git a/graphics/particles/fountain.xml b/graphics/particles/fountain.xml
index 9bba33a5..e3fb28c0 100644
--- a/graphics/particles/fountain.xml
+++ b/graphics/particles/fountain.xml
@@ -4,8 +4,8 @@ Copyright (C) 2016 Evol Online -->
 
 <effect>
     <particle position-x="16"
-              position-y="128"
-              position-z="116">
+              position-y="108"
+              position-z="96">
         <emitter>
             <property name="output" value="2"/>
             <property name="power" min="3" max="5"/>
@@ -14,7 +14,7 @@ Copyright (C) 2016 Evol Online -->
             <property name="image" value="graphics/particles/orb-large.png|W:#6fa1b1"/>
             <property name="gravity" value="0.13"/>
             <property name="lifetime" value="80"/>
-            <property name="fade-out" value="20"/>
+            <property name="fade-out" value="70"/>
         </emitter>
         <emitter>
             <property name="output" value="2"/>
@@ -30,10 +30,11 @@ Copyright (C) 2016 Evol Online -->
             <property name="output" value="2"/>
             <property name="power" min="4" max="5"/>
             <property name="horizontal-angle" min="-60" max="240"/>
-            <property name="vertical-angle" min="76" max="80"/>
+            <property name="vertical-angle" min="72" max="77"/>
             <property name="image" value="graphics/particles/orb-small.png|W:#e3f3ec"/>
             <property name="gravity" value="0.15"/>
             <property name="lifetime" min="80" max="150"/>
+            <property name="fade-in" value="30"/>
             <property name="fade-out" value="25"/>
             <property name="bounce" value="0.1"/>
         </emitter>
diff --git a/maps/001-1.tmx b/maps/001-1.tmx
index 9ac72df6..4842a763 100644
--- a/maps/001-1.tmx
+++ b/maps/001-1.tmx
@@ -1802,7 +1802,7 @@
    <properties>
     <property name="dest_map" value="001-2-28"/>
     <property name="dest_x" value="29"/>
-    <property name="dest_y" value="39"/>
+    <property name="dest_y" value="42"/>
     <property name="npc_id" value="NPC_ARTIS_DOOR"/>
     <property name="trigger_x" value="2"/>
     <property name="trigger_y" value="3"/>
diff --git a/maps/001-2-31.tmx b/maps/001-2-31.tmx
index b01f8d52..83acf99b 100644
--- a/maps/001-2-31.tmx
+++ b/maps/001-2-31.tmx
@@ -416,7 +416,7 @@
 910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
 910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,913,913,913,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
 910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,913,913,913,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
-910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,0,0,0,0,0,0,0,0,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,0,0,0,0,910,0,0,0,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
 910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,0,0,0,0,0,0,0,0,0,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
 910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,0,0,0,0,0,0,0,0,0,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
 910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,0,0,0,0,0,0,0,0,0,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
@@ -480,8 +480,8 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,896,896,896,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,895,895,895,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,894,894,894,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,893,893,893,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
diff --git a/maps/001-2-4.tmx b/maps/001-2-4.tmx
index a14a1878..4413f485 100644
--- a/maps/001-2-4.tmx
+++ b/maps/001-2-4.tmx
@@ -473,7 +473,7 @@
    <properties>
     <property name="dest_map" value="001-2-6"/>
     <property name="dest_x" value="57"/>
-    <property name="dest_y" value="34"/>
+    <property name="dest_y" value="36"/>
    </properties>
   </object>
   <object id="3" name="To Library Warehouse" type="ani_warp" x="1664" y="864" width="32" height="32">
diff --git a/quests.xml b/quests.xml
index 980866e8..baedff9e 100644
--- a/quests.xml
+++ b/quests.xml
@@ -572,7 +572,7 @@ Copyright (C) 2012-2013 Evol Online -->
             <questgiver>Rumly</questgiver>
             <coordinates x="35" y="125">Artis, Market Place. (35,125)</coordinates>
         </quest>
-        <quest name="Plushroom Addict" group="Artis" complete="2">
+        <quest name="Plushroom Addict" group="Artis" incomplete="2">
             <name>Plushroom Addict</name>
             <text text1="[Plushroom]">Rumly is waiting for you to bring him some {@@1}s.</text>
             <text></text>
@@ -604,6 +604,7 @@ Copyright (C) 2012-2013 Evol Online -->
         <effect map="001-1.tmx" npc="140" value="7" effect="14"/>
         <effect map="001-1.tmx" npc="119" value="8" effect="13"/>
         <effect map="001-2-26.tmx" npc="127" value="8" effect="12"/>
+        <effect map="001-1.tmx" npc="119" value="9" effect="13"/>
         <quest name="Newby Quest" group="Artis" incomplete="1">
             <name>Newby Quest</name>
             <text>You are charged to visit Chelios and bring back Enora's package.</text>