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

Añadiendo habitaciones

Browse Source
This commit is contained in:
Sergio
2022-11-12 10:00:27 +01:00
parent 763126580f
commit 6b4c089683
21 changed files with 302 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
source/director.cpp
View File

@@ -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<std::string> 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<std::string> 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);

2
source/ending2.cpp
View File

@@ -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");

18
source/player.cpp
View File

@@ -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

6
source/scoreboard.cpp
View File

@@ -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");
}