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

Arreglado un bug en la eleccion aleatoria de frame de los enemigos

Browse Source
This commit is contained in:
Sergio
2022-10-19 20:24:49 +02:00
parent d5dfc952c2
commit efeed945e7
20 changed files with 323 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
data/enemies/amstrad_character_set.ani Normal file
View File

@@ -0,0 +1,9 @@
frameWidth=8
frameHeight=8
[animation]
name=default
speed=4
loop=0
frames=0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255
[/animation]

BIN
data/enemies/amstrad_character_set.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.9 KiB

2
data/enemies/jailbattle_alien.ani
View File

@@ -3,7 +3,7 @@ frameHeight=15
[animation] [animation]
name=default name=default
speed=8 speed=6
loop=0 loop=0
frames=0,1 frames=0,1
[/animation] [/animation]

2
data/enemies/jailbattle_human.ani
View File

@@ -3,7 +3,7 @@ frameHeight=13
[animation] [animation]
name=default name=default
speed=8 speed=6
loop=0 loop=0
frames=0,1 frames=0,1
[/animation] [/animation]

BIN
data/items/items.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 950 B

After

Width:  |  Height:  |  Size: 960 B

120
data/room/47.room
View File

@@ -1,33 +1,119 @@
name=no 47 name=the battle never ends
bgColor=black bgColor=black
border=red border=white
tilemap=47.tmx tilemap=47.tmx
tileset=standard.png tileset=standard.png
roomUp=51.room roomUp=51.room
roomDown=0 roomDown=0
roomLeft=48.room roomLeft=48.room
roomRight=0 roomRight=0
itemColor1=red
itemColor2=yellow
[enemy] [enemy]
tileset=diskette.png tileset=jailbattle_alien.png
animation=diskette.ani animation=jailbattle_alien.ani
width=16 width=13
height=16 height=15
x=2 x=10
y=2 y=3
vx=0 vx=0.8
vy=0 vy=0
x1=2 x1=3
y1=2 y1=3
x2=2 x2=27
y2=2 y2=3
color=magenta color=green
flip=true
[/enemy]
[enemy]
tileset=jailbattle_alien.png
animation=jailbattle_alien.ani
width=13
height=15
x=25
y=4
vx=0
vy=0.8
x1=25
y1=4
x2=25
y2=10
color=yellow
flip=true
[/enemy]
[enemy]
tileset=jailbattle_human.png
animation=jailbattle_human.ani
width=11
height=13
x=7
y=6
vx=0
vy=0.5
x1=7
y1=6
x2=7
y2=13
color=red
flip=true
[/enemy]
[enemy]
tileset=jailbattle_human.png
animation=jailbattle_human.ani
width=11
height=13
x=18
y=13
vx=0.5
vy=0
x1=15
y1=13
x2=27
y2=13
color=cyan
flip=true
[/enemy] [/enemy]
[item] [item]
tileset=items.png tileset=items.png
tile=1 tile=19
x=1 x=6
y=1 y=14
counter=1 counter=1
[/item]
[item]
tileset=items.png
tile=19
x=14
y=14
counter=2
[/item]
[item]
tileset=items.png
tile=19
x=23
y=14
counter=3
[/item]
[item]
tileset=items.png
tile=19
x=28
y=6
counter=4
[/item]
[item]
tileset=items.png
tile=19
x=14
y=5
counter=5
[/item] [/item]

