Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Boulder and Material visibility #2491

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified src/images/blocks/boulder.png
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/blocks/sand-block-dark-down.png
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/blocks/sand-block-dark-four.png
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/blocks/sand-block-dark-up.png
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/blocks/sand-block-dark.png
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/blocks/sand-block.png
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/hiddendoor/dalmatian.png
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/hiddendoor/dean_closet.png
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/hiddendoor/painting.png
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/hiddendoor/sandbarrier.png
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/hiddendoor/skulltrigger.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/materials/animal_skeleton.png
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/materials/arm.png
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/materials/banana.png
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/materials/berry.png
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/materials/bluemushroom.png
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/materials/boulder.png
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/materials/bubblegum.png
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/materials/buddhaAmber.png
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/materials/buddhaGarnet.png
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/materials/buddhaJade.png
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/materials/buddhaStone.png
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/materials/buddhaTopaz.png
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/materials/carkeys.png
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/materials/crystal.png
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/materials/duck.png
Binary file modified src/images/materials/ember.png
Binary file modified src/images/materials/energonPod.png
Binary file modified src/images/materials/eye.png
Binary file modified src/images/materials/fire.png
Binary file modified src/images/materials/fries.png
Binary file modified src/images/materials/keyshardbottom.png
Binary file modified src/images/materials/keyshardtop.png
Binary file modified src/images/materials/leaf.png
Binary file modified src/images/materials/mushroom.png
Binary file modified src/images/materials/pancake.png
Binary file modified src/images/materials/peanut.png
Binary file modified src/images/materials/potato.png
Binary file modified src/images/materials/rock.png
Binary file added src/images/materials/skull.png
Binary file modified src/images/materials/star.png
Binary file modified src/images/materials/stick.png
Binary file modified src/images/materials/stone.png
Binary file modified src/images/platforms/blackcavernsplatform.png
Binary file modified src/images/platforms/sandplatformbreak.png
Binary file modified src/images/throwables/claypot.png
Binary file modified src/images/tilesets/black-caverns.png
Binary file modified src/images/tilesets/greendale-exterior.png
Binary file modified src/images/tilesets/valley-sandpits.png
Binary file modified src/images/tilesets/valley.png
Binary file modified src/images/weapons/axe.png
Binary file modified src/images/weapons/battleaxe_small.png
Binary file modified src/images/weapons/dagger.png
Binary file modified src/images/weapons/mace_small.png
Binary file modified src/images/weapons/scythe.png
28 changes: 14 additions & 14 deletions src/maps/blacksmith-upstairs.tmx
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>
16 changes: 13 additions & 3 deletions src/maps/forest-2.tmx
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">
<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,12 +92,12 @@
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">
<objectgroup name="nodes">
<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"/>
Expand Down
Loading