JailDoctor/jdd_opendingux
1
0
Fork 0
forked from jaildesigner-jailgames/jaildoctors_dilemma
Code Issues Pull Requests Projects Releases Wiki Activity

Retocando la abadía

Browse Source
This commit is contained in:
Sergio
2022-11-01 22:36:12 +01:00
parent cb62cb8eb0
commit 4901635bb7
20 changed files with 363 additions and 429 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/items/items.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

40
data/room/06.room
View File

@@ -1,4 +1,4 @@
name=welcome to my abbey name=WELCOME TO MY ABBEY
bgColor=blue bgColor=blue
border=yellow border=yellow
tileMapFile=06.tmx tileMapFile=06.tmx
@@ -7,8 +7,8 @@ roomUp=15.room
roomDown=0 roomDown=0
roomLeft=05.room roomLeft=05.room
roomRight=25.room roomRight=25.room
itemColor1=yellow itemColor1=green
itemColor2=cyan itemColor2=bright_blue
[enemy] [enemy]
tileSetFile=abad.png tileSetFile=abad.png
@@ -21,15 +21,15 @@ vx=0.8
vy=0 vy=0
x1=1 x1=1
y1=13 y1=13
x2=30 x2=25
y2=13 y2=13
color=yellow color=yellow
flip=true flip=true
[/enemy] [/enemy]
[enemy] [enemy]
tileSetFile=wave_v.png tileSetFile=spider.png
animation=wave_v.ani animation=spider.ani
width=8 width=8
height=8 height=8
x=24 x=24
@@ -40,12 +40,12 @@ x1=24
y1=2 y1=2
x2=24 x2=24
y2=7 y2=7
color=yellow color=green
[/enemy] [/enemy]
[item] [item]
tileSetFile=items.png tileSetFile=items.png
tile=48 tile=49
x=7 x=7
y=2 y=2
counter=1 counter=1
@@ -53,7 +53,7 @@ counter=1
[item] [item]
tileSetFile=items.png tileSetFile=items.png
tile=48 tile=49
x=1 x=1
y=14 y=14
counter=2 counter=2
@@ -61,8 +61,24 @@ counter=2
[item] [item]
tileSetFile=items.png tileSetFile=items.png
tile=48 tile=49
x=30 x=18
y=9 y=14
counter=3 counter=3
[/item] [/item]
[item]
tileSetFile=items.png
tile=49
x=30
y=9
counter=4
[/item]
[item]
tileSetFile=items.png
tile=49
x=30
y=4
counter=5
[/item]

22
data/room/06.tmx
View File

@@ -3,21 +3,21 @@
<tileset firstgid="1" source="standard.tsx"/> <tileset firstgid="1" source="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">
32,32,32,32,0,0,0,0,32,32,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68, 426,427,426,427,0,0,0,0,426,427,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,
32,32,0,0,0,0,0,0,0,0,91,92,91,92,91,92,91,92,91,92,91,92,91,92,91,92,91,92,91,92,91,92, 427,426,427,0,0,0,0,0,0,0,91,92,91,92,91,92,91,92,91,92,91,92,91,92,91,92,91,92,91,92,91,92,
93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93, 93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,
117,0,0,0,426,427,426,427,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,117, 117,0,0,0,426,427,426,427,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,117,
117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,117, 117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,117,
117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,117, 117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,526,403,404,404,117,
141,0,0,426,427,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,117, 141,0,0,426,427,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,526,0,0,0,0,117,
32,0,0,0,426,427,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,117, 32,0,0,0,426,427,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,526,0,0,0,0,0,117,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,526,403,403,403,403,403,550,0,0,0,117, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,526,403,404,404,404,405,550,0,0,0,117,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,526,0,0,0,0,0,0,0,550,0,0,117, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,526,0,0,0,0,0,0,0,550,0,0,117,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,526,0,0,0,0,0,0,0,0,0,403,403,117, 0,0,0,0,0,0,0,0,556,0,0,0,0,0,0,0,0,0,0,526,0,0,0,0,0,0,0,0,0,403,404,117,
32,67,68,67,68,403,403,403,403,403,403,0,0,0,526,67,68,67,68,67,68,67,68,0,0,0,0,0,0,0,140,141, 32,67,68,67,68,404,404,404,404,404,405,0,0,0,403,67,68,67,68,67,68,67,68,405,0,0,0,0,0,0,140,141,
32,91,92,91,92,0,0,0,0,0,0,0,0,526,0,91,92,91,92,91,92,91,92,0,0,0,0,0,0,0,0,32, 32,91,92,91,92,0,0,0,0,0,0,0,0,0,0,91,92,91,92,91,92,91,92,0,0,0,0,0,0,0,0,32,
135,0,0,0,0,0,0,0,0,0,0,0,526,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 135,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,428,0,0,0,0,0,0,0,
135,0,0,0,0,0,0,0,0,0,0,526,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 135,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,556,0,0,0,0,0,
89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90 89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90
</data> </data>
</layer> </layer>

