diff --git a/objects/card_base/card_base.tscn b/objects/card_base/card_base.tscn index 1bdbd1b..e02c82e 100644 --- a/objects/card_base/card_base.tscn +++ b/objects/card_base/card_base.tscn @@ -5,7 +5,7 @@ [ext_resource type="FontFile" uid="uid://1000owdyvwfg" path="res://fonts/unifont-15.1.04.otf" id="3_0qykx"] [ext_resource type="Texture2D" uid="uid://b5d2rfms7vyfi" path="res://objects/card_base/card_base1.png" id="3_h7i1h"] [ext_resource type="Texture2D" uid="uid://bkjbrw1ppac5q" path="res://objects/card_base/card_base_disabled.png" id="4_0unxr"] -[ext_resource type="Texture2D" uid="uid://cs7vfmsrhpomj" path="res://objects/card_base/card_base_highlighted.png" id="5_tkdj2"] +[ext_resource type="Texture2D" uid="uid://bkuwo3g8pyuyi" path="res://objects/card_base/card_base_highlight_border.png" id="5_r41oe"] [ext_resource type="AudioStream" uid="uid://0sefo32v1jne" path="res://objects/card_base/pick_up.wav" id="7_0c7kt"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_2cmwb"] @@ -28,14 +28,6 @@ animations = [{ "loop": true, "name": &"disabled", "speed": 5.0 -}, { -"frames": [{ -"duration": 1.0, -"texture": ExtResource("5_tkdj2") -}], -"loop": true, -"name": &"highlighted", -"speed": 5.0 }] [node name="CardBase" type="Area2D"] @@ -45,10 +37,20 @@ script = ExtResource("1_k5qn1") shape = SubResource("RectangleShape2D_2cmwb") debug_color = Color(0.65098, 0.431373, 0.756863, 0.419608) +[node name="CardBaseSprite" type="AnimatedSprite2D" parent="."] +sprite_frames = SubResource("SpriteFrames_bhb3x") + [node name="Word" parent="." instance=ExtResource("2_jvsp3")] -z_index = 1 frame_progress = 0.953211 +[node name="HighlightSprite" type="Sprite2D" parent="."] +visible = false +texture = ExtResource("5_r41oe") + +[node name="DisabledSprite" type="Sprite2D" parent="."] +visible = false +texture = ExtResource("4_0unxr") + [node name="Label" type="Label" parent="."] offset_left = -13.0 offset_top = 17.0 @@ -59,9 +61,6 @@ text = "0" horizontal_alignment = 1 vertical_alignment = 1 -[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] -sprite_frames = SubResource("SpriteFrames_bhb3x") - [node name="Cards" type="Node" parent="."] [node name="FadeTimer" type="Timer" parent="."] diff --git a/objects/card_base/card_base_highlight_border.png b/objects/card_base/card_base_highlight_border.png new file mode 100644 index 0000000..19ad568 Binary files /dev/null and b/objects/card_base/card_base_highlight_border.png differ diff --git a/objects/card_base/card_base_highlighted.png.import b/objects/card_base/card_base_highlight_border.png.import similarity index 63% rename from objects/card_base/card_base_highlighted.png.import rename to objects/card_base/card_base_highlight_border.png.import index 5c5565a..5de750e 100644 --- a/objects/card_base/card_base_highlighted.png.import +++ b/objects/card_base/card_base_highlight_border.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://cs7vfmsrhpomj" -path="res://.godot/imported/card_base_highlighted.png-50d4af98046c8a87d73d61ca6664f89e.ctex" +uid="uid://bkuwo3g8pyuyi" +path="res://.godot/imported/card_base_highlight_border.png-02641e6f6e23a694917134adadde948a.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://objects/card_base/card_base_highlighted.png" -dest_files=["res://.godot/imported/card_base_highlighted.png-50d4af98046c8a87d73d61ca6664f89e.ctex"] +source_file="res://objects/card_base/card_base_highlight_border.png" +dest_files=["res://.godot/imported/card_base_highlight_border.png-02641e6f6e23a694917134adadde948a.ctex"] [params] diff --git a/objects/card_base/card_base_highlighted.png b/objects/card_base/card_base_highlighted.png deleted file mode 100644 index 6213968..0000000 Binary files a/objects/card_base/card_base_highlighted.png and /dev/null differ