From 44a8757ced38f0d778a29573dff62e05e5eec275 Mon Sep 17 00:00:00 2001 From: betalars Date: Sun, 25 Jun 2023 23:50:51 +0200 Subject: [PATCH] godot weirdnes --- src/dev-util/board of devs.tscn | 2 +- src/logic-scenes/board/void_card.tscn | 1 + src/logic-scenes/collectable/collectable_ui.tscn | 1 + src/main.tscn | 8 ++++---- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/dev-util/board of devs.tscn b/src/dev-util/board of devs.tscn index b79b9e9..4787897 100644 --- a/src/dev-util/board of devs.tscn +++ b/src/dev-util/board of devs.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=4 format=3 uid="uid://bvowj4l8dtceu"] +[gd_scene load_steps=3 format=3 uid="uid://bvowj4l8dtceu"] [ext_resource type="PackedScene" uid="uid://dy5rd437h5hsw" path="res://logic-scenes/board/card.tscn" id="1_xrckx"] [ext_resource type="PackedScene" uid="uid://vkcdj8c3ytbq" path="res://logic-scenes/board/post-it.tscn" id="2_ucudl"] diff --git a/src/logic-scenes/board/void_card.tscn b/src/logic-scenes/board/void_card.tscn index ed78f9b..6480c94 100644 --- a/src/logic-scenes/board/void_card.tscn +++ b/src/logic-scenes/board/void_card.tscn @@ -156,6 +156,7 @@ clip_children = 2 position = Vector2(150, 110) scale = Vector2(0.6, 0.6) sprite_frames = SubResource("SpriteFrames_ckivt") +frame = 2 script = SubResource("GDScript_8bs16") [node name="GPUParticles2D" type="GPUParticles2D" parent="BackgroundSprite"] diff --git a/src/logic-scenes/collectable/collectable_ui.tscn b/src/logic-scenes/collectable/collectable_ui.tscn index 57eede9..c2217bf 100644 --- a/src/logic-scenes/collectable/collectable_ui.tscn +++ b/src/logic-scenes/collectable/collectable_ui.tscn @@ -171,6 +171,7 @@ libraries = { [connection signal="resized" from="Panel/Content/Buttons/VBoxContainer" to="Panel/Content/Buttons" method="_on_v_box_container_resized"] [connection signal="focus_entered" from="Panel/Content/Buttons/VBoxContainer/collect_or_listen" to="." method="_yoink_focus"] +[connection signal="pressed" from="Panel/Content/Buttons/VBoxContainer/collect_or_listen" to="." method="_on_pick_button_pressed"] [connection signal="focus_entered" from="Panel/Content/Buttons/VBoxContainer/Summary" to="." method="_yoink_focus"] [connection signal="focus_entered" from="Panel/Content/Buttons/VBoxContainer/skip" to="." method="_yoink_focus"] [connection signal="focus_entered" from="Panel/Content/Buttons/VBoxContainer/put_back" to="." method="_yoink_focus"] diff --git a/src/main.tscn b/src/main.tscn index 990fc15..68d8ec9 100644 --- a/src/main.tscn +++ b/src/main.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=8 format=3 uid="uid://befxf8uruwnrl"] [ext_resource type="Texture2D" uid="uid://balmcptv73l2j" path="res://dev-util/menu_background.png" id="1_0oiki"] -[ext_resource type="PackedScene" uid="uid://df3ppd08g84f3" path="res://logic-scenes/startup/startup.tscn" id="1_v5rpm"] +[ext_resource type="PackedScene" uid="uid://gldtxysavetf" path="res://logic-scenes/startup/startup.tscn" id="1_v5rpm"] [ext_resource type="PackedScene" uid="uid://b3b0gyvklqn50" path="res://base-environments/youth_room/youth_room.tscn" id="2_23ia3"] [ext_resource type="Theme" uid="uid://b056fn288p8ha" path="res://logic-scenes/themes/messy.theme" id="3_8hrj7"] [ext_resource type="Texture2D" uid="uid://d3ewjumh0b0g6" path="res://logic-scenes/main menu/logo.png" id="4_kslkj"] @@ -23,6 +23,8 @@ texture = ExtResource("1_0oiki") [node name="Startup Menu" parent="." instance=ExtResource("1_v5rpm")] visible = false +[node name="youth room" parent="." instance=ExtResource("2_23ia3")] + [node name="Main Menu" type="Panel" parent="."] anchors_preset = 15 anchor_right = 1.0 @@ -63,7 +65,5 @@ grow_vertical = 2 layout_mode = 2 text = "new Game" -[node name="youth room" parent="." instance=ExtResource("2_23ia3")] - -[connection signal="pressed" from="Main Menu/PanelContainer/Button" to="Main Menu" method="hide"] [connection signal="pressed" from="Main Menu/PanelContainer/Button" to="youth room" method="start"] +[connection signal="pressed" from="Main Menu/PanelContainer/Button" to="Main Menu" method="hide"]