351
data/room/25.room
View File

@@ -1,4 +1,4 @@
name=no 25 name=THE CHAPPEL
bgColor=blue bgColor=blue
border=yellow border=yellow
tileMapFile=25.tmx tileMapFile=25.tmx
@@ -15,15 +15,15 @@ tileSetFile=batman_bell.png
animation=batman_bell.ani animation=batman_bell.ani
width=16 width=16
height=16 height=16
x=14 x=28
y=12 y=13
vx=0 vx=0
vy=0 vy=0
x1=14 x1=28
y1=12 y1=13
x2=14 x2=28
y2=12 y2=13
color=bright_cyan color=cyan
[/enemy] [/enemy]
[enemy] [enemy]
@@ -31,290 +31,97 @@ tileSetFile=bell.png
animation=bell.ani animation=bell.ani
width=16 width=16
height=16 height=16
x=14 x=28
y=2 y=10
vx=0 vx=0
vy=0 vy=0
x1=14 x1=28
y1=2 y1=10
x2=14 x2=28
y2=2 y2=10
color=yellow
[/enemy]
[enemy]
tileSetFile=chip.png
animation=chip.ani
width=8
height=16
x=5
y=3
vx=0
vy=0
x1=5
y1=3
x2=5
y2=3
color=bright_blue
[/enemy]
[enemy]
tileSetFile=chip.png
animation=chip.ani
width=8
height=16
x=6
y=3
vx=0
vy=0
x1=6
y1=3
x2=6
y2=3
color=bright_red
[/enemy]
[enemy]
tileSetFile=chip.png
animation=chip.ani
width=8
height=16
x=7
y=3
vx=0
vy=0
x1=7
y1=3
x2=7
y2=3
color=bright_magenta
[/enemy]
[enemy]
tileSetFile=chip.png
animation=chip.ani
width=8
height=16
x=8
y=3
vx=0
vy=0
x1=8
y1=3
x2=8
y2=3
color=bright_green
[/enemy]
[enemy]
tileSetFile=chip.png
animation=chip.ani
width=8
height=16
x=9
y=3
vx=0
vy=0
x1=9
y1=3
x2=9
y2=3
color=bright_cyan
[/enemy]
[enemy]
tileSetFile=chip.png
animation=chip.ani
width=8
height=16
x=10
y=3
vx=0
vy=0
x1=10
y1=3
x2=10
y2=3
color=bright_yellow
[/enemy]
[enemy]
tileSetFile=chip.png
animation=chip.ani
width=8
height=16
x=11
y=3
vx=0
vy=0
x1=11
y1=3
x2=11
y2=3
color=bright_white
[/enemy]
[enemy]
tileSetFile=chip.png
animation=chip.ani
width=8
height=16
x=12
y=3
vx=0
vy=0
x1=12
y1=3
x2=12
y2=3
color=bright_black
[/enemy]
[enemy]
tileSetFile=chip.png
animation=chip.ani
width=8
height=16
x=5
y=7
vx=0
vy=0
x1=5
y1=7
x2=5
y2=7
color=blue
[/enemy]
[enemy]
tileSetFile=chip.png
animation=chip.ani
width=8
height=16
x=6
y=7
vx=0
vy=0
x1=6
y1=7
x2=6
y2=7
color=red
[/enemy]
[enemy]
tileSetFile=chip.png
animation=chip.ani
width=8
height=16
x=7
y=7
vx=0
vy=0
x1=7
y1=7
x2=7
y2=7
color=magenta
[/enemy]
[enemy]
tileSetFile=chip.png
animation=chip.ani
width=8
height=16
x=8
y=7
vx=0
vy=0
x1=8
y1=7
x2=8
y2=7
color=green
[/enemy]
[enemy]
tileSetFile=chip.png
animation=chip.ani
width=8
height=16
x=9
y=7
vx=0
vy=0
x1=9
y1=7
x2=9
y2=7
color=cyan color=cyan
[/enemy] [/enemy]
[enemy] [enemy]
tileSetFile=chip.png # Campana izquierda
animation=chip.ani tileSetFile=bell.png
width=8 animation=bell.ani
width=16
height=16 height=16
x=10 x=6
y=7 y=2
vx=0 vx=0
vy=0 vy=0
x1=10 x1=6
y1=7 y1=2
x2=10 x2=6
y2=7 y2=2
color=yellow color=cyan
[/enemy]
[enemy]
tileSetFile=chip.png
animation=chip.ani
width=8
height=16
x=11
y=7
vx=0
vy=0
x1=11
y1=7
x2=11
y2=7
color=white
[/enemy] [/enemy]
[enemy] [enemy]
tileSetFile=chip.png # Dong izquierdo
animation=chip.ani tileSetFile=dong.png
width=8 animation=dong.ani
width=22
height=16 height=16
x=12 x=6
y=7 y=4
vx=0 vx=0
vy=0 vy=0.5
x1=12 x1=6
y1=7 y1=4
x2=12 x2=6
y2=7 y2=13
color=black color=cyan
[/enemy] [/enemy]
[enemy]
# Campana derecha
tileSetFile=bell.png
animation=bell.ani
width=16
height=16
x=20
y=2
vx=0
vy=0
x1=20
y1=2
x2=20
y2=2
color=cyan
[/enemy]
[enemy]
# Dong derecha
tileSetFile=dong.png
animation=dong.ani
width=22
height=16
x=20
y=13
vx=0
vy=-0.5
x1=20
y1=4
x2=20
y2=13
color=cyan
[/enemy]
[item] [item]
tileSetFile=items.png tileSetFile=items.png
tile=48 tile=48
x=17 x=1
y=8 y=2
counter=1 counter=1
[/item] [/item]
[item]
tileSetFile=items.png
tile=48
x=26
y=13
counter=2
[/item]

