Merge branch 'main' of https://github.com/jwapobie/uno-cards

icons/crossed_out.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://14u3tr2nbeao"
+path="res://.godot/imported/crossed_out.png-872ecbe9981e093e01f56ceb75f6391a.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://icons/crossed_out.png"
+dest_files=["res://.godot/imported/crossed_out.png-872ecbe9981e093e01f56ceb75f6391a.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

objects/card/card_visual.gd

@@ -48,9 +48,10 @@ func animate_new_val():
 
 func animate_slash():
 	slash_2.visible = true
+	slash_2.size.x = 1
 	number_2_new.scale = Vector2.ONE*2
 	var tween = create_tween()
-	tween.tween_property(slash_2, "size:x", 40, 0.2*Gameplay.anim_time_multiplier).set_trans(Tween.TRANS_CUBIC)
+	tween.tween_property(slash_2, "size:x", 45, 0.2*Gameplay.anim_time_multiplier).set_trans(Tween.TRANS_CUBIC)
 	tween.parallel()
 	tween.tween_property(number_2, "modulate", Color.DIM_GRAY, 0.3*Gameplay.anim_time_multiplier)
 	tween.tween_property(number_2_new, "visible", true, 0)

objects/card/card_visual.tscn

@@ -1,7 +1,8 @@
-[gd_scene load_steps=3 format=3 uid="uid://lab3gphdrxmw"]
+[gd_scene load_steps=4 format=3 uid="uid://lab3gphdrxmw"]
 
 [ext_resource type="StyleBox" uid="uid://3k0csk5nyvy1" path="res://objects/card/card_stylebox.tres" id="1_xtixo"]
 [ext_resource type="Script" path="res://objects/card/card_visual.gd" id="1_ybb6g"]
+[ext_resource type="Texture2D" uid="uid://14u3tr2nbeao" path="res://icons/crossed_out.png" id="3_fqttu"]
 
 [node name="Panel" type="Panel"]
 offset_right = 200.0
@@ -66,18 +67,22 @@ vertical_alignment = 1
 [node name="Slash2" type="Label" parent="."]
 visible = false
 layout_mode = 1
-offset_left = 9.0
-offset_right = 10.0
+offset_left = 5.0
+offset_right = 50.0
 offset_bottom = 67.0
 theme_override_colors/font_color = Color(0.605469, 0.106256, 0.210989, 1)
 theme_override_constants/shadow_offset_x = 2
 theme_override_constants/shadow_offset_y = 5
 theme_override_constants/outline_size = 8
 theme_override_font_sizes/font_size = 48
-text = " ∕"
 vertical_alignment = 1
 clip_text = true
 
+[node name="CrossedOut" type="Sprite2D" parent="Slash2"]
+position = Vector2(22, 34)
+scale = Vector2(0.5, 0.5)
+texture = ExtResource("3_fqttu")
+
 [node name="Number3" type="Label" parent="."]
 layout_mode = 1
 anchors_preset = 3