From 9826ab3ecb6b244da340beb552bf65f1fe8255bb Mon Sep 17 00:00:00 2001 From: betalars Date: Fri, 19 May 2023 22:56:53 +0200 Subject: [PATCH] transferring card animations from card 1 to card 2 --- src/logic-scenes/card_picker/card_picker.tscn | 481 ++++++++++++------ 1 file changed, 337 insertions(+), 144 deletions(-) diff --git a/src/logic-scenes/card_picker/card_picker.tscn b/src/logic-scenes/card_picker/card_picker.tscn index d7a9684..1706c89 100644 --- a/src/logic-scenes/card_picker/card_picker.tscn +++ b/src/logic-scenes/card_picker/card_picker.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=39 format=3 uid="uid://of12u28124yn"] +[gd_scene load_steps=46 format=3 uid="uid://of12u28124yn"] [ext_resource type="Script" path="res://logic-scenes/card_picker/card_picker.gd" id="1_8ofnx"] [ext_resource type="PackedScene" uid="uid://dy5rd437h5hsw" path="res://logic-scenes/board/card.tscn" id="2_dqebt"] @@ -16,7 +16,7 @@ tracks/0/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), "update": 0, -"values": [Vector2(-317, 52)] +"values": [Vector2(-317, 25)] } tracks/1/type = "value" tracks/1/imported = false @@ -43,142 +43,6 @@ tracks/2/keys = { "values": [Vector2(1, 1)] } -[sub_resource type="Animation" id="Animation_abihp"] -resource_name = "shuffle" -length = 5.0 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath(".:position") -tracks/0/interp = 2 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0.7, 1.1, 1.6, 3, 4.3, 5), -"transitions": PackedFloat32Array(1, 1, 1, 1, 0.450625, 0.450625), -"update": 0, -"values": [Vector2(-317, 52), Vector2(18, 189), Vector2(1, 168), Vector2(-11, 299), Vector2(-11, 299), Vector2(-11, 900)] -} -tracks/1/type = "value" -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/path = NodePath(".:rotation") -tracks/1/interp = 2 -tracks/1/loop_wrap = true -tracks/1/keys = { -"times": PackedFloat32Array(0.7, 1.4, 2, 2.5, 3.1, 4.5), -"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1.07177), -"update": 0, -"values": [-0.109956, -0.520108, 0.336849, -0.13439, 0.0, 0.0] -} -tracks/2/type = "value" -tracks/2/imported = false -tracks/2/enabled = true -tracks/2/path = NodePath(".:scale") -tracks/2/interp = 2 -tracks/2/loop_wrap = true -tracks/2/keys = { -"times": PackedFloat32Array(0.7, 2.5, 3.5), -"transitions": PackedFloat32Array(1, 1, 1), -"update": 0, -"values": [Vector2(1, 1), Vector2(1, 1), Vector2(1.2, 1.2)] -} - -[sub_resource type="Animation" id="Animation_76klu"] -resource_name = "take_1" -length = 1.5 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("../post-it_1:scale") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0.7, 1.4), -"transitions": PackedFloat32Array(1, 1), -"update": 0, -"values": [Vector2(1.1, 1.1), Vector2(1.2, 0.8)] -} -tracks/1/type = "value" -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/path = NodePath("../post-it_1:rotation") -tracks/1/interp = 2 -tracks/1/loop_wrap = false -tracks/1/keys = { -"times": PackedFloat32Array(0, 0.5, 1, 1.4), -"transitions": PackedFloat32Array(1, 0.435275, 0.435275, 1), -"update": 0, -"values": [-0.0244346, -0.174533, 0.698132, 0.571249] -} -tracks/2/type = "value" -tracks/2/imported = false -tracks/2/enabled = true -tracks/2/path = NodePath("../post-it_1:position") -tracks/2/interp = 2 -tracks/2/loop_wrap = false -tracks/2/keys = { -"times": PackedFloat32Array(0.2, 0.5, 0.9, 1.2, 1.4), -"transitions": PackedFloat32Array(0.535887, 1.07177, 1.03526, 0.615572, 1), -"update": 0, -"values": [Vector2(-339, 37), Vector2(-374, -127), Vector2(-405, 103), Vector2(176, 654), Vector2(508, 809)] -} - -[sub_resource type="Animation" id="Animation_d68d2"] -resource_name = "unshuffle_2" -length = 5.0 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("../card_2:position") -tracks/0/interp = 2 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0.5, 1.2, 1.5, 1.9, 3), -"transitions": PackedFloat32Array(1, 1, 1, 0.392292, 1), -"update": 0, -"values": [Vector2(0, 0), Vector2(-20, 195), Vector2(17, 161), Vector2(28, 213), Vector2(322, -781)] -} -tracks/1/type = "value" -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/path = NodePath("../card_2:rotation") -tracks/1/interp = 2 -tracks/1/loop_wrap = true -tracks/1/keys = { -"times": PackedFloat32Array(0.5, 1.4, 1.8, 2.6), -"transitions": PackedFloat32Array(1, 1, 1, 1), -"update": 0, -"values": [0.0, 0.0436332, -0.21293, 3.22362] -} - -[sub_resource type="Animation" id="Animation_ldr2c"] -resource_name = "select" -length = 0.3 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath(".:rotation") -tracks/0/interp = 2 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0, 0.2), -"transitions": PackedFloat32Array(1, 1.93187), -"update": 0, -"values": [-0.109599, -0.0244346] -} -tracks/1/type = "value" -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/path = NodePath(".:scale") -tracks/1/interp = 2 -tracks/1/loop_wrap = true -tracks/1/keys = { -"times": PackedFloat32Array(0, 0.2), -"transitions": PackedFloat32Array(1, 1.93187), -"update": 0, -"values": [Vector2(1, 1), Vector2(1.1, 1.1)] -} - [sub_resource type="Animation" id="Animation_4dp1g"] resource_name = "deselect" length = 0.7 @@ -207,14 +71,339 @@ tracks/1/keys = { "values": [Vector2(1.1, 1.1), Vector2(1, 1)] } +[sub_resource type="Animation" id="Animation_ldr2c"] +resource_name = "select" +length = 0.3 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath(".:rotation") +tracks/0/interp = 2 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 0.2), +"transitions": PackedFloat32Array(1, 1.93187), +"update": 0, +"values": [-0.109599, -0.0244346] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath(".:scale") +tracks/1/interp = 2 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0, 0.2), +"transitions": PackedFloat32Array(1, 1.93187), +"update": 0, +"values": [Vector2(1, 1), Vector2(1.1, 1.1)] +} + +[sub_resource type="Animation" id="Animation_abihp"] +resource_name = "shuffle" +length = 5.0 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath(".:position") +tracks/0/interp = 2 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0.7, 1.1, 1.6, 3, 4.3, 5), +"transitions": PackedFloat32Array(1, 1, 1, 1, 0.450625, 0.450625), +"update": 0, +"values": [Vector2(-317, 52), Vector2(18, 189), Vector2(1, 168), Vector2(-11, 299), Vector2(-11, 299), Vector2(-11, 900)] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath(".:rotation") +tracks/1/interp = 2 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0.7, 1.5, 2, 3.1, 4.5), +"transitions": PackedFloat32Array(1, 1, 1, 1, 1.07177), +"update": 0, +"values": [-0.109956, 0.261799, -0.174533, 0.0, 0.0] +} +tracks/2/type = "value" +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/path = NodePath(".:scale") +tracks/2/interp = 2 +tracks/2/loop_wrap = true +tracks/2/keys = { +"times": PackedFloat32Array(0.7, 2.5, 3.5), +"transitions": PackedFloat32Array(1, 1, 1), +"update": 0, +"values": [Vector2(1, 1), Vector2(1, 1), Vector2(1.2, 1.2)] +} + +[sub_resource type="Animation" id="Animation_76klu"] +resource_name = "take" +length = 1.5 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath(".:scale") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0.7, 1.4), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [Vector2(1.1, 1.1), Vector2(1.2, 0.8)] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath(".:rotation") +tracks/1/interp = 2 +tracks/1/loop_wrap = false +tracks/1/keys = { +"times": PackedFloat32Array(0, 0.5, 1, 1.4), +"transitions": PackedFloat32Array(1, 0.435275, 0.435275, 1), +"update": 0, +"values": [-0.0244346, -0.174533, 0.698132, 0.571249] +} +tracks/2/type = "value" +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/path = NodePath(".:position") +tracks/2/interp = 2 +tracks/2/loop_wrap = false +tracks/2/keys = { +"times": PackedFloat32Array(0.2, 0.5, 0.9, 1.2, 1.4), +"transitions": PackedFloat32Array(0.535887, 1.07177, 1.03526, 0.615572, 1), +"update": 0, +"values": [Vector2(-339, 37), Vector2(-374, -127), Vector2(-405, 103), Vector2(176, 654), Vector2(508, 809)] +} + +[sub_resource type="Animation" id="Animation_d68d2"] +resource_name = "unshuffle" +length = 3.0 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath(".:position") +tracks/0/interp = 2 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0.5, 1.2, 1.9, 3), +"transitions": PackedFloat32Array(1, 1, 0.233258, 1), +"update": 0, +"values": [Vector2(-317, 25), Vector2(9.00003, 191), Vector2(58, 223), Vector2(242, -866)] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath(".:rotation") +tracks/1/interp = 2 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0.5, 1.4, 1.8, 3), +"transitions": PackedFloat32Array(1, 1, 1, 1), +"update": 0, +"values": [-0.109599, 0.5044, -0.3735, 3.4924] +} + [sub_resource type="AnimationLibrary" id="AnimationLibrary_gdxmh"] _data = { "RESET": SubResource("Animation_dinvx"), "deselect": SubResource("Animation_4dp1g"), "select": SubResource("Animation_ldr2c"), "shuffle": SubResource("Animation_abihp"), -"take_1": SubResource("Animation_76klu"), -"unshuffle_2": SubResource("Animation_d68d2") +"take": SubResource("Animation_76klu"), +"unshuffle": SubResource("Animation_d68d2") +} + +[sub_resource type="Animation" id="Animation_pcher"] +length = 0.001 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath(".:position") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Vector2(0, 0)] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath(".:rotation") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [0.0] +} +tracks/2/type = "value" +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/path = NodePath(".:scale") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Vector2(1, 1)] +} + +[sub_resource type="Animation" id="Animation_5q97d"] +resource_name = "deselect" +length = 0.7 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath(".:scale") +tracks/0/interp = 2 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 0.4), +"transitions": PackedFloat32Array(0.482968, 1), +"update": 0, +"values": [Vector2(1.1, 1.1), Vector2(1, 1)] +} + +[sub_resource type="Animation" id="Animation_2c94q"] +resource_name = "select" +length = 0.3 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath(".:scale") +tracks/0/interp = 2 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 0.2), +"transitions": PackedFloat32Array(1, 1.93187), +"update": 0, +"values": [Vector2(1, 1), Vector2(1.1, 1.1)] +} + +[sub_resource type="Animation" id="Animation_pdic8"] +resource_name = "shuffle" +length = 5.0 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath(".:position") +tracks/0/interp = 2 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0.7, 1.1, 1.6, 3, 4.3, 5), +"transitions": PackedFloat32Array(1, 1, 1, 1, 0.450625, 0.450625), +"update": 0, +"values": [Vector2(0, 0), Vector2(18, 189), Vector2(1, 168), Vector2(-11, 299), Vector2(-11, 299), Vector2(-11, 900)] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath(".:rotation") +tracks/1/interp = 2 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0.7, 1.4, 2, 2.5, 3.1, 4.5), +"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1.07177), +"update": 0, +"values": [0.0, -0.520108, 0.336849, -0.13439, 0.0, 0.0] +} +tracks/2/type = "value" +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/path = NodePath(".:scale") +tracks/2/interp = 2 +tracks/2/loop_wrap = true +tracks/2/keys = { +"times": PackedFloat32Array(0.7, 2.5, 3.5), +"transitions": PackedFloat32Array(1, 1, 1), +"update": 0, +"values": [Vector2(1, 1), Vector2(1, 1), Vector2(1.2, 1.2)] +} + +[sub_resource type="Animation" id="Animation_sa974"] +resource_name = "unshuffle" +length = 3.0 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath(".:position") +tracks/0/interp = 2 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0.5, 1.2, 1.5, 1.9, 3), +"transitions": PackedFloat32Array(1, 1, 1, 0.392292, 1), +"update": 0, +"values": [Vector2(0, 0), Vector2(-20, 195), Vector2(17, 161), Vector2(28, 213), Vector2(322, -781)] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath(".:rotation") +tracks/1/interp = 2 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0.5, 1.4, 1.8, 2.6), +"transitions": PackedFloat32Array(1, 1, 1, 1), +"update": 0, +"values": [0.0, 0.0436332, -0.21293, 3.22362] +} + +[sub_resource type="Animation" id="Animation_16dsw"] +resource_name = "take" +length = 1.5 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath(".:scale") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0.7, 1.4), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [Vector2(1.1, 1.1), Vector2(1.2, 0.8)] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath(".:rotation") +tracks/1/interp = 2 +tracks/1/loop_wrap = false +tracks/1/keys = { +"times": PackedFloat32Array(0, 0.6, 1.4), +"transitions": PackedFloat32Array(1, 0.574349, 0.535887), +"update": 0, +"values": [0.0, -0.174533, 0.571249] +} +tracks/2/type = "value" +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/path = NodePath(".:position") +tracks/2/interp = 2 +tracks/2/loop_wrap = false +tracks/2/keys = { +"times": PackedFloat32Array(0.2, 0.5, 0.9, 1.2, 1.4), +"transitions": PackedFloat32Array(0.535887, 1.07177, 1.03526, 0.615572, 1), +"update": 0, +"values": [Vector2(0, 0), Vector2(-10.0001, -123), Vector2(-8, 40), Vector2(176, 654), Vector2(508, 809)] +} + +[sub_resource type="AnimationLibrary" id="AnimationLibrary_oxheu"] +_data = { +"RESET": SubResource("Animation_pcher"), +"deselect": SubResource("Animation_5q97d"), +"select": SubResource("Animation_2c94q"), +"shuffle": SubResource("Animation_pdic8"), +"take": SubResource("Animation_16dsw"), +"unshuffle": SubResource("Animation_sa974") } [sub_resource type="Animation" id="Animation_hh7qf"] @@ -709,12 +898,13 @@ layout_mode = 2 layout_mode = 2 anchors_preset = 0 offset_left = -317.0 -offset_top = 52.0 +offset_top = 25.0 offset_right = -317.0 -offset_bottom = 52.0 +offset_bottom = 25.0 rotation = -0.109599 [node name="card" parent="cards/card_1" instance=ExtResource("2_dqebt")] +text = "card1" [node name="AnimationPlayer" type="AnimationPlayer" parent="cards/card_1"] libraries = { @@ -726,8 +916,12 @@ layout_mode = 2 anchors_preset = 0 [node name="card" parent="cards/card_2" instance=ExtResource("2_dqebt")] +text = "card2" [node name="AnimationPlayer" type="AnimationPlayer" parent="cards/card_2"] +libraries = { +"": SubResource("AnimationLibrary_oxheu") +} [node name="card_3" type="Control" parent="cards"] layout_mode = 2 @@ -737,8 +931,7 @@ offset_bottom = 57.0 rotation = 0.0802851 [node name="card" parent="cards/card_3" instance=ExtResource("2_dqebt")] - -[node name="AnimationPlayer" type="AnimationPlayer" parent="cards/card_3"] +text = "card3" [node name="post-its" type="Panel" parent="."] visible = false