diff options
| author | Saulc <lucashelaine14@gmail.com> | 2018-02-23 19:10:39 +0100 |
|---|---|---|
| committer | Saulc <lucashelaine14@gmail.com> | 2018-02-23 19:10:39 +0100 |
| commit | 92facc0039ad4cdf85da1ace748006646e8e3b2b (patch) | |
| tree | 5257122fc743d7dd3da0a05b1b80521428a9f0c1 /maps/005-4.tmx | |
| parent | ea9e6725b7ff2eb7f93fc9de9bba5354d2e81494 (diff) | |
| parent | fd49ef55127c4a36bdcd1d5c02a928e0c2b497e4 (diff) | |
| download | clientdata-92facc0039ad4cdf85da1ace748006646e8e3b2b.tar.gz clientdata-92facc0039ad4cdf85da1ace748006646e8e3b2b.tar.bz2 clientdata-92facc0039ad4cdf85da1ace748006646e8e3b2b.tar.xz clientdata-92facc0039ad4cdf85da1ace748006646e8e3b2b.zip | |
Merge branch 'master' of gitlab.com:TMW2/clientdata
Conflicts:
maps/007-1.tmx
Diffstat (limited to 'maps/005-4.tmx')
| -rw-r--r-- | maps/005-4.tmx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/maps/005-4.tmx b/maps/005-4.tmx index 133b808a..dd551007 100644 --- a/maps/005-4.tmx +++ b/maps/005-4.tmx @@ -1,9 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" tiledversion="1.1.1" orientation="orthogonal" renderorder="right-down" width="70" height="68" tilewidth="32" tileheight="32" infinite="0" nextobjectid="27"> +<map version="1.0" tiledversion="2018.02.14" orientation="orthogonal" renderorder="right-down" width="70" height="68" tilewidth="32" tileheight="32" infinite="0" nextobjectid="27"> <properties> <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> - <property name="name" value="Merchant Guild"/> + <property name="minimap" value="graphics/minimaps/005-4.png"/> + <property name="music" value="magick - real.ogg"/> + <property name="name" value="Armor Shop"/> </properties> <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3"> <image source="../graphics/tilesets/collision.png" width="96" height="96"/> |