diff --git a/data/config/param_320x240.txt b/data/config/param_320x240.txt index 59c8d01..1fc4cba 100644 --- a/data/config/param_320x240.txt +++ b/data/config/param_320x240.txt @@ -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 diff --git a/data/config/param_320x256.txt b/data/config/param_320x256.txt index e0d8b12..c39a178 100644 --- a/data/config/param_320x256.txt +++ b/data/config/param_320x256.txt @@ -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 diff --git a/data/gfx/item/item_clock.ani b/data/gfx/item/item_clock.ani index 3922815..9d1ebae 100644 --- a/data/gfx/item/item_clock.ani +++ b/data/gfx/item/item_clock.ani @@ -3,7 +3,7 @@ frame_height=20 [animation] name=default -speed=10 +speed=8 loop=0 -frames=0,1 +frames=0,0,1 [/animation] \ No newline at end of file diff --git a/data/gfx/item/item_clock.png b/data/gfx/item/item_clock.png index ac24a2a..7c87437 100644 Binary files a/data/gfx/item/item_clock.png and b/data/gfx/item/item_clock.png differ diff --git a/data/gfx/item/item_coffee.ani b/data/gfx/item/item_coffee.ani index 3922815..9d1ebae 100644 --- a/data/gfx/item/item_coffee.ani +++ b/data/gfx/item/item_coffee.ani @@ -3,7 +3,7 @@ frame_height=20 [animation] name=default -speed=10 +speed=8 loop=0 -frames=0,1 +frames=0,0,1 [/animation] \ No newline at end of file diff --git a/data/gfx/item/item_coffee.png b/data/gfx/item/item_coffee.png index b849835..e51cdb1 100644 Binary files a/data/gfx/item/item_coffee.png and b/data/gfx/item/item_coffee.png differ diff --git a/data/gfx/item/item_coffee_machine.ani b/data/gfx/item/item_coffee_machine.ani index 6659918..d518dec 100644 --- a/data/gfx/item/item_coffee_machine.ani +++ b/data/gfx/item/item_coffee_machine.ani @@ -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] \ No newline at end of file diff --git a/data/gfx/item/item_coffee_machine.png b/data/gfx/item/item_coffee_machine.png index 5d0196a..ac67691 100644 Binary files a/data/gfx/item/item_coffee_machine.png and b/data/gfx/item/item_coffee_machine.png differ diff --git a/data/gfx/item/item_debian.ani b/data/gfx/item/item_debian.ani index 3922815..9d1ebae 100644 --- a/data/gfx/item/item_debian.ani +++ b/data/gfx/item/item_debian.ani @@ -3,7 +3,7 @@ frame_height=20 [animation] name=default -speed=10 +speed=8 loop=0 -frames=0,1 +frames=0,0,1 [/animation] \ No newline at end of file diff --git a/data/gfx/item/item_debian.png b/data/gfx/item/item_debian.png index 850892a..3e52ae7 100644 Binary files a/data/gfx/item/item_debian.png and b/data/gfx/item/item_debian.png differ diff --git a/data/gfx/item/item_points1_disk.ani b/data/gfx/item/item_points1_disk.ani index 3922815..9d1ebae 100644 --- a/data/gfx/item/item_points1_disk.ani +++ b/data/gfx/item/item_points1_disk.ani @@ -3,7 +3,7 @@ frame_height=20 [animation] name=default -speed=10 +speed=8 loop=0 -frames=0,1 +frames=0,0,1 [/animation] \ No newline at end of file diff --git a/data/gfx/item/item_points1_disk.png b/data/gfx/item/item_points1_disk.png index f82b12e..06fc5e5 100644 Binary files a/data/gfx/item/item_points1_disk.png and b/data/gfx/item/item_points1_disk.png differ diff --git a/data/gfx/item/item_points2_gavina.ani b/data/gfx/item/item_points2_gavina.ani index 3922815..9d1ebae 100644 --- a/data/gfx/item/item_points2_gavina.ani +++ b/data/gfx/item/item_points2_gavina.ani @@ -3,7 +3,7 @@ frame_height=20 [animation] name=default -speed=10 +speed=8 loop=0 -frames=0,1 +frames=0,0,1 [/animation] \ No newline at end of file diff --git a/data/gfx/item/item_points2_gavina.png b/data/gfx/item/item_points2_gavina.png index 7699909..59b382a 100644 Binary files a/data/gfx/item/item_points2_gavina.png and b/data/gfx/item/item_points2_gavina.png differ diff --git a/data/gfx/item/item_points3_pacmar.ani b/data/gfx/item/item_points3_pacmar.ani index 3922815..9d1ebae 100644 --- a/data/gfx/item/item_points3_pacmar.ani +++ b/data/gfx/item/item_points3_pacmar.ani @@ -3,7 +3,7 @@ frame_height=20 [animation] name=default -speed=10 +speed=8 loop=0 -frames=0,1 +frames=0,0,1 [/animation] \ No newline at end of file diff --git a/data/gfx/item/item_points3_pacmar.png b/data/gfx/item/item_points3_pacmar.png index 810c945..19d5466 100644 Binary files a/data/gfx/item/item_points3_pacmar.png and b/data/gfx/item/item_points3_pacmar.png differ diff --git a/data/gfx/player/player.ani b/data/gfx/player/player.ani index 6316805..cea7556 100644 --- a/data/gfx/player/player.ani +++ b/data/gfx/player/player.ani @@ -1,5 +1,5 @@ -frame_width=30 -frame_height=30 +frame_width=32 +frame_height=32 [animation] name=walk diff --git a/data/gfx/player/player1.gif b/data/gfx/player/player1.gif index 2fe3cb1..fe6044b 100644 Binary files a/data/gfx/player/player1.gif and b/data/gfx/player/player1.gif differ diff --git a/data/gfx/player/player1_1_coffee_palette.gif b/data/gfx/player/player1_1_coffee_palette.gif index b403c17..108c27f 100644 Binary files a/data/gfx/player/player1_1_coffee_palette.gif and b/data/gfx/player/player1_1_coffee_palette.gif differ diff --git a/data/gfx/player/player1_2_coffee_palette.gif b/data/gfx/player/player1_2_coffee_palette.gif index 58a13f6..772936e 100644 Binary files a/data/gfx/player/player1_2_coffee_palette.gif and b/data/gfx/player/player1_2_coffee_palette.gif differ diff --git a/data/gfx/player/player1_invencible_palette.gif b/data/gfx/player/player1_invencible_palette.gif index 1c85424..041e846 100644 Binary files a/data/gfx/player/player1_invencible_palette.gif and b/data/gfx/player/player1_invencible_palette.gif differ diff --git a/data/gfx/player/player2.gif b/data/gfx/player/player2.gif index f68dfc5..f89b994 100644 Binary files a/data/gfx/player/player2.gif and b/data/gfx/player/player2.gif differ diff --git a/data/gfx/player/player2_1_coffee_palette.gif b/data/gfx/player/player2_1_coffee_palette.gif index af339df..4368e88 100644 Binary files a/data/gfx/player/player2_1_coffee_palette.gif and b/data/gfx/player/player2_1_coffee_palette.gif differ diff --git a/data/gfx/player/player2_2_coffee_palette.gif b/data/gfx/player/player2_2_coffee_palette.gif index abd3f88..6bab1c1 100644 Binary files a/data/gfx/player/player2_2_coffee_palette.gif and b/data/gfx/player/player2_2_coffee_palette.gif differ diff --git a/data/gfx/player/player2_invencible_palette.gif b/data/gfx/player/player2_invencible_palette.gif index 2c569cb..29a4939 100644 Binary files a/data/gfx/player/player2_invencible_palette.gif and b/data/gfx/player/player2_invencible_palette.gif differ diff --git a/source/sections/game.cpp b/source/sections/game.cpp index 58c857b..2e5d770 100644 --- a/source/sections/game.cpp +++ b/source/sections/game.cpp @@ -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(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(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(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(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()));