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

Retocando habitaciones

Browse Source
This commit is contained in:
Sergio
2022-11-08 20:27:55 +01:00
parent db56185be2
commit 9605aa61c8
15 changed files with 76 additions and 57 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.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

2
data/room/06.room
View File

@@ -21,7 +21,7 @@ vx=0.8
vy=0 vy=0
x1=1 x1=1
y1=13 y1=13
x2=25 x2=23
y2=13 y2=13
color=yellow color=yellow
flip=true flip=true

4
data/room/15.tmx
View File

@@ -3,10 +3,10 @@
<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">
16,16,16,16,16,0,16,16,16,16,16,16,16,16,16,16,16,16,16,0,0,0,0,0,0,16,16,16,16,16,16,16, 16,16,16,16,16,0,16,16,16,16,349,349,349,349,349,349,349,349,349,349,0,0,0,0,0,16,16,16,16,16,16,16,
16,16,0,0,0,0,0,349,16,349,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,16, 16,16,0,0,0,0,0,349,16,349,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,16,
16,0,0,0,0,0,0,0,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16, 16,0,0,0,0,0,0,0,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,
16,0,0,0,0,349,0,0,16,0,0,0,0,0,0,0,0,0,0,423,423,423,423,423,423,0,0,0,0,0,0,16, 16,0,0,0,0,349,0,0,16,0,0,0,0,0,0,0,0,0,0,0,423,423,423,423,423,0,0,0,0,0,0,16,
16,0,0,0,16,16,16,16,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16, 16,0,0,0,16,16,16,16,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,
16,0,0,0,0,0,0,16,16,16,16,0,0,0,423,0,0,0,423,547,0,0,0,0,0,0,0,0,0,0,0,16, 16,0,0,0,0,0,0,16,16,16,16,0,0,0,423,0,0,0,423,547,0,0,0,0,0,0,0,0,0,0,0,16,
16,0,0,0,0,0,0,0,16,16,0,0,0,0,0,0,0,0,0,0,547,0,0,0,0,424,422,424,422,0,0,16, 16,0,0,0,0,0,0,0,16,16,0,0,0,0,0,0,0,0,0,0,547,0,0,0,0,424,422,424,422,0,0,16,

2
data/room/19.room
View File

@@ -23,7 +23,7 @@ x1=5
y1=13 y1=13
x2=26 x2=26
y2=13 y2=13
color=bright_blue color=bright_cyan
flip=true flip=true
[/enemy] [/enemy]

2
data/room/19.tmx
View File

@@ -14,7 +14,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,38,38,241,241,0,0,0,0,0,0,0,0,0,0,0,0,241,241,38,38,0,0,0,0,0,0, 0,0,0,0,0,0,38,38,241,241,0,0,0,0,0,0,0,0,0,0,0,0,241,241,38,38,0,0,0,0,0,0,
0,0,0,0,0,38,38,0,0,0,0,241,241,0,0,0,0,0,0,241,241,0,0,0,0,38,38,0,0,0,0,0, 0,0,0,0,0,38,38,0,0,0,0,241,241,0,0,0,0,0,0,241,241,0,0,0,0,38,38,0,0,0,0,0,
0,0,0,241,38,38,0,0,0,0,0,0,0,0,241,241,241,241,0,0,0,0,0,0,0,0,38,38,241,0,0,0, 0,0,0,0,38,38,0,0,0,0,0,0,0,0,241,241,241,241,0,0,0,0,0,0,0,0,38,38,0,0,0,0,
0,0,0,0,38,0,0,0,0,0,0,241,241,0,0,0,0,0,0,241,241,0,0,0,0,0,0,38,0,0,0,0, 0,0,0,0,38,0,0,0,0,0,0,241,241,0,0,0,0,0,0,241,241,0,0,0,0,0,0,38,0,0,0,0,
0,0,0,241,38,0,0,0,241,241,0,0,0,0,0,0,0,0,0,0,0,0,241,241,0,0,0,38,241,0,0,0, 0,0,0,241,38,0,0,0,241,241,0,0,0,0,0,0,0,0,0,0,0,0,241,241,0,0,0,38,241,0,0,0,
0,0,0,0,38,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,38,0,0,0,0, 0,0,0,0,38,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,38,0,0,0,0,

