From e9b21183e30968a3832268dce2690c35b0cf0208 Mon Sep 17 00:00:00 2001 From: betalars Date: Tue, 6 May 2025 12:51:51 +0200 Subject: [PATCH] fix the bluddy card disappearing bug for good --- src/logic-scenes/board/demo-card.tscn | 71 +++++++++++++++++++++++++++ src/logic-scenes/startup/startup.tscn | 8 ++- src/thank-you.tscn | 20 +++----- 3 files changed, 84 insertions(+), 15 deletions(-) create mode 100644 src/logic-scenes/board/demo-card.tscn diff --git a/src/logic-scenes/board/demo-card.tscn b/src/logic-scenes/board/demo-card.tscn new file mode 100644 index 0000000..82285e7 --- /dev/null +++ b/src/logic-scenes/board/demo-card.tscn @@ -0,0 +1,71 @@ +[gd_scene load_steps=8 format=3 uid="uid://dhohgea31bn40"] + +[ext_resource type="Texture2D" uid="uid://sv0nhkkur1tt" path="res://logic-scenes/board/card-textures/cardsheet.png" id="2_jx3wu"] + +[sub_resource type="AtlasTexture" id="AtlasTexture_aqrbw"] +atlas = ExtResource("2_jx3wu") +region = Rect2(0, 880, 600, 440) + +[sub_resource type="AtlasTexture" id="AtlasTexture_e20ok"] +atlas = ExtResource("2_jx3wu") +region = Rect2(0, 440, 600, 440) + +[sub_resource type="AtlasTexture" id="AtlasTexture_onstk"] +atlas = ExtResource("2_jx3wu") +region = Rect2(600, 440, 600, 440) + +[sub_resource type="AtlasTexture" id="AtlasTexture_mtvrf"] +atlas = ExtResource("2_jx3wu") +region = Rect2(600, 0, 600, 440) + +[sub_resource type="AtlasTexture" id="AtlasTexture_inyug"] +atlas = ExtResource("2_jx3wu") +region = Rect2(0, 0, 600, 440) + +[sub_resource type="SpriteFrames" id="SpriteFrames_cu2at"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_aqrbw") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_e20ok") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_onstk") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_mtvrf") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_inyug") +}], +"loop": true, +"name": &"default", +"speed": 5.0 +}] + +[node name="Visual" type="Node2D"] + +[node name="BackgroundSprite" type="AnimatedSprite2D" parent="."] +unique_name_in_owner = true +clip_children = 2 +scale = Vector2(0.6, 0.6) +sprite_frames = SubResource("SpriteFrames_cu2at") +frame = 1 + +[node name="Label" type="Label" parent="."] +anchors_preset = 8 +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +offset_left = -136.0 +offset_top = -95.0 +offset_right = 165.0 +offset_bottom = 131.0 +grow_horizontal = 2 +grow_vertical = 2 +theme_type_variation = &"card_text" +text = "Lukas did not ask for consent, he didn't explain a thing, I didn't even move! Yet he dared to assume, that " +autowrap_mode = 3 diff --git a/src/logic-scenes/startup/startup.tscn b/src/logic-scenes/startup/startup.tscn index 7a8a9e0..b18e85c 100644 --- a/src/logic-scenes/startup/startup.tscn +++ b/src/logic-scenes/startup/startup.tscn @@ -222,13 +222,12 @@ layout_mode = 2 [node name="TabContainer" type="TabContainer" parent="CenterContainer/PanelContainer/VBoxContainer"] layout_mode = 2 -current_tab = 2 +current_tab = 0 tabs_visible = false use_hidden_tabs_for_min_size = true script = SubResource("GDScript_ia432") [node name="physical Accessibility" type="VBoxContainer" parent="CenterContainer/PanelContainer/VBoxContainer/TabContainer"] -visible = false layout_mode = 2 metadata/_tab_index = 0 @@ -362,6 +361,7 @@ visible = false layout_mode = 2 [node name="Managing Expectations" type="VBoxContainer" parent="CenterContainer/PanelContainer/VBoxContainer/TabContainer"] +visible = false layout_mode = 2 metadata/_tab_index = 2 @@ -434,7 +434,11 @@ grow_vertical = 2 text = "I stream this game, please show content notes." [node name="card" parent="." instance=ExtResource("5_7c77g")] +process_mode = 4 position = Vector2(1491, 598) +collision_layer = 0 +collision_mask = 0 +input_pickable = false text = "I never put in much effort for Homework" [connection signal="toggled" from="CenterContainer/PanelContainer/VBoxContainer/TabContainer/physical Accessibility/Container2/reduce motion" to="." method="_on_reduce_motion_toggled"] diff --git a/src/thank-you.tscn b/src/thank-you.tscn index 80f1db2..35848eb 100644 --- a/src/thank-you.tscn +++ b/src/thank-you.tscn @@ -3,7 +3,7 @@ [ext_resource type="Texture2D" uid="uid://d0ucjqi8tx6vt" path="res://import/interface-elements/frame.png" id="1_picwm"] [ext_resource type="FontFile" uid="uid://cb66e4mqysgf8" path="res://import/fonts/title_handwriting.tres" id="2_jb5y5"] [ext_resource type="Texture2D" uid="uid://bwicl5q0lw06q" path="res://import/interface-elements/bottom.png" id="3_oob40"] -[ext_resource type="PackedScene" uid="uid://dy5rd437h5hsw" path="res://logic-scenes/board/card.tscn" id="4_48hwg"] +[ext_resource type="PackedScene" uid="uid://dhohgea31bn40" path="res://logic-scenes/board/demo-card.tscn" id="4_u0gbc"] [ext_resource type="PackedScene" uid="uid://vkcdj8c3ytbq" path="res://logic-scenes/board/sticky-note.tscn" id="5_sfuv4"] [sub_resource type="GDScript" id="GDScript_cqlqo"] @@ -150,30 +150,24 @@ texture = ExtResource("3_oob40") expand_mode = 2 stretch_mode = 4 -[node name="card" parent="childhood/PanelContainer" instance=ExtResource("4_48hwg")] -process_mode = 4 +[node name="Visual" parent="childhood/PanelContainer" instance=ExtResource("4_u0gbc")] position = Vector2(1164, 301) -collision_layer = 0 -collision_mask = 0 -text = "Lukas did not ask for consent, he didn't explain a thing, I didn't even move! Yet he dared to assume, that " -[node name="sticky-note" parent="childhood/PanelContainer/card" instance=ExtResource("5_sfuv4")] +[node name="sticky-note" parent="childhood/PanelContainer/Visual" instance=ExtResource("5_sfuv4")] position = Vector2(39, 120) rotation = -0.103332 +scale = Vector2(1, 1) collision_layer = 0 collision_mask = 0 text = "I was wet so I must have been into it" -[node name="card2" parent="childhood/PanelContainer" instance=ExtResource("4_48hwg")] -process_mode = 4 +[node name="Visual2" parent="childhood/PanelContainer" instance=ExtResource("4_u0gbc")] position = Vector2(1287, 589) -collision_layer = 0 -collision_mask = 0 -text = "Lukas jumped me, he didn't even explain a thing or ask consent. I was confused and paralised, so " -[node name="sticky-note" parent="childhood/PanelContainer/card2" instance=ExtResource("5_sfuv4")] +[node name="sticky-note2" parent="childhood/PanelContainer/Visual2" instance=ExtResource("5_sfuv4")] position = Vector2(-208.193, 96.8376) rotation = 0.123092 +scale = Vector2(1, 1) collision_layer = 0 collision_mask = 0 text = "I didn't say stop"