diff --git a/data/enemies/crosshair.ani b/data/enemies/crosshair.ani
new file mode 100644
index 0000000..1facc66
--- /dev/null
+++ b/data/enemies/crosshair.ani
@@ -0,0 +1,9 @@
+frameWidth=16
+frameHeight=16
+
+[animation]
+name=default
+speed=6
+loop=0
+frames=0,1,2,3
+[/animation]
\ No newline at end of file
diff --git a/data/enemies/crosshair.png b/data/enemies/crosshair.png
new file mode 100644
index 0000000..e2425dd
Binary files /dev/null and b/data/enemies/crosshair.png differ
diff --git a/data/enemies/tree_thing.ani b/data/enemies/tree_thing.ani
new file mode 100644
index 0000000..1e61f47
--- /dev/null
+++ b/data/enemies/tree_thing.ani
@@ -0,0 +1,9 @@
+frameWidth=16
+frameHeight=16
+
+[animation]
+name=default
+speed=6
+loop=0
+frames=0,1,2,3,4,5,6,7,8,9,10,11,12
+[/animation]
\ No newline at end of file
diff --git a/data/enemies/tree_thing.png b/data/enemies/tree_thing.png
new file mode 100644
index 0000000..3d71fce
Binary files /dev/null and b/data/enemies/tree_thing.png differ
diff --git a/data/items/items.png b/data/items/items.png
index 2027a85..ebbbc48 100644
Binary files a/data/items/items.png and b/data/items/items.png differ
diff --git a/data/room/07.room b/data/room/07.room
index aeda556..4feb190 100644
--- a/data/room/07.room
+++ b/data/room/07.room
@@ -1,12 +1,14 @@
-name=SIGMASUA
+name=SIGMASUA > TELEGRAM
bgColor=black
-border=black
+border=blue
tileMapFile=07.tmx
tileSetFile=standard.png
roomUp=0
roomDown=0
roomLeft=08.room
roomRight=04.room
+itemColor1=magenta
+itemColor2=red
[enemy]
tileSetFile=sigmasua.png
@@ -17,11 +19,27 @@ x=15
y=7
vx=0.8
vy=0
-x1=9
+x1=7
y1=7
-x2=25
+x2=23
y2=7
-color=bright_red
+color=cyan
+[/enemy]
+
+[enemy]
+tileSetFile=sigmasua.png
+animation=sigmasua.ani
+width=16
+height=16
+x=15
+y=4
+vx=-0.5
+vy=0
+x1=7
+y1=4
+x2=23
+y2=4
+color=blue
[/enemy]
[enemy]
@@ -36,10 +54,26 @@ vy=0.4
x1=3
y1=5
x2=3
-y2=12
+y2=13
color=bright_red
[/enemy]
+[enemy]
+tileSetFile=sigmasua.png
+animation=sigmasua.ani
+width=16
+height=16
+x=27
+y=8
+vx=0
+vy=-0.4
+x1=27
+y1=5
+x2=27
+y2=13
+color=yellow
+[/enemy]
+
[enemy]
tileSetFile=sigmasua.png
animation=sigmasua.ani
@@ -74,15 +108,15 @@ color=bright_green
[item]
tileSetFile=items.png
-tile=9
+tile=67
x=15
-y=5
+y=6
counter=1
[/item]
[item]
tileSetFile=items.png
-tile=9
+tile=67
x=1
y=8
counter=2
@@ -90,7 +124,7 @@ counter=2
[item]
tileSetFile=items.png
-tile=9
+tile=67
x=30
y=8
counter=3
@@ -98,7 +132,7 @@ counter=3
[item]
tileSetFile=items.png
-tile=9
+tile=67
x=21
y=13
counter=4
diff --git a/data/room/07.tmx b/data/room/07.tmx
index 57023c8..cd6524f 100644
--- a/data/room/07.tmx
+++ b/data/room/07.tmx
@@ -3,22 +3,22 @@
-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,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,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,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,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,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,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,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,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,74,
-74,265,0,0,0,0,0,265,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,265,0,0,0,0,0,265,74,
-74,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,74,
-74,0,0,0,0,0,265,265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,74,265,265,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,74,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,74,265,0,0,0,0,0,0,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,
-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,
+0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,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,
+2,0,0,0,0,0,0,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,
+2,0,0,0,0,0,0,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,
+2,411,0,0,0,0,0,413,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,413,0,0,0,0,0,411,2,
+2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,0,0,0,0,0,0,2,
+2,0,0,0,0,0,411,411,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,411,411,0,0,0,0,0,0,
+2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,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,7,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,7,0,0,0,0,0,0,0,0,
+7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7
diff --git a/data/room/16.tmx b/data/room/16.tmx
index 39c62b3..2227a5e 100644
--- a/data/room/16.tmx
+++ b/data/room/16.tmx
@@ -3,7 +3,7 @@
-29,297,297,297,297,297,297,297,297,297,297,297,297,297,0,0,0,0,297,297,297,297,297,297,297,297,297,297,297,297,297,29,
+29,297,297,297,297,297,297,297,297,297,297,297,297,297,417,0,0,417,297,297,297,297,297,297,297,297,297,297,297,297,297,29,
29,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,29,
29,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,29,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,273,273,273,273,0,0,0,0,0,0,0,0,0,0,0,0,0,29,
diff --git a/data/room/26.room b/data/room/26.room
index c3e49a3..c036056 100644
--- a/data/room/26.room
+++ b/data/room/26.room
@@ -7,8 +7,8 @@ roomUp=0
roomDown=0
roomLeft=25.room
roomRight=27.room
-itemColor1=yellow
-itemColor2=cyan
+itemColor1=magenta
+itemColor2=red
[enemy]
tileSetFile=batman_bell.png
@@ -146,32 +146,40 @@ color=yellow
[item]
tileSetFile=items.png
-tile=37
-x=15
+tile=60
+x=26
y=3
counter=1
[/item]
[item]
tileSetFile=items.png
-tile=37
-x=15
-y=7
+tile=60
+x=5
+y=6
counter=2
[/item]
[item]
tileSetFile=items.png
-tile=37
-x=15
-y=10
+tile=60
+x=26
+y=9
counter=3
[/item]
[item]
tileSetFile=items.png
-tile=37
-x=15
+tile=60
+x=4
y=13
counter=4
+[/item]
+
+[item]
+tileSetFile=items.png
+tile=60
+x=27
+y=13
+counter=5
[/item]
\ No newline at end of file
diff --git a/data/room/28.tmx b/data/room/28.tmx
index 691bbca..aa4dfd9 100644
--- a/data/room/28.tmx
+++ b/data/room/28.tmx
@@ -3,10 +3,10 @@
-90,89,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,89,94,
-89,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,89,
+90,89,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,89,90,41,235,235,0,0,235,235,41,89,90,89,
+89,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,89,90,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,89,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,235,235,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,235,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,235,0,0,0,0,235,0,0,0,0,
0,0,0,0,0,0,0,0,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/32.room b/data/room/32.room
index e173bfd..5c37fa0 100644
--- a/data/room/32.room
+++ b/data/room/32.room
@@ -9,16 +9,16 @@ roomLeft=0
roomRight=33.room
[enemy]
-tileSetFile=diskette.png
-animation=diskette.ani
+tileSetFile=tree_thing.png
+animation=tree_thing.ani
width=16
height=16
x=23
-y=3
+y=4
vx=0
vy=0.4
x1=23
-y1=3
+y1=4
x2=23
y2=13
color=yellow
diff --git a/data/room/32.tmx b/data/room/32.tmx
index 6a24a28..64f2446 100644
--- a/data/room/32.tmx
+++ b/data/room/32.tmx
@@ -3,10 +3,10 @@
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,235,235,0,0,235,235,41,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,0,0,0,0,0,0,41,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,0,0,0,0,0,0,41,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,142,0,0,0,0,0,0,0,41,0,235,235,0,0,0,143,0,235,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,235,143,0,0,0,235,235,0,41,235,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,142,0,0,0,0,0,0,0,41,0,0,0,0,0,0,143,0,235,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,235,143,0,235,235,235,235,0,41,235,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,235,235,0,143,0,0,0,0,0,0,41,0,0,0,
0,0,0,0,0,142,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,0,0,0,0,0,235,41,0,142,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,0,0,0,235,235,0,41,0,0,0,
@@ -15,9 +15,9 @@
0,0,0,71,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,0,0,0,0,235,235,41,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,235,143,0,0,0,0,0,0,143,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,235,0,143,0,0,0,235,235,0,41,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,0,0,0,0,0,0,41,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,0,0,0,0,0,0,356,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,143,235,0,0,0,0,0,356,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,381,0,41,0,0,0,0,0,0,356,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,381,0,41,0,0,0,0,0,0,41,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,235,235,235,41,235,235,0,0,235,235,41,235,188,188
diff --git a/data/room/34.room b/data/room/34.room
index b75f84a..ebf99b3 100644
--- a/data/room/34.room
+++ b/data/room/34.room
@@ -1,33 +1,100 @@
-name=no 34
+name=ULA HOP!
bgColor=black
-border=red
+border=cyan
tileMapFile=34.tmx
tileSetFile=standard.png
roomUp=0
roomDown=32.room
roomLeft=35.room
roomRight=0
+itemColor1=green
+itemColor2=red
[enemy]
tileSetFile=diskette.png
animation=diskette.ani
width=16
height=16
-x=2
-y=2
+x=20
+y=1
vx=0
+vy=0.8
+x1=20
+y1=1
+x2=20
+y2=13
+color=cyan
+[/enemy]
+
+[enemy]
+tileSetFile=spark.png
+animation=spark.ani
+width=8
+height=16
+x=11
+y=4
+vx=0.5
vy=0
-x1=2
-y1=2
-x2=2
-y2=2
-color=magenta
+x1=11
+y1=4
+x2=18
+y2=4
+color=cyan
+[/enemy]
+
+[enemy]
+tileSetFile=spark.png
+animation=spark.ani
+width=8
+height=16
+x=1
+y=1
+vx=1
+vy=0
+x1=1
+y1=1
+x2=29
+y2=1
+color=yellow
+mirror=true
+[/enemy]
+
+[enemy]
+tileSetFile=wave.png
+animation=wave.ani
+width=8
+height=8
+x=1
+y=6
+vx=0.5
+vy=0
+x1=1
+y1=6
+x2=10
+y2=6
+color=yellow
+[/enemy]
+
+[enemy]
+tileSetFile=wave.png
+animation=wave.ani
+width=8
+height=8
+x=17
+y=8
+vx=0.9
+vy=0
+x1=17
+y1=8
+x2=29
+y2=8
+color=yellow
[/enemy]
[item]
tileSetFile=items.png
-tile=1
-x=1
-y=1
+tile=66
+x=29
+y=3
counter=1
[/item]
\ No newline at end of file
diff --git a/data/room/34.tmx b/data/room/34.tmx
index c1a9000..ac8b2fb 100644
--- a/data/room/34.tmx
+++ b/data/room/34.tmx
@@ -9,14 +9,14 @@
116,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,140,116,
140,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,116,140,
116,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,140,116,
-140,0,0,0,0,0,0,0,0,0,0,114,115,114,115,114,115,114,115,0,0,0,0,0,0,0,0,0,0,0,116,140,
+140,0,0,0,0,0,0,0,0,0,0,114,115,114,115,114,115,114,115,0,0,0,0,0,0,0,0,0,0,377,116,140,
116,0,0,0,0,0,0,0,377,0,0,114,115,114,115,114,115,114,115,0,0,0,0,377,377,0,0,0,0,0,140,116,
-140,0,0,0,0,0,0,0,0,0,0,0,0,114,115,114,115,0,0,0,0,0,0,0,0,0,0,0,0,0,116,140,
-116,0,0,0,377,377,377,0,0,0,0,0,0,115,114,115,114,0,0,377,0,0,0,0,0,0,0,0,0,0,140,116,
-140,0,0,0,0,0,0,0,0,0,0,377,0,114,115,114,115,0,0,0,0,0,0,0,0,0,0,0,0,0,116,140,
-116,0,0,0,0,0,0,0,0,0,0,0,0,115,114,115,114,0,0,0,0,0,0,0,0,0,114,115,114,115,140,116,
-140,0,0,0,0,0,0,0,0,377,0,0,0,114,115,114,115,0,0,0,0,0,0,114,115,114,115,114,115,0,116,140,
-0,0,0,0,0,0,0,0,0,0,0,0,377,115,114,115,114,0,0,0,0,0,0,0,0,0,0,0,0,0,140,116,
+140,0,0,0,0,0,0,0,0,377,0,0,0,114,115,114,115,0,0,0,0,0,0,0,0,0,0,0,0,0,116,140,
+116,0,0,0,377,377,377,0,0,0,0,0,0,115,114,115,114,0,0,0,0,0,377,377,377,377,0,0,0,0,140,116,
+140,0,0,0,0,0,0,0,0,0,0,377,0,114,115,114,115,0,0,377,0,0,0,0,0,0,0,0,0,0,116,140,
+116,0,0,0,0,0,0,0,0,0,0,0,0,115,114,115,114,0,0,0,0,0,0,0,0,0,431,432,114,115,140,116,
+140,0,0,0,0,0,0,0,377,0,0,0,0,114,115,114,115,0,0,0,0,0,0,431,432,431,432,431,432,0,116,140,
+0,0,0,0,0,0,0,0,0,0,0,0,377,115,114,115,114,0,0,377,0,0,0,0,0,0,0,0,0,0,140,116,
0,0,0,0,0,0,0,0,0,0,0,0,0,114,115,114,115,0,0,0,0,0,0,0,0,0,0,0,0,0,116,140,
114,115,114,115,114,115,114,115,114,115,114,115,114,115,114,115,114,115,114,115,114,115,114,115,0,0,114,115,114,115,114,115
diff --git a/data/room/44.room b/data/room/44.room
index 818f583..4db0b86 100644
--- a/data/room/44.room
+++ b/data/room/44.room
@@ -1,4 +1,4 @@
-name=THE KITCHEN
+name=SANDWITCH AND COUNTER
bgColor=black
border=cyan
tileMapFile=44.tmx
@@ -7,27 +7,46 @@ roomUp=43.room
roomDown=16.room
roomLeft=0
roomRight=0
+itemColor1=white
+itemColor2=red
[enemy]
-tileSetFile=diskette.png
-animation=diskette.ani
-width=16
+tileSetFile=congo.png
+animation=congo.ani
+width=8
height=16
x=2
-y=2
-vx=0
+y=4
+vx=0.5
vy=0
x1=2
-y1=2
-x2=2
-y2=2
-color=magenta
+y1=4
+x2=14
+y2=4
+color=green
+flip=true
+[/enemy]
+
+[enemy]
+tileSetFile=crosshair.png
+animation=crosshair.ani
+width=16
+height=16
+x=23
+y=4
+vx=0
+vy=0.8
+x1=23
+y1=4
+x2=23
+y2=13
+color=yellow
[/enemy]
[item]
tileSetFile=items.png
-tile=1
-x=1
-y=1
+tile=8
+x=2
+y=2
counter=1
[/item]
\ No newline at end of file
diff --git a/data/room/44.tmx b/data/room/44.tmx
index 834f028..6de24f6 100644
--- a/data/room/44.tmx
+++ b/data/room/44.tmx
@@ -4,20 +4,20 @@
44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,26,0,0,0,0,0,0,26,44,44,44,44,44,
-37,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,37,37,
-37,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,37,37,
-37,37,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,37,37,
-37,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,37,37,
-37,37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,413,413,0,0,0,0,0,0,0,0,0,0,37,37,
-37,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,37,37,
-37,37,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,37,37,
-37,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,37,37,
-37,37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,413,413,0,0,0,0,0,0,0,0,0,0,37,37,
-37,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,37,37,
-37,37,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,37,37,
-37,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,37,37,
-37,37,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,0,0,37,37,
-37,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,37,37,
+37,37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,345,37,37,0,0,0,0,0,0,0,0,37,37,37,37,
+37,37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,345,37,37,0,0,0,0,0,0,0,0,37,37,37,37,
+37,37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,345,37,37,343,343,343,343,343,343,0,0,37,37,37,37,
+37,37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,345,37,37,0,0,0,0,0,0,0,0,37,37,37,37,
+37,37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,345,37,37,0,0,343,0,0,0,0,0,37,37,37,37,
+37,37,465,465,465,465,465,465,465,465,465,465,465,465,465,0,0,345,37,37,0,0,0,0,0,0,343,0,37,37,37,37,
+37,37,37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,345,37,37,0,0,0,0,0,0,0,343,37,37,37,37,
+37,37,37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,345,0,0,0,0,343,0,0,0,0,0,37,37,37,37,
+37,37,37,0,0,0,0,0,0,0,0,0,0,0,0,345,0,345,0,0,0,0,0,0,0,0,0,0,37,37,37,37,
+37,37,37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,345,0,0,0,0,0,0,0,0,343,0,37,37,37,37,
+37,37,37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,345,0,0,0,343,0,0,0,0,0,0,37,37,37,37,
+37,37,37,0,0,0,0,0,0,0,0,0,0,0,345,0,0,345,0,0,0,0,0,0,0,0,343,0,37,37,37,37,
+37,37,37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,345,0,0,0,0,0,0,0,0,0,0,37,37,37,37,
+37,37,37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,345,0,0,0,0,343,0,0,0,0,0,37,37,37,37,
38,38,38,38,38,38,38,38,38,38,38,38,38,38,417,0,0,417,38,38,38,38,38,38,38,38,38,38,38,38,38,38
diff --git a/data/room/60.tmx b/data/room/60.tmx
index 888686c..1df006c 100644
--- a/data/room/60.tmx
+++ b/data/room/60.tmx
@@ -3,22 +3,22 @@
-25,25,25,25,25,25,25,25,25,25,25,25,25,25,0,0,0,0,25,25,25,25,25,25,25,25,25,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,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,25,
-25,0,0,0,0,0,0,0,0,0,0,0,0,0,411,411,411,411,0,0,0,0,0,0,0,0,0,0,0,0,0,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,25,
-25,0,0,0,0,0,0,0,0,0,0,0,0,411,0,0,0,0,411,0,0,0,0,0,0,0,0,0,0,0,0,25,
-25,0,0,0,0,308,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,308,0,0,0,0,25,
-25,0,0,0,0,0,0,0,0,0,411,411,411,411,0,0,0,0,411,411,411,411,0,0,0,0,0,0,0,0,0,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,25,
-25,0,0,0,0,0,0,0,0,0,0,0,0,0,411,0,0,411,0,0,0,0,0,0,0,0,0,0,0,0,0,25,
-25,0,0,0,308,0,0,0,0,308,0,0,0,0,0,0,0,0,0,0,0,0,308,0,0,0,0,308,0,0,0,25,
-25,0,0,0,0,0,0,0,0,0,0,0,0,0,411,411,411,411,0,0,0,0,0,0,0,0,0,0,0,0,0,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,25,
-25,0,0,0,0,0,0,0,0,0,0,0,0,411,0,0,0,0,411,0,0,0,0,0,0,0,0,0,0,0,0,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,25,
-25,411,411,411,411,411,411,411,411,411,411,411,411,411,411,411,411,411,411,411,411,411,411,411,411,411,0,0,411,411,411,25
+28,28,28,28,28,28,28,28,28,28,28,28,28,28,0,0,0,0,28,28,28,28,28,28,28,28,28,28,28,28,28,28,
+28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,
+28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,
+28,0,0,0,0,0,0,0,0,0,0,0,0,0,411,411,411,411,0,0,0,0,0,0,0,0,0,0,0,0,0,28,
+28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,
+28,0,0,0,0,0,0,0,0,0,0,0,0,411,0,0,0,0,411,0,0,0,0,0,0,0,0,0,0,0,0,28,
+28,0,0,0,0,308,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,308,0,0,0,0,28,
+28,0,0,0,0,0,0,0,0,0,411,411,411,411,0,0,0,0,411,411,411,411,0,0,0,0,0,0,0,0,0,28,
+28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,
+28,0,0,0,0,0,0,0,0,0,0,0,0,0,411,0,0,411,0,0,0,0,0,0,0,0,0,0,0,0,0,28,
+28,0,0,0,308,0,0,0,0,308,0,0,0,0,0,0,0,0,0,0,0,0,308,0,0,0,0,308,0,0,0,28,
+28,0,0,0,0,0,0,0,0,0,0,0,0,0,411,411,411,411,0,0,0,0,0,0,0,0,0,0,0,0,0,28,
+28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,
+28,0,0,0,0,0,0,0,0,0,0,0,0,411,0,0,0,0,411,0,0,0,0,0,0,0,0,0,0,0,0,28,
+28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,
+28,411,411,411,411,411,411,411,411,411,411,411,411,411,411,411,411,411,411,411,411,411,411,411,411,411,0,0,411,411,411,28
diff --git a/source/director.cpp b/source/director.cpp
index 0edbb01..cf691b7 100644
--- a/source/director.cpp
+++ b/source/director.cpp
@@ -366,6 +366,7 @@ void Director::loadResources(section_t section)
textureList.push_back("chip.png");
textureList.push_back("code.png");
textureList.push_back("congo.png");
+ textureList.push_back("crosshair.png");
textureList.push_back("demon.png");
textureList.push_back("heavy.png");
textureList.push_back("dimallas.png");
@@ -390,6 +391,7 @@ void Director::loadResources(section_t section)
textureList.push_back("sigmasua.png");
textureList.push_back("spider.png");
textureList.push_back("spark.png");
+ textureList.push_back("tree_thing.png");
textureList.push_back("tuno.png");
textureList.push_back("tv_panel.png");
textureList.push_back("tv.png");
@@ -426,6 +428,7 @@ void Director::loadResources(section_t section)
animationList.push_back("chip.ani");
animationList.push_back("code.ani");
animationList.push_back("congo.ani");
+ animationList.push_back("crosshair.ani");
animationList.push_back("demon.ani");
animationList.push_back("heavy.ani");
animationList.push_back("dimallas.ani");
@@ -450,6 +453,7 @@ void Director::loadResources(section_t section)
animationList.push_back("sigmasua.ani");
animationList.push_back("spider.ani");
animationList.push_back("spark.ani");
+ animationList.push_back("tree_thing.ani");
animationList.push_back("tuno.ani");
animationList.push_back("tv_panel.ani");
animationList.push_back("tv.ani");
@@ -499,7 +503,14 @@ void Director::loadResources(section_t section)
std::vector textureList;
// Jugador
- textureList.push_back("player.png");
+ if (options->cheat.altSkin)
+ {
+ textureList.push_back("player2.png");
+ }
+ else
+ {
+ textureList.push_back("player.png");
+ }
// Tilesets
textureList.push_back("standard.png");
@@ -526,6 +537,7 @@ void Director::loadResources(section_t section)
textureList.push_back("chip.png");
textureList.push_back("code.png");
textureList.push_back("congo.png");
+ textureList.push_back("crosshair.png");
textureList.push_back("demon.png");
textureList.push_back("heavy.png");
textureList.push_back("dimallas.png");
@@ -550,6 +562,7 @@ void Director::loadResources(section_t section)
textureList.push_back("sigmasua.png");
textureList.push_back("spark.png");
textureList.push_back("spider.png");
+ textureList.push_back("tree_thing.png");
textureList.push_back("tuno.png");
textureList.push_back("tv_panel.png");
textureList.push_back("tv.png");
@@ -570,7 +583,14 @@ void Director::loadResources(section_t section)
std::vector animationList;
// Jugador
- animationList.push_back("player.ani");
+ if (options->cheat.altSkin)
+ {
+ animationList.push_back("player2.ani");
+ }
+ else
+ {
+ animationList.push_back("player.ani");
+ }
// Enemigos
animationList.push_back("abad.ani");
@@ -593,6 +613,7 @@ void Director::loadResources(section_t section)
animationList.push_back("chip.ani");
animationList.push_back("code.ani");
animationList.push_back("congo.ani");
+ animationList.push_back("crosshair.ani");
animationList.push_back("demon.ani");
animationList.push_back("heavy.ani");
animationList.push_back("dimallas.ani");
@@ -617,6 +638,7 @@ void Director::loadResources(section_t section)
animationList.push_back("sigmasua.ani");
animationList.push_back("spark.ani");
animationList.push_back("spider.ani");
+ animationList.push_back("tree_thing.ani");
animationList.push_back("tuno.ani");
animationList.push_back("tv_panel.ani");
animationList.push_back("tv.ani");
@@ -1175,6 +1197,8 @@ bool Director::setFileList()
asset->add(prefix + "/data/enemies/code.png", t_bitmap);
asset->add(prefix + "/data/enemies/congo.ani", t_data);
asset->add(prefix + "/data/enemies/congo.png", t_bitmap);
+ asset->add(prefix + "/data/enemies/crosshair.ani", t_data);
+ asset->add(prefix + "/data/enemies/crosshair.png", t_bitmap);
asset->add(prefix + "/data/enemies/demon.ani", t_data);
asset->add(prefix + "/data/enemies/demon.png", t_bitmap);
asset->add(prefix + "/data/enemies/heavy.ani", t_data);
@@ -1223,6 +1247,8 @@ bool Director::setFileList()
asset->add(prefix + "/data/enemies/spark.png", t_bitmap);
asset->add(prefix + "/data/enemies/spider.ani", t_data);
asset->add(prefix + "/data/enemies/spider.png", t_bitmap);
+ asset->add(prefix + "/data/enemies/tree_thing.ani", t_data);
+ asset->add(prefix + "/data/enemies/tree_thing.png", t_bitmap);
asset->add(prefix + "/data/enemies/tuno.ani", t_data);
asset->add(prefix + "/data/enemies/tuno.png", t_bitmap);
asset->add(prefix + "/data/enemies/tv_panel.ani", t_data);
diff --git a/source/ending2.cpp b/source/ending2.cpp
index 13001ba..7536079 100644
--- a/source/ending2.cpp
+++ b/source/ending2.cpp
@@ -332,6 +332,8 @@ void Ending2::iniSpriteList()
spriteList.push_back("lamp");
spriteList.push_back("macaronni_ted");
spriteList.push_back("congo");
+ spriteList.push_back("crosshair");
+ spriteList.push_back("tree_thing");
spriteList.push_back("matatunos");
spriteList.push_back("tuno");
diff --git a/source/player.cpp b/source/player.cpp
index f87ea55..3f8ca36 100644
--- a/source/player.cpp
+++ b/source/player.cpp
@@ -18,15 +18,7 @@ Player::Player(player_t player)
sprite = new AnimatedSprite(renderer, resource->getAnimation(player.animation));
// Inicializa variables
- color = stringToColor(options->palette, "white");
- if (options->cheat.infiniteLives)
- {
- color = stringToColor(options->palette, "yellow");
- }
- if (options->cheat.invincible)
- {
- color = stringToColor(options->palette, "cyan");
- }
+ reLoadPalette();
onBorder = false;
border = BORDER_TOP;
autoMovement = false;
@@ -708,6 +700,14 @@ void Player::reLoadTexture()
void Player::reLoadPalette()
{
color = stringToColor(options->palette, "white");
+ if (options->cheat.infiniteLives)
+ {
+ color = stringToColor(options->palette, "yellow");
+ }
+ if (options->cheat.invincible)
+ {
+ color = stringToColor(options->palette, "cyan");
+ }
}
// Establece el valor de la variable
diff --git a/source/scoreboard.cpp b/source/scoreboard.cpp
index 18f4b81..043d5b5 100644
--- a/source/scoreboard.cpp
+++ b/source/scoreboard.cpp
@@ -13,9 +13,9 @@ ScoreBoard::ScoreBoard(SDL_Renderer *renderer, Resource *resource, Asset *asset,
this->options = options;
// Reserva memoria para los objetos
- // playerTexture = resource->getTexture("player.png");
itemTexture = resource->getTexture("items.png");
- sprite = new AnimatedSprite(renderer, resource->getAnimation("player.ani"));
+ const std::string playerANI = options->cheat.altSkin ? "player2.ani" : "player.ani";
+ sprite = new AnimatedSprite(renderer, resource->getAnimation(playerANI));
sprite->setCurrentAnimation("walk_menu");
text = new Text(resource->getOffset("smb2.txt"), resource->getTexture("smb2.png"), renderer);
@@ -161,7 +161,7 @@ void ScoreBoard::updateItemsColor()
return;
}
- if (counter % 20 <10)
+ if (counter % 20 < 10)
{
itemsColor = stringToColor(options->palette, "white");
}