14
data/room/20.room
View File

@@ -8,7 +8,7 @@ roomDown=0
roomLeft=21.room roomLeft=21.room
roomRight=19.room roomRight=19.room
itemColor1=magenta itemColor1=magenta
itemColor2=blue itemColor2=green
[enemy] [enemy]
tileSetFile=bin.png tileSetFile=bin.png
@@ -17,13 +17,13 @@ width=16
height=8 height=8
x=8 x=8
y=12 y=12
vx=0.5 vx=1
vy=0 vy=0
x1=8 x1=8
y1=12 y1=12
x2=24 x2=24
y2=12 y2=12
color=magenta color=green
[/enemy] [/enemy]
[enemy] [enemy]
@@ -44,7 +44,7 @@ color=yellow
[item] [item]
tileSetFile=items.png tileSetFile=items.png
tile=11 tile=19
x=7 x=7
y=3 y=3
counter=1 counter=1
@@ -52,8 +52,8 @@ counter=1
[item] [item]
tileSetFile=items.png tileSetFile=items.png
tile=11 tile=19
x=29 x=27
y=10 y=8
counter=2 counter=2
[/item] [/item]

18
data/room/20.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">
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
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, 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,
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, 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,
21,0,0,0,0,0,0,413,413,413,413,413,0,0,0,0,413,413,413,413,413,0,0,0,0,0,0,0,0,0,0,0,
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, 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,
21,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,413,0,0,0,0,0,0,0,
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, 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,
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, 21,21,0,0,0,0,0,0,0,0,0,0,0,0,0,0,413,413,413,413,413,413,0,0,0,0,0,0,0,0,0,0,
21,0,0,0,0,0,0,413,413,413,413,413,0,0,0,0,413,413,413,413,413,413,413,0,0,0,0,0,0,0,0,0,
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,
21,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,413,413,413,413,413,413,0,0,0,0,
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,
21,21,0,0,0,0,0,0,0,0,0,0,0,0,0,0,413,413,413,413,413,413,413,0,0,0,413,413,413,0,0,0,
21,21,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, 21,21,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,
21,21,21,0,0,0,0,0,0,0,413,413,413,413,413,413,413,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 21,21,21,0,0,0,0,0,0,0,413,413,413,413,413,0,0,0,0,0,0,0,0,0,0,0,413,413,413,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,413,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,413,413,413,413,413,413,413,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,413,413,413,413,413,413,413,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,556,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
21,21,21,21,21,21,21,21,413,413,413,413,413,413,413,413,413,413,413,413,413,413,413,413,413,413,413,413,413,413,413,413 21,21,21,21,21,21,21,21,373,373,373,373,373,373,373,373,373,373,373,373,373,373,373,373,373,373,373,373,373,373,373,373
</data> </data>
</layer> </layer>
</map> </map>

10
data/room/21.room
View File

@@ -1,5 +1,5 @@
name=ENTER PAKU SIMBEL name=ENTER PAKU SIMBEL
bgColor=black bgColor=bright_black
border=yellow border=yellow
tileMapFile=21.tmx tileMapFile=21.tmx
tileSetFile=standard.png tileSetFile=standard.png
@@ -7,6 +7,8 @@ roomUp=23.room
roomDown=0 roomDown=0
roomLeft=22.room roomLeft=22.room
roomRight=20.room roomRight=20.room
itemColor1=magenta
itemColor2=yellow
[enemy] [enemy]
tileSetFile=mummy.png tileSetFile=mummy.png
@@ -17,9 +19,9 @@ x=13
y=13 y=13
vx=0.3 vx=0.3
vy=0 vy=0
x1=3 x1=9
y1=13 y1=13
x2=24 x2=18
y2=13 y2=13
color=yellow color=yellow
flip=true flip=true
@@ -61,7 +63,7 @@ counter=2
[item] [item]
tileSetFile=items.png tileSetFile=items.png
tile=36 tile=36
x=14 x=5
y=3 y=3
counter=3 counter=3
[/item] [/item]

