Added stairs. Made 'em myself.
Justin Armstrong justinmeister@gmail.com
Sat, 14 Jun 2014 13:14:13 -0700
6 files changed,
33 insertions(+),
21 deletions(-)
M
data/states/shop.py
→
data/states/shop.py
@@ -192,7 +192,7 @@ def make_accept_dialogue(self):
""" Make the dialogue for when the player buys an item. """ - return ['Your health has been replenished!'] + return ['Your health has been replenished and your game saved!'] def make_purchasable_items(self): """Make list of items to be chosen"""
M
resources/tmx/dungeon.tmx
→
resources/tmx/dungeon.tmx
@@ -6,9 +6,12 @@ </tileset>
<tileset firstgid="111" name="tileset3" tilewidth="16" tileheight="16"> <image source="../graphics/tileset3.png" width="176" height="192"/> </tileset> + <tileset firstgid="243" name="stairs" tilewidth="16" tileheight="16"> + <image source="../graphics/stairs.png" trans="5e81a2" width="32" height="16"/> + </tileset> <layer name="Tile Layer 1" width="25" height="27"> <data encoding="base64" compression="zlib"> - eJztlUkOwjAMRX1CYAldQveIUWLacQugDIeg6+Zk/EiJaiwXCLQIoUR6ihs3fkqy8JCIxmACpmAG5m5tVJELWV+AJdiAFVi7WH5/Em+/6LgqtEA7gI5SI2eOQsl3QS+AxNUpWD3psBCL33HkDmKxdBhGHwwYWl2eT8V+ozhkXiLPlVS8o8Q6dmCvzPLtNEchsPvO4AJOLNYGv79nDkP37/vq4PcXHdHxjw6fi+f4jXPU5fBzkw7fz5p0POpR8qwhDtunMnCkstfI3ptS2c8O7v8swFH3uAG1VgYY + eJztlUsOwiAQhjmhutQutXvjM/G18xZqfRyiXcOZPIA/CaTjZKqirTEGki9MmTJfgMUMlVJjMAFTMANztzaqyIWsL8ASbMAKrF3Mvz+Jt1905AIt0A6gI9QoiEML+S7oBZC4OprU4w7t1nz8jqNwXEnMHYbQBwOCVJfmU7bfCA6e5/BzJRXvyLGOHdgLM387yaEZdt8ZXMCJxNKg9/fMYdT9+7466P1FR3T8o8Pn4jl+4xx1OfzcpMP3syYdj3oUP2uIw/apDBxV2Wt4701V2c8O7v8swFH3uAGzDAfD </data> </layer> <objectgroup name="Object Layer 1" width="25" height="27">@@ -107,14 +110,14 @@ <object name="blocker" gid="70" x="304" y="176"/>
<object name="blocker" gid="70" x="304" y="192"/> <object name="blocker" gid="70" x="304" y="160"/> <object name="portal" type="dungeon2" gid="89" x="48" y="96"/> - <object name="start point" gid="73" x="48" y="112"> + <object name="start point" gid="73" x="48" y="96"> <properties> <property name="direction" value="down"/> <property name="state" value="dungeon2"/> </properties> </object> <object name="portal" type="dungeon4" gid="89" x="336" y="96"/> - <object name="start point" gid="73" x="336" y="112"> + <object name="start point" gid="73" x="336" y="96"> <properties> <property name="direction" value="down"/> <property name="state" value="dungeon4"/>@@ -131,7 +134,7 @@ </object>
</objectgroup> <layer name="Tile Layer 2" width="25" height="27"> <data encoding="base64" compression="zlib"> - eJxjYKAP6EHj9yKx+3CoI0YNsvh0NDtmILFn4lBHjBpk8VEwCkbBKBgFo2AUjIJRQD0AAG1HCSk= + eJxjYKAP6EHj9yKx+3CoI0YNsvh0NDtmILFn4lBHjBpk8eEGPlPJnC9UMmcUjIJRMApGwSgYBSMLAABr6wsQ </data> </layer> </map>
M
resources/tmx/dungeon2.tmx
→
resources/tmx/dungeon2.tmx
@@ -6,13 +6,16 @@ </tileset>
<tileset firstgid="111" name="tileset3" tilewidth="16" tileheight="16"> <image source="../graphics/tileset3.png" width="176" height="192"/> </tileset> + <tileset firstgid="243" name="stairs" tilewidth="16" tileheight="16"> + <image source="../graphics/stairs.png" trans="5e81a2" width="32" height="16"/> + </tileset> <layer name="Tile Layer 1" width="25" height="25"> <data encoding="base64" compression="zlib"> - eJzdlEEKACAIBP3/g+zey7qGiEjuSiV0Smc0JJH/Qs1hMNTkVRwzcHTMwXZ4uSd8Vg1idhY/w0DwIxaSb5nV3bvFMRocrDk8PnunMncIPsLD+ksqb52t7XJIIi9y7JxKL+jaF2IBx8lVXg== + eJxjYBh+YBsapoUZILHPVLLjEB476OEPWtuBTS055tNKDzX8TivziTGDGubjM4ua5qObSWnaGyx2bKeDHbTyBzbzaZ2miJGjhvnUsIdWZQklYU2sXnrZQW5dCNPzhQg7aO2PoQoAd2pYOA== </data> </layer> <objectgroup name="Object Layer 1" width="25" height="25"> - <object name="start point" gid="73" x="64" y="80"> + <object name="start point" gid="73" x="64" y="64"> <properties> <property name="direction" value="down"/> <property name="state" value="dungeon"/>@@ -124,14 +127,14 @@ <object name="blocker" gid="70" x="256" y="224"/>
<object name="blocker" gid="70" x="256" y="224"/> <object name="blocker" gid="70" x="256" y="240"/> <object name="portal" type="dungeon3" gid="89" x="336" y="352"/> - <object name="start point" gid="73" x="336" y="368"> + <object name="start point" gid="73" x="336" y="352"> <properties> <property name="direction" value="down"/> <property name="state" value="dungeon3"/> </properties> </object> <object name="portal" type="dungeon4" gid="89" x="80" y="352"/> - <object name="start point" gid="73" x="80" y="368"> + <object name="start point" gid="73" x="80" y="352"> <properties> <property name="direction" value="down"/> <property name="state" value="dungeon4"/>
M
resources/tmx/dungeon3.tmx
→
resources/tmx/dungeon3.tmx
@@ -9,26 +9,29 @@ </tileset>
<tileset firstgid="243" name="castledoor" tilewidth="16" tileheight="16"> <image source="../graphics/castledoor.png" width="32" height="48"/> </tileset> + <tileset firstgid="249" name="stairs" tilewidth="16" tileheight="16"> + <image source="../graphics/stairs.png" trans="5e81a2" width="32" height="16"/> + </tileset> <layer name="Tile Layer 1" width="25" height="25"> <data encoding="base64" compression="zlib"> - eJztz80KgkAYheG5wmgpLaN9plaklT94F1r2cw+51ivzXYwwiAuhiSi+Aw8z3+pwlPpu1nCxgQcfAbbYYY/Dmx0hIhxxwhkxEqTIkP9IR4NWvzPMjbu11PFCrV8HC+OuLXWYO/oO2THeITumd8iO6R3/uGOJlfrsjj42dxQoccEVFW6444Gn/kskw3Q16m94 + eJztz80KgkAYheG5wmgZLaO9labYj5Z4F5Wl3kOzzivrXUwwiAuhiVC+Aw8z3+pwlPpvPKywxgY+AmwRIkL8ZccOexxwRIIUJ5yRIR9IxwuNeSeYWnfjqOMJbd4Z5tatHXXYOz4dsqO7Q3b075Ad/TvGuGOBpfrtDm243HHBFTcUuOOBEhVq85dI2nkD3Rtw5g== </data> </layer> <layer name="Tile Layer 2" width="25" height="25"> <data encoding="base64" compression="zlib"> - eJxjYBhc4DMQf6GxHV+B+BuN7fgOxD9obMcoGAWjYBSMglEwCkYuAACy2gXC + eJxjYBhc4DMQf6GxHV+B+BuN7fgOxD9obMcoGAWjYBSMAtqDn3jkftHNFaNgFGACAK3hB7U= </data> </layer> <objectgroup name="Object Layer 1" width="25" height="25"> - <object name="portal" type="dungeon2" gid="89" x="176" y="304"/> - <object name="portal" type="dungeon4" gid="89" x="192" y="304"/> - <object name="start point" gid="73" x="176" y="288"> + <object name="portal" type="dungeon2" gid="89" x="128" y="304"/> + <object name="portal" type="dungeon4" gid="89" x="240" y="304"/> + <object name="start point" gid="73" x="128" y="304"> <properties> <property name="direction" value="up"/> <property name="state" value="dungeon2"/> </properties> </object> - <object name="start point" gid="73" x="192" y="288"> + <object name="start point" gid="73" x="240" y="304"> <properties> <property name="direction" value="up"/> <property name="state" value="dungeon4"/>@@ -80,13 +83,13 @@ <object name="blocker" gid="70" x="112" y="112"/>
<object name="blocker" gid="70" x="112" y="96"/> <object name="portal" type="dungeon5" gid="89" x="176" y="64"/> <object name="portal" type="dungeon5" gid="89" x="192" y="64"/> - <object name="start point" gid="73" x="176" y="80"> + <object name="start point" gid="73" x="176" y="64"> <properties> <property name="direction" value="down"/> <property name="state" value="dungeon5"/> </properties> </object> - <object name="start point" gid="73" x="192" y="80"> + <object name="start point" gid="73" x="192" y="64"> <properties> <property name="direction" value="down"/> <property name="state" value="dungeon5"/>
M
resources/tmx/dungeon4.tmx
→
resources/tmx/dungeon4.tmx
@@ -6,14 +6,17 @@ </tileset>
<tileset firstgid="111" name="tileset3" tilewidth="16" tileheight="16"> <image source="../graphics/tileset3.png" width="176" height="192"/> </tileset> + <tileset firstgid="243" name="stairs" tilewidth="16" tileheight="16"> + <image source="../graphics/stairs.png" trans="5e81a2" width="32" height="16"/> + </tileset> <layer name="Tile Layer 1" width="25" height="25"> <data encoding="base64" compression="zlib"> - eJxjYBhcYBsSpqUdyDSt7KC1P2D20BoMVjtIDWNy7SBFL6X+IMY/1IiPgbaDWvkDW9gh44NEqKGW/fjUUAoGOr5g8pSGHan5iNZ20NoflIDhYAe96vPhYAe5AAC7pDeA + eJxjYBhcYBsSpqUdn+lgB639AbOH1mCw2kFqGJNrBylphVJ/EOMfasTHQNtBrfyBLeyQ8UEi1FDLfnxqKAUDHV8weUrDjpR89IUOdtDaH5SA4WAHverz4WAHuQAAYlY6Wg== </data> </layer> <objectgroup name="Object Layer 1" width="25" height="25"> <object name="portal" type="dungeon" gid="89" x="368" y="272"/> - <object name="start point" gid="73" x="368" y="288"> + <object name="start point" gid="73" x="368" y="272"> <properties> <property name="direction" value="down"/> <property name="state" value="dungeon"/>@@ -126,14 +129,14 @@ <object name="blocker" gid="70" x="208" y="176"/>
<object name="blocker" gid="70" x="400" y="256"/> <object name="blocker" gid="70" x="400" y="272"/> <object name="blocker" gid="70" x="400" y="288"/> - <object name="start point" gid="73" x="16" y="160"> + <object name="start point" gid="73" x="16" y="144"> <properties> <property name="direction" value="down"/> <property name="state" value="dungeon3"/> </properties> </object> <object name="portal" type="dungeon2" gid="89" x="192" y="48"/> - <object name="start point" gid="73" x="192" y="64"> + <object name="start point" gid="73" x="192" y="48"> <properties> <property name="direction" value="down"/> <property name="state" value="dungeon2"/>