From b2f944379eaf7f4fb03c66c9f590eecec78bd50c Mon Sep 17 00:00:00 2001 From: Adrian Schmid Date: Fri, 14 Jul 2023 22:05:42 +0200 Subject: [PATCH] scene update --- src/dev-util/board of devs.tscn | 57 ++++++----------------- src/logic-scenes/board/card.tscn | 1 + src/logic-scenes/board/physics-board.tscn | 54 ++++----------------- 3 files changed, 22 insertions(+), 90 deletions(-) diff --git a/src/dev-util/board of devs.tscn b/src/dev-util/board of devs.tscn index d8688f2..419b87d 100644 --- a/src/dev-util/board of devs.tscn +++ b/src/dev-util/board of devs.tscn @@ -1,14 +1,8 @@ -[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"] -[sub_resource type="GDScript" id="GDScript_cr445"] -script/source = "extends Control - -var has_stage: bool = false -" - [node name="board of devs" type="Control"] layout_mode = 3 anchors_preset = 15 @@ -16,7 +10,6 @@ anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -script = SubResource("GDScript_cr445") [node name="childhood" type="Control" parent="."] anchors_preset = 0 @@ -27,47 +20,41 @@ offset_bottom = 181.0 [node name="c_homework" parent="childhood" instance=ExtResource("1_xrckx")] text = "I never put in much effort for homework " -metadata/type = "card" +bounce_speed = 5.0 [node name="p_good_grades" parent="childhood/c_homework" groups=["c_body", "c_boy_stuff", "c_teachers"] instance=ExtResource("2_ucudl")] position = Vector2(-32, 50) text = "but at least I get good grades." -metadata/type = "post-it" [node name="p_upset_peers" parent="childhood/c_homework" groups=["c_Joy", "c_backlash", "c_boy_stuff", "c_comic_heroes", "c_teachers"] instance=ExtResource("2_ucudl")] position = Vector2(-32, 140) text = "and my peers were upset about that." -metadata/type = "post-it" [node name="c_teachers" parent="childhood" instance=ExtResource("1_xrckx")] position = Vector2(0, 300) text = "I like my teachers more than my classmates " -metadata/type = "card" +bounce_speed = 5.0 [node name="p_volunteering" parent="childhood/c_teachers" groups=["c_Joy", "c_backlash", "c_boy_stuff"] instance=ExtResource("2_ucudl")] position = Vector2(-32, 50) text = "doing voluntary social service at my school would be great." -metadata/type = "post-it" [node name="p_becoming_teacher" parent="childhood/c_teachers" groups=["c_Joy", "c_backlash", "c_homework"] instance=ExtResource("2_ucudl")] position = Vector2(-32, 140) text = "maybe I want to become a teacher." -metadata/type = "post-it" [node name="c_Joy" parent="childhood" instance=ExtResource("1_xrckx")] position = Vector2(0, 600) text = "I can put ages into things I enjoy " -metadata/type = "card" +bounce_speed = 5.0 [node name="p_worried_mother" parent="childhood/c_Joy" groups=["c_body", "c_boy_stuff", "c_comic_heroes", "c_homework", "c_teachers"] instance=ExtResource("2_ucudl")] position = Vector2(-32, 50) text = "my mother would be worried about that" -metadata/type = "post-it" [node name="p_thomas" parent="childhood/c_Joy" groups=["c_backlash", "c_comic_heroes", "c_homework", "c_teachers"] instance=ExtResource("2_ucudl")] position = Vector2(-32, 140) text = "Mr Thomas thinks that makes me gifted." -metadata/type = "post-it" [node name="voice_training" type="Control" parent="."] anchors_preset = 0 @@ -78,47 +65,41 @@ offset_bottom = 141.0 [node name="c_comic_heroes" parent="voice_training" instance=ExtResource("1_xrckx")] text = "Comic heroes are my role models " -metadata/type = "card" +bounce_speed = 5.0 [node name="p_effort" parent="voice_training/c_comic_heroes" groups=["c_Joy", "c_hit", "c_teachers"] instance=ExtResource("2_ucudl")] position = Vector2(-32, 50) text = "when I put in the effort, I can make the world a better place" -metadata/type = "post-it" [node name="p_upset_peers" parent="voice_training/c_comic_heroes" groups=["c_Joy", "c_body", "c_boy_stuff", "c_hit"] instance=ExtResource("2_ucudl")] position = Vector2(-32, 140) text = "and I want to be like agent q!" -metadata/type = "post-it" [node name="c_boy_stuff" parent="voice_training" instance=ExtResource("1_xrckx")] position = Vector2(0, 300) text = "I like boy stuff " -metadata/type = "card" +bounce_speed = 5.0 [node name="p_slut" parent="voice_training/c_boy_stuff" groups=["c_Joy", "c_body", "c_hit", "c_homework", "c_teachers"] instance=ExtResource("2_ucudl")] position = Vector2(-32, 50) text = "others think I only pretend to." -metadata/type = "post-it" [node name="p_girls" parent="voice_training/c_boy_stuff" groups=["c_Joy", "c_body", "c_comic_heroes", "c_hit", "c_homework", "c_teachers"] instance=ExtResource("2_ucudl")] position = Vector2(-32, 140) text = "and girls don't get that." -metadata/type = "post-it" [node name="c_backlash" parent="voice_training" instance=ExtResource("1_xrckx")] position = Vector2(0, 600) text = "Despite the backlash, I protected Joyo in front of class " -metadata/type = "card" +bounce_speed = 5.0 [node name="p_cross_friend" parent="voice_training/c_backlash" groups=["c_Joy", "c_boy_stuff", "c_comic_heroes", "c_hit"] instance=ExtResource("2_ucudl")] position = Vector2(-32, 50) text = "I would never cross a friend, even if it was for my own good." -metadata/type = "post-it" [node name="p_reward" parent="voice_training/c_backlash" groups=["c_Joy"] instance=ExtResource("2_ucudl")] position = Vector2(-32, 140) text = "those who put in the effort should be rewarded." -metadata/type = "post-it" [node name="juijutsu" type="Control" parent="."] anchors_preset = 0 @@ -129,46 +110,40 @@ offset_bottom = 141.0 [node name="c_body" parent="juijutsu" instance=ExtResource("1_xrckx")] text = "my body makes me uncomfortable " -metadata/type = "card" +bounce_speed = 5.0 [node name="p_boobs" parent="juijutsu/c_body" groups=["c_boy_stuff"] instance=ExtResource("2_ucudl")] position = Vector2(-32, 50) text = "boobs are just not made for fighting." -metadata/type = "post-it" [node name="p_fat" parent="juijutsu/c_body" instance=ExtResource("2_ucudl")] position = Vector2(-32, 140) text = "I despise all the fat on my hips." -metadata/type = "post-it" [node name="c_hit" parent="juijutsu" instance=ExtResource("1_xrckx")] position = Vector2(0, 300) text = "I know how to properly hit people " -metadata/type = "card" +bounce_speed = 5.0 [node name="p_confidence" parent="juijutsu/c_hit" groups=["c_Joy", "c_backlash", "c_boy_stuff", "c_comic_heroes", "c_homework"] instance=ExtResource("2_ucudl")] position = Vector2(-32, 50) text = "..., that gives me a lot of confidence." -metadata/type = "post-it" [node name="p_vent" parent="juijutsu/c_hit" groups=["c_Joy", "c_backlash", "c_boy_stuff", "c_comic_heroes", "c_homework", "c_teachers"] instance=ExtResource("2_ucudl")] position = Vector2(-32, 140) text = "and that’s a great vent." -metadata/type = "post-it" [node name="c_void" parent="juijutsu" instance=ExtResource("1_xrckx")] position = Vector2(0, 600) -metadata/type = "card" +bounce_speed = 5.0 [node name="p_wet" parent="juijutsu/c_void" groups=["c_void"] instance=ExtResource("2_ucudl")] position = Vector2(-32, 50) text = "… I was wet, so I must have been into it." -metadata/type = "post-it" [node name="p_stop" parent="juijutsu/c_void" groups=["c_void"] instance=ExtResource("2_ucudl")] position = Vector2(-32, 140) text = "… I didn’t say stop." -metadata/type = "post-it" [node name="test" type="Control" parent="."] anchors_preset = 0 @@ -178,42 +153,36 @@ offset_right = 1274.0 offset_bottom = 181.0 [node name="c_random1" parent="test" instance=ExtResource("1_xrckx")] -metadata/type = "card" +bounce_speed = 5.0 [node name="p_random11" parent="test/c_random1" groups=["c_boy_stuff"] instance=ExtResource("2_ucudl")] position = Vector2(-32, 50) text = "random 1" -metadata/type = "post-it" [node name="p_random12" parent="test/c_random1" instance=ExtResource("2_ucudl")] position = Vector2(-32, 140) text = "random 1" -metadata/type = "post-it" [node name="c_pick" parent="test" instance=ExtResource("1_xrckx")] position = Vector2(0, 300) -metadata/type = "card" +bounce_speed = 5.0 [node name="p_pick" parent="test/c_pick" groups=["c_Joy", "c_backlash", "c_boy_stuff", "c_comic_heroes", "c_homework"] instance=ExtResource("2_ucudl")] position = Vector2(-32, 50) text = "pick me 2" -metadata/type = "post-it" [node name="p_goof" parent="test/c_pick" groups=["c_Joy", "c_backlash", "c_boy_stuff", "c_comic_heroes", "c_homework", "c_teachers"] instance=ExtResource("2_ucudl")] position = Vector2(-32, 140) text = "you done goofed" -metadata/type = "post-it" [node name="c_random2" parent="test" instance=ExtResource("1_xrckx")] position = Vector2(0, 600) -metadata/type = "card" +bounce_speed = 5.0 [node name="p_random21" parent="test/c_random2" groups=["c_void"] instance=ExtResource("2_ucudl")] position = Vector2(-32, 50) text = "random 2" -metadata/type = "post-it" [node name="p_random22" parent="test/c_random2" groups=["c_void"] instance=ExtResource("2_ucudl")] position = Vector2(-32, 140) text = "random 2" -metadata/type = "post-it" diff --git a/src/logic-scenes/board/card.tscn b/src/logic-scenes/board/card.tscn index b870db4..16e8f8a 100644 --- a/src/logic-scenes/board/card.tscn +++ b/src/logic-scenes/board/card.tscn @@ -147,6 +147,7 @@ func _process(_delta): [node name="card" type="Area2D"] script = ExtResource("1_emip0") +bounce_speed = null metadata/type = "card" [node name="CollisionShape2D" type="CollisionShape2D" parent="."] diff --git a/src/logic-scenes/board/physics-board.tscn b/src/logic-scenes/board/physics-board.tscn index 81760e7..d1428d8 100644 --- a/src/logic-scenes/board/physics-board.tscn +++ b/src/logic-scenes/board/physics-board.tscn @@ -1,11 +1,10 @@ -[gd_scene load_steps=8 format=3 uid="uid://bnskiyx1sksww"] +[gd_scene load_steps=7 format=3 uid="uid://bnskiyx1sksww"] [ext_resource type="Texture2D" uid="uid://bi3xqdknw5tpe" path="res://logic-scenes/board/board-texture/Cork002_2K_Color.png" id="1_8brxc"] [ext_resource type="Shader" path="res://logic-scenes/board/physics-board.gdshader" id="1_ggnth"] [ext_resource type="Script" path="res://logic-scenes/board/card-board.gd" id="3_8v4c4"] [ext_resource type="PackedScene" uid="uid://dy5rd437h5hsw" path="res://logic-scenes/board/card.tscn" id="3_mg053"] [ext_resource type="PackedScene" uid="uid://bvowj4l8dtceu" path="res://dev-util/board of devs.tscn" id="4_sskx2"] -[ext_resource type="PackedScene" uid="uid://vkcdj8c3ytbq" path="res://logic-scenes/board/post-it.tscn" id="5_048k0"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_ttqei"] shader = ExtResource("1_ggnth") @@ -35,13 +34,19 @@ size_flags_horizontal = 3 mouse_filter = 1 [node name="card3" parent="HBoxContainer/dropzone" instance=ExtResource("3_mg053")] +process_mode = 4 +visible = false z_as_relative = false position = Vector2(371, 290) collision_layer = 2147483649 +bounce_speed = 5.0 is_dragable = true [node name="card" parent="HBoxContainer/dropzone" instance=ExtResource("3_mg053")] +process_mode = 4 +visible = false position = Vector2(640, 659) +bounce_speed = 5.0 is_dragable = true [node name="ScrollContainer" type="ScrollContainer" parent="HBoxContainer"] @@ -60,50 +65,7 @@ mouse_filter = 1 [node name="post-it_anchor1" type="Node2D" parent="HBoxContainer/ScrollContainer/VBoxContainer/Panel"] position = Vector2(105, 57) -[node name="post-it" parent="HBoxContainer/ScrollContainer/VBoxContainer/Panel" instance=ExtResource("5_048k0")] -z_index = 1 -position = Vector2(105, 57) -is_dragable = true - -[node name="Panel2" type="Panel" parent="HBoxContainer/ScrollContainer/VBoxContainer"] -self_modulate = Color(1, 1, 1, 0) -custom_minimum_size = Vector2(400, 120) -layout_mode = 2 -mouse_filter = 1 - -[node name="post-it_anchor2" type="Node2D" parent="HBoxContainer/ScrollContainer/VBoxContainer/Panel2"] -position = Vector2(105, 57) - -[node name="post-it" parent="HBoxContainer/ScrollContainer/VBoxContainer/Panel2" instance=ExtResource("5_048k0")] -position = Vector2(105, 57) -is_dragable = true - -[node name="Panel3" type="Panel" parent="HBoxContainer/ScrollContainer/VBoxContainer"] -self_modulate = Color(1, 1, 1, 0) -custom_minimum_size = Vector2(400, 120) -layout_mode = 2 -mouse_filter = 1 - -[node name="post-it_anchor3" type="Node2D" parent="HBoxContainer/ScrollContainer/VBoxContainer/Panel3"] -position = Vector2(105, 57) - -[node name="post-it" parent="HBoxContainer/ScrollContainer/VBoxContainer/Panel3" instance=ExtResource("5_048k0")] -position = Vector2(105, 57) -is_dragable = true - -[node name="Panel4" type="Panel" parent="HBoxContainer/ScrollContainer/VBoxContainer"] -self_modulate = Color(1, 1, 1, 0) -custom_minimum_size = Vector2(400, 120) -layout_mode = 2 -mouse_filter = 1 - -[node name="post-it_anchor4" type="Node2D" parent="HBoxContainer/ScrollContainer/VBoxContainer/Panel4"] -position = Vector2(105, 57) - -[node name="post-it" parent="HBoxContainer/ScrollContainer/VBoxContainer/Panel4" instance=ExtResource("5_048k0")] -position = Vector2(105, 57) -is_dragable = true - [node name="board of devs" parent="." instance=ExtResource("4_sskx2")] +process_mode = 4 visible = false layout_mode = 2