Skip to content

Commit

Permalink
Fix map issue with missed solid objects
Browse files Browse the repository at this point in the history
  • Loading branch information
@Vasar007
Vasar007 committed Sep 27, 2018
1 parent 6f1f23a commit b0b3461
Show file tree
Hide file tree
Showing 5 changed files with 61 additions and 25 deletions.
40 changes: 29 additions & 11 deletions ReleaseWithoutConsole/Level2.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" tiledversion="1.1.6" orientation="orthogonal" renderorder="right-down" width="470" height="350" tilewidth="16" tileheight="16" infinite="0" backgroundcolor="#1a1a1a" nextobjectid="3957">
<map version="1.0" tiledversion="1.1.6" orientation="orthogonal" renderorder="right-down" width="470" height="350" tilewidth="16" tileheight="16" infinite="0" backgroundcolor="#1a1a1a" nextobjectid="3976">
<tileset firstgid="1" name="tileset" tilewidth="16" tileheight="16" tilecount="7565" columns="85">
<image source="tileset.png" trans="98ace2" width="1360" height="1424"/>
<terraintypes>
Expand Down Expand Up @@ -822561,7 +822561,7 @@
<tile/>
</data>
</layer>
<objectgroup name="Enemies" visible="0">
<objectgroup name="Enemies">
<object id="3327" name="enemyDarkArcher" type="21" x="2406" y="2573" width="50" height="50"/>
<object id="3328" name="enemyDarkArcher" type="27" x="1935" y="1933" width="50" height="50"/>
<object id="3331" name="enemyDarkArcher" type="34" x="2249" y="1564" width="50" height="50"/>
Expand Down Expand Up @@ -822626,7 +822626,7 @@
<object id="3409" name="enemyDwarfA" type="50" x="3777" y="1812" width="40" height="27"/>
<object id="3410" name="enemyDwarfA" type="5" x="2475" y="1587" width="40" height="27"/>
<object id="3411" name="enemyDwarfA" type="30" x="921" y="1667" width="40" height="27"/>
<object id="3412" name="enemyDwarfA" type="5" x="629" y="1778" width="40" height="27"/>
<object id="3412" name="enemyDwarfA" type="5" x="629" y="1780" width="40" height="27"/>
<object id="3413" name="enemyDwarfA" type="24" x="2100" y="2164" width="40" height="27"/>
<object id="3415" name="enemyDwarfA" type="31" x="1652" y="1379" width="40" height="27"/>
<object id="3416" name="enemyDwarvenArcherA" type="23" x="1484" y="2100" width="40" height="27"/>
Expand Down Expand Up @@ -822833,15 +822833,18 @@
<object id="3438" name="enemyBorder" type="1" x="1475" y="3071" width="16" height="64"/>
<object id="3437" name="enemyBorder" type="1" x="1475" y="3135" width="589" height="11"/>
<object id="3436" name="enemyBorder" type="1" x="2048" y="3071" width="16" height="64"/>
<object id="3958" name="enemyBorder" type="5" x="544" y="1744" width="16" height="64"/>
<object id="3959" name="enemyBorder" type="5" x="544" y="1808" width="196" height="20"/>
<object id="3960" name="enemyBorder" type="5" x="724" y="1744" width="16" height="64"/>
</objectgroup>
<objectgroup name="Gates" visible="0">
<objectgroup name="Gates">
<object id="3708" name="gateO" type="2" x="3584" y="5136" width="16" height="30"/>
<object id="3709" name="gateO" type="4" x="3376" y="527" width="16" height="64"/>
<object id="3710" name="gateС" type="4" x="2560" y="591" width="16" height="64"/>
<object id="3711" name="gateO" type="4" x="6720" y="2799" width="16" height="64"/>
<object id="3712" name="gateС" type="4" x="6080" y="2736" width="16" height="64"/>
</objectgroup>
<objectgroup name="FallingRocks" visible="0"/>
<objectgroup name="FallingRocks"/>
<objectgroup name="Solids">
<object id="751" name="solid" x="0" y="3135" width="2111" height="47"/>
<object id="753" name="solid" x="624" y="2943" width="96" height="113"/>
Expand Down Expand Up @@ -824283,6 +824286,21 @@
<object id="3925" x="4232" y="4643" width="5" height="10"/>
<object id="3926" x="4263" y="4611" width="5" height="10"/>
<object id="3956" x="4203" y="4671" width="5" height="10"/>
<object id="3961" name="solid" x="2560" y="3081" width="5" height="18"/>
<object id="3962" name="solid" x="2564" y="3077" width="5" height="18"/>
<object id="3963" name="solid" x="2568" y="3073" width="5" height="18"/>
<object id="3964" name="solid" x="2572" y="3071" width="5" height="18"/>
<object id="3965" name="solid" x="2576" y="3065" width="5" height="18"/>
<object id="3966" name="solid" x="2580" y="3061" width="5" height="18"/>
<object id="3967" name="solid" x="2588" y="3053" width="5" height="18"/>
<object id="3968" name="solid" x="2584" y="3057" width="5" height="18"/>
<object id="3969" name="solid" x="2592" y="3049" width="5" height="18"/>
<object id="3970" name="solid" x="2596" y="3045" width="5" height="18"/>
<object id="3971" name="solid" x="2600" y="3041" width="5" height="18"/>
<object id="3972" name="solid" x="2604" y="3037" width="5" height="18"/>
<object id="3973" name="solid" x="2608" y="3033" width="5" height="18"/>
<object id="3974" name="solid" x="2611" y="3029" width="5" height="18"/>
<object id="3975" name="solid" x="2615" y="3025" width="5" height="18"/>
</objectgroup>
<objectgroup name="SpikesNLava">
<object id="2923" name="death" x="2241" y="2674" width="127" height="14"/>
Expand Down Expand Up @@ -824352,12 +824370,12 @@
<object id="3448" name="enemyBorder" type="4" x="2096" y="5358" width="96" height="18"/>
<object id="3449" name="enemyBorder" type="4" x="2176" y="5294" width="16" height="64"/>
</objectgroup>
<objectgroup name="Players" visible="0">
<object id="3713" name="player" x="3764" y="1584" width="20" height="30"/>
<object id="3233" name="playerO" x="828" y="3105" width="20" height="30"/>
<objectgroup name="Players">
<object id="3713" name="playerO" x="3764" y="1584" width="20" height="30"/>
<object id="3233" name="player" x="828" y="3105" width="20" height="30"/>
</objectgroup>
<objectgroup name="Events" visible="0"/>
<objectgroup name="MovPlatforms" visible="0">
<objectgroup name="Events"/>
<objectgroup name="MovPlatforms">
<object id="748" name="Platform" type="2" x="1664" y="2320" width="48" height="16"/>
<object id="3639" name="PlatformBorder" type="1" x="1712" y="2320" width="16" height="16"/>
<object id="3640" name="PlatformBorder" type="1" x="1184" y="2319" width="16" height="17"/>
Expand Down Expand Up @@ -824404,7 +824422,7 @@
<object id="3717" name="PlatformBorder" type="8" x="5552" y="2544" width="16" height="17"/>
<object id="3718" name="PlatformBorder" type="8" x="5360" y="2544" width="16" height="16"/>
</objectgroup>
<objectgroup name="TeleportsAkaDoors" visible="0">
<objectgroup name="TeleportsAkaDoors">
<object id="3239" name="teleport" type="1" x="3185" y="3209" width="30" height="38"/>
<object id="3241" name="teleport" type="1" x="1121" y="5017" width="30" height="38"/>
<object id="3242" name="teleport" type="2" x="1121" y="4793" width="30" height="38"/>
Expand Down
Binary file modified ReleaseWithoutConsole/TIMLE.exe
View file
Binary file not shown.
6 changes: 3 additions & 3 deletions TIMLE/Level1.tmx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -654181,14 +654181,14 @@
<object id="759" name="solid" x="13024" y="944" width="48" height="256"/>
</objectgroup>
<objectgroup name="Player">
<object id="760" name="playerO" x="12496" y="1168" width="20" height="30"/>
<object id="760" name="player" x="12496" y="1168" width="20" height="30"/>
<object id="511" name="playerO" x="11832" y="1168" width="20" height="30"/>
<object id="727" name="playerO" x="8870" y="2433" width="20" height="30"/>
<object id="757" name="playerO" x="8008" y="2768" width="20" height="30"/>
<object id="735" name="playerO" x="8060" y="1184" width="20" height="30"/>
<object id="758" name="playerO" x="5074" y="1265" width="20" height="30"/>
<object id="510" name="playerO" x="4028" y="1168.33" width="20" height="30"/>
<object id="275" name="player" x="400" y="1024" width="20" height="30"/>
<object id="275" name="playerO" x="400" y="1024" width="20" height="30"/>
</objectgroup>
<objectgroup name="EnemyBorders">
<object id="356" name="enemyBorder" type="1" x="800" y="960" width="352" height="16"/>
Expand Down Expand Up @@ -654376,7 +654376,7 @@
<object id="348" name="gateOC" type="5" x="11856" y="1040" width="16" height="80"/>
<object id="350" name="gateC" type="5" x="11920" y="1040" width="16" height="80"/>
<object id="351" name="gateO" type="5" x="12464" y="1120" width="16" height="80"/>
<object id="352" name="gateO" type="5" x="12528" y="1120" width="16" height="80"/>
<object id="352" name="gateO" type="5" x="12528" y="1200" width="16" height="80"/>
<object id="353" name="gateO" type="4" x="4960" y="1216" width="16" height="64"/>
<object id="354" name="gateO" type="3" x="4144" y="1136" width="16" height="48"/>
<object id="355" name="gateO" type="4" x="4336" y="1360" width="16" height="64"/>
Expand Down
40 changes: 29 additions & 11 deletions TIMLE/Level2.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" tiledversion="1.1.6" orientation="orthogonal" renderorder="right-down" width="470" height="350" tilewidth="16" tileheight="16" infinite="0" backgroundcolor="#1a1a1a" nextobjectid="3957">
<map version="1.0" tiledversion="1.1.6" orientation="orthogonal" renderorder="right-down" width="470" height="350" tilewidth="16" tileheight="16" infinite="0" backgroundcolor="#1a1a1a" nextobjectid="3976">
<tileset firstgid="1" name="tileset" tilewidth="16" tileheight="16" tilecount="7565" columns="85">
<image source="tileset.png" trans="98ace2" width="1360" height="1424"/>
<terraintypes>
Expand Down Expand Up @@ -822561,7 +822561,7 @@
<tile/>
</data>
</layer>
<objectgroup name="Enemies" visible="0">
<objectgroup name="Enemies">
<object id="3327" name="enemyDarkArcher" type="21" x="2406" y="2573" width="50" height="50"/>
<object id="3328" name="enemyDarkArcher" type="27" x="1935" y="1933" width="50" height="50"/>
<object id="3331" name="enemyDarkArcher" type="34" x="2249" y="1564" width="50" height="50"/>
Expand Down Expand Up @@ -822626,7 +822626,7 @@
<object id="3409" name="enemyDwarfA" type="50" x="3777" y="1812" width="40" height="27"/>
<object id="3410" name="enemyDwarfA" type="5" x="2475" y="1587" width="40" height="27"/>
<object id="3411" name="enemyDwarfA" type="30" x="921" y="1667" width="40" height="27"/>
<object id="3412" name="enemyDwarfA" type="5" x="629" y="1778" width="40" height="27"/>
<object id="3412" name="enemyDwarfA" type="5" x="629" y="1780" width="40" height="27"/>
<object id="3413" name="enemyDwarfA" type="24" x="2100" y="2164" width="40" height="27"/>
<object id="3415" name="enemyDwarfA" type="31" x="1652" y="1379" width="40" height="27"/>
<object id="3416" name="enemyDwarvenArcherA" type="23" x="1484" y="2100" width="40" height="27"/>
Expand Down Expand Up @@ -822833,15 +822833,18 @@
<object id="3438" name="enemyBorder" type="1" x="1475" y="3071" width="16" height="64"/>
<object id="3437" name="enemyBorder" type="1" x="1475" y="3135" width="589" height="11"/>
<object id="3436" name="enemyBorder" type="1" x="2048" y="3071" width="16" height="64"/>
<object id="3958" name="enemyBorder" type="5" x="544" y="1744" width="16" height="64"/>
<object id="3959" name="enemyBorder" type="5" x="544" y="1808" width="196" height="20"/>
<object id="3960" name="enemyBorder" type="5" x="724" y="1744" width="16" height="64"/>
</objectgroup>
<objectgroup name="Gates" visible="0">
<objectgroup name="Gates">
<object id="3708" name="gateO" type="2" x="3584" y="5136" width="16" height="30"/>
<object id="3709" name="gateO" type="4" x="3376" y="527" width="16" height="64"/>
<object id="3710" name="gateС" type="4" x="2560" y="591" width="16" height="64"/>
<object id="3711" name="gateO" type="4" x="6720" y="2799" width="16" height="64"/>
<object id="3712" name="gateС" type="4" x="6080" y="2736" width="16" height="64"/>
</objectgroup>
<objectgroup name="FallingRocks" visible="0"/>
<objectgroup name="FallingRocks"/>
<objectgroup name="Solids">
<object id="751" name="solid" x="0" y="3135" width="2111" height="47"/>
<object id="753" name="solid" x="624" y="2943" width="96" height="113"/>
Expand Down Expand Up @@ -824283,6 +824286,21 @@
<object id="3925" x="4232" y="4643" width="5" height="10"/>
<object id="3926" x="4263" y="4611" width="5" height="10"/>
<object id="3956" x="4203" y="4671" width="5" height="10"/>
<object id="3961" name="solid" x="2560" y="3081" width="5" height="18"/>
<object id="3962" name="solid" x="2564" y="3077" width="5" height="18"/>
<object id="3963" name="solid" x="2568" y="3073" width="5" height="18"/>
<object id="3964" name="solid" x="2572" y="3071" width="5" height="18"/>
<object id="3965" name="solid" x="2576" y="3065" width="5" height="18"/>
<object id="3966" name="solid" x="2580" y="3061" width="5" height="18"/>
<object id="3967" name="solid" x="2588" y="3053" width="5" height="18"/>
<object id="3968" name="solid" x="2584" y="3057" width="5" height="18"/>
<object id="3969" name="solid" x="2592" y="3049" width="5" height="18"/>
<object id="3970" name="solid" x="2596" y="3045" width="5" height="18"/>
<object id="3971" name="solid" x="2600" y="3041" width="5" height="18"/>
<object id="3972" name="solid" x="2604" y="3037" width="5" height="18"/>
<object id="3973" name="solid" x="2608" y="3033" width="5" height="18"/>
<object id="3974" name="solid" x="2611" y="3029" width="5" height="18"/>
<object id="3975" name="solid" x="2615" y="3025" width="5" height="18"/>
</objectgroup>
<objectgroup name="SpikesNLava">
<object id="2923" name="death" x="2241" y="2674" width="127" height="14"/>
Expand Down Expand Up @@ -824352,12 +824370,12 @@
<object id="3448" name="enemyBorder" type="4" x="2096" y="5358" width="96" height="18"/>
<object id="3449" name="enemyBorder" type="4" x="2176" y="5294" width="16" height="64"/>
</objectgroup>
<objectgroup name="Players" visible="0">
<object id="3713" name="player" x="3764" y="1584" width="20" height="30"/>
<object id="3233" name="playerO" x="828" y="3105" width="20" height="30"/>
<objectgroup name="Players">
<object id="3713" name="playerO" x="3764" y="1584" width="20" height="30"/>
<object id="3233" name="player" x="828" y="3105" width="20" height="30"/>
</objectgroup>
<objectgroup name="Events" visible="0"/>
<objectgroup name="MovPlatforms" visible="0">
<objectgroup name="Events"/>
<objectgroup name="MovPlatforms">
<object id="748" name="Platform" type="2" x="1664" y="2320" width="48" height="16"/>
<object id="3639" name="PlatformBorder" type="1" x="1712" y="2320" width="16" height="16"/>
<object id="3640" name="PlatformBorder" type="1" x="1184" y="2319" width="16" height="17"/>
Expand Down Expand Up @@ -824404,7 +824422,7 @@
<object id="3717" name="PlatformBorder" type="8" x="5552" y="2544" width="16" height="17"/>
<object id="3718" name="PlatformBorder" type="8" x="5360" y="2544" width="16" height="16"/>
</objectgroup>
<objectgroup name="TeleportsAkaDoors" visible="0">
<objectgroup name="TeleportsAkaDoors">
<object id="3239" name="teleport" type="1" x="3185" y="3209" width="30" height="38"/>
<object id="3241" name="teleport" type="1" x="1121" y="5017" width="30" height="38"/>
<object id="3242" name="teleport" type="2" x="1121" y="4793" width="30" height="38"/>
Expand Down
Binary file modified TIMLE/ReleaseWithoutConsole/TIMLE.tlog/TIMLE.write.1u.tlog
View file
Binary file not shown.

0 comments on commit b0b3461

Please sign in to comment.