diff --git a/de.po b/de.po index 467a17a..b79601a 100644 --- a/de.po +++ b/de.po @@ -202,6 +202,13 @@ msgstr "" "[center][img=200x200,center,center]res://icon.svg[/img][/center]\n" "[center]Godot Game Engine 4.6[/center]" +#: entities/ui/credits/scenes/Credits.tscn +#: entities/ui/deck_viewer/scenes/DeckViewer.tscn +#: entities/ui/multiplayer_server_browser/scenes/MultiplayerServerBrowser.tscn +#: entities/ui/settings_menu/scenes/SettingsMenu.tscn +msgid "CLOSE" +msgstr "Schließen" + #: entities/ui/credits/scenes/Credits.tscn msgid "Kenney.nl" msgstr "" @@ -218,13 +225,6 @@ msgstr "" msgid "Material Maker" msgstr "" -#: entities/ui/credits/scenes/Credits.tscn -#: entities/ui/deck_viewer/scenes/DeckViewer.tscn -#: entities/ui/multiplayer_server_browser/scenes/MultiplayerServerBrowser.tscn -#: entities/ui/settings_menu/scenes/SettingsMenu.tscn -msgid "CLOSE" -msgstr "Schließen" - #: entities/ui/deck_preview/scenes/DeckPreview.tscn msgid "DECK_INFO" msgstr "Deck Informationen" @@ -1083,7 +1083,9 @@ msgstr "" "Da du ein übereinstimmendes Paar gefunden hast, wird deine Runde " "fortgesetzt. Entsprechend darfst du erneut zwei Karten drehen, findest du " "erneut ein Pärchen, wird deine Runde fortgesetzt. Deine Runde endet sobald " -"du kein Paar gefunden hast." +"du kein Paar gefunden hast.\n" +"Wenn dir die abgespielte Animation nicht gefallen sollte, kannst du diese in " +"den Spieleinstellungen deaktivieren." #: entities/game/tutorial_window/assets/PlayerFirstRoundEnd.tres msgid "FIRST_ROUND_END" @@ -1456,6 +1458,17 @@ msgstr "" msgid "ENTER_ANIMATE_CONTROLS" msgstr "Animierte Menüs" +#: entities/ui/graphic_settings/scenes/GraphicSettings.tscn +msgid "CARD_MACH_ANIMATION_DESCRIPTION" +msgstr "" +"Aktiviert oder deaktiviert die Animation für das Finden passender Karten, " +"die abgespielt wird, wenn ein Spieler ein Kartenpaar findet.\n" +"KI-Spieler animieren ihre Treffer unabhängig von dieser Einstellung nicht." + +#: entities/ui/graphic_settings/scenes/GraphicSettings.tscn +msgid "CARD_MACH_ANIMATION" +msgstr "Karten zusammenführanimation" + #: entities/ui/graphic_settings/scenes/GraphicSettings.tscn msgid "UI_SCALE_TOOLTIP" msgstr "" diff --git a/en.po b/en.po index 4c25230..ab33359 100644 --- a/en.po +++ b/en.po @@ -155,6 +155,13 @@ msgstr "" "[center][img=200x200,center,center]res://icon.svg[/img][/center]\n" "[center]Godot Game Engine 4.6[/center]" +#: entities/ui/credits/scenes/Credits.tscn +#: entities/ui/deck_viewer/scenes/DeckViewer.tscn +#: entities/ui/multiplayer_server_browser/scenes/MultiplayerServerBrowser.tscn +#: entities/ui/settings_menu/scenes/SettingsMenu.tscn +msgid "CLOSE" +msgstr "Close" + #: entities/ui/credits/scenes/Credits.tscn msgid "Kenney.nl" msgstr "" @@ -171,13 +178,6 @@ msgstr "" msgid "Material Maker" msgstr "" -#: entities/ui/credits/scenes/Credits.tscn -#: entities/ui/deck_viewer/scenes/DeckViewer.tscn -#: entities/ui/multiplayer_server_browser/scenes/MultiplayerServerBrowser.tscn -#: entities/ui/settings_menu/scenes/SettingsMenu.tscn -msgid "CLOSE" -msgstr "Close" - #: entities/ui/deck_preview/scenes/DeckPreview.tscn msgid "DECK_INFO" msgstr "Deck Info" @@ -999,7 +999,9 @@ msgstr "" "\n" "If you have found a matching pair, your round will continue accordingly, you " "may turn two cards again, if you find another pair, your round will " -"continue. Your round ends as soon as you no longer find a matching pair." +"continue. Your round ends as soon as you no longer find a matching pair.\n" +"If you do not like the animation played, you can disable it in the settings " +"menu" #: entities/game/tutorial_window/assets/PlayerFirstRoundEnd.tres msgid "FIRST_ROUND_END" @@ -1363,6 +1365,17 @@ msgstr "" msgid "ENTER_ANIMATE_CONTROLS" msgstr "Animate Menus" +#: entities/ui/graphic_settings/scenes/GraphicSettings.tscn +msgid "CARD_MACH_ANIMATION_DESCRIPTION" +msgstr "" +"Enables or disables the card matching animation, which is played if a player " +"does find a matching card.\n" +"AI players won't animate there matches regarding this setting." + +#: entities/ui/graphic_settings/scenes/GraphicSettings.tscn +msgid "CARD_MACH_ANIMATION" +msgstr "Card Matching Animation" + #: entities/ui/graphic_settings/scenes/GraphicSettings.tscn msgid "UI_SCALE_TOOLTIP" msgstr "" diff --git a/entities/ui/gameplay_settings/scripts/CardMatchAnimationControl.gd b/entities/ui/gameplay_settings/scripts/CardMatchAnimationControl.gd new file mode 100644 index 0000000..049e96f --- /dev/null +++ b/entities/ui/gameplay_settings/scripts/CardMatchAnimationControl.gd @@ -0,0 +1,6 @@ +extends ClickableToggle + +func settings_loaded(settings: SettingsResource) -> void: + button_pressed = settings.animate_card_matches + toggled.emit(button_pressed) + starts_ready = true diff --git a/entities/ui/gameplay_settings/scripts/CardMatchAnimationControl.gd.uid b/entities/ui/gameplay_settings/scripts/CardMatchAnimationControl.gd.uid new file mode 100644 index 0000000..aa21010 --- /dev/null +++ b/entities/ui/gameplay_settings/scripts/CardMatchAnimationControl.gd.uid @@ -0,0 +1 @@ +uid://bnslwcicl1lal diff --git a/entities/ui/graphic_settings/scenes/GraphicSettings.tscn b/entities/ui/graphic_settings/scenes/GraphicSettings.tscn index f53d6e5..5103903 100644 --- a/entities/ui/graphic_settings/scenes/GraphicSettings.tscn +++ b/entities/ui/graphic_settings/scenes/GraphicSettings.tscn @@ -6,6 +6,7 @@ [ext_resource type="Script" uid="uid://b6p42kfefnyc0" path="res://entities/ui/graphic_settings/scripts/VsyncButton.gd" id="4_r24jl"] [ext_resource type="Script" uid="uid://b3mbd6eeylk66" path="res://entities/ui/graphic_settings/scripts/UiScale.gd" id="5_180xw"] [ext_resource type="Script" uid="uid://eqtw0pawym83" path="res://entities/ui/graphic_settings/scripts/EnterAnimateControls.gd" id="5_fnqnv"] +[ext_resource type="Script" uid="uid://bnslwcicl1lal" path="res://entities/ui/gameplay_settings/scripts/CardMatchAnimationControl.gd" id="6_5tilo"] [ext_resource type="Script" uid="uid://crpang1vb3yxa" path="res://entities/ui/graphic_settings/scripts/UiScaleLabel.gd" id="6_fnqnv"] [ext_resource type="PackedScene" uid="uid://cf4ydk76w8s3l" path="res://entities/ui/button_scroll_bar/scene/ButtonScrollBar.tscn" id="7_r24jl"] @@ -50,6 +51,12 @@ tooltip_text = "ENTER_ANIMATE_CONTROLS_DESCRIPTION" text = "ENTER_ANIMATE_CONTROLS" script = ExtResource("5_fnqnv") +[node name="CardMatchAnimation" type="CheckButton" parent="VBoxContainer" unique_id=1420551184] +layout_mode = 2 +tooltip_text = "CARD_MACH_ANIMATION_DESCRIPTION" +text = "CARD_MACH_ANIMATION" +script = ExtResource("6_5tilo") + [node name="UiScale" type="HBoxContainer" parent="VBoxContainer" unique_id=1692092135] layout_mode = 2 script = ExtResource("5_180xw") @@ -76,11 +83,13 @@ text = "RESET_SCALING" [connection signal="language_changed" from="." to="VBoxContainer/UiScale/UiScaleLabel" method="language_changed"] [connection signal="settings_changed" from="." to="VBoxContainer/WindowModeSelection" method="settings_loaded"] [connection signal="settings_changed" from="." to="VBoxContainer/VSync" method="settings_loaded"] -[connection signal="settings_changed" from="." to="VBoxContainer/UiScale" method="settings_changed"] [connection signal="settings_changed" from="." to="VBoxContainer/EnterAnimate" method="settings_loaded"] +[connection signal="settings_changed" from="." to="VBoxContainer/UiScale" method="settings_changed"] +[connection signal="settings_changed" from="." to="VBoxContainer/CardMatchAnimation" method="settings_loaded"] [connection signal="window_mode_changed" from="VBoxContainer/WindowModeSelection" to="." method="change_window_mode"] [connection signal="toggled" from="VBoxContainer/VSync" to="." method="change_v_sync"] [connection signal="toggled" from="VBoxContainer/EnterAnimate" to="." method="change_enter_animate"] +[connection signal="toggled" from="VBoxContainer/CardMatchAnimation" to="." method="change_card_match_animation"] [connection signal="value_changed" from="VBoxContainer/UiScale" to="VBoxContainer/UiScale/ButtonScrollBar" method="set_value"] [connection signal="drag_ended" from="VBoxContainer/UiScale/ButtonScrollBar" to="VBoxContainer/UiScale" method="update_preview"] [connection signal="value_changed" from="VBoxContainer/UiScale/ButtonScrollBar" to="." method="change_ui_scale"] diff --git a/entities/ui/graphic_settings/scripts/GraphicSettings.gd b/entities/ui/graphic_settings/scripts/GraphicSettings.gd index 1e6ad7b..8dcffb8 100644 --- a/entities/ui/graphic_settings/scripts/GraphicSettings.gd +++ b/entities/ui/graphic_settings/scripts/GraphicSettings.gd @@ -3,6 +3,7 @@ extends PanelContainer signal window_mode_changed(new_mode: DisplayServer.WindowMode) signal v_sync_changed(state: bool) signal enter_animate_changed(state: bool) +signal card_match_animation_changed(state: bool) signal ui_scale_changed(new_scale: float) signal settings_changed(setting: SettingsResource) signal language_changed(language_code: String) @@ -23,4 +24,7 @@ func change_language(language_code: String) -> void: language_changed.emit(language_code) func change_enter_animate(state: bool) -> void: - enter_animate_changed.emit(state) \ No newline at end of file + enter_animate_changed.emit(state) + +func change_card_match_animation(new_state: bool) -> void: + card_match_animation_changed.emit(new_state) \ No newline at end of file diff --git a/entities/ui/settings_menu/scenes/SettingsMenu.tscn b/entities/ui/settings_menu/scenes/SettingsMenu.tscn index fbe1651..dde55ec 100644 --- a/entities/ui/settings_menu/scenes/SettingsMenu.tscn +++ b/entities/ui/settings_menu/scenes/SettingsMenu.tscn @@ -119,6 +119,7 @@ script = ExtResource("19_3ip51") [connection signal="load_custom_deck_changed" from="CenterContainer/PanelContainer/MarginContainer/SettingsMenu/GameplaySettings" to="." method="load_custom_deck_changed"] [connection signal="reset_tutorial" from="CenterContainer/PanelContainer/MarginContainer/SettingsMenu/GameplaySettings" to="." method="reset_tutorial"] [connection signal="time_for_completion_changed" from="CenterContainer/PanelContainer/MarginContainer/SettingsMenu/GameplaySettings" to="." method="time_for_completion_changed"] +[connection signal="card_match_animation_changed" from="CenterContainer/PanelContainer/MarginContainer/SettingsMenu/GraphicSettings" to="." method="matching_card_animation_changed"] [connection signal="enter_animate_changed" from="CenterContainer/PanelContainer/MarginContainer/SettingsMenu/GraphicSettings" to="." method="enter_animate_changed"] [connection signal="language_changed" from="CenterContainer/PanelContainer/MarginContainer/SettingsMenu/GraphicSettings" to="CenterContainer/PanelContainer/MarginContainer/SettingsMenu/GraphicSettings/VBoxContainer/UiScale/UiScaleLabel" method="language_changed"] [connection signal="settings_changed" from="CenterContainer/PanelContainer/MarginContainer/SettingsMenu/GraphicSettings" to="CenterContainer/PanelContainer/MarginContainer/SettingsMenu/GraphicSettings/VBoxContainer/UiScale" method="settings_changed"] diff --git a/entities/ui/settings_menu/scripts/SettingsMenu.gd b/entities/ui/settings_menu/scripts/SettingsMenu.gd index 3ca901a..f46fc51 100644 --- a/entities/ui/settings_menu/scripts/SettingsMenu.gd +++ b/entities/ui/settings_menu/scripts/SettingsMenu.gd @@ -77,5 +77,8 @@ func v_sync_changed(new_value: bool) -> void: func enter_animate_changed(new_value: bool) -> void: _current_settings.enter_animate_controls = new_value +func matching_card_animation_changed(new_value: bool) -> void: + _current_settings.animate_card_matches = new_value + func ai_think_time_updated(new_value: float) -> void: _current_settings.ai_think_time = new_value diff --git a/translations.pot b/translations.pot index 9b6fecd..d33da66 100644 --- a/translations.pot +++ b/translations.pot @@ -215,6 +215,13 @@ msgstr "" msgid "CREDITS_ROLL_TEXT" msgstr "" +#: entities/ui/credits/scenes/Credits.tscn +#: entities/ui/deck_viewer/scenes/DeckViewer.tscn +#: entities/ui/multiplayer_server_browser/scenes/MultiplayerServerBrowser.tscn +#: entities/ui/settings_menu/scenes/SettingsMenu.tscn +msgid "CLOSE" +msgstr "" + #: entities/ui/credits/scenes/Credits.tscn msgid "Kenney.nl" msgstr "" @@ -231,13 +238,6 @@ msgstr "" msgid "Material Maker" msgstr "" -#: entities/ui/credits/scenes/Credits.tscn -#: entities/ui/deck_viewer/scenes/DeckViewer.tscn -#: entities/ui/multiplayer_server_browser/scenes/MultiplayerServerBrowser.tscn -#: entities/ui/settings_menu/scenes/SettingsMenu.tscn -msgid "CLOSE" -msgstr "" - #: entities/ui/deck_preview/scenes/DeckPreview.tscn msgid "DECK_INFO" msgstr "" @@ -1297,6 +1297,14 @@ msgstr "" msgid "ENTER_ANIMATE_CONTROLS" msgstr "" +#: entities/ui/graphic_settings/scenes/GraphicSettings.tscn +msgid "CARD_MACH_ANIMATION_DESCRIPTION" +msgstr "" + +#: entities/ui/graphic_settings/scenes/GraphicSettings.tscn +msgid "CARD_MACH_ANIMATION" +msgstr "" + #: entities/ui/graphic_settings/scenes/GraphicSettings.tscn msgid "UI_SCALE_TOOLTIP" msgstr ""