26
data/room/25.tmx
View File

@@ -5,19 +5,19 @@
<data encoding="csv"> <data encoding="csv">
67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68, 67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,
91,92,91,92,91,92,91,92,91,92,91,92,91,92,91,92,91,92,91,92,91,92,91,92,91,92,91,92,91,92,91,92, 91,92,91,92,91,92,91,92,91,92,91,92,91,92,91,92,91,92,91,92,91,92,91,92,91,92,91,92,91,92,91,92,
93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,
117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,117,
117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,117,
117,0,0,0,0,157,158,159,160,161,162,163,164,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 117,398,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,141,
117,0,0,0,0,181,182,183,184,185,186,187,188,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 117,0,0,0,0,0,0,0,0,0,0,0,0,0,526,93,550,0,0,0,0,0,0,0,0,0,0,0,0,0,0,32,
117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 117,404,405,0,0,0,0,0,0,0,0,0,403,404,404,404,404,405,400,0,0,0,0,0,0,0,0,0,0,0,0,0,
117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 117,0,0,0,0,0,0,0,0,0,399,400,0,0,0,117,0,0,0,428,0,0,0,0,0,0,0,556,0,0,0,0,
117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,403,403,403,403,403,403,403,403,403,403,403,403,403,32,32, 117,0,0,428,0,428,0,0,0,428,0,0,0,0,0,117,0,0,0,0,0,0,0,526,403,404,404,32,32,32,32,32,
117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,32,32, 117,0,428,0,0,0,0,0,0,0,0,0,0,0,0,117,0,0,0,0,0,0,526,0,0,0,0,32,0,0,32,32,
141,0,0,0,0,0,0,0,0,0,0,0,426,427,426,427,426,427,0,0,0,0,0,0,0,0,0,0,0,403,32,32, 141,556,0,0,0,0,0,0,0,0,0,0,0,0,0,117,0,0,0,0,0,526,0,0,0,0,0,32,0,0,32,32,
32,0,0,0,0,0,0,0,0,0,0,0,93,0,0,0,0,93,0,0,0,0,0,0,0,0,0,0,0,0,32,32, 32,404,404,405,399,0,0,0,397,0,0,0,403,404,404,404,404,405,0,403,405,0,0,0,403,404,404,32,32,32,32,32,
0,0,0,0,0,0,0,0,0,0,0,0,117,0,0,0,0,117,0,0,0,0,0,0,0,0,0,0,0,403,32,32, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,117,0,0,0,0,0,0,0,0,0,0,0,135,0,0,32,32,
0,0,0,0,0,0,0,0,0,0,0,0,141,0,0,0,0,141,0,0,0,0,0,0,0,0,0,0,0,0,32,32, 0,0,0,0,0,0,0,556,0,0,0,0,0,89,90,141,556,0,0,0,0,0,0,0,0,89,90,135,0,0,32,89,
89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90 89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90
</data> </data>
</layer> </layer>

