From 3a295c38875dae32d2c12f79148b75ef94714878 Mon Sep 17 00:00:00 2001 From: betalars Date: Mon, 17 Jul 2023 14:15:40 +0200 Subject: [PATCH] card updates --- src/dev-util/board of devs.tscn | 12 ------------ src/logic-scenes/board/card.gd | 3 ++- src/logic-scenes/board/card.tscn | 1 - src/logic-scenes/board/physics-board.tscn | 13 ++++++++++++- src/logic-scenes/card_picker/card_picker.tscn | 4 ---- 5 files changed, 14 insertions(+), 19 deletions(-) diff --git a/src/dev-util/board of devs.tscn b/src/dev-util/board of devs.tscn index 419b87d..ea233ac 100644 --- a/src/dev-util/board of devs.tscn +++ b/src/dev-util/board of devs.tscn @@ -20,7 +20,6 @@ offset_bottom = 181.0 [node name="c_homework" parent="childhood" instance=ExtResource("1_xrckx")] text = "I never put in much effort for homework " -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) @@ -33,7 +32,6 @@ text = "and my peers were upset about that." [node name="c_teachers" parent="childhood" instance=ExtResource("1_xrckx")] position = Vector2(0, 300) text = "I like my teachers more than my classmates " -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) @@ -46,7 +44,6 @@ text = "maybe I want to become a teacher." [node name="c_Joy" parent="childhood" instance=ExtResource("1_xrckx")] position = Vector2(0, 600) text = "I can put ages into things I enjoy " -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) @@ -65,7 +62,6 @@ offset_bottom = 141.0 [node name="c_comic_heroes" parent="voice_training" instance=ExtResource("1_xrckx")] text = "Comic heroes are my role models " -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) @@ -78,7 +74,6 @@ text = "and I want to be like agent q!" [node name="c_boy_stuff" parent="voice_training" instance=ExtResource("1_xrckx")] position = Vector2(0, 300) text = "I like boy stuff " -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) @@ -91,7 +86,6 @@ text = "and girls don't get that." [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 " -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) @@ -110,7 +104,6 @@ offset_bottom = 141.0 [node name="c_body" parent="juijutsu" instance=ExtResource("1_xrckx")] text = "my body makes me uncomfortable " -bounce_speed = 5.0 [node name="p_boobs" parent="juijutsu/c_body" groups=["c_boy_stuff"] instance=ExtResource("2_ucudl")] position = Vector2(-32, 50) @@ -123,7 +116,6 @@ text = "I despise all the fat on my hips." [node name="c_hit" parent="juijutsu" instance=ExtResource("1_xrckx")] position = Vector2(0, 300) text = "I know how to properly hit people " -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) @@ -135,7 +127,6 @@ text = "and that’s a great vent." [node name="c_void" parent="juijutsu" instance=ExtResource("1_xrckx")] position = Vector2(0, 600) -bounce_speed = 5.0 [node name="p_wet" parent="juijutsu/c_void" groups=["c_void"] instance=ExtResource("2_ucudl")] position = Vector2(-32, 50) @@ -153,7 +144,6 @@ offset_right = 1274.0 offset_bottom = 181.0 [node name="c_random1" parent="test" instance=ExtResource("1_xrckx")] -bounce_speed = 5.0 [node name="p_random11" parent="test/c_random1" groups=["c_boy_stuff"] instance=ExtResource("2_ucudl")] position = Vector2(-32, 50) @@ -165,7 +155,6 @@ text = "random 1" [node name="c_pick" parent="test" instance=ExtResource("1_xrckx")] position = Vector2(0, 300) -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) @@ -177,7 +166,6 @@ text = "you done goofed" [node name="c_random2" parent="test" instance=ExtResource("1_xrckx")] position = Vector2(0, 600) -bounce_speed = 5.0 [node name="p_random21" parent="test/c_random2" groups=["c_void"] instance=ExtResource("2_ucudl")] position = Vector2(-32, 50) diff --git a/src/logic-scenes/board/card.gd b/src/logic-scenes/board/card.gd index 3e43973..4809623 100644 --- a/src/logic-scenes/board/card.gd +++ b/src/logic-scenes/board/card.gd @@ -93,7 +93,7 @@ func _process(delta: float) -> void: if highlighted: _handle_wiggle(delta) - if get_overlapping_areas().size() > 0: + if get_overlapping_areas().size() > 0 and is_dragable: for area in get_overlapping_areas(): if area is Card or area is CardCollider: if area is CardCollider: @@ -114,6 +114,7 @@ func replace_with(card: Card): self.compatible_postits = card.compatible_postits self.own_postits = card.own_postits self.voice_line = card.voice_line + self.name = card.name func _on_focus_entered(): print(self, "is focused") diff --git a/src/logic-scenes/board/card.tscn b/src/logic-scenes/board/card.tscn index 16e8f8a..b870db4 100644 --- a/src/logic-scenes/board/card.tscn +++ b/src/logic-scenes/board/card.tscn @@ -147,7 +147,6 @@ 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 3d89e77..35bb3e1 100644 --- a/src/logic-scenes/board/physics-board.tscn +++ b/src/logic-scenes/board/physics-board.tscn @@ -139,7 +139,18 @@ rotation = 1.5708 shape = SubResource("RectangleShape2D_ivo5o") [node name="emptyText" type="Label" parent="."] +modulate = Color(0, 0, 0, 1) layout_mode = 2 -text = "Bitte nicht wundern!" +theme_override_font_sizes/font_size = 50 +text = "Collect mementos to fill board with cards." +horizontal_alignment = 1 +vertical_alignment = 1 + +[node name="disclaimer" type="Label" parent="."] +modulate = Color(0, 0, 0, 1) +layout_mode = 2 +size_flags_vertical = 0 +theme_override_font_sizes/font_size = 40 +text = "alpha: Gamepad compatibility is limited. Using a mouse to move cards is advised." horizontal_alignment = 1 vertical_alignment = 1 diff --git a/src/logic-scenes/card_picker/card_picker.tscn b/src/logic-scenes/card_picker/card_picker.tscn index b8c5459..555c789 100644 --- a/src/logic-scenes/card_picker/card_picker.tscn +++ b/src/logic-scenes/card_picker/card_picker.tscn @@ -1539,7 +1539,6 @@ libraries = { [node name="post-it" parent="postIts/postIt_1" instance=ExtResource("3_ggbxq")] text = "Post 1" -metadata/type = "post-it" [node name="postIt_2" type="Control" parent="postIts"] layout_mode = 2 @@ -1556,7 +1555,6 @@ libraries = { [node name="post-it" parent="postIts/postIt_2" instance=ExtResource("3_ggbxq")] text = "Post 2" -metadata/type = "post-it" [node name="postIt_3" type="Control" parent="postIts"] layout_mode = 2 @@ -1573,7 +1571,6 @@ libraries = { [node name="post-it" parent="postIts/postIt_3" instance=ExtResource("3_ggbxq")] text = "Post 3" -metadata/type = "post-it" [node name="postIt_4" type="Control" parent="postIts"] layout_mode = 2 @@ -1590,7 +1587,6 @@ libraries = { [node name="post-it" parent="postIts/postIt_4" instance=ExtResource("3_ggbxq")] text = "Post 4" -metadata/type = "post-it" [node name="board of devs" parent="." instance=ExtResource("4_1kvte")] visible = false