18
data/room/21.tmx
View File

@@ -4,16 +4,16 @@
<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">
21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,530,0,0,0,0,21,21,21,21,21, 21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,530,0,0,0,0,21,21,21,21,21,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,530,0,0,0,0,0,0,0,21, 21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,0,0,530,0,0,0,0,0,0,21,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,530,0,0,0,0,0,0,21, 21,21,21,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,530,0,0,0,0,0,0,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,530,0,0,0,0,0,21, 21,21,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,530,0,0,0,0,0,21,
0,0,0,0,0,0,0,0,0,0,0,0,0,23,24,0,0,0,0,0,0,0,0,0,0,0,530,0,0,0,0,21, 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,530,0,0,0,0,21,
0,0,0,0,0,0,0,0,0,0,0,0,0,47,48,0,0,0,0,0,0,0,0,0,0,0,0,530,0,0,0,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,530,0,519,21,21,
398,398,398,398,398,0,0,0,0,397,397,397,397,398,400,400,0,0,0,0,0,0,0,0,0,0,0,519,21,21,21,21, 0,0,0,0,0,400,0,0,0,397,397,397,397,398,400,400,0,0,0,0,0,0,0,0,0,0,0,519,21,21,21,21,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,400,0,0,0,0,0,0,0,0,0,519,299,21,23,24,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,519,299,21,23,24,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,519,299,299,21,47,48,21, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,400,0,0,0,0,0,0,0,0,519,299,299,21,47,48,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,519,299,299,299,21,21,21,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,519,299,299,299,21,21,21,21,
419,397,419,419,399,399,419,419,0,397,397,397,419,419,419,399,419,397,419,0,419,399,419,419,419,397,419,419,419,419,419,21, 419,397,0,419,399,399,419,419,0,397,397,397,419,419,419,399,419,397,419,0,419,399,419,419,419,397,419,419,419,419,419,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,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,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,

31
data/room/22.room
View File

@@ -1,5 +1,5 @@
name=AEE2 NEVER CAME OUT name=AEE REMAKE, PLEASE
bgColor=black bgColor=bright_black
border=yellow border=yellow
tileMapFile=22.tmx tileMapFile=22.tmx
tileSetFile=standard.png tileSetFile=standard.png
@@ -13,13 +13,13 @@ tileSetFile=mummy.png
animation=mummy.ani animation=mummy.ani
width=8 width=8
height=16 height=16
x=13 x=15
y=13 y=13
vx=0.3 vx=0.3
vy=0 vy=0
x1=3 x1=12
y1=13 y1=13
x2=24 x2=21
y2=13 y2=13
color=yellow color=yellow
flip=true flip=true
@@ -34,9 +34,26 @@ x=13
y=8 y=8
vx=0.3 vx=0.3
vy=0 vy=0
x1=10 x1=13
y1=8 y1=8
x2=25 x2=19
y2=8
color=bright_yellow
flip=true
[/enemy]
[enemy]
tileSetFile=mummy.png
animation=mummy.ani
width=8
height=16
x=22
y=8
vx=0.4
vy=0
x1=22
y1=8
x2=28
y2=8 y2=8
color=bright_yellow color=bright_yellow
flip=true flip=true

16
data/room/22.tmx
View File