18
data/room/26.room
View File

@@ -60,18 +60,18 @@ color=yellow
[/enemy] [/enemy]
[enemy] [enemy]
# Dong campana uno # Dong izquierda
tileSetFile=dong.png tileSetFile=dong.png
animation=dong.ani animation=dong.ani
width=22 width=22
height=16 height=16
x=1 x=1
y=2 y=2
vx=0.6 vx=0
vy=0 vy=0
x1=1 x1=1
y1=2 y1=2
x2=28 x2=1
y2=2 y2=2
color=yellow color=yellow
[/enemy] [/enemy]
@@ -94,19 +94,19 @@ color=yellow
[/enemy] [/enemy]
[enemy] [enemy]
# Dong campana dos # Dong derecha
tileSetFile=dong.png tileSetFile=dong.png
animation=dong.ani animation=dong.ani
width=22 width=22
height=16 height=16
x=28 x=28
y=7 y=2
vx=-0.6 vx=-0
vy=0 vy=0
x1=1 x1=28
y1=7 y1=2
x2=28 x2=28
y2=7 y2=2
color=yellow color=yellow
[/enemy] [/enemy]

14
data/room/26.tmx
View File

@@ -8,16 +8,16 @@
93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93, 93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,
117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,117, 117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,117,
117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,117, 117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,117,
141,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,526,403,0,0,0,0,117, 141,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,526,428,0,0,0,0,117,
32,0,0,0,0,0,0,403,403,403,403,403,403,403,403,403,403,403,403,403,403,403,403,403,403,0,0,0,0,0,0,117, 32,0,0,0,0,0,0,403,404,404,404,404,404,404,404,404,404,404,404,404,404,404,404,404,405,0,0,0,0,0,0,117,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,117, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,117,
0,0,0,0,0,403,550,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,141, 0,0,0,0,0,428,550,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,141,
93,0,0,0,0,0,0,403,403,403,403,403,403,403,403,403,403,403,403,403,403,403,403,403,403,0,0,0,0,0,0,32, 93,0,0,0,0,0,0,403,404,404,404,404,404,404,404,404,404,404,404,404,404,404,404,404,405,0,0,0,0,0,0,32,
117,550,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 117,550,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
141,0,550,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,526,403,0,0,0,0,0, 141,0,550,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,526,428,0,0,0,0,0,
32,32,32,32,0,0,0,403,403,403,403,403,403,403,403,403,403,403,403,403,403,403,403,403,403,0,0,0,32,32,32,32, 32,32,32,32,0,0,0,403,404,404,404,404,404,404,404,404,404,404,404,404,404,404,404,404,405,0,0,0,32,32,32,32,
93,0,0,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,0,0,93, 93,0,0,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,0,0,93,
141,0,0,141,0,0,0,0,0,0,0,0,0,0,526,93,550,0,0,0,0,0,0,0,0,0,0,0,141,0,0,141, 141,0,0,141,0,0,0,0,0,0,0,0,0,0,526,428,550,0,0,0,0,0,0,0,0,0,0,0,141,0,0,141,
89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90 89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90
</data> </data>
</layer> </layer>

58
data/room/27.room
View File

