Skip to content

Commit

Permalink
design fix for bass
Browse files Browse the repository at this point in the history
  • Loading branch information
Yozzaxia1311 committed Feb 3, 2021
1 parent fe945d4 commit d1452c2
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 33 deletions.
52 changes: 23 additions & 29 deletions assets/states/demo.stage.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.4" tiledversion="1.4.2" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="16" height="14" tilewidth="16" tileheight="16" infinite="1" backgroundcolor="#ffaaff" nextlayerid="6" nextobjectid="192">
<map version="1.4" tiledversion="1.4.2" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="16" height="14" tilewidth="16" tileheight="16" infinite="1" backgroundcolor="#ffaaff" nextlayerid="6" nextobjectid="195">
<properties>
<property name="fadeIn" type="bool" value="true"/>
<property name="musicPath" value="assets/sfx/music/demo.ogg"/>
Expand Down Expand Up @@ -79,7 +79,7 @@
0,0,0,0,1,16,0,16,1,0,0,0,0,0,0,0,
0,0,0,0,26,0,0,0,1,0,0,0,0,0,0,0,
0,0,0,26,0,0,0,0,1,0,0,0,0,0,0,0,
0,0,26,0,0,0,6,7,0,0,0,0,0,0,0,0
0,0,26,0,0,0,0,0,1,0,0,0,0,0,0,0
</chunk>
<chunk x="0" y="0" width="16" height="16">
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
Expand Down Expand Up @@ -154,19 +154,19 @@
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
</chunk>
<chunk x="64" y="0" width="16" height="16">
21,22,0,0,6,7,0,0,0,0,0,0,0,0,0,0,
0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,
1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,
1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,
1,16,1,0,0,0,0,0,0,0,0,0,0,0,0,0,
1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,
1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,
1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,
1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
21,22,0,0,6,7,0,0,1,0,0,0,0,0,0,0,
0,0,0,2,0,1,13,0,1,0,0,0,0,0,0,0,
0,0,2,0,0,1,0,0,1,0,0,0,0,0,0,0,
1,1,1,0,0,1,0,0,1,0,0,0,0,0,0,0,
0,0,1,0,0,1,0,0,1,0,0,0,0,0,0,0,
0,0,1,0,0,1,0,0,1,0,0,0,0,0,0,0,
1,0,1,0,0,1,13,0,1,0,0,0,0,0,0,0,
1,16,1,0,0,1,0,0,1,0,0,0,0,0,0,0,
1,0,1,0,0,1,0,0,1,0,0,0,0,0,0,0,
1,0,1,1,1,1,0,0,1,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,
1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,
1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
Expand Down Expand Up @@ -393,16 +393,8 @@
<objectgroup id="3" name="sections">
<object id="2" template="templates/sections/section.tx" x="0" y="0" width="672" height="224"/>
<object id="56" template="templates/sections/section.tx" x="416" y="-224"/>
<object id="62" template="templates/sections/down.tx" x="608" y="-16" width="32" height="16">
<properties>
<property name="checkLadder" type="bool" value="true"/>
</properties>
</object>
<object id="63" template="templates/sections/up.tx" x="608" y="0" width="32" height="16">
<properties>
<property name="checkLadder" type="bool" value="true"/>
</properties>
</object>
<object id="62" template="templates/sections/down.tx" x="608" y="-16" width="32" height="16"/>
<object id="63" template="templates/sections/up.tx" x="608" y="0" width="32" height="16"/>
<object id="64" template="templates/sections/section.tx" x="672" y="-224" width="512" height="224"/>
<object id="67" template="templates/sections/section.tx" x="928" y="-224" width="256" height="448"/>
<object id="68" template="templates/sections/section.tx" x="256" y="224" width="800" height="224"/>
Expand Down Expand Up @@ -469,12 +461,12 @@
<object id="83" template="templates/collision/solid.tx" x="672" y="384" width="128" height="64"/>
<object id="84" template="templates/collision/solid.tx" x="848" y="384" width="64" height="64"/>
<object id="85" template="templates/collision/solid.tx" x="912" y="304" width="112" height="80"/>
<object id="86" template="templates/collision/solid.tx" x="1024" y="176" width="32" height="128"/>
<object id="86" template="templates/collision/solid.tx" x="1024" y="192" width="128" height="112"/>
<object id="87" template="templates/collision/solid.tx" x="928" y="32" width="32" height="128"/>
<object id="88" template="templates/collision/solid.tx" x="784" y="-144" width="32" height="64"/>
<object id="89" template="templates/collision/solid.tx" x="864" y="-144" width="144" height="64"/>
<object id="90" template="templates/collision/solid.tx" x="992" y="-240" width="64" height="48"/>
<object id="91" template="templates/collision/solid.tx" x="1152" y="-112" width="16" height="96"/>
<object id="91" template="templates/collision/solid.tx" x="1152" y="-112" width="16" height="304"/>
<object id="92" template="templates/collision/solid.tx" x="1088" y="-80" width="16" height="32"/>
<object id="93" template="templates/collision/slopeLeft.tx" x="1072" y="-112"/>
<object id="94" template="templates/collision/slopeLeft.tx" x="1088" y="-96"/>
Expand All @@ -484,7 +476,6 @@
<object id="100" template="templates/collision/slopeLeftInvert.tx" x="1072" y="-32"/>
<object id="101" template="templates/collision/slopeLeftInvert.tx" x="1056" y="-16"/>
<object id="104" template="templates/collision/slopeRightLong.tx" x="1088" y="0"/>
<object id="105" template="templates/collision/slopeRightLong.tx" x="1120" y="-16"/>
<object id="106" template="templates/collision/slopeLeftLong.tx" x="1008" y="-144"/>
<object id="107" template="templates/collision/slopeLeftLong.tx" x="1040" y="-128"/>
<object id="108" template="templates/collision/slopeLeftLongInvert.tx" x="1024" y="0"/>
Expand Down Expand Up @@ -519,14 +510,17 @@
<object id="177" template="templates/collision/solid.tx" x="320" y="576" width="16" height="16"/>
<object id="181" template="templates/collision/slopeRightInvert.tx" x="1120" y="-160"/>
<object id="183" template="templates/collision/oneway.tx" x="1120" y="-80" width="32" height="8"/>
<object id="184" template="templates/collision/solid.tx" x="1056" y="64" width="16" height="112"/>
<object id="184" template="templates/collision/solid.tx" x="1056" y="64" width="48" height="96"/>
<object id="185" template="templates/collision/solid.tx" x="960" y="16" width="32" height="16"/>
<object id="186" template="templates/collision/solid.tx" x="960" y="112" width="32" height="48"/>
<object id="187" template="templates/collision/solid.tx" x="992" y="96" width="48" height="64"/>
<object id="188" template="templates/collision/solid.tx" x="976" y="48" width="80" height="16"/>
<object id="189" template="templates/collision/solid.tx" x="976" y="64" width="32" height="16"/>
<object id="190" template="templates/collision/slopeRightInvert.tx" x="1136" y="-128"/>
<object id="191" template="templates/collision/solid.tx" x="1136" y="-144" width="16" height="16"/>
<object id="192" template="templates/collision/solid.tx" x="1104" y="16" width="16" height="144"/>
<object id="193" template="templates/collision/oneway.tx" x="1120" y="16" width="16" height="8"/>
<object id="194" template="templates/collision/oneway.tx" x="1120" y="96" width="16" height="8"/>
</objectgroup>
<objectgroup id="5" name="entities">
<object id="5" template="templates/player/player.tx" x="112" y="144"/>
Expand Down
4 changes: 2 additions & 2 deletions assets/states/templates/sections/down.tx
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
<template>
<object name="down" width="16" height="16">
<properties>
<property name="checkLadder" type="bool" value="false"/>
<property name="checkLadder" type="bool" value="true"/>
<property name="doScrollX" type="bool" value="true"/>
<property name="doScrollY" type="bool" value="true"/>
<property name="platform" type="bool" value="false"/>
<property name="toSection" value=""/>
<property name="speed" type="float" value="0.8"/>
<property name="toSection" value=""/>
</properties>
</object>
</template>
4 changes: 2 additions & 2 deletions assets/states/templates/sections/up.tx
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
<template>
<object name="up" width="16" height="16">
<properties>
<property name="checkLadder" type="bool" value="false"/>
<property name="checkLadder" type="bool" value="true"/>
<property name="doScrollX" type="bool" value="true"/>
<property name="doScrollY" type="bool" value="true"/>
<property name="goIntoSection" type="bool" value="false"/>
<property name="platform" type="bool" value="false"/>
<property name="toSection" value=""/>
<property name="speed" type="float" value="0.8"/>
<property name="toSection" value=""/>
</properties>
</object>
</template>

0 comments on commit d1452c2

Please sign in to comment.