Skip to content

fix: card back not shown correctly #222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
XanatosX merged 2 commits into from
Jul 2, 2026
Merged

fix: card back not shown correctly #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8437385
fix: wrong card back image used
XanatosX Jul 2, 2026
568b5d4
chore: increase game version to 0.20.4
XanatosX Jul 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion entities/game/card_template/scenes/CardTemplate.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion entities/game/card_template/scripts/CardTemplate.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
_valid_game_state = true
5 changes: 4 additions & 1 deletion entities/game/memory_game/scenes/MemoryGame.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down Expand Up @@ -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"]
2 changes: 1 addition & 1 deletion project.godot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion shared/resources/decks/MemoryDeckResource.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
return using_default_texture
Loading