@@ -1,33 +1,49 @@
name=no 27 name=the backyard
bgColor=black bgColor=blue
border=red border=cyan
tileMapFile=27.tmx tileMapFile=27.tmx
tileSetFile=standard.png tileSetFile=standard.png
roomUp=28.room roomUp=28.room
roomDown=29.room roomDown=29.room
roomLeft=0 roomLeft=26.room
roomRight=0 roomRight=0
[enemy] #[enemy]
tileSetFile=diskette.png #tileSetFile=diskette.png
animation=diskette.ani #animation=diskette.ani
width=16 #width=16
height=16 #height=16
x=2 #x=2
y=2 #y=2
vx=0 #vx=0
vy=0 #vy=0
x1=2 #x1=2
y1=2 #y1=2
x2=2 #x2=2
y2=2 #y2=2
color=magenta #color=magenta
[/enemy] #[/enemy]
[item] [item]
tileSetFile=items.png tileSetFile=items.png
tile=1 tile=28
x=1 x=1
y=1 y=13
counter=1 counter=1
[/item] [/item]
[item]
tileSetFile=items.png
tile=32
x=11
y=14
counter=2
[/item]
[item]
tileSetFile=items.png
tile=32
x=14
y=14
counter=3
[/item]

32
data/room/27.tmx
View File

@@ -3,22 +3,22 @@
<tileset firstgid="1" source="standard.tsx"/> <tileset firstgid="1" source="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">
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,25, 67,68,67,68,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,17,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, 91,92,91,92,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, 93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, 117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,523,257,0,0,0,0,0,17,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, 117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,257,0,0,0,0,0,0,0,17,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, 117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, 117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,305,305,305,0,305,0,0,0,0,0,17,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, 117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,305,0,305,305,305,305,0,305,305,0,0,0,17,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, 141,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,305,0,305,0,305,305,305,305,0,0,0,0,0,17,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, 32,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,305,0,305,305,305,305,305,305,0,305,0,0,17,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,305,305,305,305,305,305,305,305,305,0,0,0,17,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,305,305,305,41,41,305,305,305,0,0,0,17,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, 32,426,427,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,305,0,305,0,41,41,305,0,0,305,0,0,17,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, 93,0,426,427,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,305,0,0,41,41,0,0,305,0,0,0,17,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, 141,426,427,426,427,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,41,0,0,0,0,0,0,17,
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,25 89,90,89,90,89,90,89,90,89,90,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,0,523,17,17,17
</data> </data>
</layer> </layer>
</map> </map>

2
data/room/28.tmx
View File

@@ -18,7 +18,7 @@
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, 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,
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, 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,
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, 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,
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,25 25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,0,25,25,25,25,25,25,25
</data> </data>
</layer> </layer>
</map> </map>

88
data/room/29.room
View File

@@ -1,33 +1,91 @@
name=no 29 name=QUO VOIDIS
bgColor=black bgColor=bright_black
border=red border=black
tileMapFile=29.tmx tileMapFile=29.tmx
tileSetFile=standard.png tileSetFile=standard.png
roomUp=27.room roomUp=27.room
roomDown=0 roomDown=0
roomLeft=30.room roomLeft=30.room
roomRight=0 roomRight=0
itemColor1=green
itemColor2=magenta
[enemy] [enemy]
tileSetFile=diskette.png tileSetFile=qvoid.png
animation=diskette.ani animation=qvoid.ani
width=16 width=16
height=16 height=16
x=2 x=7
y=2 y=1
vx=0 vx=0
vy=0 vy=0.7
x1=2 x1=7
y1=2 y1=1
x2=2 x2=7
y2=2 y2=13
color=magenta color=magenta
[/enemy] [/enemy]
[enemy]
tileSetFile=qvoid.png
animation=qvoid.ani
width=16
height=16
x=12
y=6
vx=0
vy=0.7
x1=12
y1=1
x2=12
y2=13
color=green
[/enemy]
[enemy]
tileSetFile=qvoid.png
animation=qvoid.ani
width=16
height=16
x=17
y=8
vx=0
vy=0.7
x1=17
y1=1
x2=17
y2=13
color=red
[/enemy]
[enemy]
tileSetFile=qvoid.png
animation=qvoid.ani
width=16
height=16
x=22
y=10
vx=0
vy=0.7
x1=22
y1=1
x2=22
y2=13
color=yellow
[/enemy]
[item] [item]
tileSetFile=items.png tileSetFile=items.png
tile=1 tile=20
x=1 x=9
y=1 y=9
counter=1 counter=1
[/item] [/item]
[item]
tileSetFile=items.png
tile=20
x=30
y=6
counter=2
[/item]

