Skip to content

Commit

Permalink
Increase Foreground visibility
Browse files Browse the repository at this point in the history 
Still need to create materials from foreground objects
  • Loading branch information
@8bitgentleman
8bitgentleman committed Sep 22, 2015
1 parent 2ba002c commit ad92631
Show file tree
Hide file tree
Showing 12 changed files with 121 additions and 106 deletions.
Binary file modified src/images/throwables/claypot.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/weapons/axe.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/weapons/battleaxe_small.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/weapons/dagger.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/weapons/mace_small.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/weapons/scythe.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: 14 additions & 14 deletions src/maps/blacksmith-upstairs.tmx
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.0" orientation="orthogonal" width="22" height="14" tilewidth="24" tileheight="24">
<map version="1.0" orientation="orthogonal" renderorder="right-down" width="22" height="14" tilewidth="24" tileheight="24" nextobjectid="17">
<properties>
<property name="overworldName" value="town_1"/>
<property name="soundtrack" value="blacksmith"/>
Expand All @@ -19,7 +19,7 @@
</layer>
<layer name="pillar_bottom" width="22" height="14">
<data encoding="base64" compression="zlib">
eJyzYWBgECEByyOxbRgYGhiQADLfZgiaq8DAsIBYTIq5pAB5KE0rc9HNIdXcLCDOBuIcKplrhUMcZG4GVD855rrhMTedAnPxgWISzE1mYDhAqvnUdi+1zU0m0VwgXkAmxmkuAKFjNok=
eJyzYWBgECEByyOxbRgYGhiQADLfZgiaq8DAsIBYTIq5pAB5KE0rc9HNGczmZkD1U9vcdBqYCwLFJJibzMBwgFTzqe1eapubTKK5QLyATIzTXABLozTI
</data>
</layer>
<layer name="pillar_top" width="22" height="14">
Expand All @@ -28,35 +28,35 @@
</data>
</layer>
<objectgroup color="#a47533" name="floorspace">
<object x="360" y="264">
<object id="1" x="360" y="264">
<properties>
<property name="primary" value="true"/>
</properties>
<polygon points="0,0 -48,-48 -336,-48 -336,48 0,48"/>
</object>
<object x="48" y="287">
<object id="2" x="48" y="287">
<properties>
<property name="height" value="20"/>
</properties>
<polygon points="0,2 8,-7 24,-7 15,2"/>
</object>
<object x="112" y="239">
<object id="3" x="112" y="239">
<properties>
<property name="height" value="24"/>
</properties>
<polygon points="36,0 16,25 -88,25 -88,1"/>
</object>
</objectgroup>
<objectgroup color="#000000" name="nodes">
<object type="sprite" x="48" y="264" width="24" height="24">
<object id="4" type="sprite" x="48" y="264" width="24" height="24">
<properties>
<property name="depth" value="2"/>
<property name="height" value="24"/>
<property name="sheet" value="images/sprites/town/little_chest_left.png"/>
<property name="width" value="24"/>
</properties>
</object>
<object type="sprite" x="48" y="216" width="120" height="48">
<object id="5" type="sprite" x="48" y="216" width="120" height="48">
<properties>
<property name="depth" value="18"/>
<property name="flip" value="true"/>
Expand All @@ -65,29 +65,29 @@
<property name="width" value="95"/>
</properties>
</object>
<object type="sprite" x="24" y="192" width="24" height="48">
<object id="6" type="sprite" x="24" y="192" width="24" height="48">
<properties>
<property name="flip" value="true"/>
<property name="height" value="48"/>
<property name="sheet" value="images/sprites/town/bed_headboard.png"/>
<property name="width" value="24"/>
</properties>
</object>
<object name="main" type="door" x="318" y="180" width="17" height="62">
<object id="7" name="main" type="door" x="318" y="180" width="17" height="62">
<properties>
<property name="button" value="RIGHT"/>
<property name="level" value="blacksmith"/>
<property name="to" value="upstairs"/>
</properties>
</object>
<object name="pot" type="throwable" x="288" y="264" width="24" height="24"/>
<object name="pot" type="throwable" x="299" y="276" width="24" height="24"/>
<object name="duck" type="material" x="216" y="228" width="24" height="24"/>
<object name="red_potion" type="detail" x="264" y="216" width="24" height="24">
<object id="8" name="pot" type="throwable" x="288" y="264" width="24" height="24"/>
<object id="9" name="pot" type="throwable" x="299" y="276" width="24" height="24"/>
<object id="10" name="duck" type="material" x="216" y="228" width="24" height="24"/>
<object id="11" name="red_potion" type="detail" x="264" y="216" width="24" height="24">
<properties>
<property name="category" value="recipe"/>
</properties>
</object>
<object name="blacksmith_wife" type="npc" x="168" y="252" width="48" height="48"/>
<object id="12" name="blacksmith_wife" type="npc" x="168" y="252" width="48" height="48"/>
</objectgroup>
</map>
108 changes: 59 additions & 49 deletions src/maps/forest-2.tmx
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.0" orientation="orthogonal" width="150" height="24" tilewidth="24" tileheight="24">
<map version="1.0" orientation="orthogonal" renderorder="right-down" width="150" height="24" tilewidth="24" tileheight="24" nextobjectid="47">
<properties>
<property name="blue" value="250"/>
<property name="green" value="222"/>
Expand Down Expand Up @@ -57,6 +57,16 @@
eJzt0rEJwDAMAEFN4z20WUYP6dIaLATy3QRffAQAwCwZ8XQ3MEuGrzjr+8lXnPb/KrtjGMNXVPAVFXwFAAAAAADsWN0BjOQrKviKCr66zwvbKAwv
</data>
</layer>
<layer name="tree fade" width="150" height="24">
<data encoding="base64" compression="zlib">
eJzt1DENAAAIA0H8a0EkCyMjLOQueQdNIwAAAIAPsoMNOQQb7IoLPgsAAAAAAAAAYFb/CwrB
</data>
</layer>
<layer name="Copy of tree fade" width="150" height="24">
<data encoding="base64" compression="zlib">
eJzt1DENAAAIA0H8a0EkCyMjLOQueQdNIwAAAIAPsoMNOQQb7IoLPgsAAAAAAAAAYFb/CwrB
</data>
</layer>
<layer name="leaves3" width="150" height="24">
<data encoding="base64" compression="zlib">
eJzt2EEKgkAUgOGBXLTIpS08nUfpKB7Fo3SU3lDCZIalERHfB4+GyUWLn4eUEv+kKgbe1aTUH2LmvtMVa+SmdvE5zpSuWCP2VNIVnxb76mlX3q/YotxZcR7Ge12xRd5Z0VOXJ85dvht7qlM655n2Fc+e9teBRXVxPkY35X11/9ygK14RHfW5nbn/HMauij2mKxY1t6byzL3DH9NjV2101X73ZwIAAAAAAAAA/IQLzeQPKA==
Expand All @@ -82,192 +92,192 @@
eJztmFEOgjAMhvFBY4jRhz1LeNJrcBSOwlE4CkfxKHYBDC6dS3FsA/4vaUhwrM360xazDPgmJztYjH5rQvjTfkL4BuFIVVcKuooGnX1FOSmnRvdKyR6hdaUsflCr0sGmCYm2QuuK86mgKxFDPWlHk9YSFzZNSPLC1Y+le5H2STG+tI0+uHtbhNFEJ11v5j137CHFh66G2D85DZXb8wq1o/rcimeNKfR8JdEEt17n/UTnd+yvyeoqBJcsq7XFjmMOg55a44ydtYaDqTWNYz2rqxs9d+2v3nVl62Fb7iMx+PH+dv/uNUdXZt5960oz9LB6NGjKPz51Zc4crnzZ+uY078j5Ook5b6RYN8xvibkzwd7BvPGN5b/tLmZMa0U6F20Z6MofKfajWEBXYAm4uWDP7xnwB75HAQAAFFT/72RF7EDApniSph5kz9iBAAAAAAAAsAPeP4dHoQ==
</data>
</layer>
<layer name="collision" width="150" height="24">
<layer name="collision" width="150" height="24" visible="0">
<data encoding="base64" compression="zlib">
eJzt1wEKgzAMQNHe/1A7h8dwPYETFESatkusxvY/CAzmTFiyZoYAAAAAAAAAAMA1pl/Mmffjds0xMJZz/1PhsSYvtaKNb9D1c/1MvLiW3pT2Qo62L4DGfq5HQ6T2g3V3HGti9/yn9L2z4zGy1HMZc+9DaZdo95LHM8/yPxHw7OM8tJ4+M3qh7ZGld6O68/dhyVlbU67WUu1vnSuP52Lr61vdQ7qf9Lom71vn6g7MlZyHudJjruQ8zJUecyXn6XWuFmUL3Kk=
</data>
</layer>
<objectgroup name="nodes" width="150" height="24">
<object name="main" type="door" x="36" y="432" width="24" height="49"/>
<object name="leaf" type="material" x="1320" y="287" width="24" height="24"/>
<object name="leaf" type="material" x="2184" y="238" width="24" height="24"/>
<object name="leaf" type="material" x="2737" y="383" width="24" height="24"/>
<object name="stick" type="material" x="1271" y="287" width="24" height="24"/>
<object name="rock" type="material" x="1823" y="431" width="24" height="24"/>
<object name="rock" type="material" x="2425" y="408" width="24" height="24"/>
<object name="stick" type="material" x="1893" y="294" width="24" height="24"/>
<object name="stick" type="material" x="1674" y="155" width="23" height="24"/>
<object name="stick" type="material" x="1732" y="96" width="23" height="24"/>
<object name="stick" type="material" x="2118" y="84" width="23" height="24"/>
<object name="stick" type="material" x="992" y="216" width="23" height="24"/>
<object type="door" x="3576" y="0" width="24" height="408">
<objectgroup name="nodes">
<object id="1" name="main" type="door" x="36" y="432" width="24" height="49"/>
<object id="2" name="leaf" type="material" x="1320" y="287" width="24" height="24"/>
<object id="3" name="leaf" type="material" x="2184" y="238" width="24" height="24"/>
<object id="4" name="leaf" type="material" x="2737" y="383" width="24" height="24"/>
<object id="5" name="stick" type="material" x="1271" y="287" width="24" height="24"/>
<object id="6" name="rock" type="material" x="1823" y="431" width="24" height="24"/>
<object id="7" name="rock" type="material" x="2425" y="408" width="24" height="24"/>
<object id="8" name="stick" type="material" x="1893" y="294" width="24" height="24"/>
<object id="9" name="stick" type="material" x="1674" y="155" width="23" height="24"/>
<object id="10" name="stick" type="material" x="1732" y="96" width="23" height="24"/>
<object id="11" name="stick" type="material" x="2118" y="84" width="23" height="24"/>
<object id="12" name="stick" type="material" x="992" y="216" width="23" height="24"/>
<object id="13" type="door" x="3576" y="0" width="24" height="408">
<properties>
<property name="instant" value="true"/>
<property name="level" value="town"/>
<property name="to" value="main"/>
</properties>
</object>
<object type="enemy" x="1200" y="288" width="24" height="24">
<object id="14" type="enemy" x="1200" y="288" width="24" height="24">
<properties>
<property name="enemytype" value="acorn"/>
</properties>
</object>
<object type="enemy" x="1608" y="336" width="24" height="24">
<object id="15" type="enemy" x="1608" y="336" width="24" height="24">
<properties>
<property name="enemytype" value="acorn"/>
</properties>
</object>
<object type="enemy" x="1728" y="288" width="24" height="24">
<object id="16" type="enemy" x="1728" y="288" width="24" height="24">
<properties>
<property name="enemytype" value="acorn"/>
</properties>
</object>
<object type="enemy" x="1632" y="336" width="24" height="24">
<object id="17" type="enemy" x="1632" y="336" width="24" height="24">
<properties>
<property name="enemytype" value="acorn"/>
</properties>
</object>
<object type="enemy" x="1992" y="432" width="24" height="24">
<object id="18" type="enemy" x="1992" y="432" width="24" height="24">
<properties>
<property name="enemytype" value="acorn"/>
</properties>
</object>
<object type="enemy" x="1944" y="216" width="24" height="24">
<object id="19" type="enemy" x="1944" y="216" width="24" height="24">
<properties>
<property name="enemytype" value="acorn"/>
</properties>
</object>
<object type="enemy" x="2352" y="408" width="24" height="24">
<object id="20" type="enemy" x="2352" y="408" width="24" height="24">
<properties>
<property name="enemytype" value="acorn"/>
</properties>
</object>
<object type="enemy" x="2400" y="408" width="24" height="24">
<object id="21" type="enemy" x="2400" y="408" width="24" height="24">
<properties>
<property name="enemytype" value="acorn"/>
</properties>
</object>
<object type="enemy" x="2976" y="216" width="24" height="24">
<object id="22" type="enemy" x="2976" y="216" width="24" height="24">
<properties>
<property name="enemytype" value="acorn"/>
</properties>
</object>
<object type="enemy" x="2784" y="384" width="24" height="24">
<object id="23" type="enemy" x="2784" y="384" width="24" height="24">
<properties>
<property name="enemytype" value="acorn"/>
</properties>
</object>
<object type="enemy" x="2557" y="456" width="48" height="48">
<object id="24" type="enemy" x="2557" y="456" width="48" height="48">
<properties>
<property name="enemytype" value="fish"/>
</properties>
</object>
<object type="enemy" x="2244" y="480" width="48" height="48">
<object id="25" type="enemy" x="2244" y="480" width="48" height="48">
<properties>
<property name="enemytype" value="fish"/>
</properties>
</object>
<object type="enemy" x="2088" y="480" width="48" height="48">
<object id="26" type="enemy" x="2088" y="480" width="48" height="48">
<properties>
<property name="enemytype" value="fish"/>
</properties>
</object>
<object type="enemy" x="1272" y="480" width="48" height="48">
<object id="27" type="enemy" x="1272" y="480" width="48" height="48">
<properties>
<property name="enemytype" value="fish"/>
</properties>
</object>
<object type="enemy" x="1440" y="480" width="48" height="48">
<object id="28" type="enemy" x="1440" y="480" width="48" height="48">
<properties>
<property name="enemytype" value="fish"/>
</properties>
</object>
<object type="liquid" x="1200" y="480" width="384" height="96">
<object id="29" type="liquid" x="1200" y="480" width="384" height="96">
<properties>
<property name="foreground" value="false"/>
<property name="speed" value="0.2"/>
<property name="sprite" value="images/liquid/waterfall.png"/>
<property name="uniform" value="true"/>
</properties>
</object>
<object type="liquid" x="2087" y="480" width="48" height="96">
<object id="30" type="liquid" x="2087" y="480" width="48" height="96">
<properties>
<property name="foreground" value="true"/>
<property name="speed" value="0.2"/>
<property name="sprite" value="images/liquid/waterfall.png"/>
<property name="uniform" value="true"/>
</properties>
</object>
<object type="liquid" x="2231" y="480" width="72" height="96">
<object id="31" type="liquid" x="2231" y="480" width="72" height="96">
<properties>
<property name="foreground" value="false"/>
<property name="speed" value="0.2"/>
<property name="sprite" value="images/liquid/waterfall.png"/>
<property name="uniform" value="true"/>
</properties>
</object>
<object type="liquid" x="2519" y="456" width="120" height="120">
<object id="32" type="liquid" x="2519" y="456" width="120" height="120">
<properties>
<property name="foreground" value="true"/>
<property name="speed" value="0.2"/>
<property name="sprite" value="images/liquid/waterfall.png"/>
<property name="uniform" value="true"/>
</properties>
</object>
<object type="door" x="0" y="0" width="24" height="480">
<object id="33" type="door" x="0" y="0" width="24" height="480">
<properties>
<property name="instant" value="true"/>
<property name="level" value="forest"/>
<property name="to" value="next"/>
</properties>
</object>
<object name="next" type="door" x="3504" y="360" width="24" height="48"/>
<object type="liquid" x="624" y="504" width="264" height="72">
<object id="34" name="next" type="door" x="3504" y="360" width="24" height="48"/>
<object id="35" type="liquid" x="624" y="504" width="264" height="72">
<properties>
<property name="foreground" value="true"/>
<property name="speed" value="0.2"/>
<property name="sprite" value="images/liquid/waterfall.png"/>
<property name="uniform" value="true"/>
</properties>
</object>
<object type="enemy" x="864" y="360" width="24" height="24">
<object id="36" type="enemy" x="864" y="360" width="24" height="24">
<properties>
<property name="enemytype" value="acorn"/>
</properties>
</object>
<object type="enemy" x="984" y="360" width="24" height="24">
<object id="37" type="enemy" x="984" y="360" width="24" height="24">
<properties>
<property name="enemytype" value="acorn"/>
</properties>
</object>
<object type="enemy" x="432" y="456" width="24" height="24">
<object id="38" type="enemy" x="432" y="456" width="24" height="24">
<properties>
<property name="enemytype" value="acorn"/>
</properties>
</object>
<object name="stick" type="material" x="240" y="240" width="23" height="24"/>
<object name="stick" type="material" x="144" y="288" width="24" height="24"/>
<object name="rock" type="material" x="360" y="408" width="24" height="24"/>
<object name="hidden" type="door" x="2808" y="144" width="72" height="96">
<object id="39" name="stick" type="material" x="240" y="240" width="23" height="24"/>
<object id="40" name="stick" type="material" x="144" y="288" width="24" height="24"/>
<object id="41" name="rock" type="material" x="360" y="408" width="24" height="24"/>
<object id="42" name="hidden" type="door" x="2808" y="144" width="72" height="96">
<properties>
<property name="level" value="forest-hidden"/>
<property name="sound" value="false"/>
<property name="to" value="main"/>
</properties>
</object>
<object name="rock" type="material" x="792" y="360" width="24" height="24"/>
<object type="enemy" x="720" y="312" width="24" height="24">
<object id="43" name="rock" type="material" x="792" y="360" width="24" height="24"/>
<object id="44" type="enemy" x="720" y="312" width="24" height="24">
<properties>
<property name="enemytype" value="cat"/>
</properties>
</object>
<object type="enemy" x="240" y="360" width="24" height="24">
<object id="45" type="enemy" x="240" y="360" width="24" height="24">
<properties>
<property name="direction" value="left"/>
<property name="enemytype" value="monkey"/>
</properties>
</object>
<object type="enemy" x="2160" y="168" width="24" height="24">
<object id="46" type="enemy" x="2160" y="168" width="24" height="24">
<properties>
<property name="direction" value="right"/>
<property name="enemytype" value="monkey"/>
Expand Down
Loading

0 comments on commit ad92631

Please sign in to comment.