summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2020-10-21 17:02:19 -0300
committerJesusaves <cpntb1@ymail.com>2020-10-21 17:02:19 -0300
commit0d8a21f17f45b3ee96dd845ecb4b2de7f8476a75 (patch)
treeb427f47fec75fb0e113422f26e123b991a24d3c8
parent757dc792aeca5d88602a6fd31a36908301897f79 (diff)
downloadclientdata-0d8a21f17f45b3ee96dd845ecb4b2de7f8476a75.tar.gz
clientdata-0d8a21f17f45b3ee96dd845ecb4b2de7f8476a75.tar.bz2
clientdata-0d8a21f17f45b3ee96dd845ecb4b2de7f8476a75.tar.xz
clientdata-0d8a21f17f45b3ee96dd845ecb4b2de7f8476a75.zip
Review by Prsm and Monwarez
-rw-r--r--maps/fermi.tmx20
-rw-r--r--maps/marine-2.tmx22
2 files changed, 30 insertions, 12 deletions
diff --git a/maps/fermi.tmx b/maps/fermi.tmx
index 0d7562ed..e35bb178 100644
--- a/maps/fermi.tmx
+++ b/maps/fermi.tmx
@@ -37,21 +37,21 @@
112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,226,226,226,226,226,226,226,226,226,226,1,1,1,1,1,1,1,1,1,1,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,
112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,226,226,226,226,226,226,226,226,226,226,1,1,1,1,1,1,1,1,1,1,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,
112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,226,226,226,226,226,226,226,226,226,226,1,1,1,1,1,1,1,1,1,1,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,
+112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,226,226,226,226,226,226,226,226,226,226,1,1,1,231,1,1,1,231,1,1,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,
+112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,226,226,226,226,226,226,226,226,226,226,1,1,1,231,231,1,231,231,1,1,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,
+112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,226,226,226,226,226,226,226,226,226,226,1,1,1,1,231,231,231,1,1,1,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,
+112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,226,226,226,226,226,226,226,226,226,226,1,1,1,1,1,231,1,1,1,1,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,
+112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,226,226,226,226,226,226,226,226,226,226,1,1,1,1,1,231,1,1,1,1,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,
112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,226,226,226,226,226,226,226,226,226,226,1,1,1,1,1,1,1,1,1,1,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,
112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,226,226,226,226,226,226,226,226,226,226,1,1,1,1,1,1,1,1,1,1,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,
112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,226,226,226,226,226,226,226,226,226,226,1,1,1,1,1,1,1,1,1,1,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,
-112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,226,226,226,226,226,226,226,226,226,226,1,1,1,1,1,1,1,1,1,1,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,
-112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,226,226,226,226,226,226,226,226,226,226,1,1,1,1,1,1,1,1,1,1,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,
-112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,226,226,226,226,226,226,226,226,226,226,1,1,1,1,1,1,1,1,1,1,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,
-112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,226,226,226,226,226,226,226,226,226,226,1,1,1,1,1,1,1,1,1,1,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,
-112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,226,226,226,226,226,226,226,226,226,226,1,1,1,1,1,1,1,1,1,1,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,
-112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,226,226,226,226,226,226,226,226,226,226,215,215,215,215,215,215,215,215,215,215,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,
-112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,226,226,226,226,226,226,226,226,226,226,215,215,215,215,215,215,215,215,215,215,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,
-112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,226,226,226,226,226,226,226,226,226,226,215,215,215,215,215,215,215,215,215,215,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,
-112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,226,226,226,226,226,226,226,226,226,226,215,215,215,215,215,215,215,215,215,215,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,
-112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,226,226,226,226,226,226,226,226,226,226,215,215,215,215,215,215,215,215,215,215,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,
112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,226,226,226,226,226,226,226,226,226,226,215,215,215,215,215,215,215,215,215,215,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,
112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,226,226,226,226,226,226,226,226,226,226,215,215,215,215,215,215,215,215,215,215,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,
+112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,226,226,226,226,226,226,226,226,226,226,215,215,215,231,215,215,215,231,215,215,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,
+112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,226,226,226,226,226,226,226,226,226,226,215,215,215,231,231,215,215,231,215,215,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,
+112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,226,226,226,226,226,226,226,226,226,226,215,215,215,231,215,231,215,231,215,215,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,
+112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,226,226,226,226,226,226,226,226,226,226,215,215,215,231,215,215,231,231,215,215,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,
+112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,226,226,226,226,226,226,226,226,226,226,215,215,215,231,215,215,215,231,215,215,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,
112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,226,226,226,226,226,226,226,226,226,226,215,215,215,215,215,215,215,215,215,215,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,
112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,226,226,226,226,226,226,226,226,226,226,215,215,215,215,215,215,215,215,215,215,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,
112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,226,226,226,226,226,226,226,226,226,226,215,215,215,215,215,215,215,215,215,215,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,
diff --git a/maps/marine-2.tmx b/maps/marine-2.tmx
index b85dfa5c..b9af1e13 100644
--- a/maps/marine-2.tmx
+++ b/maps/marine-2.tmx
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.4" tiledversion="1.4.1" orientation="orthogonal" renderorder="right-down" width="80" height="62" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="4">
+<map version="1.4" tiledversion="1.4.1" orientation="orthogonal" renderorder="right-down" width="80" height="62" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="6">
<properties>
<property name="author" value="Saulc"/>
<property name="license" value="CC BY-SA 4.0"/>
@@ -426,7 +426,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
</data>
</layer>
- <layer id="7" name="Collision" width="80" height="62" visible="0">
+ <layer id="7" name="Collision" width="80" height="62">
<data encoding="csv">
498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,
498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,
@@ -558,4 +558,22 @@
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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>
+ <objectgroup id="10" name="Objects">
+ <object id="4" name="Croc" type="spawn" x="736" y="928" width="640" height="256">
+ <properties>
+ <property name="death" value="12000"/>
+ <property name="max_beings" value="2"/>
+ <property name="monster_id" value="1006"/>
+ <property name="spawn" value="13000"/>
+ </properties>
+ </object>
+ <object id="5" name="Piou" type="spawn" x="704" y="960" width="640" height="256">
+ <properties>
+ <property name="death" value="14000"/>
+ <property name="max_beings" value="1"/>
+ <property name="monster_id" value="1016"/>
+ <property name="spawn" value="14000"/>
+ </properties>
+ </object>
+ </objectgroup>
</map>