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/007-1.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/007-1.tmx')
| -rw-r--r-- | maps/007-1.tmx | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/maps/007-1.tmx b/maps/007-1.tmx index be6e4164..b94cf84f 100644 --- a/maps/007-1.tmx +++ b/maps/007-1.tmx @@ -1,12 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" tiledversion="1.1.1" orientation="orthogonal" renderorder="right-down" width="200" height="200" tilewidth="32" tileheight="32" infinite="0" nextobjectid="7"> +<map version="1.0" tiledversion="2018.02.14" orientation="orthogonal" renderorder="right-down" width="200" height="200" tilewidth="32" tileheight="32" infinite="0" nextobjectid="7"> <properties> - <property name="license" value="CC BY-SA 3.0"/> - <property name="manaplus version" value="2"/> - <property name="minimap" value=""/> - <property name="music" value="bartk - the adventure begins.ogg"/> - <property name="name" value="mining cave"/> - <property name="overlay0image" value="graphics/images/ambient/cloud.png"/> + <property name="minimap" value="graphics/minimaps/007-1.png"/> + <property name="music" value="dariunas - the forest.ogg"/> + <property name="name" value="Tulimshar Mining Camp"/> + <property name="overlay0image" value="graphics/images/ambient/spotlight.png"/> <property name="overlay0keepratio" value="true"/> <property name="overlay0parallax" value="1.0"/> <property name="overlay0scrollX" value="0.2"/> @@ -1042,7 +1040,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </data> </layer> - <layer name="Over1" width="200" height="200" visible="0"> + <layer name="Over1" width="200" height="200"> <data encoding="csv"> 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, |