From a7600caea1c22decb5024be2dd329c925f7ef627 Mon Sep 17 00:00:00 2001 From: Cubic Love <7754483+cubiclove@users.noreply.github.com> Date: Sat, 6 May 2023 16:31:07 +0100 Subject: [PATCH] Base+Snake: Capitalize snake skin names In Snake, the menu for choosing a skin looked messy due to inconsistent capitalization. Two skins names were entirely lowercase. For the sprite-based skins, the menu takes the name of each skin's directory, so I have capitalized these. Capitalizing the original snake skin required more change than simply renaming a directory. --- .../corner.png | Bin .../head.png | Bin .../horizontal.png | Bin .../tail.png | Bin .../vertical.png | Bin .../corner.png | Bin .../head.png | Bin .../horizontal.png | Bin .../tail.png | Bin .../vertical.png | Bin .../snake/skins/{ladybird => Ladybird}/corner.png | Bin .../snake/skins/{ladybird => Ladybird}/head.png | Bin .../skins/{ladybird => Ladybird}/horizontal.png | Bin .../snake/skins/{ladybird => Ladybird}/tail.png | Bin .../snake/skins/{ladybird => Ladybird}/vertical.png | Bin .../corner.png | Bin .../head.png | Bin .../horizontal.png | Bin .../tail.png | Bin .../vertical.png | Bin .../snake/skins/{snake => Snake}/corner.png | Bin .../graphics/snake/skins/{snake => Snake}/head.png | Bin .../snake/skins/{snake => Snake}/horizontal.png | Bin .../graphics/snake/skins/{snake => Snake}/tail.png | Bin .../snake/skins/{snake => Snake}/vertical.png | Bin .../corner.png | Bin .../head.png | Bin .../horizontal.png | Bin .../tail.png | Bin .../vertical.png | Bin Userland/Games/Snake/Game.cpp | 2 +- Userland/Games/Snake/Skins/SnakeSkin.cpp | 2 +- Userland/Games/Snake/main.cpp | 6 +++--- 33 files changed, 5 insertions(+), 5 deletions(-) rename Base/res/graphics/snake/skins/{Blue Malaysian coral snake (Calliophis bivirgatus) => Blue Malaysian Coral Snake (Calliophis bivirgatus)}/corner.png (100%) rename Base/res/graphics/snake/skins/{Blue Malaysian coral snake (Calliophis bivirgatus) => Blue Malaysian Coral Snake (Calliophis bivirgatus)}/head.png (100%) rename Base/res/graphics/snake/skins/{Blue Malaysian coral snake (Calliophis bivirgatus) => Blue Malaysian Coral Snake (Calliophis bivirgatus)}/horizontal.png (100%) rename Base/res/graphics/snake/skins/{Blue Malaysian coral snake (Calliophis bivirgatus) => Blue Malaysian Coral Snake (Calliophis bivirgatus)}/tail.png (100%) rename Base/res/graphics/snake/skins/{Blue Malaysian coral snake (Calliophis bivirgatus) => Blue Malaysian Coral Snake (Calliophis bivirgatus)}/vertical.png (100%) rename Base/res/graphics/snake/skins/{Eastern coral snake (Micrurus fulvius) => Eastern Coral Snake (Micrurus fulvius)}/corner.png (100%) rename Base/res/graphics/snake/skins/{Eastern coral snake (Micrurus fulvius) => Eastern Coral Snake (Micrurus fulvius)}/head.png (100%) rename Base/res/graphics/snake/skins/{Eastern coral snake (Micrurus fulvius) => Eastern Coral Snake (Micrurus fulvius)}/horizontal.png (100%) rename Base/res/graphics/snake/skins/{Eastern coral snake (Micrurus fulvius) => Eastern Coral Snake (Micrurus fulvius)}/tail.png (100%) rename Base/res/graphics/snake/skins/{Eastern coral snake (Micrurus fulvius) => Eastern Coral Snake (Micrurus fulvius)}/vertical.png (100%) rename Base/res/graphics/snake/skins/{ladybird => Ladybird}/corner.png (100%) rename Base/res/graphics/snake/skins/{ladybird => Ladybird}/head.png (100%) rename Base/res/graphics/snake/skins/{ladybird => Ladybird}/horizontal.png (100%) rename Base/res/graphics/snake/skins/{ladybird => Ladybird}/tail.png (100%) rename Base/res/graphics/snake/skins/{ladybird => Ladybird}/vertical.png (100%) rename Base/res/graphics/snake/skins/{San Francisco garter snake (Thamnophis sirtalis tetrataenia) => San Francisco Garter Snake (Thamnophis sirtalis tetrataenia)}/corner.png (100%) rename Base/res/graphics/snake/skins/{San Francisco garter snake (Thamnophis sirtalis tetrataenia) => San Francisco Garter Snake (Thamnophis sirtalis tetrataenia)}/head.png (100%) rename Base/res/graphics/snake/skins/{San Francisco garter snake (Thamnophis sirtalis tetrataenia) => San Francisco Garter Snake (Thamnophis sirtalis tetrataenia)}/horizontal.png (100%) rename Base/res/graphics/snake/skins/{San Francisco garter snake (Thamnophis sirtalis tetrataenia) => San Francisco Garter Snake (Thamnophis sirtalis tetrataenia)}/tail.png (100%) rename Base/res/graphics/snake/skins/{San Francisco garter snake (Thamnophis sirtalis tetrataenia) => San Francisco Garter Snake (Thamnophis sirtalis tetrataenia)}/vertical.png (100%) rename Base/res/graphics/snake/skins/{snake => Snake}/corner.png (100%) rename Base/res/graphics/snake/skins/{snake => Snake}/head.png (100%) rename Base/res/graphics/snake/skins/{snake => Snake}/horizontal.png (100%) rename Base/res/graphics/snake/skins/{snake => Snake}/tail.png (100%) rename Base/res/graphics/snake/skins/{snake => Snake}/vertical.png (100%) rename Base/res/graphics/snake/skins/{Sri Lankan green vine snake (Ahaetulla nasuta) => Sri Lankan Green Vine Snake (Ahaetulla nasuta)}/corner.png (100%) rename Base/res/graphics/snake/skins/{Sri Lankan green vine snake (Ahaetulla nasuta) => Sri Lankan Green Vine Snake (Ahaetulla nasuta)}/head.png (100%) rename Base/res/graphics/snake/skins/{Sri Lankan green vine snake (Ahaetulla nasuta) => Sri Lankan Green Vine Snake (Ahaetulla nasuta)}/horizontal.png (100%) rename Base/res/graphics/snake/skins/{Sri Lankan green vine snake (Ahaetulla nasuta) => Sri Lankan Green Vine Snake (Ahaetulla nasuta)}/tail.png (100%) rename Base/res/graphics/snake/skins/{Sri Lankan green vine snake (Ahaetulla nasuta) => Sri Lankan Green Vine Snake (Ahaetulla nasuta)}/vertical.png (100%) diff --git a/Base/res/graphics/snake/skins/Blue Malaysian coral snake (Calliophis bivirgatus)/corner.png b/Base/res/graphics/snake/skins/Blue Malaysian Coral Snake (Calliophis bivirgatus)/corner.png similarity index 100% rename from Base/res/graphics/snake/skins/Blue Malaysian coral snake (Calliophis bivirgatus)/corner.png rename to Base/res/graphics/snake/skins/Blue Malaysian Coral Snake (Calliophis bivirgatus)/corner.png diff --git a/Base/res/graphics/snake/skins/Blue Malaysian coral snake (Calliophis bivirgatus)/head.png b/Base/res/graphics/snake/skins/Blue Malaysian Coral Snake (Calliophis bivirgatus)/head.png similarity index 100% rename from Base/res/graphics/snake/skins/Blue Malaysian coral snake (Calliophis bivirgatus)/head.png rename to Base/res/graphics/snake/skins/Blue Malaysian Coral Snake (Calliophis bivirgatus)/head.png diff --git a/Base/res/graphics/snake/skins/Blue Malaysian coral snake (Calliophis bivirgatus)/horizontal.png b/Base/res/graphics/snake/skins/Blue Malaysian Coral Snake (Calliophis bivirgatus)/horizontal.png similarity index 100% rename from Base/res/graphics/snake/skins/Blue Malaysian coral snake (Calliophis bivirgatus)/horizontal.png rename to Base/res/graphics/snake/skins/Blue Malaysian Coral Snake (Calliophis bivirgatus)/horizontal.png diff --git a/Base/res/graphics/snake/skins/Blue Malaysian coral snake (Calliophis bivirgatus)/tail.png b/Base/res/graphics/snake/skins/Blue Malaysian Coral Snake (Calliophis bivirgatus)/tail.png similarity index 100% rename from Base/res/graphics/snake/skins/Blue Malaysian coral snake (Calliophis bivirgatus)/tail.png rename to Base/res/graphics/snake/skins/Blue Malaysian Coral Snake (Calliophis bivirgatus)/tail.png diff --git a/Base/res/graphics/snake/skins/Blue Malaysian coral snake (Calliophis bivirgatus)/vertical.png b/Base/res/graphics/snake/skins/Blue Malaysian Coral Snake (Calliophis bivirgatus)/vertical.png similarity index 100% rename from Base/res/graphics/snake/skins/Blue Malaysian coral snake (Calliophis bivirgatus)/vertical.png rename to Base/res/graphics/snake/skins/Blue Malaysian Coral Snake (Calliophis bivirgatus)/vertical.png diff --git a/Base/res/graphics/snake/skins/Eastern coral snake (Micrurus fulvius)/corner.png b/Base/res/graphics/snake/skins/Eastern Coral Snake (Micrurus fulvius)/corner.png similarity index 100% rename from Base/res/graphics/snake/skins/Eastern coral snake (Micrurus fulvius)/corner.png rename to Base/res/graphics/snake/skins/Eastern Coral Snake (Micrurus fulvius)/corner.png diff --git a/Base/res/graphics/snake/skins/Eastern coral snake (Micrurus fulvius)/head.png b/Base/res/graphics/snake/skins/Eastern Coral Snake (Micrurus fulvius)/head.png similarity index 100% rename from Base/res/graphics/snake/skins/Eastern coral snake (Micrurus fulvius)/head.png rename to Base/res/graphics/snake/skins/Eastern Coral Snake (Micrurus fulvius)/head.png diff --git a/Base/res/graphics/snake/skins/Eastern coral snake (Micrurus fulvius)/horizontal.png b/Base/res/graphics/snake/skins/Eastern Coral Snake (Micrurus fulvius)/horizontal.png similarity index 100% rename from Base/res/graphics/snake/skins/Eastern coral snake (Micrurus fulvius)/horizontal.png rename to Base/res/graphics/snake/skins/Eastern Coral Snake (Micrurus fulvius)/horizontal.png diff --git a/Base/res/graphics/snake/skins/Eastern coral snake (Micrurus fulvius)/tail.png b/Base/res/graphics/snake/skins/Eastern Coral Snake (Micrurus fulvius)/tail.png similarity index 100% rename from Base/res/graphics/snake/skins/Eastern coral snake (Micrurus fulvius)/tail.png rename to Base/res/graphics/snake/skins/Eastern Coral Snake (Micrurus fulvius)/tail.png diff --git a/Base/res/graphics/snake/skins/Eastern coral snake (Micrurus fulvius)/vertical.png b/Base/res/graphics/snake/skins/Eastern Coral Snake (Micrurus fulvius)/vertical.png similarity index 100% rename from Base/res/graphics/snake/skins/Eastern coral snake (Micrurus fulvius)/vertical.png rename to Base/res/graphics/snake/skins/Eastern Coral Snake (Micrurus fulvius)/vertical.png diff --git a/Base/res/graphics/snake/skins/ladybird/corner.png b/Base/res/graphics/snake/skins/Ladybird/corner.png similarity index 100% rename from Base/res/graphics/snake/skins/ladybird/corner.png rename to Base/res/graphics/snake/skins/Ladybird/corner.png diff --git a/Base/res/graphics/snake/skins/ladybird/head.png b/Base/res/graphics/snake/skins/Ladybird/head.png similarity index 100% rename from Base/res/graphics/snake/skins/ladybird/head.png rename to Base/res/graphics/snake/skins/Ladybird/head.png diff --git a/Base/res/graphics/snake/skins/ladybird/horizontal.png b/Base/res/graphics/snake/skins/Ladybird/horizontal.png similarity index 100% rename from Base/res/graphics/snake/skins/ladybird/horizontal.png rename to Base/res/graphics/snake/skins/Ladybird/horizontal.png diff --git a/Base/res/graphics/snake/skins/ladybird/tail.png b/Base/res/graphics/snake/skins/Ladybird/tail.png similarity index 100% rename from Base/res/graphics/snake/skins/ladybird/tail.png rename to Base/res/graphics/snake/skins/Ladybird/tail.png diff --git a/Base/res/graphics/snake/skins/ladybird/vertical.png b/Base/res/graphics/snake/skins/Ladybird/vertical.png similarity index 100% rename from Base/res/graphics/snake/skins/ladybird/vertical.png rename to Base/res/graphics/snake/skins/Ladybird/vertical.png diff --git a/Base/res/graphics/snake/skins/San Francisco garter snake (Thamnophis sirtalis tetrataenia)/corner.png b/Base/res/graphics/snake/skins/San Francisco Garter Snake (Thamnophis sirtalis tetrataenia)/corner.png similarity index 100% rename from Base/res/graphics/snake/skins/San Francisco garter snake (Thamnophis sirtalis tetrataenia)/corner.png rename to Base/res/graphics/snake/skins/San Francisco Garter Snake (Thamnophis sirtalis tetrataenia)/corner.png diff --git a/Base/res/graphics/snake/skins/San Francisco garter snake (Thamnophis sirtalis tetrataenia)/head.png b/Base/res/graphics/snake/skins/San Francisco Garter Snake (Thamnophis sirtalis tetrataenia)/head.png similarity index 100% rename from Base/res/graphics/snake/skins/San Francisco garter snake (Thamnophis sirtalis tetrataenia)/head.png rename to Base/res/graphics/snake/skins/San Francisco Garter Snake (Thamnophis sirtalis tetrataenia)/head.png diff --git a/Base/res/graphics/snake/skins/San Francisco garter snake (Thamnophis sirtalis tetrataenia)/horizontal.png b/Base/res/graphics/snake/skins/San Francisco Garter Snake (Thamnophis sirtalis tetrataenia)/horizontal.png similarity index 100% rename from Base/res/graphics/snake/skins/San Francisco garter snake (Thamnophis sirtalis tetrataenia)/horizontal.png rename to Base/res/graphics/snake/skins/San Francisco Garter Snake (Thamnophis sirtalis tetrataenia)/horizontal.png diff --git a/Base/res/graphics/snake/skins/San Francisco garter snake (Thamnophis sirtalis tetrataenia)/tail.png b/Base/res/graphics/snake/skins/San Francisco Garter Snake (Thamnophis sirtalis tetrataenia)/tail.png similarity index 100% rename from Base/res/graphics/snake/skins/San Francisco garter snake (Thamnophis sirtalis tetrataenia)/tail.png rename to Base/res/graphics/snake/skins/San Francisco Garter Snake (Thamnophis sirtalis tetrataenia)/tail.png diff --git a/Base/res/graphics/snake/skins/San Francisco garter snake (Thamnophis sirtalis tetrataenia)/vertical.png b/Base/res/graphics/snake/skins/San Francisco Garter Snake (Thamnophis sirtalis tetrataenia)/vertical.png similarity index 100% rename from Base/res/graphics/snake/skins/San Francisco garter snake (Thamnophis sirtalis tetrataenia)/vertical.png rename to Base/res/graphics/snake/skins/San Francisco Garter Snake (Thamnophis sirtalis tetrataenia)/vertical.png diff --git a/Base/res/graphics/snake/skins/snake/corner.png b/Base/res/graphics/snake/skins/Snake/corner.png similarity index 100% rename from Base/res/graphics/snake/skins/snake/corner.png rename to Base/res/graphics/snake/skins/Snake/corner.png diff --git a/Base/res/graphics/snake/skins/snake/head.png b/Base/res/graphics/snake/skins/Snake/head.png similarity index 100% rename from Base/res/graphics/snake/skins/snake/head.png rename to Base/res/graphics/snake/skins/Snake/head.png diff --git a/Base/res/graphics/snake/skins/snake/horizontal.png b/Base/res/graphics/snake/skins/Snake/horizontal.png similarity index 100% rename from Base/res/graphics/snake/skins/snake/horizontal.png rename to Base/res/graphics/snake/skins/Snake/horizontal.png diff --git a/Base/res/graphics/snake/skins/snake/tail.png b/Base/res/graphics/snake/skins/Snake/tail.png similarity index 100% rename from Base/res/graphics/snake/skins/snake/tail.png rename to Base/res/graphics/snake/skins/Snake/tail.png diff --git a/Base/res/graphics/snake/skins/snake/vertical.png b/Base/res/graphics/snake/skins/Snake/vertical.png similarity index 100% rename from Base/res/graphics/snake/skins/snake/vertical.png rename to Base/res/graphics/snake/skins/Snake/vertical.png diff --git a/Base/res/graphics/snake/skins/Sri Lankan green vine snake (Ahaetulla nasuta)/corner.png b/Base/res/graphics/snake/skins/Sri Lankan Green Vine Snake (Ahaetulla nasuta)/corner.png similarity index 100% rename from Base/res/graphics/snake/skins/Sri Lankan green vine snake (Ahaetulla nasuta)/corner.png rename to Base/res/graphics/snake/skins/Sri Lankan Green Vine Snake (Ahaetulla nasuta)/corner.png diff --git a/Base/res/graphics/snake/skins/Sri Lankan green vine snake (Ahaetulla nasuta)/head.png b/Base/res/graphics/snake/skins/Sri Lankan Green Vine Snake (Ahaetulla nasuta)/head.png similarity index 100% rename from Base/res/graphics/snake/skins/Sri Lankan green vine snake (Ahaetulla nasuta)/head.png rename to Base/res/graphics/snake/skins/Sri Lankan Green Vine Snake (Ahaetulla nasuta)/head.png diff --git a/Base/res/graphics/snake/skins/Sri Lankan green vine snake (Ahaetulla nasuta)/horizontal.png b/Base/res/graphics/snake/skins/Sri Lankan Green Vine Snake (Ahaetulla nasuta)/horizontal.png similarity index 100% rename from Base/res/graphics/snake/skins/Sri Lankan green vine snake (Ahaetulla nasuta)/horizontal.png rename to Base/res/graphics/snake/skins/Sri Lankan Green Vine Snake (Ahaetulla nasuta)/horizontal.png diff --git a/Base/res/graphics/snake/skins/Sri Lankan green vine snake (Ahaetulla nasuta)/tail.png b/Base/res/graphics/snake/skins/Sri Lankan Green Vine Snake (Ahaetulla nasuta)/tail.png similarity index 100% rename from Base/res/graphics/snake/skins/Sri Lankan green vine snake (Ahaetulla nasuta)/tail.png rename to Base/res/graphics/snake/skins/Sri Lankan Green Vine Snake (Ahaetulla nasuta)/tail.png diff --git a/Base/res/graphics/snake/skins/Sri Lankan green vine snake (Ahaetulla nasuta)/vertical.png b/Base/res/graphics/snake/skins/Sri Lankan Green Vine Snake (Ahaetulla nasuta)/vertical.png similarity index 100% rename from Base/res/graphics/snake/skins/Sri Lankan green vine snake (Ahaetulla nasuta)/vertical.png rename to Base/res/graphics/snake/skins/Sri Lankan Green Vine Snake (Ahaetulla nasuta)/vertical.png diff --git a/Userland/Games/Snake/Game.cpp b/Userland/Games/Snake/Game.cpp index e440037721..3645e59ca0 100644 --- a/Userland/Games/Snake/Game.cpp +++ b/Userland/Games/Snake/Game.cpp @@ -68,7 +68,7 @@ ErrorOr> Game::try_create() } auto color = Color::from_argb(Config::read_u32("Snake"sv, "Snake"sv, "BaseColor"sv, Color(Color::Green).value())); - auto skin_name = Config::read_string("Snake"sv, "Snake"sv, "SnakeSkin"sv, "classic"sv); + auto skin_name = Config::read_string("Snake"sv, "Snake"sv, "SnakeSkin"sv, "Classic"sv); auto skin = TRY(SnakeSkin::create(skin_name, color)); return adopt_nonnull_ref_or_enomem(new (nothrow) Game(move(food_bitmaps), color, skin_name, move(skin))); diff --git a/Userland/Games/Snake/Skins/SnakeSkin.cpp b/Userland/Games/Snake/Skins/SnakeSkin.cpp index e797725b85..cdb213a8cf 100644 --- a/Userland/Games/Snake/Skins/SnakeSkin.cpp +++ b/Userland/Games/Snake/Skins/SnakeSkin.cpp @@ -14,7 +14,7 @@ namespace Snake { ErrorOr> SnakeSkin::create(StringView skin_name, Color color) { - if (skin_name == "classic"sv) + if (skin_name == "Classic"sv) return try_make(color); // Try to find an image-based skin matching the name. diff --git a/Userland/Games/Snake/main.cpp b/Userland/Games/Snake/main.cpp index 25ba16d838..b0e7fe4e29 100644 --- a/Userland/Games/Snake/main.cpp +++ b/Userland/Games/Snake/main.cpp @@ -59,7 +59,7 @@ ErrorOr serenity_main(Main::Arguments arguments) game.set_focus(true); auto high_score = Config::read_u32("Snake"sv, "Snake"sv, "HighScore"sv, 0); - auto snake_skin_name = Config::read_string("Snake"sv, "Snake"sv, "SnakeSkin"sv, "classic"sv); + auto snake_skin_name = Config::read_string("Snake"sv, "Snake"sv, "SnakeSkin"sv, "Classic"sv); auto& statusbar = *widget->find_descendant_of_type_named("statusbar"sv); statusbar.set_text(0, "Score: 0"sv); @@ -110,7 +110,7 @@ ErrorOr serenity_main(Main::Arguments arguments) if (!was_paused) game.start(); }); - change_snake_color->set_enabled(snake_skin_name == "classic"sv); + change_snake_color->set_enabled(snake_skin_name == "Classic"sv); TRY(game_menu->try_add_action(change_snake_color)); GUI::ActionGroup skin_action_group; @@ -137,7 +137,7 @@ ErrorOr serenity_main(Main::Arguments arguments) TRY(add_skin_action(entry.name, false)); return IterationDecision::Continue; })); - TRY(add_skin_action("classic"sv, true)); + TRY(add_skin_action("Classic"sv, true)); TRY(game_menu->try_add_separator()); TRY(game_menu->try_add_action(GUI::CommonActions::make_quit_action([](auto&) {