@@ -3,17 +3,17 @@
<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">
21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21, 21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,23,24,21,
21,21,21,21,23,24,21,23,24,21,23,24,21,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 21,21,21,21,23,24,21,23,24,21,23,24,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,47,48,21,
21,0,0,21,47,48,21,47,48,21,47,48,21,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 21,0,0,21,47,48,21,47,48,21,47,48,21,21,0,0,0,0,0,0,0,0,0,0,0,21,21,21,21,21,21,21,
21,0,0,21,21,21,21,21,21,21,21,21,21,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 21,0,0,21,21,21,21,21,21,21,21,21,21,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,21,21,
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, 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,21,
21,400,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 21,400,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
21,0,0,0,0,0,0,0,0,0,0,0,0,0,0,400,400,400,400,400,0,0,0,398,398,398,398,0,0,398,398,398, 21,0,0,0,0,0,0,0,0,0,0,0,0,0,0,400,400,400,400,400,0,0,0,0,0,0,0,0,0,0,0,0,
21,400,400,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 21,400,400,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
21,0,0,0,0,0,0,0,0,0,0,0,400,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 21,0,0,0,0,0,0,0,0,0,0,0,400,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
21,0,0,399,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 21,0,0,399,0,0,0,0,0,0,0,0,556,0,0,0,0,0,0,0,0,556,0,0,0,0,0,0,0,0,0,0,
21,0,0,0,399,0,0,506,419,397,397,397,419,419,398,419,419,419,419,419,0,397,397,397,419,398,397,397,419,419,419,419, 21,0,0,0,399,0,0,506,419,397,397,397,419,419,398,419,419,419,419,419,0,397,397,397,419,398,397,397,419,0,419,419,
21,0,0,0,0,0,506,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 21,0,0,0,0,0,506,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
21,0,0,0,0,506,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 21,0,0,0,0,506,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
21,0,0,0,506,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 21,0,0,0,506,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,

2
data/room/25.tmx
View File

@@ -12,7 +12,7 @@
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,526,93,550,0,0,0,0,0,0,0,0,0,0,0,0,0,0,32,
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,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,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,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,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,403,404,405,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,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, 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,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, 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,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, 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,

BIN
data/tilesets/standard.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.7 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

BIN
data/tilesets/standard_zxarne.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.1 KiB

After

Width:  |  Height:  |  Size: 9.2 KiB

14
source/game.cpp
View File

@@ -506,28 +506,28 @@ void Game::setScoreBoardColor()
const bool isBrightBlack = colorAreEqual(colorBorder, stringToColor(options->palette, "bright_black")); const bool isBrightBlack = colorAreEqual(colorBorder, stringToColor(options->palette, "bright_black"));
// Si el color del borde es negro o negro brillante cambia el texto del marcador a blanco // Si el color del borde es negro o negro brillante cambia el texto del marcador a blanco
board.color = isBlack || isBrightBlack? stringToColor(options->palette, "white") : colorBorder; board.color = isBlack || isBrightBlack ? stringToColor(options->palette, "white") : colorBorder;
} }
// Comprueba si ha finalizado el juego // Comprueba si ha finalizado el juego
bool Game::checkEndGame() bool Game::checkEndGame()
{ {
const bool a = room->getName() == "THE JAIL"; // Estar en la habitación que toca const bool isOnTheRoom = room->getName() == "THE JAIL"; // Estar en la habitación que toca
const bool b = board.items >= int(totalItems * 0.9f); // Con mas del 90% de los items recogidos const bool haveTheItems = board.items >= int(totalItems * 0.9f); // Con mas del 90% de los items recogidos
const bool c = player->getRect().x <= 128; // Y en la ubicación que toca (En la puerta) const bool isOnTheDoor = player->getRect().x <= 128; // Y en la ubicación que toca (En la puerta)
if (b) if (haveTheItems)
{ {
board.jailEnabled = true; board.jailEnabled = true;
} }
if (a && b && c) if (isOnTheRoom && haveTheItems && isOnTheDoor)
{ {
section.name = SECTION_PROG_ENDING; section.name = SECTION_PROG_ENDING;
return true; return true;
} }
if (options->cheat.jailEnabled && a && c) if (options->cheat.jailEnabled && isOnTheRoom && isOnTheDoor)
{ {
section.name = SECTION_PROG_ENDING; section.name = SECTION_PROG_ENDING;
return true; return true;