fixed logic typo, selection state was compared, not assigned

This commit is contained in:
betalars 2023-05-25 19:23:25 +02:00
parent 7e3677befd
commit 7c8c5e9267
2 changed files with 133 additions and 125 deletions

View File

@ -80,4 +80,4 @@ func pick(id: int):
post.get_child(1).play("post") post.get_child(1).play("post")
curr_selection_id = -1 curr_selection_id = -1
await anim_players[0].animation_finished await anim_players[0].animation_finished
selection_state == POSTS selection_state = POSTS

View File

@ -71,6 +71,46 @@ tracks/1/keys = {
"values": [Vector2(1.1, 1.1), Vector2(1, 1)] "values": [Vector2(1.1, 1.1), Vector2(1, 1)]
} }
[sub_resource type="Animation" id="Animation_76klu"]
resource_name = "pick"
length = 4.0
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(3, 3.9),
"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, 3.2),
"transitions": PackedFloat32Array(1, 0.435275, 0.435275),
"update": 0,
"values": [-0.0244346, -0.174533, 0.0]
}
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, 1.3, 3.1, 3.4, 3.9),
"transitions": PackedFloat32Array(0.535887, 1, 0.999997, 0.901248, 0.659752, 1.03526),
"update": 0,
"values": [Vector2(-317, 25), Vector2(-336, -127), Vector2(-12, 0), Vector2(-12, 0), Vector2(-12, 0), Vector2(0, 968)]
}
[sub_resource type="Animation" id="Animation_ldr2c"] [sub_resource type="Animation" id="Animation_ldr2c"]
resource_name = "select" resource_name = "select"
length = 0.3 length = 0.3
@ -167,46 +207,6 @@ tracks/1/keys = {
"values": [-0.109599, 0.5044, 3.4924] "values": [-0.109599, 0.5044, 3.4924]
} }
[sub_resource type="Animation" id="Animation_76klu"]
resource_name = "pick"
length = 4.0
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(3, 3.9),
"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, 3.2),
"transitions": PackedFloat32Array(1, 0.435275, 0.435275),
"update": 0,
"values": [-0.0244346, -0.174533, 0.0]
}
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, 1.3, 3.1, 3.4, 3.9),
"transitions": PackedFloat32Array(0.535887, 1, 0.999997, 0.901248, 0.659752, 1.03526),
"update": 0,
"values": [Vector2(-317, 25), Vector2(-336, -127), Vector2(-12, 0), Vector2(-12, 0), Vector2(-12, 0), Vector2(0, 968)]
}
[sub_resource type="AnimationLibrary" id="AnimationLibrary_gdxmh"] [sub_resource type="AnimationLibrary" id="AnimationLibrary_gdxmh"]
_data = { _data = {
"RESET": SubResource("Animation_dinvx"), "RESET": SubResource("Animation_dinvx"),
@ -272,6 +272,46 @@ tracks/0/keys = {
"values": [Vector2(1.1, 1.1), Vector2(1, 1)] "values": [Vector2(1.1, 1.1), Vector2(1, 1)]
} }
[sub_resource type="Animation" id="Animation_16dsw"]
resource_name = "pick"
length = 4.0
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(3.2, 3.9),
"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, 3.7),
"transitions": PackedFloat32Array(1, 0.574349, 0.535887),
"update": 0,
"values": [0.0, -0.174533, 0.0]
}
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, 1.3, 3, 3.3, 3.9),
"transitions": PackedFloat32Array(0.535887, 1.07177, 0.466514, 0.933028, 0.466514, 1),
"update": 0,
"values": [Vector2(0, 0), Vector2(-10.0001, -123), Vector2(0, 0), Vector2(0, 0), Vector2(0, 0), Vector2(0, 1000)]
}
[sub_resource type="Animation" id="Animation_2c94q"] [sub_resource type="Animation" id="Animation_2c94q"]
resource_name = "select" resource_name = "select"
length = 0.3 length = 0.3
@ -356,46 +396,6 @@ tracks/1/keys = {
"values": [0.0, 0.0436332, 3.22362] "values": [0.0, 0.0436332, 3.22362]
} }
[sub_resource type="Animation" id="Animation_16dsw"]
resource_name = "pick"
length = 4.0
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(3.2, 3.9),
"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, 3.7),
"transitions": PackedFloat32Array(1, 0.574349, 0.535887),
"update": 0,
"values": [0.0, -0.174533, 0.0]
}
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, 1.3, 3, 3.3, 3.9),
"transitions": PackedFloat32Array(0.535887, 1.07177, 0.466514, 0.933028, 0.466514, 1),
"update": 0,
"values": [Vector2(0, 0), Vector2(-10.0001, -123), Vector2(0, 0), Vector2(0, 0), Vector2(0, 0), Vector2(0, 1000)]
}
[sub_resource type="AnimationLibrary" id="AnimationLibrary_oxheu"] [sub_resource type="AnimationLibrary" id="AnimationLibrary_oxheu"]
_data = { _data = {
"RESET": SubResource("Animation_pcher"), "RESET": SubResource("Animation_pcher"),
@ -473,6 +473,46 @@ tracks/1/keys = {
"values": [0.0349066, 0.10472] "values": [0.0349066, 0.10472]
} }
[sub_resource type="Animation" id="Animation_wp0c8"]
resource_name = "pick"
length = 4.0
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(3, 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, 3.4),
"transitions": PackedFloat32Array(1, 0.574349, 0.535887),
"update": 0,
"values": [0.0349066, 0.174533, 0.0]
}
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.6, 1.3, 3, 3.3, 4),
"transitions": PackedFloat32Array(0.535887, 1, 0.93303, 1.07177, 0.554783, 1),
"update": 0,
"values": [Vector2(315, 22), Vector2(350, -123), Vector2(0, 0), Vector2(0, 0), Vector2(0, 0), Vector2(0, 1000)]
}
[sub_resource type="Animation" id="Animation_pcu23"] [sub_resource type="Animation" id="Animation_pcu23"]
resource_name = "select" resource_name = "select"
length = 0.3 length = 0.3
@ -569,46 +609,6 @@ tracks/1/keys = {
"values": [0.10472, 0.0436332, 3.22362] "values": [0.10472, 0.0436332, 3.22362]
} }
[sub_resource type="Animation" id="Animation_wp0c8"]
resource_name = "pick"
length = 4.0
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(3, 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, 3.4),
"transitions": PackedFloat32Array(1, 0.574349, 0.535887),
"update": 0,
"values": [0.0349066, 0.174533, 0.0]
}
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.6, 1.3, 3, 3.3, 4),
"transitions": PackedFloat32Array(0.535887, 1, 0.93303, 1.07177, 0.554783, 1),
"update": 0,
"values": [Vector2(315, 22), Vector2(350, -123), Vector2(0, 0), Vector2(0, 0), Vector2(0, 0), Vector2(0, 1000)]
}
[sub_resource type="AnimationLibrary" id="AnimationLibrary_8blxm"] [sub_resource type="AnimationLibrary" id="AnimationLibrary_8blxm"]
_data = { _data = {
"RESET": SubResource("Animation_pf55g"), "RESET": SubResource("Animation_pf55g"),
@ -1371,8 +1371,16 @@ grow_horizontal = 2
grow_vertical = 2 grow_vertical = 2
script = ExtResource("1_pjntm") script = ExtResource("1_pjntm")
[node name="label" type="Label" parent="."] [node name="Control" type="Control" parent="."]
layout_mode = 2 layout_mode = 2
[node name="label" type="Label" parent="Control"]
layout_mode = 2
offset_left = -359.0
offset_top = -256.0
offset_right = 358.0
offset_bottom = -218.0
text = "Pick a Card to take with you, a second one will be randomly assigned."
horizontal_alignment = 1 horizontal_alignment = 1
[node name="cards" type="Panel" parent="."] [node name="cards" type="Panel" parent="."]
@ -1388,7 +1396,7 @@ offset_bottom = 25.0
rotation = -0.109599 rotation = -0.109599
[node name="card" parent="cards/card_1" instance=ExtResource("2_dqebt")] [node name="card" parent="cards/card_1" instance=ExtResource("2_dqebt")]
text = "card1" text = "I never put in much effort for homework "
[node name="AnimationPlayer" type="AnimationPlayer" parent="cards/card_1"] [node name="AnimationPlayer" type="AnimationPlayer" parent="cards/card_1"]
libraries = { libraries = {
@ -1400,7 +1408,7 @@ layout_mode = 2
anchors_preset = 0 anchors_preset = 0
[node name="card" parent="cards/card_2" instance=ExtResource("2_dqebt")] [node name="card" parent="cards/card_2" instance=ExtResource("2_dqebt")]
text = "card2" text = "I like my teachers more than my classmates "
[node name="AnimationPlayer" type="AnimationPlayer" parent="cards/card_2"] [node name="AnimationPlayer" type="AnimationPlayer" parent="cards/card_2"]
libraries = { libraries = {
@ -1417,7 +1425,7 @@ offset_bottom = 22.0
rotation = 0.10472 rotation = 0.10472
[node name="card" parent="cards/card_3" instance=ExtResource("2_dqebt")] [node name="card" parent="cards/card_3" instance=ExtResource("2_dqebt")]
text = "card3" text = "I can put ages into things I enjoy "
[node name="AnimationPlayer" type="AnimationPlayer" parent="cards/card_3"] [node name="AnimationPlayer" type="AnimationPlayer" parent="cards/card_3"]
libraries = { libraries = {