From 8437385d04d14ffc6f8e2d67fd5be1b15c2f7f02 Mon Sep 17 00:00:00 2001 From: Xanatos <10531466+XanatosX@users.noreply.github.com> Date: Thu, 2 Jul 2026 20:26:53 +0200 Subject: [PATCH 1/2] fix: wrong card back image used fix $19q fix $19r --- entities/game/card_template/scenes/CardTemplate.tscn | 3 ++- entities/game/card_template/scripts/CardTemplate.gd | 2 +- entities/game/memory_game/scenes/MemoryGame.tscn | 5 ++++- shared/resources/decks/MemoryDeckResource.gd | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/entities/game/card_template/scenes/CardTemplate.tscn b/entities/game/card_template/scenes/CardTemplate.tscn index a584723..fded758 100644 --- a/entities/game/card_template/scenes/CardTemplate.tscn +++ b/entities/game/card_template/scenes/CardTemplate.tscn @@ -20,6 +20,7 @@ [ext_resource type="Shader" uid="uid://c7ms87q12jcrh" path="res://assets/shaders/SoftAlphaBorder.gdshader" id="14_l7f2y"] [ext_resource type="Material" uid="uid://ceraa2tomrum8" path="res://entities/game/card_template/assets/materials/SelectionShader.tres" id="16_ja01p"] [ext_resource type="Script" uid="uid://bipcmxhkarmo3" path="res://entities/game/card_template/scripts/DebugControl.gd" id="18_8fn1p"] +[ext_resource type="Texture2D" uid="uid://cpdy0umtx233e" path="res://assets/sprites/Axuree/back_card_3.png" id="18_l7f2y"] [ext_resource type="Script" uid="uid://oqb8v04e4sw6" path="res://entities/game/card_template/scripts/CardTemplateDebug.gd" id="18_tqsbp"] [ext_resource type="Texture2D" uid="uid://bl38eat4t17v6" path="res://assets/sprites/Axuree/sparkle.png" id="20_ja01p"] [ext_resource type="Script" uid="uid://dy87p5qmcoqva" path="res://entities/game/card_template/scripts/MatchingCardParticleEffect.gd" id="21_ja01p"] @@ -154,7 +155,7 @@ script = ExtResource("4_kxmgl") [node name="CardBack" type="Sprite2D" parent="." unique_id=597243811] material = ExtResource("5_b0osi") position = Vector2(0, 25) -texture = ExtResource("14_bmj37") +texture = ExtResource("18_l7f2y") script = ExtResource("8_pw264") focus_animation_time = 0.1 toggle_material = ExtResource("5_b0osi") diff --git a/entities/game/card_template/scripts/CardTemplate.gd b/entities/game/card_template/scripts/CardTemplate.gd index cc5b47b..576949a 100644 --- a/entities/game/card_template/scripts/CardTemplate.gd +++ b/entities/game/card_template/scripts/CardTemplate.gd @@ -289,4 +289,4 @@ func game_state_changed(new_state: GameEnum.State) -> void: hide_card_now() if new_state == GameEnum.State.TURN_START: unfreeze_card() - _valid_game_state = true \ No newline at end of file + _valid_game_state = true diff --git a/entities/game/memory_game/scenes/MemoryGame.tscn b/entities/game/memory_game/scenes/MemoryGame.tscn index 0c1eba6..b341b2c 100644 --- a/entities/game/memory_game/scenes/MemoryGame.tscn +++ b/entities/game/memory_game/scenes/MemoryGame.tscn @@ -235,7 +235,7 @@ memory_game = NodePath("../..") debug_functions = Array[ExtResource("34_4hsit")]([SubResource("Resource_8rpam")]) [connection signal="announce_deck" from="." to="World/CardBoard" method="set_deck"] -[connection signal="announce_deck" from="." to="UI/PlayersOverlay" method="set_deck"] +[connection signal="announce_deck" from="." to="UI/PlayersOverlay" method="set_texture"] [connection signal="game_paused" from="." to="Systems/PlayerInputSystem" method="game_paused"] [connection signal="game_paused" from="." to="World/Camera2D" method="game_paused"] [connection signal="load_game" from="." to="World/CardBoard/CardInteractionField" method="set_board_information"] @@ -303,5 +303,8 @@ debug_functions = Array[ExtResource("34_4hsit")]([SubResource("Resource_8rpam")] [connection signal="remove_card_at" from="World/CardBoard/CardInteractionField" to="Systems/AiAgentSystem" method="remove_card_to_all_ais"] [connection signal="remove_cards_at" from="World/CardBoard/CardInteractionField" to="World/CardBoard" method="remove_cards_from_board"] [connection signal="turn_ended" from="World/CardBoard/CardInteractionField" to="Systems/GameStateSystem" method="no_matches"] +[connection signal="deck_changed" from="World/CardTemplateGhost" to="World/CardTemplateGhost/CardContentGroup/DropShadow" method="deck_changed"] +[connection signal="deck_changed" from="World/CardTemplateGhost" to="World/CardTemplateGhost/CardBack" method="deck_changed"] +[connection signal="focus_changed" from="World/CardTemplateGhost" to="World/CardTemplateGhost/CardBack" method="focus_changed"] [connection signal="touch_used" from="World/Camera2D" to="World/CardBoard" method="disable_card_effects"] [connection signal="pressed" from="UI/PauseMenuButton" to="." method="show_game_menu"] diff --git a/shared/resources/decks/MemoryDeckResource.gd b/shared/resources/decks/MemoryDeckResource.gd index efb1ecd..55c8e1f 100644 --- a/shared/resources/decks/MemoryDeckResource.gd +++ b/shared/resources/decks/MemoryDeckResource.gd @@ -59,4 +59,4 @@ func fix_image(image: Image) -> Image: return new_image func is_using_default_texture() -> bool: - return using_default_texture or built_in \ No newline at end of file + return using_default_texture \ No newline at end of file From 568b5d40b9285ef6da398086a0993bf98cd87ece Mon Sep 17 00:00:00 2001 From: Xanatos <10531466+XanatosX@users.noreply.github.com> Date: Thu, 2 Jul 2026 20:28:47 +0200 Subject: [PATCH 2/2] chore: increase game version to 0.20.4 --- project.godot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.godot b/project.godot index 1cafad3..e988f77 100644 --- a/project.godot +++ b/project.godot @@ -15,7 +15,7 @@ compatibility/default_parent_skeleton_in_mesh_instance_3d=true [application] config/name="Samory" -config/version="0.20.3" +config/version="0.20.4" config/tags=PackedStringArray("public") run/main_scene="res://shared/global_entities/game_manager/scenes/GameManager.tscn" config/features=PackedStringArray("4.7", "GL Compatibility")