small collision changes

pull/29/head
Quapsel 11 months ago
parent 41d0a8e602
commit cb86417a38
  1. 2
      Adventures in Lestoria/assets/Campaigns/1_8.tmx
  2. 253
      Adventures in Lestoria/assets/maps/Decorations_c1_No_Shadow24x24.tsx

@ -435,7 +435,7 @@
<object id="15" name="Spawn 16" type="SpawnGroup" x="3960.09" y="421.757" width="359.818" height="348.485"> <object id="15" name="Spawn 16" type="SpawnGroup" x="3960.09" y="421.757" width="359.818" height="348.485">
<ellipse/> <ellipse/>
</object> </object>
<object id="16" name="Spawn 15" type="SpawnGroup" x="3978.09" y="831.757" width="359.818" height="348.485"> <object id="16" name="Spawn 15" type="SpawnGroup" x="3959.91" y="837.818" width="359.818" height="348.485">
<ellipse/> <ellipse/>
</object> </object>
<object id="17" name="Spawn 17" type="SpawnGroup" x="4287.09" y="177.757" width="281.818" height="348.485"> <object id="17" name="Spawn 17" type="SpawnGroup" x="4287.09" y="177.757" width="281.818" height="348.485">

@ -353,15 +353,31 @@
<tile id="435" type="ForegroundTile"> <tile id="435" type="ForegroundTile">
<objectgroup draworder="index" id="2"> <objectgroup draworder="index" id="2">
<object id="1" x="0" y="18" width="24" height="6"/> <object id="1" x="0" y="18" width="24" height="6"/>
<object id="2" x="20.9091" y="2.18182" width="3.63636" height="22"/>
</objectgroup> </objectgroup>
</tile> </tile>
<tile id="436" type="ForegroundTile"> <tile id="436" type="ForegroundTile">
<objectgroup draworder="index" id="2"> <objectgroup draworder="index" id="2">
<object id="1" x="0" y="11" width="18" height="13"/> <object id="1" x="0" y="5" width="18" height="19"/>
</objectgroup> </objectgroup>
</tile> </tile>
<tile id="438" type="ForegroundTile"/> <tile id="438" type="ForegroundTile"/>
<tile id="439" type="ForegroundTile"/> <tile id="439" type="ForegroundTile"/>
<tile id="440">
<objectgroup draworder="index" id="2">
<object id="1" x="13" y="12" width="11" height="12"/>
</objectgroup>
</tile>
<tile id="441">
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="6" width="24" height="18"/>
</objectgroup>
</tile>
<tile id="442">
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="7" width="24" height="17"/>
</objectgroup>
</tile>
<tile id="452" type="ForegroundTile"/> <tile id="452" type="ForegroundTile"/>
<tile id="453" type="ForegroundTile"/> <tile id="453" type="ForegroundTile"/>
<tile id="454" type="ForegroundTile"/> <tile id="454" type="ForegroundTile"/>
@ -395,16 +411,52 @@
<tile id="464" type="ForegroundTile"/> <tile id="464" type="ForegroundTile"/>
<tile id="465" type="ForegroundTile"/> <tile id="465" type="ForegroundTile"/>
<tile id="466" type="ForegroundTile"/> <tile id="466" type="ForegroundTile"/>
<tile id="469" type="ForegroundTile"/> <tile id="469" type="ForegroundTile">
<tile id="470" type="ForegroundTile"/> <objectgroup draworder="index" id="2">
<tile id="471" type="ForegroundTile"/> <object id="1" x="1.36364" y="16.1818" width="22.6364" height="7.81818"/>
<tile id="472" type="ForegroundTile"/> </objectgroup>
<tile id="473" type="ForegroundTile"/> </tile>
<tile id="470" type="ForegroundTile">
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="24" height="24"/>
</objectgroup>
</tile>
<tile id="471" type="ForegroundTile">
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="24" height="24"/>
</objectgroup>
</tile>
<tile id="472" type="ForegroundTile">
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="6" width="24" height="18"/>
</objectgroup>
</tile>
<tile id="473" type="ForegroundTile">
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="16" width="9" height="8"/>
</objectgroup>
</tile>
<tile id="474" type="ForegroundTile"/> <tile id="474" type="ForegroundTile"/>
<tile id="475" type="ForegroundTile"/> <tile id="475" type="ForegroundTile">
<tile id="476" type="ForegroundTile"/> <objectgroup draworder="index" id="2">
<tile id="477" type="ForegroundTile"/> <object id="1" x="0" y="0" width="24" height="24"/>
<tile id="478" type="ForegroundTile"/> </objectgroup>
</tile>
<tile id="476" type="ForegroundTile">
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="24" height="24"/>
</objectgroup>
</tile>
<tile id="477" type="ForegroundTile">
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="5.09091" width="24" height="18.9091"/>
</objectgroup>
</tile>
<tile id="478" type="ForegroundTile">
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="17.9091" width="9" height="6.09091"/>
</objectgroup>
</tile>
<tile id="479" type="ForegroundTile"> <tile id="479" type="ForegroundTile">
<objectgroup draworder="index" id="2"> <objectgroup draworder="index" id="2">
<object id="1" x="4" y="0" width="20" height="22"/> <object id="1" x="4" y="0" width="20" height="22"/>
@ -430,6 +482,26 @@
<object id="1" x="0" y="0" width="16" height="18"/> <object id="1" x="0" y="0" width="16" height="18"/>
</objectgroup> </objectgroup>
</tile> </tile>
<tile id="485">
<objectgroup draworder="index" id="2">
<object id="1" x="12" y="0" width="12" height="19"/>
</objectgroup>
</tile>
<tile id="486">
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="24" height="24"/>
</objectgroup>
</tile>
<tile id="487">
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="24" height="24"/>
</objectgroup>
</tile>
<tile id="488">
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="3" width="16" height="21"/>
</objectgroup>
</tile>
<tile id="497" type="ForegroundTile"/> <tile id="497" type="ForegroundTile"/>
<tile id="498" type="ForegroundTile"/> <tile id="498" type="ForegroundTile"/>
<tile id="499" type="ForegroundTile"/> <tile id="499" type="ForegroundTile"/>
@ -531,19 +603,51 @@
<tile id="525" type="ForegroundTile"> <tile id="525" type="ForegroundTile">
<objectgroup draworder="index" id="2"> <objectgroup draworder="index" id="2">
<object id="1" x="0" y="19" width="24" height="5"/> <object id="1" x="0" y="19" width="24" height="5"/>
<object id="2" x="20.1818" y="2.27273" width="3.63636" height="22"/>
</objectgroup> </objectgroup>
</tile> </tile>
<tile id="526" type="ForegroundTile"> <tile id="526" type="ForegroundTile">
<objectgroup draworder="index" id="2"> <objectgroup draworder="index" id="2">
<object id="1" x="0" y="12" width="18" height="12"/> <object id="1" x="0" y="4.18182" width="18" height="19.8182"/>
</objectgroup> </objectgroup>
</tile> </tile>
<tile id="528" type="ForegroundTile"/> <tile id="528" type="ForegroundTile"/>
<tile id="529" type="ForegroundTile"/> <tile id="529" type="ForegroundTile"/>
<tile id="542" type="ForegroundTile"/> <tile id="531">
<tile id="543" type="ForegroundTile"/> <objectgroup draworder="index" id="2">
<tile id="544" type="ForegroundTile"/> <object id="1" x="4" y="0" width="20" height="9"/>
<tile id="545" type="ForegroundTile"/> </objectgroup>
</tile>
<tile id="532">
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="24" height="13"/>
</objectgroup>
</tile>
<tile id="533">
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="15" height="12"/>
</objectgroup>
</tile>
<tile id="542" type="ForegroundTile">
<objectgroup draworder="index" id="2">
<object id="1" x="12.2727" y="10.7273" width="11.7273" height="13.2727"/>
</objectgroup>
</tile>
<tile id="543" type="ForegroundTile">
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="6.72727" width="24" height="17.2727"/>
</objectgroup>
</tile>
<tile id="544" type="ForegroundTile">
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="6.18182" width="24" height="17.8182"/>
</objectgroup>
</tile>
<tile id="545" type="ForegroundTile">
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="13.2727" width="12.3636" height="10.7273"/>
</objectgroup>
</tile>
<tile id="546" type="ForegroundTile"/> <tile id="546" type="ForegroundTile"/>
<tile id="547" type="ForegroundTile"/> <tile id="547" type="ForegroundTile"/>
<tile id="548" type="ForegroundTile"/> <tile id="548" type="ForegroundTile"/>
@ -624,6 +728,16 @@
</tile> </tile>
<tile id="573" type="ForegroundTile"/> <tile id="573" type="ForegroundTile"/>
<tile id="574" type="ForegroundTile"/> <tile id="574" type="ForegroundTile"/>
<tile id="575">
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="6" width="24" height="18"/>
</objectgroup>
</tile>
<tile id="576">
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="6" width="24" height="18"/>
</objectgroup>
</tile>
<tile id="587" type="ForegroundTile"> <tile id="587" type="ForegroundTile">
<objectgroup draworder="index" id="2"> <objectgroup draworder="index" id="2">
<object id="1" x="1" y="0" width="23" height="24"/> <object id="1" x="1" y="0" width="23" height="24"/>
@ -646,17 +760,17 @@
</tile> </tile>
<tile id="591" type="ForegroundTile"> <tile id="591" type="ForegroundTile">
<objectgroup draworder="index" id="2"> <objectgroup draworder="index" id="2">
<object id="1" x="7" y="10" width="17" height="14"/> <object id="1" x="7.36364" y="4.90909" width="17" height="19.2727"/>
</objectgroup> </objectgroup>
</tile> </tile>
<tile id="592" type="ForegroundTile"> <tile id="592" type="ForegroundTile">
<objectgroup draworder="index" id="2"> <objectgroup draworder="index" id="2">
<object id="1" x="0" y="10" width="24" height="14"/> <object id="1" x="0" y="3" width="24" height="21"/>
</objectgroup> </objectgroup>
</tile> </tile>
<tile id="593" type="ForegroundTile"> <tile id="593" type="ForegroundTile">
<objectgroup draworder="index" id="2"> <objectgroup draworder="index" id="2">
<object id="1" x="0" y="10" width="16" height="14"/> <object id="1" x="0" y="3.09091" width="16" height="20.9091"/>
</objectgroup> </objectgroup>
</tile> </tile>
<tile id="594" type="ForegroundTile"> <tile id="594" type="ForegroundTile">
@ -684,9 +798,21 @@
<object id="1" x="0" y="10" width="22" height="14"/> <object id="1" x="0" y="10" width="22" height="14"/>
</objectgroup> </objectgroup>
</tile> </tile>
<tile id="599" type="ForegroundTile"/> <tile id="599" type="ForegroundTile">
<tile id="600" type="ForegroundTile"/> <objectgroup draworder="index" id="2">
<tile id="601" type="ForegroundTile"/> <object id="1" x="6" y="0.181818" width="18" height="23.8182"/>
</objectgroup>
</tile>
<tile id="600" type="ForegroundTile">
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="-2.22045e-15" width="24" height="24"/>
</objectgroup>
</tile>
<tile id="601" type="ForegroundTile">
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="3.18182" width="19" height="20.8182"/>
</objectgroup>
</tile>
<tile id="618" type="ForegroundTile"> <tile id="618" type="ForegroundTile">
<objectgroup draworder="index" id="2"> <objectgroup draworder="index" id="2">
<object id="1" x="5" y="0" width="19" height="15"/> <object id="1" x="5" y="0" width="19" height="15"/>
@ -697,6 +823,16 @@
<object id="1" x="0" y="0" width="15" height="18"/> <object id="1" x="0" y="0" width="15" height="18"/>
</objectgroup> </objectgroup>
</tile> </tile>
<tile id="620">
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="24" height="19"/>
</objectgroup>
</tile>
<tile id="621">
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="24" height="18"/>
</objectgroup>
</tile>
<tile id="623" type="ForegroundTile"/> <tile id="623" type="ForegroundTile"/>
<tile id="624" type="ForegroundTile"/> <tile id="624" type="ForegroundTile"/>
<tile id="625" type="ForegroundTile"/> <tile id="625" type="ForegroundTile"/>
@ -772,6 +908,16 @@
<object id="1" x="0" y="0" width="18" height="15"/> <object id="1" x="0" y="0" width="18" height="15"/>
</objectgroup> </objectgroup>
</tile> </tile>
<tile id="664">
<objectgroup draworder="index" id="2">
<object id="1" x="10.7273" y="10.0909" width="13.2727" height="12.7273"/>
</objectgroup>
</tile>
<tile id="665">
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="9.18182" width="12.8182" height="12.8182"/>
</objectgroup>
</tile>
<tile id="668" type="ForegroundTile"/> <tile id="668" type="ForegroundTile"/>
<tile id="669" type="ForegroundTile"/> <tile id="669" type="ForegroundTile"/>
<tile id="670" type="ForegroundTile"/> <tile id="670" type="ForegroundTile"/>
@ -807,10 +953,41 @@
<tile id="726" type="ForegroundTile"/> <tile id="726" type="ForegroundTile"/>
<tile id="727" type="ForegroundTile"/> <tile id="727" type="ForegroundTile"/>
<tile id="728" type="ForegroundTile"/> <tile id="728" type="ForegroundTile"/>
<tile id="767" type="ForegroundTile"/> <tile id="734">
<tile id="768" type="ForegroundTile"/> <objectgroup draworder="index" id="2">
<tile id="769" type="ForegroundTile"/> <object id="1" x="1" y="9.81818" width="23" height="14.1818"/>
<tile id="770" type="ForegroundTile"/> </objectgroup>
</tile>
<tile id="735">
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="24" height="24"/>
</objectgroup>
</tile>
<tile id="736">
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="6" width="21" height="18"/>
</objectgroup>
</tile>
<tile id="767" type="ForegroundTile">
<objectgroup draworder="index" id="2">
<object id="1" x="12.5" y="11" width="11.7273" height="13.2727"/>
</objectgroup>
</tile>
<tile id="768" type="ForegroundTile">
<objectgroup draworder="index" id="2">
<object id="1" x="0.363636" y="6.63638" width="24" height="17.2727"/>
</objectgroup>
</tile>
<tile id="769" type="ForegroundTile">
<objectgroup draworder="index" id="2">
<object id="1" x="-0.181818" y="6.36363" width="24" height="17.8182"/>
</objectgroup>
</tile>
<tile id="770" type="ForegroundTile">
<objectgroup draworder="index" id="2">
<object id="1" x="-0.363618" y="13.9091" width="12.3636" height="10.7273"/>
</objectgroup>
</tile>
<tile id="771" type="ForegroundTile"/> <tile id="771" type="ForegroundTile"/>
<tile id="772" type="ForegroundTile"/> <tile id="772" type="ForegroundTile"/>
<tile id="773" type="ForegroundTile"/> <tile id="773" type="ForegroundTile"/>
@ -819,6 +996,16 @@
<tile id="776" type="ForegroundTile"/> <tile id="776" type="ForegroundTile"/>
<tile id="777" type="ForegroundTile"/> <tile id="777" type="ForegroundTile"/>
<tile id="778" type="ForegroundTile"/> <tile id="778" type="ForegroundTile"/>
<tile id="790">
<objectgroup draworder="index" id="2">
<object id="1" x="10" y="0" width="14" height="10"/>
</objectgroup>
</tile>
<tile id="791">
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="4.63636" height="10"/>
</objectgroup>
</tile>
<tile id="812" type="ForegroundTile"> <tile id="812" type="ForegroundTile">
<objectgroup draworder="index" id="2"> <objectgroup draworder="index" id="2">
<object id="1" x="1" y="0" width="23" height="24"/> <object id="1" x="1" y="0" width="23" height="24"/>
@ -837,17 +1024,17 @@
</tile> </tile>
<tile id="816" type="ForegroundTile"> <tile id="816" type="ForegroundTile">
<objectgroup draworder="index" id="2"> <objectgroup draworder="index" id="2">
<object id="1" x="7" y="10" width="17" height="14"/> <object id="1" x="7" y="7.81818" width="17" height="16.1818"/>
</objectgroup> </objectgroup>
</tile> </tile>
<tile id="817" type="ForegroundTile"> <tile id="817" type="ForegroundTile">
<objectgroup draworder="index" id="2"> <objectgroup draworder="index" id="2">
<object id="1" x="0" y="10" width="24" height="14"/> <object id="1" x="0" y="4.54545" width="24" height="19.4545"/>
</objectgroup> </objectgroup>
</tile> </tile>
<tile id="818" type="ForegroundTile"> <tile id="818" type="ForegroundTile">
<objectgroup draworder="index" id="2"> <objectgroup draworder="index" id="2">
<object id="1" x="0" y="10" width="16" height="14"/> <object id="1" x="0" y="3.09091" width="16" height="20.9091"/>
</objectgroup> </objectgroup>
</tile> </tile>
<tile id="819" type="ForegroundTile"> <tile id="819" type="ForegroundTile">
@ -961,6 +1148,16 @@
<object id="1" x="0" y="0" width="18" height="15"/> <object id="1" x="0" y="0" width="18" height="15"/>
</objectgroup> </objectgroup>
</tile> </tile>
<tile id="880">
<objectgroup draworder="index" id="2">
<object id="1" x="10" y="0" width="14" height="10"/>
</objectgroup>
</tile>
<tile id="881">
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="4" height="10"/>
</objectgroup>
</tile>
<tile id="902" type="ForegroundTile"/> <tile id="902" type="ForegroundTile"/>
<tile id="903" type="ForegroundTile"/> <tile id="903" type="ForegroundTile"/>
<tile id="904" type="ForegroundTile"/> <tile id="904" type="ForegroundTile"/>

Loading…
Cancel
Save