jailers/jaildoctors_dilemma
5
0
Fork 0
forked from jaildesigner-jailgames/jaildoctors_dilemma
Code Pull Requests Activity

Revisar colisiones

Browse Source
This commit is contained in:
Sergio
2022-09-13 22:57:46 +02:00
parent 7776d61747
commit 2ff12f7db1
14 changed files with 209 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/room/03.room
View File

@@ -5,7 +5,7 @@ tileset=standard.png
roomUp=0 roomUp=0
roomDown=05.room roomDown=05.room
roomLeft=02.room roomLeft=02.room
roomRight=0 roomRight=11.room
[tilemap] [tilemap]
03.tmx 03.tmx

4
data/room/03.tmx
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<map version="1.9" tiledversion="1.9.0" orientation="orthogonal" renderorder="right-down" width="32" height="16" tilewidth="8" tileheight="8" infinite="0" nextlayerid="2" nextobjectid="1"> <map version="1.9" tiledversion="1.9.1" orientation="orthogonal" renderorder="right-down" width="32" height="16" tilewidth="8" tileheight="8" infinite="0" nextlayerid="2" nextobjectid="1">
<tileset firstgid="1" source="../../../jaildoctors_dilemma_resources/tilesets/standard.tsx"/> <tileset firstgid="1" source="../../../jaildoctors_dilemma_resources/tilesets/standard.tsx"/>
<layer id="1" name="Capa de patrones 1" width="32" height="16"> <layer id="1" name="Capa de patrones 1" width="32" height="16">
<data encoding="csv"> <data encoding="csv">
@@ -11,7 +11,7 @@
26,0,0,0,0,0,271,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 26,0,0,0,0,0,271,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
26,0,0,271,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 26,0,0,271,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,271,271,271,271,271,271,271,271,271,271,271,271,271,271,271,271,271,271,0,232,0,0,0,0,0,0,0,0,0, 0,0,0,271,271,271,271,271,271,271,271,271,271,271,271,271,271,271,271,271,271,0,232,0,0,0,232,232,232,232,232,232,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,232,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,232,0,0,0,0,0,0,0,0,0,
26,26,26,0,0,0,26,26,26,0,0,0,26,26,26,0,0,0,26,26,26,0,0,0,0,0,0,0,0,0,0,0, 26,26,26,0,0,0,26,26,26,0,0,0,26,26,26,0,0,0,26,26,26,0,0,0,0,0,0,0,0,0,0,0,

4
data/room/05.room
View File

@@ -5,7 +5,7 @@ tileset=standard.png
roomUp=03.room roomUp=03.room
roomDown=0 roomDown=0
roomLeft=04.room roomLeft=04.room
roomRight=0 roomRight=12.room
[tilemap] [tilemap]
05.tmx 05.tmx
@@ -24,7 +24,7 @@ x1=9
y1=7 y1=7
x2=25 x2=25
y2=7 y2=7
color=bright_yellow color=bright_red
[/enemy] [/enemy]
[enemy] [enemy]

68
data/room/11.room Normal file
View File

@@ -0,0 +1,68 @@
name=qvoid
bgColor=bright_blue
border=white
tileset=standard.png
roomUp=0
roomDown=0
roomLeft=03.room
roomRight=0
[tilemap]
11.tmx
[/tilemap]
[enemy]
tileset=qvoid.png
animation=qvoid.ani
width=16
height=16
x=13
y=3
vx=0
vy=0.3
x1=13
y1=3
x2=13
y2=11
color=white
[/enemy]
[enemy]
tileset=qvoid.png
animation=qvoid.ani
width=16
height=16
x=19
y=7
vx=0.6
vy=0.3
x1=19
y1=3
x2=19
y2=11
color=bright_red
[/enemy]
[item]
tileset=items.png
tile=20
x=1
y=12
counter=1
[/item]
[item]
tileset=items.png
tile=20
x=16
y=5
counter=2
[/item]
[item]
tileset=items.png
tile=20
x=25
y=11
counter=3
[/item]

24
data/room/11.tmx Normal file
View File

@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.9" tiledversion="1.9.1" orientation="orthogonal" renderorder="right-down" width="32" height="16" tilewidth="8" tileheight="8" infinite="0" nextlayerid="2" nextobjectid="1">
<tileset firstgid="1" source="../../../jaildoctors_dilemma_resources/tilesets/standard.tsx"/>
<layer id="1" name="Capa de patrones 1" width="32" height="16">
<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,113,113,113,183,0,0,0,0,113,113,0,0,0,0,113,113,0,0,0,0,113,113,0,0,0,0,113,113,113,113,
113,113,113,113,113,0,183,0,0,0,113,113,0,0,0,0,113,113,0,0,0,0,113,113,0,0,0,0,113,113,113,113,
113,113,113,113,113,0,0,183,0,0,113,113,0,0,0,0,113,113,0,0,0,0,113,113,0,0,0,0,113,113,113,113,
113,0,0,0,0,0,163,113,113,113,113,113,0,0,0,0,113,113,0,0,0,0,113,113,0,0,0,0,113,113,113,113,
113,0,0,0,0,163,0,113,113,113,113,113,0,0,0,0,113,113,0,0,0,0,113,113,0,0,0,0,113,113,113,113,
113,0,0,0,163,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
113,0,0,163,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
113,113,113,113,101,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,103,113,113,113,113,113,
113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113
</data>
</layer>
</map>