32
data/room/47.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, 28,28,28,28,28,28,28,28,28,28,28,28,28,28,28,28,28,28,28,28,28,0,0,0,0,0,505,28,28,28,86,86,
0,0,0,0,0,0,0,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,505,0,0,0,0,86,86,
0,0,0,0,0,0,0,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,505,0,0,0,0,0,86,86,
0,0,0,0,0,0,0,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,505,0,0,0,0,0,0,86,86,
0,0,0,0,0,0,0,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,505,0,0,0,0,0,0,0,86,86,
0,0,0,0,0,0,0,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,413,413,0,0,0,0,0,0,0,0,86,86,
0,0,0,0,0,0,0,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,86,86,
0,0,0,0,0,0,0,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,413,413,413,529,0,0,0,0,0,0,0,86,86,
0,0,0,0,0,0,0,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, 28,529,0,0,0,0,0,0,0,0,0,0,0,505,413,0,0,0,0,0,0,0,505,413,0,0,0,0,413,413,86,86,
0,0,0,0,0,0,0,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, 28,0,413,529,0,0,0,0,0,0,0,0,413,529,0,0,0,0,0,0,0,505,0,0,0,0,0,0,0,0,86,86,
0,0,0,0,0,0,0,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, 28,0,0,0,413,0,0,0,0,0,0,0,0,0,529,0,0,0,0,0,413,529,0,0,0,0,0,0,0,0,86,86,
0,0,0,0,0,0,0,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, 28,0,0,0,0,0,0,0,0,0,0,0,0,0,505,413,413,0,0,0,0,0,529,0,0,0,0,0,0,0,86,86,
0,0,0,0,0,0,0,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, 28,0,0,0,505,413,0,0,0,413,529,0,505,413,0,0,0,0,0,0,0,0,0,413,413,529,0,0,0,0,86,86,
0,0,0,0,0,0,0,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, 28,0,0,413,0,0,0,0,0,0,0,413,0,0,0,0,0,0,0,0,0,0,0,0,0,0,413,0,0,0,86,86,
0,0,0,0,0,0,0,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, 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,86,86,
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 28,28,28,28,28,389,389,389,28,28,28,28,28,389,389,389,28,28,28,28,28,389,389,28,389,28,28,28,28,28,86,86
</data> </data>
</layer> </layer>
</map> </map>

85
data/room/48.room
View File

@@ -1,33 +1,86 @@
name=no 48 name=welcome to the jailbattle
bgColor=black bgColor=green
border=red border=bright_green
tilemap=48.tmx tilemap=48.tmx
tileset=standard.png tileset=standard.png
roomUp=0 roomUp=0
roomDown=49.room roomDown=49.room
roomLeft=0 roomLeft=0
roomRight=47.room roomRight=47.room
itemColor1=white
itemColor2=green
[enemy] [enemy]
tileset=diskette.png tileset=jailbattle_human.png
animation=diskette.ani animation=jailbattle_human.ani
width=16 width=11
height=16 height=13
x=17
y=6
vx=0.5
vy=0
x1=12
y1=6
x2=27
y2=6
color=white
flip=true
[/enemy]
[enemy]
tileset=jailbattle_human.png
animation=jailbattle_human.ani
width=11
height=13
x=2 x=2
y=2 y=13
vx=0 vx=0.6
vy=0 vy=0
x1=2 x1=2
y1=2 y1=13
x2=2 x2=16
y2=2 y2=13
color=magenta color=white
flip=true
[/enemy]
[enemy]
tileset=jailbattle_human.png
animation=jailbattle_human.ani
width=11
height=13
x=29
y=10
vx=0
vy=0.2
x1=29
y1=10
x2=29
y2=13
color=white
flip=true
[/enemy] [/enemy]
[item] [item]
tileset=items.png tileset=items.png
tile=1 tile=19
x=1 x=27
y=1 y=11
counter=1 counter=1
[/item]
[item]
tileset=items.png
tile=19
x=3
y=3
counter=2
[/item]
[item]
tileset=items.png
tile=19
x=23
y=4
counter=3
[/item] [/item]

32
data/room/48.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, 33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,
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, 33,0,0,0,0,0,0,0,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, 33,0,0,0,0,0,0,0,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, 33,0,0,0,0,0,0,0,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, 33,0,0,0,0,0,0,0,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, 33,0,401,401,401,0,0,0,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, 33,0,0,0,0,0,0,0,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, 33,0,0,0,0,0,401,401,401,401,401,529,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, 33,0,0,0,0,0,0,0,0,0,0,0,529,0,0,0,0,33,0,33,0,33,0,33,0,33,0,33,0,33,401,33,
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, 33,0,0,0,0,0,0,0,0,0,0,0,0,529,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,
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, 33,0,0,0,0,0,0,0,0,0,0,0,0,0,529,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,
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, 33,0,0,0,0,0,0,0,0,0,0,0,505,401,401,401,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,
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, 33,0,0,0,0,505,401,401,401,401,401,401,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,
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, 33,0,0,0,505,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,
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, 33,0,0,505,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,
25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,0,0,25,25,25,25,25,25,25,25,25,25,25 33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,0,0,33,33,33,33,33,33,33,33,33,33,33
</data> </data>
</layer> </layer>
</map> </map>