32
data/room/29.tmx
View File

@@ -3,22 +3,22 @@
<tileset firstgid="1" source="standard.tsx"/> <tileset firstgid="1" source="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">
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,25, 133,133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,505,133,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, 133,133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,505,0,133,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, 133,133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,505,0,0,133,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, 133,133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,505,0,0,0,133,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, 133,133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,505,0,0,0,0,133,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, 133,133,0,0,228,228,228,0,0,228,228,228,0,0,228,228,228,0,0,228,228,228,0,0,228,228,0,0,228,0,0,133,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, 133,133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,133,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, 133,133,228,228,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,228,230,133,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, 133,133,228,228,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,133,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, 133,133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,133,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, 133,133,0,0,228,228,228,0,0,229,228,228,0,0,228,228,228,0,0,228,228,228,0,0,228,228,0,0,0,0,0,133,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, 133,133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,228,228,133,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, 133,133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,133,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,228,228,0,0,0,0,133,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,133,
25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25 133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133
</data> </data>
</layer> </layer>
</map> </map>

32
data/room/30.tmx
View File

@@ -3,22 +3,22 @@
<tileset firstgid="1" source="standard.tsx"/> <tileset firstgid="1" source="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">
25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25, 133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,
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, 133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,133,
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, 133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,133,
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, 133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,133,
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, 133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,133,
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, 133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,133,
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, 133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,133,
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, 133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,133,
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, 133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,133,
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, 133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,133,
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, 133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,133,
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, 133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,133,
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, 133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,133,
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, 133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
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, 133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25 133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133
</data> </data>
</layer> </layer>
</map> </map>

BIN
data/tilesets/standard.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.2 KiB

After

Width:  |  Height:  |  Size: 7.3 KiB

BIN
data/tilesets/standard_zxarne.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.6 KiB

After

Width:  |  Height:  |  Size: 8.8 KiB

21
source/common/resource.cpp
View File

