From 5da55f37181f8e705d2682fa03fcbc4abe95e518 Mon Sep 17 00:00:00 2001 From: Gabriel Kaszewski Date: Sun, 25 May 2025 15:16:55 +0200 Subject: [PATCH] Refactor HUD and level names for internationalization; update tooltip texts and descriptions --- objects/ui/hud.tscn | 6 +++--- objects/ui/marketplace.tscn | 1 - objects/ui/marketplace_button.tscn | 3 +++ resources/levels/village/village_1.tres | 2 +- resources/levels/village/village_2.tres | 2 +- resources/levels/village/village_3.tres | 3 ++- resources/levels/village/village_4.tres | 2 +- resources/levels/village/village_5.tres | 3 ++- resources/skills/brick_throw.tres | 4 ++-- resources/skills/explosive_brick.tres | 4 ++-- resources/skills/fire_brick.tres | 4 ++-- resources/skills/ice_brick.tres | 4 ++-- resources/skills/magnetic.tres | 4 ++-- scenes/level_village_1.tscn | 6 +++--- scripts/ui/hud.gd | 4 ++-- scripts/ui/marketplace.gd | 2 +- translations.csv | 12 ++++++++++-- translations.en.translation | Bin 1950 -> 2562 bytes translations.pl.translation | Bin 2201 -> 2997 bytes 19 files changed, 39 insertions(+), 27 deletions(-) diff --git a/objects/ui/hud.tscn b/objects/ui/hud.tscn index fbd7688..3cecb84 100644 --- a/objects/ui/hud.tscn +++ b/objects/ui/hud.tscn @@ -51,7 +51,7 @@ theme_override_constants/separation = 8 [node name="Health Label" type="Label" parent="PanelContainer/MarginContainer/HBoxContainer"] layout_mode = 2 -text = "HEALTH" +text = "HEALTH_LABEL" label_settings = ExtResource("1_4dsh5") uppercase = true @@ -68,12 +68,12 @@ show_percentage = false [node name="Lives" type="Label" parent="PanelContainer/MarginContainer/HBoxContainer"] layout_mode = 2 -text = "LIVES" +text = "LIVES_LABEL" label_settings = ExtResource("1_4dsh5") uppercase = true [node name="Coins label" type="Label" parent="PanelContainer/MarginContainer/HBoxContainer"] layout_mode = 2 -text = "COINS" +text = "COINS_LABEL" label_settings = ExtResource("1_4dsh5") uppercase = true diff --git a/objects/ui/marketplace.tscn b/objects/ui/marketplace.tscn index bc418a6..95e12e2 100644 --- a/objects/ui/marketplace.tscn +++ b/objects/ui/marketplace.tscn @@ -57,7 +57,6 @@ uppercase = true [node name="GridContainer" type="GridContainer" parent="PanelContainer/MarginContainer/VBoxContainer"] layout_mode = 2 -size_flags_horizontal = 4 size_flags_vertical = 2 theme_override_constants/h_separation = 4 theme_override_constants/v_separation = 16 diff --git a/objects/ui/marketplace_button.tscn b/objects/ui/marketplace_button.tscn index a08b6af..70a6d66 100644 --- a/objects/ui/marketplace_button.tscn +++ b/objects/ui/marketplace_button.tscn @@ -5,7 +5,10 @@ [node name="MarketplaceButton" type="Button"] offset_right = 8.0 offset_bottom = 8.0 +size_flags_horizontal = 3 +size_flags_vertical = 3 theme_override_font_sizes/font_size = 8 text = "Fire brick 100" icon = ExtResource("1_5kqfg") flat = true +autowrap_mode = 2 diff --git a/resources/levels/village/village_1.tres b/resources/levels/village/village_1.tres index 966dd13..19a5180 100644 --- a/resources/levels/village/village_1.tres +++ b/resources/levels/village/village_1.tres @@ -5,6 +5,6 @@ [resource] resource_local_to_scene = true script = ExtResource("2_a2hpx") -level_name = "Village - 1" +level_name = "LEVEL_1_NAME" scene_path = "res://scenes/level_village_1.tscn" metadata/_custom_type_script = "uid://cp68km8bykymb" diff --git a/resources/levels/village/village_2.tres b/resources/levels/village/village_2.tres index d594d75..4f20274 100644 --- a/resources/levels/village/village_2.tres +++ b/resources/levels/village/village_2.tres @@ -4,6 +4,6 @@ [resource] script = ExtResource("1_1tjmh") -level_name = "Village - 2" +level_name = "LEVEL_2_NAME" scene_path = "res://scenes/level_village_2.tscn" metadata/_custom_type_script = "uid://cp68km8bykymb" diff --git a/resources/levels/village/village_3.tres b/resources/levels/village/village_3.tres index 1543e21..5e3b078 100644 --- a/resources/levels/village/village_3.tres +++ b/resources/levels/village/village_3.tres @@ -4,5 +4,6 @@ [resource] script = ExtResource("1_3v5yj") -level_name = "Village - 3" +level_name = "LEVEL_3_NAME" +scene_path = "" metadata/_custom_type_script = "uid://cp68km8bykymb" diff --git a/resources/levels/village/village_4.tres b/resources/levels/village/village_4.tres index 3f938ce..0237690 100644 --- a/resources/levels/village/village_4.tres +++ b/resources/levels/village/village_4.tres @@ -4,6 +4,6 @@ [resource] script = ExtResource("1_upuk8") -level_name = "Village - 4" +level_name = "LEVEL_4_NAME" scene_path = "res://scenes/level_village_4.tscn" metadata/_custom_type_script = "uid://cp68km8bykymb" diff --git a/resources/levels/village/village_5.tres b/resources/levels/village/village_5.tres index bc4a9cb..c0d2df3 100644 --- a/resources/levels/village/village_5.tres +++ b/resources/levels/village/village_5.tres @@ -4,5 +4,6 @@ [resource] script = ExtResource("1_owe0p") -level_name = "Village - 5" +level_name = "LEVEL_5_NAME" +scene_path = "" metadata/_custom_type_script = "uid://cp68km8bykymb" diff --git a/resources/skills/brick_throw.tres b/resources/skills/brick_throw.tres index 27c66c8..a3f7f2f 100644 --- a/resources/skills/brick_throw.tres +++ b/resources/skills/brick_throw.tres @@ -7,8 +7,8 @@ [resource] script = ExtResource("1_etxe2") -name = "Brick power" -description = "Allows you to throw bricks at enemies" +name = "BRICK_POWER" +description = "BRICK_POWER_DESCRIPTION" node = ExtResource("1_5gnea") config = { "player_controller": NodePath("."), diff --git a/resources/skills/explosive_brick.tres b/resources/skills/explosive_brick.tres index e207aa7..703d088 100644 --- a/resources/skills/explosive_brick.tres +++ b/resources/skills/explosive_brick.tres @@ -8,8 +8,8 @@ [resource] script = ExtResource("3_cgsq1") -name = "Explosive brick" -description = "Allows you to throw explosive bricks at enemies" +name = "EXPLOSIVE_BRICK" +description = "EXPLOSIVE_BRICK_DESCRIPTION" node = ExtResource("2_e0o8w") config = { "brick_scene": ExtResource("1_6pfoa"), diff --git a/resources/skills/fire_brick.tres b/resources/skills/fire_brick.tres index 496718d..500893f 100644 --- a/resources/skills/fire_brick.tres +++ b/resources/skills/fire_brick.tres @@ -8,8 +8,8 @@ [resource] script = ExtResource("1_2j5ko") -name = "Fire brick" -description = "Allows you to throw fire bricks at enemies" +name = "FIRE_BRICK" +description = "FIRE_BIRCK_DESCRIPTION" node = ExtResource("1_g53fp") config = { "brick_scene": ExtResource("1_2g43l"), diff --git a/resources/skills/ice_brick.tres b/resources/skills/ice_brick.tres index 24419cf..1b4701e 100644 --- a/resources/skills/ice_brick.tres +++ b/resources/skills/ice_brick.tres @@ -8,8 +8,8 @@ [resource] script = ExtResource("2_pspkt") -name = "Ice brick" -description = "Allows you to throw ice bricks at enemies" +name = "ICE_BRICK" +description = "ICE_BRICK_DESCRIPTION" node = ExtResource("1_rflri") config = { "brick_scene": ExtResource("1_ci3d1"), diff --git a/resources/skills/magnetic.tres b/resources/skills/magnetic.tres index 2d47bf0..031faf9 100644 --- a/resources/skills/magnetic.tres +++ b/resources/skills/magnetic.tres @@ -6,8 +6,8 @@ [resource] script = ExtResource("1_r01oq") -name = "Magnetic" -description = "Attract coins" +name = "MAGNETIC" +description = "MAGNETIC_DESCRIPTION" node = ExtResource("1_er41s") config = { "magnetic_area": NodePath("MagneticArea"), diff --git a/scenes/level_village_1.tscn b/scenes/level_village_1.tscn index 5fed040..3b0eb88 100644 --- a/scenes/level_village_1.tscn +++ b/scenes/level_village_1.tscn @@ -129,15 +129,15 @@ position = Vector2(1485, 25) [node name="Tooltip" parent="." instance=ExtResource("18_4bhfj")] position = Vector2(712, -343) -text = "Some blocks might collapse" +text = "LEVEL_1_TOOLTIP_1" [node name="Tooltip2" parent="." instance=ExtResource("18_4bhfj")] position = Vector2(552, 25) -text = "Jump to the other side!" +text = "LEVEL_1_TOOLTIP_2" [node name="Tooltip3" parent="." instance=ExtResource("18_4bhfj")] position = Vector2(-59, -247) -text = "To rescue your child, you need to find the lever." +text = "LEVEL_1_TOOLTIP_3" [connection signal="on_death" from="Brick Player/HealthComponent" to="UI Layer/DeathScreen" method="on_player_death"] [connection signal="on_death" from="Brick Player/HealthComponent" to="UI Layer/GameOverScreen" method="on_player_death"] diff --git a/scripts/ui/hud.gd b/scripts/ui/hud.gd index 61232f0..77cd50a 100644 --- a/scripts/ui/hud.gd +++ b/scripts/ui/hud.gd @@ -33,14 +33,14 @@ func set_coins_label() -> void: return #todo: set internationalized text - coins_label.text = tr("COINS") + ": " + str(game_manager.get_coins()) + coins_label.text = tr("COINS_LABEL") + ":" + str(game_manager.get_coins()) func set_lives_label() -> void: if not game_manager: return - lives_label.text = tr("LIVES") + ": " + str(game_manager.get_lives()) + lives_label.text = tr("LIVES_LABEL") + ":" + str(game_manager.get_lives()) func set_health_progressbar() -> void: diff --git a/scripts/ui/marketplace.gd b/scripts/ui/marketplace.gd index ca3f463..b640343 100644 --- a/scripts/ui/marketplace.gd +++ b/scripts/ui/marketplace.gd @@ -44,7 +44,7 @@ func _input(event: InputEvent) -> void: func get_button_text(skill: SkillData) -> String: - return skill.name + " " + str(skill.cost) + return tr(skill.name) + " " + str(skill.cost) func create_upgrade_button(skill: SkillData): diff --git a/translations.csv b/translations.csv index 9d0d3c4..88c6750 100644 --- a/translations.csv +++ b/translations.csv @@ -13,8 +13,8 @@ GAMEPLAY_BUTTON,GAMEPLAY,GRA INPUT_TITLE,INPUT,KLAWISZE AUDIO_TITLE,AUDIO,AUDIO MASTER_VOLUME,MASTER VOLUME,OGÓLNA -MUSIC VOLUME,MUSIC VOLUME,MUZYKA -SOUNDS VOLUME,SOUNDS VOLUME,EFEKTY DŹWIĘKOWE +MUSIC_VOLUME,MUSIC VOLUME,MUZYKA +SOUNDS_VOLUME,SOUNDS VOLUME,EFEKTY DŹWIĘKOWE CREDITS_TITLE,CREDITS,AUTORZY CREDITS,"Game was created by Gabriel Kaszewski. @@ -53,3 +53,11 @@ PAUSE,PAUSE,PAUZA RESUME_BUTTON,RESUME,WZNÓW EXIT_TO_MENU_BUTTON,EXIT TO MENU,WYJDŹ DO MENU RESET_TO_DEFAULT_BUTTON,RESET TO DEFAULT BUTTON,PRZYWRÓĆ DOMYŚLNE USTAWIENIA +BRICK_POWER_DESCRIPTION,Allows you to throw bricks at enemies,Pozwala Panu Cegle rzucać cegłami w przeciwników +EXPLOSIVE_BRICK_DESCRIPTION,Allows you to throw explosive bricks at enemies,Pozwala Panu Cegle rzucać wybuchającymi cegłami w przeciwników +FIRE_BIRCK_DESCRIPTION,Allows you to throw fire bricks at enemies,Pozwala Panu Cegle rzucać ognistymi cegłami w przeciwników +ICE_BRICK_DESCRIPTION,Allows you to throw ice bricks at enemies,Pozwala Panu Cegle rzucać lodowymi cegłami w przeciwników +MAGNETIC_DESCRIPTION,Attract coins,Przyciąga monety w pobliżu +LEVEL_1_TOOLTIP_1,Some blocks might collapse,Niektóre bloki mogą się zapaść. +LEVEL_1_TOOLTIP_2,Jump to the other side!,Przeskocz na drugą stronę! +LEVEL_1_TOOLTIP_3,"To rescue your child, you need to find the lever.",Uratuj dziecko poprzez aktywację dźwigni. diff --git a/translations.en.translation b/translations.en.translation index 729d754176dcd7288ad38d0d6fbee362348af1cc..e498ad6618e8a671e8786b79d4e38220f5e17c10 100644 GIT binary patch literal 2562 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 GtbYJc?hu&( delta 822 zcmdlgK2vZ*EMvVs0|Uc^vx40i{9u>VWJH28MdDrF~F|89;g-5HA7ZRY1G}h(U@$U>gz}#6JM!p8{f5 zAXWh43qZ^S#Ed{Jc={7>7myZ);!Ibj&ZR(h8c?zXh(T&V_@aBCok7bp(GF)v$di-CMl7=kd& zx(}!O>SBO=n0^+hoJ*oo3y{eGvJr#>Kd#*X3Ri9@o_9P`Yc5C|2T*`xavZC)tw`n0 z70o~%I~2p5^5kgF)(oH+$Y>Cr{c~~7eV`;v9oQ+8<(Q>??_Vi0wg#$zIT~id77cNk z9H2NXNTgK!=Xn4nG1UEv{!$H82XWIrR%un1)?3^MfGYWbq96=2@q|Edm@!=CHCAm= zn9MD44hJb92kg4Z>)4D{b954(a|1=drULcAf=+eEjy<73aj+{U&tp}dEXgWh3o~co z!**R^m^naQ)12