76
data/room/51.room
View File

@@ -1,33 +1,75 @@
name=no 51 name=mini ascii
bgColor=black bgColor=black
border=red border=black
tilemap=51.tmx tilemap=51.tmx
tileset=standard.png tileset=standard.png
roomUp=53.room roomUp=53.room
roomDown=47.room roomDown=47.room
roomLeft=52.room roomLeft=52.room
roomRight=0 roomRight=0
itemColor1=bright_white
itemColor2=black
[enemy] [enemy]
tileset=diskette.png tileset=amstrad_character_set.png
animation=diskette.ani animation=amstrad_character_set.ani
width=16 width=8
height=16 height=8
x=2 x=1
y=2 y=6
vx=0 vx=1.2
vy=0 vy=0
x1=2 x1=1
y1=2 y1=6
x2=2 x2=30
y2=2 y2=6
color=magenta color=white
[/enemy]
[enemy]
tileset=amstrad_character_set.png
animation=amstrad_character_set.ani
width=8
height=8
x=19
y=1
vx=0
vy=1.2
x1=19
y1=1
x2=19
y2=14
color=yellow
[/enemy]
[enemy]
tileset=amstrad_character_set.png
animation=amstrad_character_set.ani
width=8
height=8
x=5
y=6
vx=0
vy=1.2
x1=5
y1=1
x2=5
y2=12
color=green
[/enemy] [/enemy]
[item] [item]
tileset=items.png tileset=items.png
tile=1 tile=39
x=1 x=28
y=1 y=2
counter=1 counter=1
[/item]
[item]
tileset=items.png
tile=39
x=9
y=9
counter=2
[/item] [/item]

32
data/room/51.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, 187,184,184,184,184,184,184,184,184,184,184,184,184,184,184,184,184,184,184,184,184,184,184,295,0,0,184,184,184,184,184,183,
0,0,0,0,0,0,0,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, 187,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,183,
0,0,0,0,0,0,0,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, 187,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,183,
0,0,0,0,0,0,0,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, 187,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,184,184,0,0,0,183,
0,0,0,0,0,0,0,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, 187,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,184,184,0,0,0,0,0,293,
0,0,0,0,0,0,0,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, 187,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,295,0,0,0,0,0,0,0,293,
0,0,0,0,0,0,0,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, 187,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,183,
0,0,0,0,0,0,0,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, 187,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,299,186,0,0,0,0,0,0,0,0,183,
0,0,0,0,0,0,0,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, 187,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,186,0,0,0,0,0,0,0,183,
0,0,0,0,0,0,0,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, 187,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,186,0,0,0,0,0,0,183,
0,0,0,0,0,0,0,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,299,0,0,0,0,0,183,
0,0,0,0,0,0,0,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,185,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,299,0,0,0,0,183,
0,0,0,0,0,0,0,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,184,184,184,184,184,0,0,0,0,0,0,0,0,289,289,289,289,289,289,289,289,289,289,289,183,
0,0,0,0,0,0,0,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,183,183,183,183,183,183,183,183,183,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,183,
0,0,0,0,0,0,0,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,182,182,182,182,182,291,182,182,182,182,182,182,182,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,183,
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 185,185,185,185,185,297,297,185,185,185,185,185,185,185,185,185,185,185,185,185,181,181,0,0,181,181,181,181,181,181,181,183
</data> </data>
</layer> </layer>
</map> </map>

