jaildesigner-jailgames/coffee_crisis_arcade_edition
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 13 Wiki Activity

fix: els globos fills estaven alineats cap a dalt en lloc de al centre

Browse Source 
fix: les explosions eren de un tamany inferior (i per tant desalineades ademes)
This commit is contained in:
Sergio
2025-07-15 09:26:31 +02:00
parent 6329283124
commit 04a80392d8
4 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/gfx/balloon/explosion4.ani
View File

@@ -1,5 +1,5 @@
frame_width=46 frame_width=48
frame_height=46 frame_height=48
[animation] [animation]
name=default name=default

BIN
data/gfx/balloon/explosion4.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

36
source/balloon_manager.cpp
View File

@@ -46,10 +46,10 @@ void BalloonManager::init()
explosions_animations_.emplace_back(Resource::get()->getAnimation("explosion4.ani")); explosions_animations_.emplace_back(Resource::get()->getAnimation("explosion4.ani"));
// Añade texturas // Añade texturas
explosions_->addTexture(1, explosions_textures_[0], explosions_animations_[0]); explosions_->addTexture(0, explosions_textures_[0], explosions_animations_[0]);
explosions_->addTexture(2, explosions_textures_[1], explosions_animations_[1]); explosions_->addTexture(1, explosions_textures_[1], explosions_animations_[1]);
explosions_->addTexture(3, explosions_textures_[2], explosions_animations_[2]); explosions_->addTexture(2, explosions_textures_[2], explosions_animations_[2]);
explosions_->addTexture(4, explosions_textures_[3], explosions_animations_[3]); explosions_->addTexture(3, explosions_textures_[3], explosions_animations_[3]);
} }
// Actualiza // Actualiza
@@ -196,12 +196,22 @@ void BalloonManager::createChildBalloon(const std::shared_ptr<Balloon> &balloon,
{ {
if (can_deploy_balloons_) if (can_deploy_balloons_)
{ {
const float vx = direction == "LEFT" ? BALLOON_VELX_NEGATIVE : BALLOON_VELX_POSITIVE; // Calcula parametros
const auto lower_size = static_cast<BalloonSize>(static_cast<int>(balloon->getSize()) - 1); const float VX = direction == "LEFT" ? BALLOON_VELX_NEGATIVE : BALLOON_VELX_POSITIVE;
auto b = createBalloon(0, balloon->getPosY(), balloon->getType(), lower_size, vx, balloon_speed_, 0); const auto SIZE = static_cast<BalloonSize>(static_cast<int>(balloon->getSize()) - 1);
const int x = direction == "LEFT" ? balloon->getPosX() + (balloon->getWidth() / 3) : balloon->getPosX() + 2 * (balloon->getWidth() / 3); const int PARENT_HEIGHT = balloon->getHeight();
b->alignTo(x); const int CHILD_HEIGHT = BALLOON_SIZE[static_cast<int>(balloon->getSize()) - 1];
const int Y = balloon->getPosY() + (PARENT_HEIGHT - CHILD_HEIGHT) / 2;
const int X = direction == "LEFT" ? balloon->getPosX() + (balloon->getWidth() / 3) : balloon->getPosX() + 2 * (balloon->getWidth() / 3);
// Crea el globo
auto b = createBalloon(0, Y, balloon->getType(), SIZE, VX, balloon_speed_, 0);
// Establece parametros
b->alignTo(X);
b->setVelY(b->getType() == BalloonType::BALLOON ? -2.50f : BALLOON_VELX_NEGATIVE * 2.0f); b->setVelY(b->getType() == BalloonType::BALLOON ? -2.50f : BALLOON_VELX_NEGATIVE * 2.0f);
// Herencia de estados
if (balloon->isStopped()) if (balloon->isStopped())
{ {
b->stop(); b->stop();
@@ -409,7 +419,7 @@ void BalloonManager::setSounds(bool value)
} }
} }
// Activa o desactiva los sonidos de rebote los globos // Activa o desactiva los sonidos de rebote los globos
void BalloonManager::setBouncingSounds(bool value) void BalloonManager::setBouncingSounds(bool value)
{ {
bouncing_sound_enabled_ = value; bouncing_sound_enabled_ = value;
@@ -418,12 +428,12 @@ void BalloonManager::setBouncingSounds(bool value)
balloon->setBouncingSound(value); balloon->setBouncingSound(value);
} }
} }
// Activa o desactiva los sonidos de los globos al explotar // Activa o desactiva los sonidos de los globos al explotar
void BalloonManager::setPoppingSounds(bool value) void BalloonManager::setPoppingSounds(bool value)
{ {
poping_sound_enabled_ = value; poping_sound_enabled_ = value;
for (auto &balloon : balloons_) for (auto &balloon : balloons_)
{ {
balloon->setPoppingSound(value); balloon->setPoppingSound(value);
} }
} }

4
source/explosions.cpp
View File

@@ -32,8 +32,8 @@ void Explosions::addTexture(int size, std::shared_ptr<Texture> texture, const st
// Añade una explosión // Añade una explosión
void Explosions::add(int x, int y, int size) void Explosions::add(int x, int y, int size)
{ {
const auto index = getIndexBySize(size); const auto INDEX = getIndexBySize(size);
explosions_.emplace_back(std::make_unique<AnimatedSprite>(textures_[index].texture, textures_[index].animation)); explosions_.emplace_back(std::make_unique<AnimatedSprite>(textures_[INDEX].texture, textures_[INDEX].animation));
explosions_.back()->setPos(x, y); explosions_.back()->setPos(x, y);
} }