From eaab646cd3fc9a617d05b2804e3ea298b9c22099 Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Sat, 4 Jan 2025 09:21:58 +0100 Subject: [PATCH] Modificades les paletes de invulnerabilitat --- ...e_palette.pal => player1_1_coffee_palette.gif} | Bin ...e_palette.pal => player1_2_coffee_palette.gif} | Bin data/gfx/player/player1_all_white_palette.pal | Bin 173 -> 0 bytes data/gfx/player/player1_invencible_palette.gif | Bin 0 -> 174 bytes ...e_palette.pal => player2_1_coffee_palette.gif} | Bin ...e_palette.pal => player2_2_coffee_palette.gif} | Bin data/gfx/player/player2_all_white_palette.pal | Bin 172 -> 0 bytes data/gfx/player/player2_invencible_palette.gif | Bin 0 -> 174 bytes source/credits.cpp | 2 -- source/director.cpp | 12 ++++++------ source/resource.cpp | 12 ++++++------ 11 files changed, 12 insertions(+), 14 deletions(-) rename data/gfx/player/{player1_one_coffee_palette.pal => player1_1_coffee_palette.gif} (100%) rename data/gfx/player/{player1_two_coffee_palette.pal => player1_2_coffee_palette.gif} (100%) delete mode 100644 data/gfx/player/player1_all_white_palette.pal create mode 100644 data/gfx/player/player1_invencible_palette.gif rename data/gfx/player/{player2_one_coffee_palette.pal => player2_1_coffee_palette.gif} (100%) rename data/gfx/player/{player2_two_coffee_palette.pal => player2_2_coffee_palette.gif} (100%) delete mode 100644 data/gfx/player/player2_all_white_palette.pal create mode 100644 data/gfx/player/player2_invencible_palette.gif diff --git a/data/gfx/player/player1_one_coffee_palette.pal b/data/gfx/player/player1_1_coffee_palette.gif similarity index 100% rename from data/gfx/player/player1_one_coffee_palette.pal rename to data/gfx/player/player1_1_coffee_palette.gif diff --git a/data/gfx/player/player1_two_coffee_palette.pal b/data/gfx/player/player1_2_coffee_palette.gif similarity index 100% rename from data/gfx/player/player1_two_coffee_palette.pal rename to data/gfx/player/player1_2_coffee_palette.gif diff --git a/data/gfx/player/player1_all_white_palette.pal b/data/gfx/player/player1_all_white_palette.pal deleted file mode 100644 index 8adecb701cd5c74d16dd8d4edf3d49ba7b0275b9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 173 zcmZ?wbh9u|6kuRtIKlt|52yjaCSf5I|8x7fh6Fo12DlpO889;fl_>sX;p76+Iw0jB iXE3meD+q8f2THI{(%`;q!7t(|92zOU;C&SbgEasZzeP*U+H3nv$l)&VI5IfH>!LP3CoIZ%Rqk_Pu>3w{w#;m}C& LX^b`UObpflZSPN* literal 0 HcmV?d00001 diff --git a/data/gfx/player/player2_one_coffee_palette.pal b/data/gfx/player/player2_1_coffee_palette.gif similarity index 100% rename from data/gfx/player/player2_one_coffee_palette.pal rename to data/gfx/player/player2_1_coffee_palette.gif diff --git a/data/gfx/player/player2_two_coffee_palette.pal b/data/gfx/player/player2_2_coffee_palette.gif similarity index 100% rename from data/gfx/player/player2_two_coffee_palette.pal rename to data/gfx/player/player2_2_coffee_palette.gif diff --git a/data/gfx/player/player2_all_white_palette.pal b/data/gfx/player/player2_all_white_palette.pal deleted file mode 100644 index 2b45990a0d51a5529625649c489f8b9aaae3d755..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 172 zcmZ?wbh9u|6kuRtIKlt|uP6p!W3Us7|GE8KLxPeb*;1}@}4vlnJ_gay`8UP?ON=g6# diff --git a/data/gfx/player/player2_invencible_palette.gif b/data/gfx/player/player2_invencible_palette.gif new file mode 100644 index 0000000000000000000000000000000000000000..2c569cb2062270a4ba5aeeb34e0f36fc62c32532 GIT binary patch literal 174 zcmZ?wbh9u|6kuRtIKlt|XTae9|Nqax0K&y&14STGKoY`+r~#6{IBx$6dkQuTolyMG z?dKX2?CcoeYNTht%m|cM{K>+}1*COAYC+CmV3kl1;9w4vV4tMHec6Iv#8WslQk?CL JjQ|saH2^)setPlayArea(play_area_); fade_in_->setColor(fade_color.r, fade_color.g, fade_color.b); diff --git a/source/director.cpp b/source/director.cpp index dbb2fb0..1979cc0 100644 --- a/source/director.cpp +++ b/source/director.cpp @@ -505,17 +505,17 @@ void Director::setFileList() { // Jugador 1 Asset::get()->add(prefix + "/data/gfx/player/player1.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/gfx/player/player1_one_coffee_palette.pal", AssetType::PALETTE); - Asset::get()->add(prefix + "/data/gfx/player/player1_two_coffee_palette.pal", AssetType::PALETTE); - Asset::get()->add(prefix + "/data/gfx/player/player1_all_white_palette.pal", AssetType::PALETTE); + Asset::get()->add(prefix + "/data/gfx/player/player1_1_coffee_palette.gif", AssetType::PALETTE); + Asset::get()->add(prefix + "/data/gfx/player/player1_2_coffee_palette.gif", AssetType::PALETTE); + Asset::get()->add(prefix + "/data/gfx/player/player1_invencible_palette.gif", AssetType::PALETTE); Asset::get()->add(prefix + "/data/gfx/player/player1_power.png", AssetType::BITMAP); } { // Jugador 2 Asset::get()->add(prefix + "/data/gfx/player/player2.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/gfx/player/player2_one_coffee_palette.pal", AssetType::PALETTE); - Asset::get()->add(prefix + "/data/gfx/player/player2_two_coffee_palette.pal", AssetType::PALETTE); - Asset::get()->add(prefix + "/data/gfx/player/player2_all_white_palette.pal", AssetType::PALETTE); + Asset::get()->add(prefix + "/data/gfx/player/player2_1_coffee_palette.gif", AssetType::PALETTE); + Asset::get()->add(prefix + "/data/gfx/player/player2_2_coffee_palette.gif", AssetType::PALETTE); + Asset::get()->add(prefix + "/data/gfx/player/player2_invencible_palette.gif", AssetType::PALETTE); Asset::get()->add(prefix + "/data/gfx/player/player2_power.png", AssetType::BITMAP); } diff --git a/source/resource.cpp b/source/resource.cpp index f63aa61..73e6a36 100644 --- a/source/resource.cpp +++ b/source/resource.cpp @@ -254,14 +254,14 @@ void Resource::addPalettes() { // Jugador 1 std::cout << "\n>> PALETTES" << std::endl; - getTexture("player1.gif")->addPaletteFromFile(Asset::get()->get("player1_one_coffee_palette.pal")); - getTexture("player1.gif")->addPaletteFromFile(Asset::get()->get("player1_two_coffee_palette.pal")); - getTexture("player1.gif")->addPaletteFromFile(Asset::get()->get("player1_all_white_palette.pal")); + getTexture("player1.gif")->addPaletteFromFile(Asset::get()->get("player1_1_coffee_palette.gif")); + getTexture("player1.gif")->addPaletteFromFile(Asset::get()->get("player1_2_coffee_palette.gif")); + getTexture("player1.gif")->addPaletteFromFile(Asset::get()->get("player1_invencible_palette.gif")); // Jugador 2 - getTexture("player2.gif")->addPaletteFromFile(Asset::get()->get("player2_one_coffee_palette.pal")); - getTexture("player2.gif")->addPaletteFromFile(Asset::get()->get("player2_two_coffee_palette.pal")); - getTexture("player2.gif")->addPaletteFromFile(Asset::get()->get("player2_all_white_palette.pal")); + getTexture("player2.gif")->addPaletteFromFile(Asset::get()->get("player2_1_coffee_palette.gif")); + getTexture("player2.gif")->addPaletteFromFile(Asset::get()->get("player2_2_coffee_palette.gif")); + getTexture("player2.gif")->addPaletteFromFile(Asset::get()->get("player2_invencible_palette.gif")); // Fuentes getTexture("smb2.gif")->addPaletteFromFile(Asset::get()->get("smb2_palette1.pal"));