summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--items.xml10
-rw-r--r--maps.xml5
-rw-r--r--maps/008-1-1.tmx19
-rw-r--r--monsters.xml14
4 files changed, 32 insertions, 16 deletions
diff --git a/items.xml b/items.xml
index 9ffec4e4..eb06328f 100644
--- a/items.xml
+++ b/items.xml
@@ -857,36 +857,41 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
image="generic/gem-shard.png|W:#581a1a,a41111,c03a3a,ff6060,ffffff"
name="Ruby Shard"
description="A small ruby shard."
+ type="generic"
weight="10"
maxFloorOffset="15"/>
<item id="802"
image="generic/gem-shard.png|W:#1f9c1f,89d689,ffffff"
name="Emerald Shard"
description="A small emerald shard."
+ type="generic"
weight="10"
maxFloorOffset="15"/>
<item id="803"
image="generic/gem-shard.png|W:#4b4bbd,888af4,ffffff"
name="Sapphire Shard"
description="A small sapphire shard."
+ type="generic"
weight="10"
maxFloorOffset="15"/>
<item id="804"
image="generic/gem-shard.png|W:#ccb534,f1ea8e,ffffaa,ffffff"
name="Topaz Shard"
description="A small topaz shard."
+ type="generic"
weight="10"
maxFloorOffset="15"/>
<item id="805"
image="generic/gem-shard.png|W:#530a7c,b362e1,ca87ef,ffffff"
name="Amethyst Shard"
description="A small amethyst shard."
+ type="generic"
weight="10"
maxFloorOffset="15"/>
<!-- Necklaces -->
<item id="1000"
- image="equipment/neck/copper-necklace.png|W:#ce8b5b,764938,e4dfca,e0d5bf"
+ image="equipment/neck/copper-necklace.png|W"
name="%Color% Necklace (Copper)"
description="A %color% necklace, made of copper."
level="10"
@@ -894,8 +899,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
weight="50"
colors="gem"
iconColors="gem">
- <sprite gender="unisex">equipment/neck/copper-necklace.xml|</sprite>
- <sprite gender="female">equipment/neck/copper-necklace.xml|</sprite>
+ <sprite gender="unisex">equipment/neck/copper-necklace.xml</sprite>
</item>
<!-- Chest Armors -->
diff --git a/maps.xml b/maps.xml
index 99b843fb..4487f62b 100644
--- a/maps.xml
+++ b/maps.xml
@@ -288,11 +288,14 @@ Copyright (C) 2012-2017 Evol Online -->
<file name="graphics/tilesets/shadow.png"/>
<file name="graphics/tilesets/artis-sewer-sunlight-x1x5.png"/>
</atlas>
-
+
<!-- namespace Legacy -->
<map name="008-1.tmx">
<atlas name="legacy-woodland"/>
</map>
+ <map name="008-1-1.tmx">
+ <atlas name="legacy-woodland"/>
+ </map>
<map name="008-2-0.tmx">
<atlas name="legacy-woodland-indoor"/>
</map>
diff --git a/maps/008-1-1.tmx b/maps/008-1-1.tmx
index dfcba6eb..c723940a 100644
--- a/maps/008-1-1.tmx
+++ b/maps/008-1-1.tmx
@@ -1,5 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="1.1.3" orientation="orthogonal" renderorder="right-down" width="270" height="220" tilewidth="32" tileheight="32" infinite="0" nextobjectid="1">
+<map version="1.0" tiledversion="1.1.4" orientation="orthogonal" renderorder="right-down" width="270" height="220" tilewidth="32" tileheight="32" infinite="0" nextobjectid="1">
+ <properties>
+ <property name="license" value="CC BY-SA 3.0"/>
+ <property name="manaplus version" value="2"/>
+ <property name="name" value="Woodland"/>
+ <property name="overlay0image" value="graphics/images/ambient/cloud.png"/>
+ <property name="overlay0parallax" value="1.0"/>
+ <property name="overlay0scrollX" value="0.2"/>
+ <property name="overlay0scrollY" value="0.1"/>
+ </properties>
<tileset firstgid="1" name="hurns-ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
<image source="../graphics/tilesets/hurns-ground.png" width="512" height="512"/>
</tileset>
@@ -101,13 +110,13 @@
<image source="../graphics/tilesets/hurns-shadows.png" width="256" height="512"/>
</tileset>
<tileset firstgid="704" name="collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
- <image source="../../../../../../evol-all/client-data/graphics/tilesets/collision.png" width="96" height="96"/>
+ <image source="../graphics/tilesets/collision.png" width="96" height="96"/>
</tileset>
<tileset firstgid="713" name="ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
- <image source="../../../../../../evol-all/client-data/graphics/tilesets/ground.png" width="512" height="512"/>
+ <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
</tileset>
<tileset firstgid="969" name="water" tilewidth="32" tileheight="32" tilecount="240" columns="15">
- <image source="../../../../../../evol-all/client-data/graphics/tilesets/water.png" width="480" height="512"/>
+ <image source="../graphics/tilesets/water.png" width="480" height="512"/>
</tileset>
<tileset firstgid="1209" source="../graphics/tilesets/water-calm.tsx"/>
<tileset firstgid="1449" name="hurns-house" tilewidth="32" tileheight="32" tilecount="144" columns="12">
@@ -131,7 +140,7 @@
</tile>
</tileset>
<tileset firstgid="1603" name="tree-x3x4" tilewidth="96" tileheight="128" tilecount="10" columns="5">
- <image source="../../../../../../evol-all/client-data/graphics/tilesets/tree-x3x4.png" width="480" height="256"/>
+ <image source="../graphics/tilesets/tree-x3x4.png" width="480" height="256"/>
</tileset>
<layer name="Ground 1" width="270" height="220">
<data encoding="csv">
diff --git a/monsters.xml b/monsters.xml
index 5b2909f5..b770d86b 100644
--- a/monsters.xml
+++ b/monsters.xml
@@ -288,19 +288,19 @@ event="" Links the sfx to an action, like die, hit, hurt, miss, move or
<sound event="spawn">monsters/mushroom/spawn2.ogg</sound>
</monster>
<monster id="1051" name="Ruby Vein" targetCursor="small">
- <sprite>monsters/vein-gem.xml|W:#581a1a,a41111,c03a3a,ff6060</sprite>
+ <sprite>monsters/vein-gem.xml|#581a1a,a41111,c03a3a,ff6060</sprite>
</monster>
<monster id="1052" name="Emerald Vein" targetCursor="small">
- <sprite>monsters/vein-gem.xml|W:#1f9c1f,89d689</sprite>
+ <sprite>monsters/vein-gem.xml|#1f9c1f,89d689</sprite>
</monster>
<monster id="1053" name="Sapphire Vein" targetCursor="small">
- <sprite>monsters/vein-gem.xml|W:#4b4bbd,888af4</sprite>
+ <sprite>monsters/vein-gem.xml|#4b4bbd,888af4</sprite>
</monster>
- <monster id="1045" name="Topaz Vein" targetCursor="small">
- <sprite>monsters/vein-gem.xml|W:#ccb534,f1ea8e,ffffaa</sprite>
+ <monster id="1054" name="Topaz Vein" targetCursor="small">
+ <sprite>monsters/vein-gem.xml|#ccb534,f1ea8e,ffffaa</sprite>
</monster>
- <monster id="1045" name="Amethyst Vein" targetCursor="small">
- <sprite>monsters/vein-gem.xml|W:#530a7c,b362e1,ca87ef</sprite>
+ <monster id="1055" name="Amethyst Vein" targetCursor="small">
+ <sprite>monsters/vein-gem.xml|#530a7c,b362e1,ca87ef</sprite>
</monster>
<monster id="1100" name="Poison Skull" walkType="fly" targetCursor="small">
<sprite>monsters/skull-poison.xml</sprite>