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

Añadidos los graficos de los enemigos especiales

Browse Source
This commit is contained in:
Sergio
2022-11-13 18:16:15 +01:00
parent 512daa68b9
commit 924e37b32b
13 changed files with 111 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
data/enemies/aerojailer.ani → data/enemies/special/aerojailer.ani
View File

0
data/enemies/aerojailer.png → data/enemies/special/aerojailer.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 337 B

After

Width:  |  Height:  |  Size: 337 B

0
data/enemies/arounder.ani → data/enemies/special/arounder.ani
View File

0
data/enemies/arounder.png → data/enemies/special/arounder.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 924 B

After

Width:  |  Height:  |  Size: 924 B

0
data/enemies/pepe_rosita_job.ani → data/enemies/special/pepe_rosita_job.ani
View File

0
data/enemies/pepe_rosita_job.png → data/enemies/special/pepe_rosita_job.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 735 B

After

Width:  |  Height:  |  Size: 735 B

9
data/enemies/special/shooting_star.ani Normal file
View File

@@ -0,0 +1,9 @@
frameWidth=64
frameHeight=64
[animation]
name=default
speed=6
loop=-1
frames=18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18
[/animation]

BIN
data/enemies/special/shooting_star.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 902 B

16
data/room/32.room
View File

@@ -23,3 +23,19 @@ x2=23
y2=13
color=yellow
[/enemy]
[enemy]
tileSetFile=shooting_star.png
animation=shooting_star.ani
width=16
height=16
x=10
y=2
vx=0
vy=0
x1=10
y1=2
x2=10
y2=2
color=white
[/enemy]

46
data/room/33.room
View File

@@ -11,19 +11,51 @@ itemColor1=bright_red
itemColor2=bright_yellow
[enemy]
tileSetFile=diskette.png
animation=diskette.ani
width=16
height=16
tileSetFile=pepe_rosita_job.png
animation=pepe_rosita_job.ani
width=62
height=47
x=2
y=2
vx=0
vy=0
vy=0.05
x1=2
y1=2
x2=2
y2=2
color=magenta
y2=3
color=white
[/enemy]
[enemy]
tileSetFile=aerojailer.png
animation=aerojailer.ani
width=43
height=44
x=14
y=5
vx=0
vy=-0.04
x1=14
y1=4
x2=14
y2=6
color=white
[/enemy]
[enemy]
tileSetFile=arounder.png
animation=arounder.ani
width=79
height=90
x=22
y=5
vx=0
vy=0.03
x1=22
y1=5
x2=22
y2=6
color=white
[/enemy]
[item]

12
data/room/33.tmx
View File

@@ -3,17 +3,17 @@
<tileset firstgid="1" source="standard.tsx"/>
<layer id="1" name="Capa de patrones 1" width="32" height="16">
<data encoding="csv">
0,0,0,0,0,0,0,0,0,142,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,71,0,0,0,0,0,0,0,0,0,0,0,0,0,0,142,0,0,0,0,0,0,0,0,0,0,0,0,72,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,71,0,0,0,95,96,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,142,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,71,0,0,0,0,0,0,
0,0,0,0,0,0,142,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,72,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,71,0,0,0,0,0,0,0,95,96,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,71,0,0,0,0,0,0,0,0,0,0,142,
0,0,0,0,0,0,0,0,0,0,0,0,142,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,142,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,71,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,71,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,142,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,

62
source/director.cpp
View File

