new: outline per als jugadors

changed: nou color per al outline dels items i canvi en el timing del outline
new: nova animació per a la maquina de cafe
This commit is contained in:
2025-06-29 17:44:22 +02:00
parent 3a401b492f
commit e058b12f07
26 changed files with 27 additions and 25 deletions

View File

@@ -1,7 +1,7 @@
## --- GAME ---
game.item_size 20 # Tamaño de los items del juego (en píxeles)
game.coffee_machine_w 28 # Ancho de la máquina de café (en píxeles)
game.coffee_machine_h 37 # Alto de la máquina de café (en píxeles)
game.coffee_machine_w 32 # Ancho de la máquina de café (en píxeles)
game.coffee_machine_h 39 # Alto de la máquina de café (en píxeles)
game.width 320 # Ancho de la resolución nativa del juego (en píxeles)
game.height 240 # Alto de la resolución nativa del juego (en píxeles)
game.play_area.rect.x 0 # Posición X de la zona jugable

View File

@@ -1,7 +1,7 @@
## --- GAME ---
game.item_size 20 # Tamaño de los items del juego (en píxeles)
game.coffee_machine_w 28 # Ancho de la máquina de café (en píxeles)
game.coffee_machine_h 37 # Alto de la máquina de café (en píxeles)
game.coffee_machine_w 32 # Ancho de la máquina de café (en píxeles)
game.coffee_machine_h 39 # Alto de la máquina de café (en píxeles)
game.width 320 # Ancho de la resolución nativa del juego (en píxeles)
game.height 256 # Alto de la resolución nativa del juego (en píxeles)
game.play_area.rect.x 0 # Posición X de la zona jugable

View File

@@ -3,7 +3,7 @@ frame_height=20
[animation]
name=default
speed=10
speed=8
loop=0
frames=0,1
frames=0,0,1
[/animation]

Binary file not shown.

Before

Width:  |  Height:  |  Size: 400 B

After

Width:  |  Height:  |  Size: 363 B

View File

@@ -3,7 +3,7 @@ frame_height=20
[animation]
name=default
speed=10
speed=8
loop=0
frames=0,1
frames=0,0,1
[/animation]

Binary file not shown.

Before

Width:  |  Height:  |  Size: 623 B

After

Width:  |  Height:  |  Size: 606 B

View File

@@ -1,9 +1,9 @@
frame_width=28
frame_height=37
frame_width=32
frame_height=39
[animation]
name=default
speed=10
speed=6
loop=0
frames=0,1,2,3
frames=0,1,2,3,4,5,6,7,8
[/animation]

Binary file not shown.

Before

Width:  |  Height:  |  Size: 835 B

After

Width:  |  Height:  |  Size: 1.9 KiB

View File

@@ -3,7 +3,7 @@ frame_height=20
[animation]
name=default
speed=10
speed=8
loop=0
frames=0,1
frames=0,0,1
[/animation]

Binary file not shown.

Before

Width:  |  Height:  |  Size: 565 B

After

Width:  |  Height:  |  Size: 537 B

View File

@@ -3,7 +3,7 @@ frame_height=20
[animation]
name=default
speed=10
speed=8
loop=0
frames=0,1
frames=0,0,1
[/animation]

Binary file not shown.

Before

Width:  |  Height:  |  Size: 336 B

After

Width:  |  Height:  |  Size: 352 B

View File

@@ -3,7 +3,7 @@ frame_height=20
[animation]
name=default
speed=10
speed=8
loop=0
frames=0,1
frames=0,0,1
[/animation]

Binary file not shown.

Before

Width:  |  Height:  |  Size: 506 B

After

Width:  |  Height:  |  Size: 498 B

View File

@@ -3,7 +3,7 @@ frame_height=20
[animation]
name=default
speed=10
speed=8
loop=0
frames=0,1
frames=0,0,1
[/animation]

Binary file not shown.

Before

Width:  |  Height:  |  Size: 492 B

After

Width:  |  Height:  |  Size: 478 B

View File

@@ -1,5 +1,5 @@
frame_width=30
frame_height=30
frame_width=32
frame_height=32
[animation]
name=walk

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.3 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 173 B

After

Width:  |  Height:  |  Size: 173 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 173 B

After

Width:  |  Height:  |  Size: 173 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 174 B

After

Width:  |  Height:  |  Size: 174 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.2 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 172 B

After

Width:  |  Height:  |  Size: 172 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 172 B

After

Width:  |  Height:  |  Size: 172 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 174 B

After

Width:  |  Height:  |  Size: 174 B

View File

@@ -1733,13 +1733,15 @@ void Game::initDifficultyVars()
void Game::initPlayers(int player_id)
{
// Crea los dos jugadores
const int Y = param.game.play_area.rect.h - 30;
players_.emplace_back(std::make_unique<Player>(1, param.game.play_area.first_quarter_x - 15, Y, demo_.enabled, param.game.play_area.rect, player_textures_[0], player_animations_));
constexpr int PLAYER_HEIGHT = 32;
constexpr int PLAYER_WIDTH = 32;
const int Y = param.game.play_area.rect.h - PLAYER_HEIGHT + 1;
players_.emplace_back(std::make_unique<Player>(1, param.game.play_area.first_quarter_x - (PLAYER_WIDTH / 2), Y, demo_.enabled, param.game.play_area.rect, player_textures_[0], player_animations_));
players_.back()->setScoreBoardPanel(SCOREBOARD_LEFT_PANEL);
players_.back()->setName(Lang::getText("[SCOREBOARD] 1"));
players_.back()->setController(getController(players_.back()->getId()));
players_.emplace_back(std::make_unique<Player>(2, param.game.play_area.third_quarter_x - 15, Y, demo_.enabled, param.game.play_area.rect, player_textures_[1], player_animations_));
players_.emplace_back(std::make_unique<Player>(2, param.game.play_area.third_quarter_x - (PLAYER_WIDTH / 2), Y, demo_.enabled, param.game.play_area.rect, player_textures_[1], player_animations_));
players_.back()->setScoreBoardPanel(SCOREBOARD_RIGHT_PANEL);
players_.back()->setName(Lang::getText("[SCOREBOARD] 2"));
players_.back()->setController(getController(players_.back()->getId()));