Skip to content

Commit

Permalink
Merge pull request #974 from didory123/levelconnects
Browse files Browse the repository at this point in the history 
Connect all levels from greendale through castle hawkthorne
  • Loading branch information
@didory123
didory123 committed Mar 12, 2013
2 parents ba8f90c + 3e7d83c commit 5722e0b
Show file tree
Hide file tree
Showing 10 changed files with 397 additions and 413 deletions.
Binary file modified src/images/tilesets/gay-island.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/images/tilesets/treeline.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/images/tilesets/valley.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
28 changes: 12 additions & 16 deletions src/maps/gay-island-2.tmx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<property name="title" value="Gay Island 2"/>
</properties>
<tileset firstgid="1" name="gay-island" tilewidth="24" tileheight="24">
<image source="../images/tilesets/gay-island.png" width="624" height="816"/>
<image source="../images/tilesets/gay-island.png" width="624" height="936"/>
</tileset>
<layer name="sky" width="343" height="42">
<properties>
Expand Down Expand Up @@ -320,13 +320,13 @@
<property name="line" value="cloud_1"/>
<property name="offset_x" value="-6"/>
<property name="offset_y" value="-24"/>
<property name="speed" value="0.8"/>
<property name="speed" value="0.5"/>
<property name="sprite" value="images/gaycloud.png"/>
<property name="start" value="0"/>
<property name="touchstart" value="true"/>
</properties>
</object>
<object name="cloud_5" type="movingplatform" x="6792" y="768" width="72" height="24">
<object name="cloud_5" type="movingplatform" x="6792" y="768" width="48" height="24">
<properties>
<property name="line" value="cloud_5"/>
<property name="offset_x" value="-6"/>
Expand All @@ -337,7 +337,7 @@
<property name="touchstart" value="true"/>
</properties>
</object>
<object name="cloud_2" type="movingplatform" x="4920" y="552" width="72" height="24">
<object name="cloud_2" type="movingplatform" x="4920" y="552" width="48" height="24">
<properties>
<property name="line" value="cloud_2"/>
<property name="offset_x" value="-6"/>
Expand All @@ -346,7 +346,7 @@
<property name="sprite" value="images/gaycloud.png"/>
</properties>
</object>
<object name="cloud_3" type="movingplatform" x="5424" y="600" width="72" height="24">
<object name="cloud_3" type="movingplatform" x="5424" y="600" width="48" height="24">
<properties>
<property name="line" value="cloud_3"/>
<property name="offset_x" value="-6"/>
Expand All @@ -356,7 +356,7 @@
<property name="start" value="1"/>
</properties>
</object>
<object name="cloud_4" type="movingplatform" x="5496" y="504" width="72" height="24">
<object name="cloud_4" type="movingplatform" x="5508" y="504" width="48" height="24">
<properties>
<property name="line" value="cloud_4"/>
<property name="offset_x" value="-6"/>
Expand All @@ -373,9 +373,10 @@
<object name="rock" type="material" x="2016" y="504" width="24" height="24"/>
<object name="rock" type="material" x="3528" y="528" width="24" height="24"/>
<object type="killing_floor" x="7200" y="816" width="408" height="24"/>
<object type="liquid" x="0" y="936" width="8184" height="72">
<object type="liquid" x="0" y="936" width="8232" height="72">
<properties>
<property name="death" value="true"/>
<property name="drown" value="true"/>
<property name="opacity" value="0.8"/>
<property name="sprite" value="images/water.png"/>
</properties>
Expand All @@ -387,22 +388,17 @@
<property name="to" value="main"/>
</properties>
</object>
<object type="enemy" x="2376" y="936" width="48" height="48">
<object type="enemy" x="2424" y="936" width="48" height="48">
<properties>
<property name="enemytype" value="fish"/>
</properties>
</object>
<object type="enemy" x="2520" y="936" width="48" height="48">
<object type="enemy" x="2592" y="936" width="48" height="48">
<properties>
<property name="enemytype" value="fish"/>
</properties>
</object>
<object type="enemy" x="2664" y="936" width="48" height="48">
<properties>
<property name="enemytype" value="fish"/>
</properties>
</object>
<object type="enemy" x="2808" y="936" width="48" height="48">
<object type="enemy" x="2760" y="936" width="48" height="48">
<properties>
<property name="enemytype" value="fish"/>
</properties>
Expand All @@ -415,7 +411,7 @@
<object name="cloud_2" x="4920" y="576">
<polyline points="0,0 288,0"/>
</object>
<object name="cloud_4" x="5544" y="408">
<object name="cloud_4" x="5532" y="408">
<polyline points="0,0 0,168"/>
</object>
<object name="cloud_5" x="6747" y="785">
Expand Down
175 changes: 52 additions & 123 deletions src/maps/gay-island-3.tmx
View file
Original file line number Diff line number Diff line change
@@ -1,188 +1,117 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.0" orientation="orthogonal" width="80" height="18" tilewidth="24" tileheight="24">
<map version="1.0" orientation="orthogonal" width="60" height="24" tilewidth="24" tileheight="24">
<properties>
<property name="offset" value="4"/>
<property name="offset" value="10"/>
<property name="soundtrack" value="mamma-mia"/>
<property name="title" value="Gay Island 3"/>
</properties>
<tileset firstgid="1" name="gay-island" tilewidth="24" tileheight="24">
<image source="../images/tilesets/gay-island.png" width="624" height="816"/>
<image source="../images/tilesets/gay-island.png" width="624" height="936"/>
</tileset>
<layer name="sky" width="80" height="18">
<layer name="background" width="60" height="24">
<properties>
<property name="parallax" value="0"/>
<property name="parallax" value="0.1"/>
</properties>
<data encoding="base64" compression="zlib">
eJzt0EENgEAAA8HrAx3oQAc60HEqTgc60IEJLJA0+2onWQO7xhgLKAXxrv/676/+8/Sfp/88/ee5oVI8UCleqBSbmFLsYkpxiCnFKaYUl5hSTDGl6D9P/3k+9IXQUQ==
eJztw1ENABAAQEE2OeSQQw45pJDDtwhySCGBAt677XoMq9ufbLAVtsBm2AR7AuuGnbDDtm3bth8vdqJHsg==
</data>
</layer>
<layer name="little_rainbows" width="80" height="18">
<layer name="clouds2" width="60" height="24">
<properties>
<property name="parallax" value="0.3"/>
</properties>
<data encoding="base64" compression="zlib">
eJzt1ckNg0AQBdEWYdjGSw42GJMDXsmH0KnJgOUwQq4n/fuo5tARWmNfxLBjud+xVTfaXe232JN2nf2kv8G9SXcnDkXul2wT9ybdnajstwj3Jt2deNkvq5L+R3ZiZ3bxP2ap6XVnDXuw1n6zvOn1YV/2Y739JEnSBCMCIgms
eJzt1skJACAMBMDYjlf/5SmWoKifGdh/WFhIBLtaiujp9xXAqTx3XGaqPS/6eEvfcJd/DQAA/houtgJH
</data>
</layer>
<layer name="little_penis" width="80" height="18">
<layer name="clouds" width="60" height="24">
<properties>
<property name="parallax" value="0.3"/>
<property name="parallax" value="0.4"/>
</properties>
<data encoding="base64" compression="zlib">
eJztlkkKgDAQBCdfc3uF2yvU5zvXBAKSFjRaBQNzsCFdBIwZwP/og9kQnj6FjtqjNL94Zv2AP7VHaR5/Wh5/Wv6r/hrfW5/uYjf8xT1G3yefOdMt/V/gL+6x+b77HJlu6fd3+qvxTfMmfzXeSfxp4E8Dfxr408CfBv408KdxAkb8Pow=
eJzt00EOgCAMRNFyOvEY4EU4uk3YsTQjFP0vmS0pTDED9I5kloecaf0sb81Q/Nw65Fp03yKcYcbbRaJ8O2AW/ume1L1F3wN1b1/Zg6e845Z7Qvat5h232vPLvgEAAHZ3A0CSFi0=
</data>
</layer>
<layer name="clouds2" width="80" height="18">
<layer name="ocean" width="60" height="24">
<properties>
<property name="parallax" value="0.5"/>
<property name="parallax" value="0.6"/>
</properties>
<data encoding="base64" compression="zlib">
eJzt1zsOACAIREG4jr/7H086KytNCPAmoVbZbRQBYpgqstT7FoiMDuXWLNtuMwpl7PXml3Mr5oR8bh2m3we7AAAAP/CPz2EDbI8EiQ==
eJztw1EJACAQBbBn/xLm8MsQ5jDDYQvhNlgCAADAc0d2p6fZ1exU1Q8WeBFgFg==
</data>
</layer>
<layer name="big_penis" width="80" height="18">
<layer name="bg_penises" width="60" height="24">
<properties>
<property name="parallax" value="0.6"/>
<property name="parallax" value="0.86"/>
</properties>
<data encoding="base64" compression="zlib">
eJztksENgDAMA9PVgDGAMYDxyZcHqiJXQaVnKT8rTk42Qwi10lTMZp+lfH1Je2X8tvruzWf/Ib+M3w7fffpcHfCL9injt574RfsEv6eit775Iz2ueUfkF+lxzTsiv8iemhd+Wib8tEz4aZnw0zLhp2XCT8uEn5YJPy0zm98NtytYPw==
eJzt0UENACAQA8EiDmyAfxXwOQXwod0R0GRT6V5v0mgPhj4xT+sK6K1fU3qrk15P9Hqj1xu93ujNQC8AAECuDcx6EzM=
</data>
</layer>
<layer name="clouds" width="80" height="18">
<properties>
<property name="parallax" value="0.7"/>
</properties>
<layer name="bg_trees" width="60" height="24">
<data encoding="base64" compression="zlib">
eJzt1sENgCAMBdAyhDOpY6CLdG8u/osXQ/TS0mL+S5pwILQhpFSEvK1FZEPsJUcdCMVaLc9ujjkqzjsQZ/D93XUgtBrf38gcT+17C71Ygt8lEdEonnOEpyxzWMQfbyHLHEb/ENFHZu1dPRF9ZNbeRUREuVyFQR1x
eJztz7sRACAIREFKt24iEwsQE3+7Mczcy4iWMSfHbRZ+TlPZrvc+P/ZWbm/vXaH3bT/27t4AAAAAFR18sCyp
</data>
</layer>
<layer name="leaves_background" width="80" height="18">
<layer name="bg_leaves2" width="60" height="24">
<data encoding="base64" compression="zlib">
eJzt0EEJACAABMGzfwcTGsK/3xNEmEmwbAIAyRyvC/7mX8e/zvnPz87yDwAArtmmpAQJ
eJztljEKgEAMBJdUvsN3WPhUn3JP00ZIIV5yFrpxB9Jl4YYQLgCwGNbJgF4dfQ3kRF3Pmg0bs3fG1Tm3t989SsTvqp91xhlXn2Gd8Z1XL8O4yyO+Psc2Z/nmcvL9Nk99mf+mDNXurgiV7q4M8q1N7/4UQgghxL/ZAWKeFOM=
</data>
</layer>
<layer name="background" width="80" height="18">
<layer name="bg_leaves" width="60" height="24">
<data encoding="base64" compression="zlib">
eJzt080NQEAQBeDXA3XoxEkDbo5EBcpRAk5Kswdiw7J2Tfy+l0xcTPLmSxZgGIZh/phGTatNd2+d10XKrwDSRH2niWXqXZalw950O3u+fvnoV8Ldz6W779juOuu3tX/UMwMq3S87uOfa/Wt+IeY3uzW1YPev+UWw+6l/KqnuvqPdaexyl18Au19AP7HbTf0brO807dHv2X5XvIOxQ0+/d/u5OtOPfvRb+w1/AQYj
eJztlEsKwjAUAKM9RXfewQvkROox/KBnED/oGcT/FdSq6BX8QXWrE6ggBRcVqvalA0OzyCKTF6pUSkpK0slnlXazKvf01+eJE9N6zyhltAE36LUBW2cbtZd7msZyoJj5tNe1rNfsT+KMn62f9CZxxlF7X/fb8o/7FwqOUkUsOb8+yXco01nBKtZC1rEh7B5a9LSxg92QPewL6x3SM8IxTkLOcC6wd4073Abf1/VeWK/hQtMCl7hCD5t4xZvQ3gMe8YRnHKAvu1fTq+nV9GrTuhHcy3vWvGfNe9Ze0Ct5vv4bJfZG5QGpAF+S
</data>
</layer>
<layer name="foreground" width="80" height="18">
<layer name="filler" width="60" height="24">
<data encoding="base64" compression="zlib">
eJztVktugzAQHTgA6bL0LpFyi37US6ThAF5kmeQMXUY5RaW2tyD0Kn0QTGLHg4HYSRA86ckCj8f2mxnbRO6wBb/BnUOfQ0JT/dAvdmU76n2Erh+nJ6ef/D9E/GLvP5oeLvQbUo66yD/EII+FYutTvyggmgQkJPEtPE1lhY/67VP+LYlmU6JPtF9dzqIMY/ZgZvh+C1W7jLHPVJdnNhzKPKKHsq2jrxyDdrOyVfSz5UBkXqew7MPUz43xUlf5vgx7EJOW9bzAuCRQ9UupiH01T19qyARu/VsHvp/gOwYfzaT4YNPrd7EL/S55W8n59bvxmoguqONb6CdrOgmrM7yo51VYP87Wz61N398z/LyArx38cf71+LvQz3K+nzGP/xp74sjcJQW59Zj0m8PXB7joqN9Gu+9l/P9ObNIW/tIDRbfVuEeb+70p6mLH5EUb27t4Y0vIt9572PyNN+II7s14D7EdMaIv+AcIarzn
eJzt0zEKgDAMheHSHMFJj+Taa3k+XT2KgjiK6ZKY+H/whkKGl0JKAQBE0V7eAL7p6Vaz3vCf9m0dmcSpJEwMciWLex9torDoP4ru3rVzQCZL9W5gaz+z1r5sgf9o9i5gjH31Dl7eFRA=
</data>
</layer>
<layer name="leaves" width="80" height="18">
<layer name="floor" width="60" height="24">
<data encoding="base64" compression="zlib">
eJztljEOgjAYhX88gGdgdFYPwFE4CoOeA2Y3E92J3WTgApIwyBHcfUCa1AYIpW1oYl/ypaSBH/7Ho5TIvLYbolfwCwsoOWM8SWAuueOamwTmRs+38MhOacy/tO+/FklX8q8JKCskMBeaqK2r3abzKxapJvouqfOrFikt+we/6AmuAoUj2b4YqjOWVxO1uX8iqB8OkWrkErnJmETlSM51xP0bkmrmj/hW9hgPgI9c8Is+EsyRnOtIxT/kJULPYQuOc5X7eP+IHgKqvVf9NbXI1L/AJU2tPU3/v6jn1NHxz7bQRyTtIXJTtZmUnaX9M4f9a7+jt0Dh/VOSTf+qfr2R96HxgjrEZuxj15BN//5BfB3nNI69Xy8vLy8vLxv6Ap+K0Fw=
eJztlU0OgjAQRifhAv5cwL26ETdyAjcsjIlr45YI6gm60XN4FI/iUfywIQGFpNDWkaZf8lIoNJmXKYXIx8ftLIlECBYSKhPK585lB7Y1YF4wlmU0CVgpkDjiDJdJ3sMjfFKMGTjJ+0qP8d6drUhDyXt7JekTw/cGJ3g9ME5iqvqmPfctuxa+eQ8v9O7l/tM367lvsY9Vfc89981KvpF0/SIiN/u7ofr/EOaFC+fVKNBjBuYBt4V6xoE+B+/7t2lyGIBhh/2NNQJrBbdXU5rq1u257rkwtbRnTOxnW9hw5nb6tTO3jwomzwRulzYU3/Zao+fcDl0o//+e1O6au3bva9f3BcYWYjs=
</data>
</layer>
<layer name="leaves2" width="80" height="18">
<layer name="trees" width="60" height="24">
<data encoding="base64" compression="zlib">
eJztlbENwjAQRc+ZhFHYAui8AiBRU5ApKEKdOvSIlBRMYCmj8C+hAFGd4shY+U/6kgvb+nrS2SLxqQ17r0gzQYecob9xWPw9pXfYTVQlCZWTy9mJaLC+Wc9b/P0TDyfHGPfAmz/BnaaMdOecoL9vSsMMHop+ZvWM11T0Z/JHfqG/cWAGfeoOnwQnyxZ/vAbrReo+FlZ439bIpkjXAd7k/k6b2fu6hbcdsqe/bAmDt04T6I8QQsgMeQEMri/f
eJztlmkOgjAQhStcwuU2+s8z6AU4gL97KFzO4ILLGURvob6madKQadOoFYT5kpeGVwjzphOCEAzTTbaJEDtoDx2SuquJzxUZS+gG3TuQ94GMT5UzFaKX1l1NfPrIOICG0MjK25Y5XxC1m7w2vjmnehHqNQEqr2/OqV6Eer8gx7uW0Apa61XiWsKXap/K65pzBdWLUC8G1foKvPMInaCzXiWuZeHJ6/OpXoR6Mcit2Zmm+lx9MjWps99Yz7ryuvZCvW9DnGeQ1L2XP8z7LmPUNbFqa1PejKhhBm/e0ryfYnJkjv7guyGrHsO4oP4LGYZhmGbzApnuWyo=
</data>
</layer>
<objectgroup color="#a4371c" name="block" width="80" height="18">
<object x="1224" y="312" width="648" height="120"/>
<object x="1008" y="240" width="72" height="192"/>
<object x="720" y="360" width="168" height="72"/>
<object x="0" y="288" width="648" height="144"/>
</objectgroup>
<objectgroup color="#4a3ea4" name="platform" width="80" height="18">
<object x="408" y="168" width="240" height="24"/>
<object x="1224" y="144" width="264" height="24"/>
<object x="24" y="216" width="204" height="24"/>
<object x="1536" y="96" width="120" height="24"/>
<object x="1584" y="168" width="168" height="24"/>
<object x="1833" y="240" width="54" height="22"/>
<object x="1428" y="265" width="34" height="22"/>
<object x="918" y="289" width="58" height="23">
<properties>
<property name="drop" value="false"/>
</properties>
</object>
<object x="877" y="96" width="34" height="23"/>
<object x="108" y="216" width="35" height="24"/>
<object x="275" y="240" width="37" height="23"/>
<object x="432" y="73" width="34" height="22"/>
<object x="648" y="168" width="72" height="24">
<properties>
<property name="drop" value="false"/>
</properties>
<objectgroup color="#a40d0d" name="platform" width="60" height="24">
<object x="1416" y="480">
<polygon points="0,0 -384,0 -432,-24 -504,-96 -888,-96 -936,-120 -1224,-120 -1272,-96 -1416,-96 -1416,-72 -504,-72 -432,0 -384,24 0,24"/>
</object>
<object x="888" y="168" width="24" height="24">
<properties>
<property name="drop" value="false"/>
</properties>
</object>
<object x="984" y="168" width="24" height="24">
<properties>
<property name="drop" value="false"/>
</properties>
</object>
<object x="720" y="168" width="168" height="24"/>
<object x="912" y="168" width="72" height="24"/>
<object x="1008" y="168" width="24" height="24"/>
<object x="1200" y="144" width="24" height="24">
<properties>
<property name="drop" value="false"/>
</properties>
<object x="0" y="288">
<polygon points="0,0 384,0 432,24 0,24"/>
</object>
<object x="96" y="240" width="168" height="24"/>
<object x="120" y="144" width="120" height="24"/>
<object x="72" y="120" width="264" height="24"/>
<object x="144" y="72" width="168" height="24"/>
<object x="48" y="168" width="24" height="24"/>
<object x="24" y="192" width="24" height="24"/>
</objectgroup>
<objectgroup color="#2aa46d" name="nodes" width="80" height="18">
<object name="end" type="door" x="1776" y="0" width="48" height="312">
<objectgroup color="#000000" name="nodes" width="60" height="24">
<object type="liquid" x="1104" y="504" width="336" height="72">
<properties>
<property name="instant" value="true"/>
<property name="level" value="black-caverns"/>
<property name="to" value="main"/>
</properties>
</object>
<object type="liquid" x="312" y="370" width="168" height="72">
<properties>
<property name="death" value="true"/>
<property name="mask" value="true"/>
<property name="opacity" value="0.95"/>
<property name="speed" value="0.15"/>
<property name="sprite" value="images/water.png"/>
</properties>
</object>
<object type="liquid" x="648" y="371" width="72" height="72">
<properties>
<property name="death" value="true"/>
<property name="mask" value="true"/>
<property name="opacity" value="0.95"/>
<property name="speed" value="0.15"/>
<property name="sprite" value="images/water.png"/>
</properties>
</object>
<object type="liquid" x="888" y="371" width="120" height="72">
<object name="main" type="door" x="168" y="192" width="24" height="48">
<properties>
<property name="death" value="true"/>
<property name="mask" value="true"/>
<property name="opacity" value="0.95"/>
<property name="speed" value="0.15"/>
<property name="sprite" value="images/water.png"/>
</properties>
</object>
<object type="liquid" x="1080" y="372" width="144" height="72">
<properties>
<property name="death" value="true"/>
<property name="mask" value="true"/>
<property name="opacity" value="0.95"/>
<property name="speed" value="0.15"/>
<property name="sprite" value="images/water.png"/>
</properties>
</object>
<object type="enemy" x="696" y="120" width="48" height="48">
<properties>
<property name="enemytype" value="manicorn"/>
<property name="level" value="gay-island-2"/>
<property name="sound" value="false"/>
<property name="to" value="next"/>
</properties>
</object>
<object name="leaf" type="material" x="552" y="264" width="24" height="24"/>
<object name="main" type="door" x="96" y="168" width="24" height="48">
<object type="door" x="1272" y="432" width="24" height="48">
<properties>
<property name="level" value="gay-island-2"/>
<property name="to" value="next"/>
<property name="level" value="black-caverns"/>
<property name="to" value="main"/>
</properties>
</object>
</objectgroup>
<objectgroup color="#7ea318" name="block" width="60" height="24">
<object x="1416" y="0" width="24" height="576"/>
</objectgroup>
</map>
24 changes: 18 additions & 6 deletions src/maps/gay-island.tmx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<property name="title" value="Gay Island"/>
</properties>
<tileset firstgid="1" name="gay-island" tilewidth="24" tileheight="24">
<image source="../images/tilesets/gay-island.png" width="624" height="816"/>
<image source="../images/tilesets/gay-island.png" width="624" height="936"/>
</tileset>
<layer name="sky" width="150" height="25">
<properties>
Expand Down Expand Up @@ -149,11 +149,15 @@
<object x="1704" y="168" width="288" height="24"/>
<object x="1776" y="144" width="96" height="24"/>
<object x="1560" y="504" width="288" height="24"/>
<object x="2088" y="408" width="1512" height="24"/>
<object x="960" y="312" width="1392" height="24"/>
<object x="792" y="360" width="72" height="24"/>
<object x="0" y="456" width="456" height="24"/>
<object x="552" y="408" width="1104" height="24"/>
<object x="0" y="456">
<polygon points="0,0 456,0 552,-48 1656,-48 1656,-24 552,-24 456,24 0,24"/>
</object>
<object x="792" y="360">
<polygon points="0,0 72,0 168,-48 1560,-48 1560,-24 168,-24 72,24 0,24"/>
</object>
<object x="1944" y="480">
<polygon points="0,0 144,-72 1656,-72 1656,-48 144,-48 0,24"/>
</object>
</objectgroup>
<objectgroup name="block" width="150" height="25"/>
<objectgroup color="#000000" name="nodes" width="150" height="25">
Expand Down Expand Up @@ -181,5 +185,13 @@
<property name="sprite" value="images/water.png"/>
</properties>
</object>
<object type="door" x="0" y="0" width="24" height="456">
<properties>
<property name="instant" value="true"/>
<property name="level" value="valley"/>
<property name="sound" value="false"/>
<property name="to" value="gayisland"/>
</properties>
</object>
</objectgroup>
</map>
Loading

0 comments on commit 5722e0b

Please sign in to comment.