@@ -100,6 +100,27 @@ void Resource::reLoadTextures()
} }
} }
// Recarga las habitaciones
void Resource::reLoadRooms()
{
for (auto r : rooms)
{
delete r.room;
r.room = new room_t(loadRoomFile(asset->get(r.name)));
r.room->tileMap = getTileMap(r.room->tileMapFile);
for (auto &e : r.room->enemies)
{
e.animation = getAnimation(e.animationString);
}
for (auto &i : r.room->items)
{
i.texture = getTexture(i.tileSetFile);
}
r.room->textureA = getTexture("standard.png");
r.room->textureB = getTexture("standard_zxarne.png");
}
}
// Libera las texturas // Libera las texturas
void Resource::freeTextures() void Resource::freeTextures()
{ {

3
source/common/resource.h
View File

@@ -81,6 +81,9 @@ public:
// Recarga las texturas // Recarga las texturas
void reLoadTextures(); void reLoadTextures();
// Recarga las habitaciones
void reLoadRooms();
// Libera las texturas // Libera las texturas
void freeTextures(); void freeTextures();

31
source/credits.cpp
View File

@@ -132,20 +132,31 @@ void Credits::fillTexture()
texts.push_back({"", stringToColor(options->palette, "white")}); texts.push_back({"", stringToColor(options->palette, "white")});
texts.push_back({"INSTRUCTIONS:", stringToColor(options->palette, "yellow")}); texts.push_back({"INSTRUCTIONS:", stringToColor(options->palette, "yellow")});
texts.push_back({"", stringToColor(options->palette, "white")}); texts.push_back({"", stringToColor(options->palette, "white")});
texts.push_back({"HELP JAILDOC TO GET BACK ALL HIS", stringToColor(options->palette, "white")}); texts.push_back({"HELP JAILDOC TO GET BACK ALL", stringToColor(options->palette, "white")});
texts.push_back({"PROJECTS AND GO TO THE JAIL TO", stringToColor(options->palette, "white")}); texts.push_back({"HIS PROJECTS AND GO TO THE", stringToColor(options->palette, "white")});
texts.push_back({"FINISH THEM", stringToColor(options->palette, "white")}); texts.push_back({"JAIL TO FINISH THEM", stringToColor(options->palette, "white")});
texts.push_back({"", stringToColor(options->palette, "white")}); texts.push_back({"", stringToColor(options->palette, "white")});
texts.push_back({"", stringToColor(options->palette, "white")}); texts.push_back({"", stringToColor(options->palette, "white")});
//texts.push_back({"KEYS:", stringToColor(options->palette, "yellow")});
//texts.push_back({"", stringToColor(options->palette, "white")});
//texts.push_back({"USE 'CURSORS' TO MOVE AND JUMP", stringToColor(options->palette, "white")});
//texts.push_back({"'F1-F4' TO CHANGE WINDOWS SIZE", stringToColor(options->palette, "white")});
//texts.push_back({"'F' TO SWITCH TO FULLSCREEN", stringToColor(options->palette, "white")});
//texts.push_back({"'B' TO SWITCH THE BORDER SCREEN", stringToColor(options->palette, "white")});
//texts.push_back({"'M' TO TURN ON/OFF THE MUSIC", stringToColor(options->palette, "white")});
//texts.push_back({"'ESC' TO LEAVE THE GAME", stringToColor(options->palette, "white")});
//texts.push_back({"", stringToColor(options->palette, "white")});
//texts.push_back({"", stringToColor(options->palette, "white")});
texts.push_back({"KEYS:", stringToColor(options->palette, "yellow")}); texts.push_back({"KEYS:", stringToColor(options->palette, "yellow")});
texts.push_back({"", stringToColor(options->palette, "white")}); texts.push_back({"", stringToColor(options->palette, "white")});
texts.push_back({"USE 'CURSORS' TO MOVE AND JUMP", stringToColor(options->palette, "white")}); texts.push_back({"CURSORS: MOVE AND JUMP", stringToColor(options->palette, "white")});
texts.push_back({"'F1-F4' TO CHANGE WINDOWS SIZE", stringToColor(options->palette, "white")}); texts.push_back({"F1-F4: CHANGE WINDOWS SIZE", stringToColor(options->palette, "white")});
texts.push_back({"'F' TO SWITCH TO FULLSCREEN", stringToColor(options->palette, "white")}); texts.push_back({"F: SWITCH TO FULLSCREEN", stringToColor(options->palette, "white")});
texts.push_back({"'B' TO SWITCH THE BORDER SCREEN", stringToColor(options->palette, "white")}); texts.push_back({"B: SWITCH THE BORDER SCREEN", stringToColor(options->palette, "white")});
texts.push_back({"'M' TO TURN ON/OFF THE MUSIC", stringToColor(options->palette, "white")}); texts.push_back({"M: TURN ON/OFF THE MUSIC", stringToColor(options->palette, "white")});
texts.push_back({"'ESC' TO LEAVE THE GAME", stringToColor(options->palette, "white")}); texts.push_back({"ESC: LEAVE THE GAME", stringToColor(options->palette, "white")});
texts.push_back({"", stringToColor(options->palette, "white")}); texts.push_back({"", stringToColor(options->palette, "white")});
texts.push_back({"", stringToColor(options->palette, "white")}); texts.push_back({"", stringToColor(options->palette, "white")});
@@ -197,8 +208,6 @@ void Credits::fillTexture()
SDL_RenderDrawPoint(renderer, i, 4); SDL_RenderDrawPoint(renderer, i, 4);
SDL_RenderDrawPoint(renderer, i, 6); SDL_RenderDrawPoint(renderer, i, 6);
// SDL_RenderDrawPoint(renderer, i + 1, 1);
// SDL_RenderDrawPoint(renderer, i + 1, 3);
SDL_RenderDrawPoint(renderer, i + 1, 5); SDL_RenderDrawPoint(renderer, i + 1, 5);
SDL_RenderDrawPoint(renderer, i + 1, 7); SDL_RenderDrawPoint(renderer, i + 1, 7);
} }

8
source/game.cpp
View File

