mirror of
https://github.com/luksamuk/engine-psx.git
synced 2025-04-28 13:28:02 +03:00
Improve angle resolution, disable mode change (for now), improve R8
This commit is contained in:
Lucas S. Vieira
Lucas Vieira
parent
c429dd88be
commit
6fdd779162
5 changed files with 58 additions and 42 deletions
Binary file not shown.
|
Before Width: | Height: | Size: 112 KiB After Width: | Height: | Size: 114 KiB |
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<map version="1.10" tiledversion="1.11.0" orientation="orthogonal" renderorder="right-down" width="255" height="31" tilewidth="128" tileheight="128" infinite="0" nextlayerid="4" nextobjectid="23">
|
||||
<map version="1.10" tiledversion="1.11.0" orientation="orthogonal" renderorder="right-down" width="255" height="31" tilewidth="128" tileheight="128" infinite="0" nextlayerid="4" nextobjectid="25">
|
||||
<tileset firstgid="1" source="128x128.tsx"/>
|
||||
<tileset firstgid="85" source="../COMMON/objects_common.tsx"/>
|
||||
<layer id="1" name="LAYER0" width="255" height="31">
|
||||
|
|
@ -22,13 +22,13 @@
|
|||
81,34,0,0,33,34,19,0,40,41,0,0,0,0,0,23,24,19,23,24,23,24,17,25,31,32,78,0,0,38,7,7,0,0,20,20,20,0,19,20,19,20,19,20,20,0,17,25,25,25,25,25,12,0,0,0,0,0,0,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
81,5,3,4,2,5,2,5,2,5,11,15,22,12,78,0,78,23,0,0,0,0,23,17,6,39,5,2,25,38,7,7,0,0,23,19,23,0,20,19,20,19,20,24,19,0,19,23,24,23,24,23,80,11,0,0,0,0,10,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
81,37,38,37,6,6,38,6,6,6,17,25,11,80,25,25,25,25,0,0,78,0,0,20,19,23,24,23,24,6,7,7,0,0,0,24,0,0,23,24,23,24,23,10,25,18,20,15,25,25,0,15,25,25,64,65,22,25,16,24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
81,82,14,24,19,23,24,0,37,37,23,24,17,11,23,24,23,24,10,25,25,25,25,25,25,25,3,8,8,7,7,7,0,0,0,0,0,0,0,78,0,0,10,16,23,21,19,28,23,24,0,28,24,19,71,73,23,24,23,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
83,5,69,77,13,77,68,0,24,23,0,0,24,17,45,0,0,15,16,24,24,20,22,19,24,23,6,37,37,7,7,7,0,0,0,0,0,0,15,25,25,22,16,24,0,21,20,28,0,0,0,42,56,2,2,5,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
7,6,6,38,6,38,6,2,58,46,0,47,30,2,66,78,0,28,24,0,29,13,42,13,32,78,24,23,19,40,6,37,0,0,78,0,0,0,28,20,23,28,23,0,0,21,19,28,0,43,57,38,7,6,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
6,37,6,38,37,37,6,6,37,53,0,54,38,37,2,5,31,42,30,2,36,6,6,6,39,5,3,8,13,33,27,41,29,30,22,3,8,0,42,13,8,42,30,25,25,25,25,25,25,36,7,6,37,7,37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
37,37,37,37,38,6,37,37,37,6,0,54,38,6,7,37,37,6,37,38,37,37,19,38,37,6,37,6,38,5,2,5,36,6,42,13,13,77,32,24,37,37,23,24,23,24,23,24,20,0,0,0,0,0,0,0,0,0,25,25,25,25,25,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
37,7,38,37,6,7,6,37,6,37,0,54,38,38,21,20,20,20,24,20,23,19,23,6,20,20,20,20,20,20,20,20,20,6,6,38,6,81,34,0,29,13,32,0,0,0,0,0,19,0,0,0,0,0,0,0,0,0,23,24,23,24,23,24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
7,6,37,6,7,6,37,37,37,6,0,54,38,6,21,20,24,20,0,20,0,20,0,20,19,24,23,24,23,24,23,24,23,6,7,7,7,83,2,5,36,7,39,31,32,0,0,29,13,68,70,74,0,75,70,8,47,48,47,48,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
81,82,14,24,19,23,24,0,37,37,23,24,17,11,23,24,23,24,15,25,25,25,25,25,25,25,3,8,8,7,7,7,0,0,0,0,0,0,0,78,0,0,10,16,23,21,19,28,23,24,0,28,24,19,71,73,23,24,23,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
83,5,69,77,13,77,68,0,24,23,0,0,24,17,45,0,0,0,72,24,24,20,22,19,24,23,6,37,37,7,7,7,0,0,0,0,0,0,15,25,25,22,16,24,0,21,20,28,0,0,0,42,56,2,2,5,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
7,6,6,38,6,38,6,2,58,46,0,47,30,2,66,78,0,0,0,0,29,13,42,13,32,78,24,23,19,40,6,37,0,0,78,0,0,0,28,20,23,28,23,0,0,21,19,28,0,43,57,38,7,6,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
6,37,6,38,37,37,6,6,37,53,0,54,38,37,2,5,2,31,77,30,36,6,6,6,39,5,3,8,13,33,27,41,29,30,22,3,8,0,42,13,8,42,30,25,25,25,25,25,25,36,7,6,37,7,37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
37,37,37,37,38,6,37,37,37,6,0,54,38,6,7,37,37,6,37,38,37,37,19,38,37,6,37,6,38,5,2,5,36,6,42,13,13,77,32,24,23,37,23,24,23,24,23,24,20,0,0,0,0,0,0,0,0,0,25,25,25,25,25,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
37,7,38,37,6,7,6,37,6,37,0,54,38,38,21,20,20,20,24,20,23,19,23,6,20,20,20,20,20,20,20,20,20,6,6,38,6,7,84,0,29,13,32,0,0,0,0,0,19,0,0,0,0,0,0,0,0,0,23,24,23,24,23,24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
7,6,37,6,7,6,37,37,37,6,0,54,38,6,21,20,24,20,0,20,0,20,0,20,19,24,23,24,23,24,23,24,23,6,7,7,7,7,2,5,36,7,39,31,32,0,0,29,13,68,70,74,0,75,70,8,47,48,47,48,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
6,7,37,37,6,37,37,37,6,37,0,54,38,7,21,23,0,24,0,24,0,19,0,19,23,0,0,0,0,0,0,0,0,6,7,7,7,38,37,7,38,37,7,38,39,2,5,36,37,7,7,2,5,2,7,38,28,21,28,21,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
7,37,37,37,37,37,37,6,7,38,0,54,38,37,21,0,0,0,0,0,0,24,0,24,0,0,0,0,0,0,0,0,0,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,28,21,28,21,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
6,37,37,7,37,37,6,37,37,7,0,54,38,7,21,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,23,24,23,24,23,24,23,24,23,24,23,24,23,24,23,24,23,24,23,24,23,24,28,21,28,21,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
|
|
@ -48,7 +48,7 @@
|
|||
</properties>
|
||||
</object>
|
||||
<object id="7" gid="87" x="3567" y="2752" width="64" height="64"/>
|
||||
<object id="8" gid="86" x="2213" y="2752" width="64" height="64">
|
||||
<object id="8" gid="86" x="2296" y="2752" width="64" height="64">
|
||||
<properties>
|
||||
<property name="Kind" value="RING"/>
|
||||
</properties>
|
||||
|
|
@ -82,6 +82,8 @@
|
|||
</properties>
|
||||
</object>
|
||||
<object id="22" gid="89" x="1520" y="1216" width="64" height="64"/>
|
||||
<object id="23" gid="90" x="4864" y="3024" width="64" height="64" rotation="90"/>
|
||||
<object id="24" gid="90" x="3712" y="2768" width="64" height="64" rotation="90"/>
|
||||
</objectgroup>
|
||||
</group>
|
||||
</map>
|
||||
|
|
|
|||
|
|
@ -6,10 +6,10 @@
|
|||
<data encoding="csv">
|
||||
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
0,0,54,55,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
0,0,66,67,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
0,0,74,75,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
0,0,54,55,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
0,7,6,6,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
0,7,66,67,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
0,7,74,75,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
0,7,5,5,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
|
|
|
|||
|
|
@ -139,13 +139,13 @@
|
|||
0,0,0,332,333,334,86,335,352,0,0,0,0,0,0,0,0,0,0,0,0,0,0,366,45,46,46,47,86,31,32,86,
|
||||
0,0,0,0,336,337,58,59,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,35,36,36,37,35,36,36,37,
|
||||
0,0,0,0,0,338,64,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,11,11,42,41,11,11,42,
|
||||
2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,85,374,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
45,46,46,47,0,0,0,372,0,0,0,0,0,0,0,0,86,375,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
35,37,253,84,0,0,367,265,2,2,2,2,2,2,2,2,288,376,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
41,42,254,85,0,189,373,265,45,46,46,47,4,7,8,6,86,377,378,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
38,40,255,85,2,2,2,2,17,18,19,20,13,14,15,16,379,380,381,382,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
86,31,32,86,45,46,46,47,23,24,25,26,10,21,22,12,207,383,384,385,386,0,0,0,0,0,0,0,0,0,0,0,
|
||||
35,36,36,37,35,36,36,37,13,14,15,16,35,36,36,37,198,212,387,388,389,390,391,0,0,0,0,0,0,0,0,0,
|
||||
2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,85,374,0,0,0,0,0,0,0,0,0,0,0,108,109,0,
|
||||
45,46,46,47,0,0,0,372,0,0,0,0,0,0,0,0,86,375,0,0,0,0,0,0,0,0,0,0,0,110,111,0,
|
||||
35,37,253,84,0,0,367,265,2,2,2,2,2,2,2,2,288,376,0,0,0,0,0,0,0,0,0,0,0,108,109,0,
|
||||
41,42,254,85,0,189,373,265,45,46,46,47,4,7,8,6,86,377,378,0,0,0,0,0,0,0,0,0,0,110,111,0,
|
||||
38,40,255,85,2,2,2,2,17,18,19,20,13,14,15,16,379,380,381,382,0,0,0,0,0,0,0,0,0,122,123,0,
|
||||
86,31,32,86,45,46,46,47,23,24,25,26,10,21,22,12,207,383,384,385,386,0,0,0,0,0,0,0,0,164,165,0,
|
||||
35,36,36,37,35,36,36,37,13,14,15,16,35,36,36,37,198,212,387,388,389,390,391,0,0,0,0,0,0,166,167,0,
|
||||
41,11,11,42,41,11,11,42,10,21,22,12,41,11,11,42,392,393,394,395,396,397,398,399,0,0,0,0,0,0,0,0,
|
||||
0,0,0,0,0,400,401,85,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
0,0,0,0,0,402,403,85,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
|
|
@ -163,14 +163,14 @@
|
|||
9,82,5,83,45,46,46,47,0,264,265,265,265,368,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
84,41,11,42,35,36,36,37,0,367,265,265,265,265,456,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
85,84,58,59,41,11,11,42,264,369,265,369,265,265,369,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
35,36,36,37,201,202,203,204,176,232,233,250,0,0,0,0,35,36,36,37,2,2,2,2,0,0,0,0,0,0,0,0,
|
||||
41,11,11,42,201,202,203,204,176,234,235,275,0,0,0,0,23,24,25,26,4,7,8,6,0,0,0,0,0,0,0,0,
|
||||
17,18,19,20,201,176,210,211,236,237,238,239,0,0,0,0,13,14,15,16,13,14,15,16,0,0,0,0,0,0,0,0,
|
||||
23,24,25,26,176,176,213,214,240,241,242,243,0,0,0,0,41,11,11,42,10,21,22,12,0,0,0,0,0,0,0,0,
|
||||
13,14,15,16,218,219,176,176,245,246,247,248,0,0,0,0,35,36,36,37,27,28,29,30,0,0,0,0,0,0,0,0,
|
||||
10,21,22,12,201,223,176,176,176,176,249,250,0,0,0,0,23,24,25,26,31,32,33,34,0,0,0,0,0,0,0,0,
|
||||
35,36,36,37,201,223,176,176,176,176,202,251,0,0,0,0,13,14,15,16,35,36,36,37,0,0,0,0,0,0,0,0,
|
||||
41,11,11,42,230,231,176,176,176,176,202,252,0,0,0,0,41,11,11,42,41,11,11,42,0,0,0,0,0,0,0,0
|
||||
35,36,36,37,201,202,203,204,176,232,233,250,0,0,0,0,35,36,36,37,2,2,2,2,60,61,62,63,50,51,52,53,
|
||||
41,11,11,42,201,202,203,204,176,234,235,275,0,0,0,0,23,24,25,26,4,7,8,6,31,32,33,34,54,55,56,57,
|
||||
17,18,19,20,201,176,210,211,236,237,238,239,0,0,0,0,13,14,15,16,13,14,15,16,35,36,36,37,35,36,36,37,
|
||||
23,24,25,26,176,176,213,214,240,241,242,243,0,0,0,0,41,11,11,42,10,21,22,12,41,11,11,42,41,11,11,42,
|
||||
13,14,15,16,218,219,176,176,245,246,247,248,0,0,0,0,35,36,36,37,27,28,29,30,245,246,247,248,0,0,0,0,
|
||||
10,21,22,12,201,223,176,176,176,176,249,250,0,0,0,0,23,24,25,26,31,32,33,34,176,176,249,250,0,0,0,0,
|
||||
35,36,36,37,201,223,176,176,176,176,202,251,0,0,0,0,13,14,15,16,35,36,36,37,176,176,202,251,0,0,0,0,
|
||||
41,11,11,42,230,231,176,176,176,176,202,252,0,0,0,0,41,11,11,42,41,11,11,42,176,176,202,252,0,0,0,0
|
||||
</data>
|
||||
</layer>
|
||||
<layer id="2" name="oneway" width="32" height="168" opacity="0.58">
|
||||
|
|
@ -335,7 +335,7 @@
|
|||
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,114,0,
|
||||
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
|
|
|
|||
40
src/player.c
40
src/player.c
|
|
@ -330,7 +330,7 @@ _player_update_collision_lr(Player *player)
|
|||
/* player->angle = 0; */
|
||||
/* player->vel.vz = 0; */
|
||||
/* // TODO: Same as hitting the head. Adjust this to look like ceiling */
|
||||
/* player->pos.vy = (player->ev_left.coord - 10) << 12; */
|
||||
/* player->pos.vy = (player->ev_left.coord - 10) << 12; */
|
||||
/* } */
|
||||
/* break; */
|
||||
/* case CDIR_CEILING: */
|
||||
|
|
@ -469,10 +469,18 @@ _player_update_collision_tb(Player *player)
|
|||
player->angle = player->ev_grnd1.angle;
|
||||
else if(!player->ev_grnd1.collided && player->ev_grnd2.collided)
|
||||
player->angle = player->ev_grnd2.angle;
|
||||
// In case both are available, get the angle on the left.
|
||||
// This introduces certain collision bugs but let's leave it
|
||||
// like this for now
|
||||
else player->angle = player->ev_grnd1.angle;
|
||||
/* // In case both are available, get the angle on the left. */
|
||||
/* // This introduces certain collision bugs but let's leave it */
|
||||
/* // like this for now */
|
||||
/* else player->angle = player->ev_grnd1.angle; */
|
||||
|
||||
// In case both are available, get the lowest angle always
|
||||
else {
|
||||
player->angle =
|
||||
(player->ev_grnd1.angle < player->ev_grnd2.angle)
|
||||
? player->ev_grnd1.angle
|
||||
: player->ev_grnd2.angle;
|
||||
}
|
||||
|
||||
// TODO: FIX THIS!!!!!
|
||||
int32_t deg = (abs(player->angle) * (360 << 12) >> 24);
|
||||
|
|
@ -608,9 +616,9 @@ _player_update_collision_tb(Player *player)
|
|||
}
|
||||
|
||||
void
|
||||
player_update(Player *player)
|
||||
_player_resolve_collision_modes(Player *player)
|
||||
{
|
||||
// NOTE THAT PLAYER INPUT IS NOT UPDATED AUTOMATICALLY!
|
||||
// NOTE THAT PLAYER INPUT IS NOT UPDATED AUTOMATICALLY!
|
||||
// One must call input_get_state on player->input so that
|
||||
// player input is recognized. This is done in screen_level.c.
|
||||
|
||||
|
|
@ -618,7 +626,7 @@ player_update(Player *player)
|
|||
// by 43 units towards the direction that makes more sense for
|
||||
// that region, so angles may be increased or decreased depending
|
||||
// on convenience.
|
||||
uint32_t p_angle = abs(player->angle);
|
||||
int32_t p_angle = player->angle;
|
||||
|
||||
/* GROUND SENSORS COLLISION MODES */
|
||||
// As a rule of thumb, only floor and ceiling min/max
|
||||
|
|
@ -630,21 +638,21 @@ player_update(Player *player)
|
|||
#define GSMODE_ANGLE_FLOOR_RIGHT 0x01d5 // ~41° (original: 45°)
|
||||
#define GSMODE_ANGLE_CEIL_MIN 0x0600 // 135°
|
||||
#define GSMODE_ANGLE_CEIL_MAX 0x0a00 // 225°
|
||||
#define GSMODE_ANGLE_FLOOR_LEFT 0x0e40 // ~318° (original: 315°)
|
||||
#define GSMODE_ANGLE_FLOOR_LEFT 0x0e94 // ~318° (original: 315°)
|
||||
|
||||
// Original collision mode ranges
|
||||
if((GSMODE_ANGLE_FLOOR_LEFT <= p_angle) || (p_angle <= GSMODE_ANGLE_FLOOR_RIGHT))
|
||||
if((p_angle >= GSMODE_ANGLE_FLOOR_LEFT) || (p_angle <= GSMODE_ANGLE_FLOOR_RIGHT))
|
||||
// floor
|
||||
player->gsmode = CDIR_FLOOR;
|
||||
else if((GSMODE_ANGLE_FLOOR_RIGHT < p_angle) && (p_angle < GSMODE_ANGLE_CEIL_MIN))
|
||||
else if((p_angle > GSMODE_ANGLE_FLOOR_RIGHT) && (p_angle < GSMODE_ANGLE_CEIL_MIN))
|
||||
// r.wall (l.wall if angle is negative)
|
||||
player->gsmode = (player->angle >= 0)
|
||||
? CDIR_RWALL
|
||||
: CDIR_LWALL;
|
||||
else if((GSMODE_ANGLE_CEIL_MIN <= p_angle) && (p_angle <= GSMODE_ANGLE_CEIL_MAX))
|
||||
else if((p_angle >= GSMODE_ANGLE_CEIL_MIN) && (p_angle <= GSMODE_ANGLE_CEIL_MAX))
|
||||
// ceiling
|
||||
player->gsmode = CDIR_CEILING;
|
||||
else if((GSMODE_ANGLE_CEIL_MAX < p_angle) && (p_angle < GSMODE_ANGLE_FLOOR_LEFT))
|
||||
else if((p_angle > GSMODE_ANGLE_CEIL_MAX) && (p_angle < GSMODE_ANGLE_FLOOR_LEFT))
|
||||
// l.wall (r.wall if angle negative)
|
||||
player->gsmode = (player->angle >= 0)
|
||||
? CDIR_LWALL
|
||||
|
|
@ -670,6 +678,12 @@ player_update(Player *player)
|
|||
player->psmode = (player->angle >= 0)
|
||||
? CDIR_LWALL
|
||||
: CDIR_RWALL;
|
||||
}
|
||||
|
||||
void
|
||||
player_update(Player *player)
|
||||
{
|
||||
//_player_resolve_collision_modes(player);
|
||||
|
||||
_player_update_collision_lr(player); // Push sensor collision detection
|
||||
_player_update_collision_tb(player); // Ground sensor collision detection
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue