diff --git a/HanafudaCard.gd b/HanafudaCard.gd index c2955d4..b42d3cd 100644 --- a/HanafudaCard.gd +++ b/HanafudaCard.gd @@ -33,10 +33,9 @@ enum Flower { export var revealed: bool = true setget reveal -onready var _is_ready := true - # Called when the node enters the scene tree for the first time. func _ready(): + $Backside/TextureRect.rect_global_position = $"Backside/Border sprite".get_rect() reveal(revealed) # Called every frame. 'delta' is the elapsed time since the previous frame. @@ -45,10 +44,6 @@ func _process(delta): func reveal(new_reveal: bool): revealed = new_reveal - - if not _is_ready: - yield(self, "ready") - if revealed: print("Reveal card") $Frontside.show() diff --git a/HanafudaCard.tscn b/HanafudaCard.tscn index 78e1223..1285ff7 100644 --- a/HanafudaCard.tscn +++ b/HanafudaCard.tscn @@ -10,16 +10,17 @@ script = ExtResource( 1 ) revealed = false [node name="Frontside" type="Sprite" parent="."] +visible = false +scale = Vector2( 0.2, 0.2 ) texture = ExtResource( 2 ) [node name="Backside" type="Node2D" parent="."] -visible = false [node name="TextureRect" type="TextureRect" parent="Backside"] -margin_left = -110.0 -margin_top = -193.0 -margin_right = 1000.0 -margin_bottom = 1722.0 +margin_left = -91.0 +margin_top = -155.0 +margin_right = 809.0 +margin_bottom = 1380.0 rect_scale = Vector2( 0.2, 0.2 ) texture = ExtResource( 4 ) stretch_mode = 2 @@ -28,4 +29,5 @@ __meta__ = { } [node name="Border sprite" type="Sprite" parent="Backside"] +scale = Vector2( 0.2, 0.2 ) texture = ExtResource( 3 ) diff --git a/Main.tscn b/Main.tscn index 63a79ce..17ca5e7 100644 --- a/Main.tscn +++ b/Main.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://HanafudaCard.tscn" type="PackedScene" id=1] -[node name="Node" type="Node"] +[node name="Node2D" type="Node"] [node name="Background" type="ColorRect" parent="."] anchor_right = 1.0 @@ -14,4 +14,3 @@ __meta__ = { [node name="HanafudaCard" parent="." instance=ExtResource( 1 )] position = Vector2( 205, 447 ) -revealed = true diff --git a/assets/Tupfile b/assets/Tupfile index 6d9cf2c..b0adc4f 100644 --- a/assets/Tupfile +++ b/assets/Tupfile @@ -1 +1 @@ -: foreach svg/*.svg |> rsvg-convert --background-color transparent --format Png --height 400 --output %o %f |> png/%B.png +: foreach svg/*.svg |> convert -background none %f %o |> png/%B.png