summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--maps.xml186
-rw-r--r--npcs.xml4
-rw-r--r--quests.xml7
3 files changed, 22 insertions, 175 deletions
diff --git a/maps.xml b/maps.xml
index 83d3fffb..f4959e63 100644
--- a/maps.xml
+++ b/maps.xml
@@ -3,184 +3,27 @@
Copyright (C) 2012-2017 Evol Online -->
<maps>
+
+ <!-- EVOL -->
<map name="000-0-0.tmx">
<atlas name="ship"/>
</map>
- <map name="000-0-1.tmx">
- <atlas name="ship"/>
- </map>
<map name="000-0.tmx">
<atlas name="island"/>
</map>
<map name="000-1.tmx">
<atlas name="island"/>
</map>
- <map name="000-1-1.tmx">
- <atlas name="island"/>
- </map>
- <map name="000-2-0.tmx">
- <atlas name="ship"/>
- </map>
- <map name="000-2-1.tmx">
- <atlas name="ship"/>
- </map>
- <map name="000-2-2.tmx">
- <atlas name="ship"/>
- </map>
- <map name="000-2-3.tmx">
- <atlas name="ship"/>
- </map>
- <map name="000-2-4.tmx">
- <atlas name="ship"/>
- </map>
- <map name="001-1.tmx">
- <atlas name="artis-outdoor"/>
- </map>
- <map name="001-2-0.tmx">
- <atlas name="artis-indoor"/>
- </map>
- <map name="001-2-1.tmx">
- <atlas name="artis-indoor"/>
- </map>
- <map name="001-2-2.tmx">
- <atlas name="artis-indoor"/>
- </map>
- <map name="001-2-3.tmx">
- <atlas name="artis-indoor"/>
- </map>
- <map name="001-2-4.tmx">
- <atlas name="artis-indoor"/>
- </map>
- <map name="001-2-5.tmx">
- <atlas name="artis-indoor"/>
- </map>
- <map name="001-2-6.tmx">
- <atlas name="artis-indoor"/>
- </map>
- <map name="001-2-7.tmx">
- <atlas name="artis-indoor"/>
- </map>
- <map name="001-2-8.tmx">
- <atlas name="artis-indoor"/>
- </map>
- <map name="001-2-9.tmx">
- <atlas name="artis-indoor"/>
- </map>
- <map name="001-2-10.tmx">
- <atlas name="artis-indoor"/>
- </map>
- <map name="001-2-11.tmx">
- <atlas name="artis-indoor"/>
- </map>
- <map name="001-2-12.tmx">
- <atlas name="artis-indoor"/>
- </map>
- <map name="001-2-13.tmx">
- <atlas name="artis-indoor"/>
- </map>
- <map name="001-2-14.tmx">
- <atlas name="artis-indoor"/>
- </map>
- <map name="001-2-15.tmx">
- <atlas name="artis-indoor"/>
- </map>
- <map name="001-2-16.tmx">
- <atlas name="artis-indoor"/>
- </map>
- <map name="001-2-17.tmx">
- <atlas name="artis-indoor"/>
- </map>
- <map name="001-2-18.tmx">
- <atlas name="artis-indoor"/>
- </map>
- <map name="001-2-19.tmx">
- <atlas name="artis-indoor"/>
- </map>
- <map name="001-2-20.tmx">
- <atlas name="artis-indoor"/>
- </map>
- <map name="001-2-21.tmx">
+ <map name="002-1.tmx">
<atlas name="ship"/>
</map>
- <map name="001-2-22.tmx">
- <atlas name="ship"/>
- </map>
- <map name="001-2-23.tmx">
- <atlas name="ship"/>
- </map>
- <map name="001-2-24.tmx">
- <atlas name="ship"/>
- </map>
- <map name="001-2-25.tmx">
- <atlas name="artis-indoor"/>
- </map>
- <map name="001-2-26.tmx">
- <atlas name="artis-indoor"/>
- </map>
- <map name="001-2-27.tmx">
- <atlas name="artis-indoor"/>
- </map>
- <map name="001-2-28.tmx">
- <atlas name="artis-indoor"/>
- </map>
- <map name="001-2-29.tmx">
- <atlas name="artis-indoor"/>
- </map>
- <map name="001-2-30.tmx">
- <atlas name="artis-indoor"/>
- </map>
- <map name="001-2-31.tmx">
- <atlas name="artis-indoor"/>
- </map>
- <map name="001-2-32.tmx">
- <atlas name="artis-indoor"/>
- </map>
- <map name="001-2-33.tmx">
- <atlas name="artis-indoor"/>
- </map>
- <map name="001-2-34.tmx">
- <atlas name="artis-indoor"/>
- </map>
- <map name="001-2-35.tmx">
- <atlas name="artis-indoor"/>
- </map>
- <map name="001-2-36.tmx">
- <atlas name="artis-indoor"/>
- </map>
- <map name="001-2-37.tmx">
- <atlas name="artis-indoor"/>
- </map>
- <map name="001-2-38.tmx">
- <atlas name="artis-indoor"/>
- </map>
- <map name="001-2-39.tmx">
- <atlas name="artis-indoor"/>
- </map>
- <map name="001-2-40.tmx">
- <atlas name="artis-indoor"/>
- </map>
- <map name="001-2-41.tmx">
- <atlas name="artis-indoor"/>
- </map>
- <map name="001-2-42.tmx">
- <atlas name="artis-indoor"/>
- </map>
- <map name="001-3-0.tmx">
- <atlas name="artis-sewer"/>
- </map>
- <map name="001-3-1.tmx">
- <atlas name="artis-sewer"/>
- </map>
- <map name="002-1.tmx">
- <atlas name="ship"/>
- </map>
- <map name="002-2.tmx">
+ <map name="002-2.tmx">
<atlas name="ship"/>
</map>
- <map name="002-3.tmx">
+ <map name="002-3.tmx">
<atlas name="ship"/>
</map>
- <map name="002-4.tmx">
+ <map name="002-4.tmx">
<atlas name="ship"/>
</map>
<map name="test.tmx">
@@ -486,6 +329,7 @@ Copyright (C) 2012-2017 Evol Online -->
<file name="graphics/tilesets/woodland_x3.png"/>
<file name="graphics/tilesets/ship-flags-x3x2.png"/>
</atlas>
+
<atlas name="candor-indoor">
<file name="graphics/tilesets/woodland-indoor.png"/>
<file name="graphics/tilesets/desert_castle2.png"/>
@@ -505,7 +349,8 @@ Copyright (C) 2012-2017 Evol Online -->
<file name="graphics/tilesets/inn_x3.png"/>
<file name="graphics/tilesets/wood_lab.png"/>
<file name="graphics/tilesets/ship-glags-x3x2.png"/>
- </atlas>
+ </atlas>
+
<atlas name="tulimshar">
<file name="graphics/tilesets/ship-base.png"/>
<file name="graphics/tilesets/docks.png"/>
@@ -538,11 +383,12 @@ Copyright (C) 2012-2017 Evol Online -->
<file name="graphics/tilesets/inn.png"/>
<file name="graphics/tilesets/inn_x3.png"/>
<file name="graphics/tilesets/woodland_indoor.png"/>
-
- </atlas>
+ </atlas>
+
<atlas name="cave">
<file name="graphics/tilesets/cave.png"/>
- </atlas>
+ </atlas>
+
<atlas name="tulimshar-indoor">
<file name="graphics/tilesets/woodland-indoor.png"/>
<file name="graphics/tilesets/inn2.png"/>
@@ -559,8 +405,8 @@ Copyright (C) 2012-2017 Evol Online -->
<file name="graphics/tilesets/woodland_indoor.png"/>
<file name="graphics/tilesets/cave2_sewer_mine.png"/>
<file name="graphics/tilesets/.png"/>
-
- </atlas>
+ </atlas>
+
<atlas name="desert">
<file name="graphics/tilesets/trans_woodland_desert.png"/>
<file name="graphics/tilesets/desert2.png"/>
@@ -578,6 +424,6 @@ Copyright (C) 2012-2017 Evol Online -->
<file name="graphics/tilesets/water3.png"/>
<file name="graphics/tilesets/desert_city.png"/>
<file name="graphics/tilesets/desert_castle.png"/>
-
</atlas>
+
</maps>
diff --git a/npcs.xml b/npcs.xml
index 7697ed38..c189f294 100644
--- a/npcs.xml
+++ b/npcs.xml
@@ -504,7 +504,7 @@ IDs 900-999 = Special
</npc>
<npc id="432">
<!-- Redy Male, walking sprite for guard NPC. -->
- <sprite>races/Redy-male.xml</sprite>
+ <sprite>races/demon-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>
@@ -600,7 +600,7 @@ IDs 900-999 = Special
</npc>
<npc id="445">
<!-- Redy Female, walking sprite for villager NPC. -->
- <sprite>races/Redy-female.xml</sprite>
+ <sprite>races/demon-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 247d7807..44cf8f8a 100644
--- a/quests.xml
+++ b/quests.xml
@@ -137,7 +137,7 @@ Copyright (C) 2012-2013 Evol Online -->
<text></text>
<questgiver>Peter</questgiver>
<coordinates x="60" y="35">La Johanne, Second Deck. (60,35)</coordinates>
- <reward>100 EXP, 1000 E.</reward>
+ <reward>100 EXP, 1000 GP.</reward>
</quest>
<quest name="Ratto Extermination" group="Ship" complete="3">
<name>Ratto Extermination</name>
@@ -157,7 +157,7 @@ Copyright (C) 2012-2013 Evol Online -->
<text></text>
<questgiver>Peter</questgiver>
<coordinates x="60" y="35">La Johanne, Second Deck. (60,35)</coordinates>
- <reward>100 EXP, 1000 E.</reward>
+ <reward>100 EXP, 1000 GP.</reward>
</quest>
<quest name="Ratto Extermination" group="Ship" incomplete="4">
<name>Ratto Extermination</name>
@@ -165,7 +165,7 @@ Copyright (C) 2012-2013 Evol Online -->
<text></text>
<questgiver>Peter</questgiver>
<coordinates x="60" y="35">La Johanne, Second Deck. (60,35)</coordinates>
- <reward>100 EXP, 1000 E.</reward>
+ <reward>100 EXP, 1000 GP.</reward>
</quest>
</var>
<var id="5">
@@ -328,6 +328,7 @@ Copyright (C) 2012-2013 Evol Online -->
<var id="38">
<!--effect map="005-1.tmx" npc="119" value="0" effect="12"/>
<effect map="005-1.tmx" npc="119" value="2" effect="12"/-->
+ <!-- LiveNPCs (the ones with equipment) cannot have quest log effects -->
<quest name="Making a Figurine" group="Candor" incomplete="1">
<name>Making a Figurine</name>
<text text1="[Bug Leg]">Vincent is making a figurine with {@@1}. He needs 12.</text>