32
data/room/52.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, 184,182,182,182,182,182,182,182,182,182,182,182,187,187,187,187,187,187,187,187,187,187,187,187,187,187,185,185,185,185,185,185,
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, 184,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,181,
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, 184,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,181,
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, 184,0,0,0,181,181,182,182,184,184,185,185,183,183,186,186,181,181,182,182,184,184,0,0,0,0,0,0,0,0,0,181,
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, 184,0,0,0,186,186,181,181,182,182,184,184,185,185,183,183,186,186,181,181,182,182,0,0,0,0,0,0,0,0,0,181,
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, 184,0,0,0,183,183,186,186,181,181,182,182,184,184,185,185,183,183,186,186,181,181,0,0,0,0,0,0,0,0,0,181,
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, 184,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,181,
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, 184,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,181,
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, 184,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,181,
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, 186,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,181,
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, 186,0,0,0,0,0,0,0,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, 186,0,0,0,0,0,0,0,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, 186,0,0,0,0,0,0,0,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, 186,0,0,0,0,0,0,0,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, 186,0,0,0,0,0,0,0,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 183,183,183,183,183,183,181,181,181,181,181,181,181,181,181,181,181,181,181,181,181,181,185,185,185,185,185,185,185,185,185,185
</data> </data>
</layer> </layer>
</map> </map>

2
data/room/53.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,0,25,25,25,25,25,25
</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: 6.2 KiB

After

Width:  |  Height:  |  Size: 6.3 KiB

6
source/common/animatedsprite.cpp
View File

@@ -88,6 +88,12 @@ void AnimatedSprite::animate()
} }
} }
// Obtiene el numero de frames de la animación actual
int AnimatedSprite::getNumFrames()
{
return (int)animation.at(currentAnimation).frames.size();
}
// Establece el frame actual de la animación // Establece el frame actual de la animación
void AnimatedSprite::setCurrentFrame(int num) void AnimatedSprite::setCurrentFrame(int num)
{ {

3
source/common/animatedsprite.h
View File

@@ -40,6 +40,9 @@ public:
// Calcula el frame correspondiente a la animación actual // Calcula el frame correspondiente a la animación actual
void animate(); void animate();
// Obtiene el numero de frames de la animación actual
int getNumFrames();
// Establece el frame actual de la animación // Establece el frame actual de la animación
void setCurrentFrame(int num); void setCurrentFrame(int num);

2
source/director.cpp
View File

@@ -541,6 +541,8 @@ bool Director::setFileList()
asset->add("/../data/enemies/mummy.ani", t_data); asset->add("/../data/enemies/mummy.ani", t_data);
asset->add("/../data/enemies/sam.png", t_bitmap); asset->add("/../data/enemies/sam.png", t_bitmap);
asset->add("/../data/enemies/sam.ani", t_data); asset->add("/../data/enemies/sam.ani", t_data);
asset->add("/../data/enemies/amstrad_character_set.png", t_bitmap);
asset->add("/../data/enemies/amstrad_character_set.ani", t_data);
asset->add("/../data/player/player.png", t_bitmap); asset->add("/../data/player/player.png", t_bitmap);
asset->add("/../data/player/player.ani", t_data); asset->add("/../data/player/player.ani", t_data);

2
source/enemy.cpp
View File

@@ -37,7 +37,7 @@ Enemy::Enemy(enemy_t enemy)
collider = getRect(); collider = getRect();
// Coloca un frame al azar // Coloca un frame al azar
sprite->setCurrentFrame(rand() % 4); sprite->setCurrentFrame(rand() % sprite->getNumFrames());
} }
// Destructor // Destructor

2
source/game.cpp
View File

@@ -17,7 +17,7 @@ Game::Game(SDL_Renderer *renderer, Screen *screen, Asset *asset, Input *input, D
// **** // ****
// this->debug->setEnabled(true); // this->debug->setEnabled(true);
currentRoom = "20.room"; currentRoom = "51.room";
const int x = 30; const int x = 30;
const int y = 13; const int y = 13;
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};

6
todo.txt
View File

@@ -58,11 +58,11 @@ x (C) Que no cree la ventana y luego añada el borde
## TEMAS ## TEMAS
arounders arounders
paku simbel x paku simbel
jail battle x jail battle
arounders race arounders race
aee gba aee gba
matatunos x matatunos
x sigmasua x sigmasua
calculin doom calculin doom
leaper reaper leaper reaper