60
data/room/12.room Normal file
View File

@@ -0,0 +1,60 @@
name=no name
bgColor=black
border=red
tileset=standard.png
roomUp=0
roomDown=0
roomLeft=05.room
roomRight=0
[tilemap]
01.tmx
[/tilemap]
[enemy]
tileset=diskette.png
animation=diskette.ani
width=16
height=16
x=1
y=0
vx=0
vy=0.3
x1=1
y1=0
x2=1
y2=5
color=magenta
[/enemy]
[enemy]
tileset=diskette.png
animation=diskette.ani
width=16
height=16
x=5
y=9
vx=0.6
vy=0
x1=5
y1=9
x2=22
y2=9
color=white
[/enemy]
[item]
tileset=items.png
tile=1
x=1
y=7
counter=1
[/item]
[item]
tileset=items.png
tile=1
x=17
y=8
counter=2
[/item]

24
data/room/12.tmx Normal file
View File

@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.9" tiledversion="1.9.1" orientation="orthogonal" renderorder="right-down" width="32" height="16" tilewidth="8" tileheight="8" infinite="0" nextlayerid="2" nextobjectid="1">
<tileset firstgid="1" source="../../../jaildoctors_dilemma_resources/tilesets/standard.tsx"/>
<layer id="1" name="Capa de patrones 1" width="32" height="16">
<data encoding="csv">
74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,
74,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
326,326,326,326,326,326,326,326,326,326,326,326,326,326,326,286,326,326,326,326,326,326,326,326,326,326,326,326,326,326,326,326,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,286,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,286,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,286,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,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,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74
</data>
</layer>
</map>

10
media/enemies/bin.ani Normal file
View File

@@ -0,0 +1,10 @@
frames_per_row=5
frame_width=16
frame_height=8
[animation]
name=default
speed=10
loop=0
frames=0,1,2,3,4
[/animation]

BIN
media/enemies/bin.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 174 B

10
media/enemies/qvoid.ani Normal file
View File

@@ -0,0 +1,10 @@
frames_per_row=8
frame_width=16
frame_height=16
[animation]
name=default
speed=8
loop=0
frames=0,1,2,3,4,5,6,7
[/animation]

BIN
media/enemies/qvoid.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 441 B

BIN
media/items/items.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 579 B

After

Width:  |  Height:  |  Size: 603 B

BIN
media/tilesets/standard.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

8
source/director.cpp
View File

@@ -360,6 +360,8 @@ bool Director::setFileList()
asset->add("/data/room/08.room", room); asset->add("/data/room/08.room", room);
asset->add("/data/room/09.room", room); asset->add("/data/room/09.room", room);
asset->add("/data/room/10.room", room); asset->add("/data/room/10.room", room);
asset->add("/data/room/11.room", room);
asset->add("/data/room/12.room", room);
asset->add("/data/room/01.tmx", room); asset->add("/data/room/01.tmx", room);
asset->add("/data/room/02.tmx", room); asset->add("/data/room/02.tmx", room);
asset->add("/data/room/03.tmx", room); asset->add("/data/room/03.tmx", room);
@@ -370,6 +372,8 @@ bool Director::setFileList()
asset->add("/data/room/08.tmx", room); asset->add("/data/room/08.tmx", room);
asset->add("/data/room/09.tmx", room); asset->add("/data/room/09.tmx", room);
asset->add("/data/room/10.tmx", room); asset->add("/data/room/10.tmx", room);
asset->add("/data/room/11.tmx", room);
asset->add("/data/room/12.tmx", room);
asset->add("/media/tilesets/standard.png", bitmap); asset->add("/media/tilesets/standard.png", bitmap);
@@ -385,6 +389,10 @@ bool Director::setFileList()
asset->add("/media/enemies/diskette.ani", data); asset->add("/media/enemies/diskette.ani", data);
asset->add("/media/enemies/bird.png", bitmap); asset->add("/media/enemies/bird.png", bitmap);
asset->add("/media/enemies/bird.ani", data); asset->add("/media/enemies/bird.ani", data);
asset->add("/media/enemies/bin.png", bitmap);
asset->add("/media/enemies/bin.ani", data);
asset->add("/media/enemies/qvoid.png", bitmap);
asset->add("/media/enemies/qvoid.ani", data);
asset->add("/media/player/player.png", bitmap); asset->add("/media/player/player.png", bitmap);
asset->add("/media/player/player.ani", data); asset->add("/media/player/player.ani", data);