diff --git a/data/items/items.png b/data/items/items.png
index 94046e0..97e01a6 100644
Binary files a/data/items/items.png and b/data/items/items.png differ
diff --git a/data/room/06.room b/data/room/06.room
index 062aa66..efc54ef 100644
--- a/data/room/06.room
+++ b/data/room/06.room
@@ -21,7 +21,7 @@ vx=0.8
vy=0
x1=1
y1=13
-x2=25
+x2=23
y2=13
color=yellow
flip=true
diff --git a/data/room/15.tmx b/data/room/15.tmx
index 77f8bd7..d81cd8a 100644
--- a/data/room/15.tmx
+++ b/data/room/15.tmx
@@ -3,10 +3,10 @@
-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,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,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,
diff --git a/data/room/19.room b/data/room/19.room
index 9b16466..ee646fb 100644
--- a/data/room/19.room
+++ b/data/room/19.room
@@ -23,7 +23,7 @@ x1=5
y1=13
x2=26
y2=13
-color=bright_blue
+color=bright_cyan
flip=true
[/enemy]
diff --git a/data/room/19.tmx b/data/room/19.tmx
index 5ddbd88..7dee2af 100644
--- a/data/room/19.tmx
+++ b/data/room/19.tmx
@@ -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,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,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,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,
diff --git a/data/room/20.room b/data/room/20.room
index 23d40c5..aae0a1d 100644
--- a/data/room/20.room
+++ b/data/room/20.room
@@ -8,7 +8,7 @@ roomDown=0
roomLeft=21.room
roomRight=19.room
itemColor1=magenta
-itemColor2=blue
+itemColor2=green
[enemy]
tileSetFile=bin.png
@@ -17,13 +17,13 @@ width=16
height=8
x=8
y=12
-vx=0.5
+vx=1
vy=0
x1=8
y1=12
x2=24
y2=12
-color=magenta
+color=green
[/enemy]
[enemy]
@@ -44,7 +44,7 @@ color=yellow
[item]
tileSetFile=items.png
-tile=11
+tile=19
x=7
y=3
counter=1
@@ -52,8 +52,8 @@ counter=1
[item]
tileSetFile=items.png
-tile=11
-x=29
-y=10
+tile=19
+x=27
+y=8
counter=2
[/item]
\ No newline at end of file
diff --git a/data/room/20.tmx b/data/room/20.tmx
index a78d918..d0f2e9c 100644
--- a/data/room/20.tmx
+++ b/data/room/20.tmx
@@ -3,22 +3,22 @@
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,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,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,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,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,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,
-0,0,0,0,0,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,
+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,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,
-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
diff --git a/data/room/21.room b/data/room/21.room
index 3dc99f9..02dc076 100644
--- a/data/room/21.room
+++ b/data/room/21.room
@@ -1,5 +1,5 @@
name=ENTER PAKU SIMBEL
-bgColor=black
+bgColor=bright_black
border=yellow
tileMapFile=21.tmx
tileSetFile=standard.png
@@ -7,6 +7,8 @@ roomUp=23.room
roomDown=0
roomLeft=22.room
roomRight=20.room
+itemColor1=magenta
+itemColor2=yellow
[enemy]
tileSetFile=mummy.png
@@ -17,9 +19,9 @@ x=13
y=13
vx=0.3
vy=0
-x1=3
+x1=9
y1=13
-x2=24
+x2=18
y2=13
color=yellow
flip=true
@@ -61,7 +63,7 @@ counter=2
[item]
tileSetFile=items.png
tile=36
-x=14
+x=5
y=3
counter=3
[/item]
\ No newline at end of file
diff --git a/data/room/21.tmx b/data/room/21.tmx
index 2a47ad6..f081e16 100644
--- a/data/room/21.tmx
+++ b/data/room/21.tmx
@@ -4,16 +4,16 @@
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,
-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,
-0,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,
-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,
-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,
-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,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,519,299,299,21,47,48,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,
+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,
+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,
+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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,530,0,519,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,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,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,
-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,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
diff --git a/data/room/22.room b/data/room/22.room
index 128043c..d70a2ce 100644
--- a/data/room/22.room
+++ b/data/room/22.room
@@ -1,5 +1,5 @@
-name=AEE2 NEVER CAME OUT
-bgColor=black
+name=AEE REMAKE, PLEASE
+bgColor=bright_black
border=yellow
tileMapFile=22.tmx
tileSetFile=standard.png
@@ -13,13 +13,13 @@ tileSetFile=mummy.png
animation=mummy.ani
width=8
height=16
-x=13
+x=15
y=13
vx=0.3
vy=0
-x1=3
+x1=12
y1=13
-x2=24
+x2=21
y2=13
color=yellow
flip=true
@@ -34,9 +34,26 @@ x=13
y=8
vx=0.3
vy=0
-x1=10
+x1=13
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
color=bright_yellow
flip=true
diff --git a/data/room/22.tmx b/data/room/22.tmx
index 7f403b8..53a5044 100644
--- a/data/room/22.tmx
+++ b/data/room/22.tmx
@@ -3,17 +3,17 @@
-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,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,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,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,0,0,0,0,0,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,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,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,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,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,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,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,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,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,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,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,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,
diff --git a/data/room/25.tmx b/data/room/25.tmx
index 164e237..d26d302 100644
--- a/data/room/25.tmx
+++ b/data/room/25.tmx
@@ -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,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,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,
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,
diff --git a/data/tilesets/standard.png b/data/tilesets/standard.png
index b437cda..d1d88dc 100644
Binary files a/data/tilesets/standard.png and b/data/tilesets/standard.png differ
diff --git a/data/tilesets/standard_zxarne.png b/data/tilesets/standard_zxarne.png
index 3fa888b..62c36cb 100644
Binary files a/data/tilesets/standard_zxarne.png and b/data/tilesets/standard_zxarne.png differ
diff --git a/source/game.cpp b/source/game.cpp
index 79fd2d4..396c8f6 100644
--- a/source/game.cpp
+++ b/source/game.cpp
@@ -506,28 +506,28 @@ void Game::setScoreBoardColor()
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
- board.color = isBlack || isBrightBlack? stringToColor(options->palette, "white") : colorBorder;
+ board.color = isBlack || isBrightBlack ? stringToColor(options->palette, "white") : colorBorder;
}
// Comprueba si ha finalizado el juego
bool Game::checkEndGame()
{
- const bool a = 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 c = player->getRect().x <= 128; // Y en la ubicación que toca (En la puerta)
+ const bool isOnTheRoom = room->getName() == "THE JAIL"; // Estar en la habitación que toca
+ const bool haveTheItems = board.items >= int(totalItems * 0.9f); // Con mas del 90% de los items recogidos
+ const bool isOnTheDoor = player->getRect().x <= 128; // Y en la ubicación que toca (En la puerta)
- if (b)
+ if (haveTheItems)
{
board.jailEnabled = true;
}
- if (a && b && c)
+ if (isOnTheRoom && haveTheItems && isOnTheDoor)
{
section.name = SECTION_PROG_ENDING;
return true;
}
- if (options->cheat.jailEnabled && a && c)
+ if (options->cheat.jailEnabled && isOnTheRoom && isOnTheDoor)
{
section.name = SECTION_PROG_ENDING;
return true;