@@ -21,8 +21,8 @@ Game::Game(SDL_Renderer *renderer, Screen *screen, Resource *resource, Asset *as
// **** // ****
// this->debug->setEnabled(true); // this->debug->setEnabled(true);
currentRoom = "25.room"; currentRoom = "25.room";
const int x = 28; const int x = 30;
const int y = 13; const int y = 7;
spawnPoint = {x * 8, y * 8, 0, 0, 0, s_standing, SDL_FLIP_HORIZONTAL}; spawnPoint = {x * 8, y * 8, 0, 0, 0, s_standing, SDL_FLIP_HORIZONTAL};
// **** // ****
@@ -105,6 +105,10 @@ void Game::checkEventHandler()
board.music ? JA_ResumeMusic() : JA_PauseMusic(); board.music ? JA_ResumeMusic() : JA_PauseMusic();
break; break;
case SDL_SCANCODE_R:
resource->reLoadRooms();
break;
case SDL_SCANCODE_M: case SDL_SCANCODE_M:
board.music = !board.music; board.music = !board.music;
board.music ? JA_ResumeMusic() : JA_PauseMusic(); board.music ? JA_ResumeMusic() : JA_PauseMusic();

12
source/room.cpp
View File

@@ -895,7 +895,7 @@ void Room::setBottomSurfaces()
lastOne = i; lastOne = i;
i++; i++;
if (i < (int)tile.size() - 1) if (i <= (int)tile.size() - 1)
{ {
while (tile.at(i) == tile.at(i - 1) + 1) while (tile.at(i) == tile.at(i - 1) + 1)
{ {
@@ -910,7 +910,7 @@ void Room::setBottomSurfaces()
line.x2 = ((tile[lastOne] % mapWidth) * tileSize) + tileSize - 1; line.x2 = ((tile[lastOne] % mapWidth) * tileSize) + tileSize - 1;
bottomSurfaces.push_back(line); bottomSurfaces.push_back(line);
if (i < (int)tile.size() - 1) if (i <= (int)tile.size() - 1)
{ {
if (tile.at(i) == -1) if (tile.at(i) == -1)
{ // Si el siguiente elemento es un separador, hay que saltarlo { // Si el siguiente elemento es un separador, hay que saltarlo
@@ -955,7 +955,7 @@ void Room::setTopSurfaces()
lastOne = i; lastOne = i;
i++; i++;
if (i < (int)tile.size() - 1) if (i <= (int)tile.size() - 1)
{ {
while (tile.at(i) == tile.at(i - 1) + 1) while (tile.at(i) == tile.at(i - 1) + 1)
{ {
@@ -970,7 +970,7 @@ void Room::setTopSurfaces()
line.x2 = ((tile[lastOne] % mapWidth) * tileSize) + tileSize - 1; line.x2 = ((tile[lastOne] % mapWidth) * tileSize) + tileSize - 1;
topSurfaces.push_back(line); topSurfaces.push_back(line);
if (i < (int)tile.size() - 1) if (i <= (int)tile.size() - 1)
{ {
if (tile.at(i) == -1) if (tile.at(i) == -1)
{ // Si el siguiente elemento es un separador, hay que saltarlo { // Si el siguiente elemento es un separador, hay que saltarlo
@@ -1187,7 +1187,7 @@ void Room::setAutoSurfaces()
lastOne = i; lastOne = i;
i++; i++;
if (i < (int)tile.size() - 1) if (i <= (int)tile.size() - 1)
{ {
while (tile.at(i) == tile.at(i - 1) + 1) while (tile.at(i) == tile.at(i - 1) + 1)
{ {
@@ -1202,7 +1202,7 @@ void Room::setAutoSurfaces()
line.x2 = ((tile[lastOne] % mapWidth) * tileSize) + tileSize - 1; line.x2 = ((tile[lastOne] % mapWidth) * tileSize) + tileSize - 1;
autoSurfaces.push_back(line); autoSurfaces.push_back(line);
if (i < (int)tile.size() - 1) if (i <= (int)tile.size() - 1)
{ {
if (tile.at(i) == -1) if (tile.at(i) == -1)
{ // Si el siguiente elemento es un separador, hay que saltarlo { // Si el siguiente elemento es un separador, hay que saltarlo