@@ -10,7 +10,7 @@ Director::Director(int argc, char *argv[])
section.subsection = SUBSECTION_LOGO_TO_INTRO;
#ifndef RELEASE
section.name = SECTION_PROG_DEMO;
section.name = SECTION_PROG_GAME;
#endif
// Crea e inicializa las opciones del programa
@@ -519,12 +519,14 @@ void Director::loadResources(section_t section)
textureList.push_back("standard_zxarne.png");
// Enemigos
textureList.push_back("abad.png");
textureList.push_back("abad_bell.png");
textureList.push_back("abad.png");
textureList.push_back("aerojailer.png");
textureList.push_back("amstrad_cs.png");
textureList.push_back("arounder_fly.png");
textureList.push_back("arounder_stop.png");
textureList.push_back("arounder_walk.png");
textureList.push_back("arounder.png");
textureList.push_back("arounders_door.png");
textureList.push_back("arounders_machine.png");
textureList.push_back("bat.png");
@@ -541,26 +543,29 @@ void Director::loadResources(section_t section)
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");
textureList.push_back("diskette.png");
textureList.push_back("dong.png");
textureList.push_back("guitar.png");
textureList.push_back("jb_alien.png");
textureList.push_back("jb_human.png");
textureList.push_back("heavy.png");
textureList.push_back("jailer.png");
textureList.push_back("jailer2.png");
textureList.push_back("jailer3.png");
textureList.push_back("jb_alien.png");
textureList.push_back("jb_human.png");
textureList.push_back("jeannine.png");
textureList.push_back("lamp.png");
textureList.push_back("lord_abad.png");
textureList.push_back("robot.png");
textureList.push_back("matatunos.png");
textureList.push_back("mummy.png");
textureList.push_back("paco.png");
textureList.push_back("pepe_rosita_job.png");
textureList.push_back("printer.png");
textureList.push_back("qvoid.png");
textureList.push_back("robot.png");
textureList.push_back("sam.png");
textureList.push_back("shock.png");
textureList.push_back("shooting_star.png");
textureList.push_back("sigmasua.png");
textureList.push_back("spark.png");
textureList.push_back("spider.png");
@@ -568,7 +573,6 @@ void Director::loadResources(section_t section)
textureList.push_back("tuno.png");
textureList.push_back("tv_panel.png");
textureList.push_back("tv.png");
textureList.push_back("shock.png");
textureList.push_back("upv_student.png");
textureList.push_back("wave.png");
textureList.push_back("z80.png");
@@ -596,12 +600,14 @@ void Director::loadResources(section_t section)
}
// Enemigos
animationList.push_back("abad.ani");
animationList.push_back("abad_bell.ani");
animationList.push_back("abad.ani");
animationList.push_back("aerojailer.ani");
animationList.push_back("amstrad_cs.ani");
animationList.push_back("arounder_fly.ani");
animationList.push_back("arounder_stop.ani");
animationList.push_back("arounder_walk.ani");
animationList.push_back("arounder.ani");
animationList.push_back("arounders_door.ani");
animationList.push_back("arounders_machine.ani");
animationList.push_back("bat.ani");
@@ -618,26 +624,29 @@ void Director::loadResources(section_t section)
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");
animationList.push_back("diskette.ani");
animationList.push_back("dong.ani");
animationList.push_back("guitar.ani");
animationList.push_back("jb_alien.ani");
animationList.push_back("jb_human.ani");
animationList.push_back("heavy.ani");
animationList.push_back("jailer.ani");
animationList.push_back("jailer2.ani");
animationList.push_back("jailer3.ani");
animationList.push_back("jb_alien.ani");
animationList.push_back("jb_human.ani");
animationList.push_back("jeannine.ani");
animationList.push_back("lamp.ani");
animationList.push_back("lord_abad.ani");
animationList.push_back("robot.ani");
animationList.push_back("matatunos.ani");
animationList.push_back("mummy.ani");
animationList.push_back("paco.ani");
animationList.push_back("pepe_rosita_job.ani");
animationList.push_back("printer.ani");
animationList.push_back("qvoid.ani");
animationList.push_back("robot.ani");
animationList.push_back("sam.ani");
animationList.push_back("shock.ani");
animationList.push_back("shooting_star.ani");
animationList.push_back("sigmasua.ani");
animationList.push_back("spark.ani");
animationList.push_back("spider.ani");
@@ -645,7 +654,6 @@ void Director::loadResources(section_t section)
animationList.push_back("tuno.ani");
animationList.push_back("tv_panel.ani");
animationList.push_back("tv.ani");
animationList.push_back("shock.ani");
animationList.push_back("upv_student.ani");
animationList.push_back("wave.ani");
animationList.push_back("z80.ani");
@@ -1205,8 +1213,6 @@ bool Director::setFileList()
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);
asset->add(prefix + "/data/enemies/heavy.png", t_bitmap);
asset->add(prefix + "/data/enemies/dimallas.ani", t_data);
asset->add(prefix + "/data/enemies/dimallas.png", t_bitmap);
asset->add(prefix + "/data/enemies/diskette.ani", t_data);
@@ -1215,24 +1221,24 @@ bool Director::setFileList()
asset->add(prefix + "/data/enemies/dong.png", t_bitmap);
asset->add(prefix + "/data/enemies/guitar.ani", t_data);
asset->add(prefix + "/data/enemies/guitar.png", t_bitmap);
asset->add(prefix + "/data/enemies/jb_alien.ani", t_data);
asset->add(prefix + "/data/enemies/jb_alien.png", t_bitmap);
asset->add(prefix + "/data/enemies/jb_human.ani", t_data);
asset->add(prefix + "/data/enemies/jb_human.png", t_bitmap);
asset->add(prefix + "/data/enemies/heavy.ani", t_data);
asset->add(prefix + "/data/enemies/heavy.png", t_bitmap);
asset->add(prefix + "/data/enemies/jailer.ani", t_data);
asset->add(prefix + "/data/enemies/jailer.png", t_bitmap);
asset->add(prefix + "/data/enemies/jailer2.ani", t_data);
asset->add(prefix + "/data/enemies/jailer2.png", t_bitmap);
asset->add(prefix + "/data/enemies/jailer3.ani", t_data);
asset->add(prefix + "/data/enemies/jailer3.png", t_bitmap);
asset->add(prefix + "/data/enemies/jb_alien.ani", t_data);
asset->add(prefix + "/data/enemies/jb_alien.png", t_bitmap);
asset->add(prefix + "/data/enemies/jb_human.ani", t_data);
asset->add(prefix + "/data/enemies/jb_human.png", t_bitmap);
asset->add(prefix + "/data/enemies/jeannine.ani", t_data);
asset->add(prefix + "/data/enemies/jeannine.png", t_bitmap);
asset->add(prefix + "/data/enemies/lamp.ani", t_data);
asset->add(prefix + "/data/enemies/lamp.png", t_bitmap);
asset->add(prefix + "/data/enemies/lord_abad.ani", t_data);
asset->add(prefix + "/data/enemies/lord_abad.png", t_bitmap);
asset->add(prefix + "/data/enemies/robot.ani", t_data);
asset->add(prefix + "/data/enemies/robot.png", t_bitmap);
asset->add(prefix + "/data/enemies/matatunos.ani", t_data);
asset->add(prefix + "/data/enemies/matatunos.png", t_bitmap);
asset->add(prefix + "/data/enemies/mummy.ani", t_data);
@@ -1243,12 +1249,24 @@ bool Director::setFileList()
asset->add(prefix + "/data/enemies/printer.png", t_bitmap);
asset->add(prefix + "/data/enemies/qvoid.ani", t_data);
asset->add(prefix + "/data/enemies/qvoid.png", t_bitmap);
asset->add(prefix + "/data/enemies/robot.ani", t_data);
asset->add(prefix + "/data/enemies/robot.png", t_bitmap);
asset->add(prefix + "/data/enemies/sam.ani", t_data);
asset->add(prefix + "/data/enemies/sam.png", t_bitmap);
asset->add(prefix + "/data/enemies/shock.ani", t_data);
asset->add(prefix + "/data/enemies/shock.png", t_bitmap);
asset->add(prefix + "/data/enemies/sigmasua.ani", t_data);
asset->add(prefix + "/data/enemies/sigmasua.png", t_bitmap);
asset->add(prefix + "/data/enemies/spark.ani", t_data);
asset->add(prefix + "/data/enemies/spark.png", t_bitmap);
asset->add(prefix + "/data/enemies/special/aerojailer.ani", t_data);
asset->add(prefix + "/data/enemies/special/aerojailer.png", t_bitmap);
asset->add(prefix + "/data/enemies/special/arounder.ani", t_data);
asset->add(prefix + "/data/enemies/special/arounder.png", t_bitmap);
asset->add(prefix + "/data/enemies/special/pepe_rosita_job.ani", t_data);
asset->add(prefix + "/data/enemies/special/pepe_rosita_job.png", t_bitmap);
asset->add(prefix + "/data/enemies/special/shooting_star.ani", t_data);
asset->add(prefix + "/data/enemies/special/shooting_star.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);
@@ -1259,8 +1277,6 @@ bool Director::setFileList()
asset->add(prefix + "/data/enemies/tv_panel.png", t_bitmap);
asset->add(prefix + "/data/enemies/tv.ani", t_data);
asset->add(prefix + "/data/enemies/tv.png", t_bitmap);
asset->add(prefix + "/data/enemies/shock.ani", t_data);
asset->add(prefix + "/data/enemies/shock.png", t_bitmap);
asset->add(prefix + "/data/enemies/upv_student.ani", t_data);
asset->add(prefix + "/data/enemies/upv_student.png", t_bitmap);
asset->add(prefix + "/data/enemies/wave.ani", t_data);

7
source/game.cpp
View File

@@ -21,8 +21,8 @@ Game::Game(SDL_Renderer *renderer, Screen *screen, Resource *resource, Asset *as
this->options = options;
#ifndef RELEASE
currentRoom = "03.room";
const int x1 = 29;
currentRoom = "33.room";
const int x1 = 1;
const int y1 = 13;
spawnPoint = {x1 * 8, y1 * 8, 0, 0, 0, s_standing, SDL_FLIP_HORIZONTAL};
#endif
@@ -418,9 +418,6 @@ void Game::killPlayer()
// Pone los objetos en pausa mientras esta la habitación en negro
room->pause();
this->player->pause();
// Deshabilita las entradas hasta que no haya ninguna activa
// input->disableUntil(d_keyPressed);
}
// Recarga todas las texturas