diff --git a/src/base-environments/youth_room/scnees/childhood.tscn b/src/base-environments/youth_room/scnees/childhood.tscn index 6e4e1f1..f4cc842 100644 --- a/src/base-environments/youth_room/scnees/childhood.tscn +++ b/src/base-environments/youth_room/scnees/childhood.tscn @@ -582,4 +582,5 @@ libraries = { } [node name="Text" type="AudioStreamPlayer" parent="AnimationPlayer"] +mix_target = 2 bus = &"text" diff --git a/src/base-environments/youth_room/scnees/draven.tscn b/src/base-environments/youth_room/scnees/draven.tscn index 29be084..b12e069 100644 --- a/src/base-environments/youth_room/scnees/draven.tscn +++ b/src/base-environments/youth_room/scnees/draven.tscn @@ -483,6 +483,7 @@ libraries = { } [node name="Text" type="AudioStreamPlayer" parent="AnimationPlayer"] +mix_target = 2 bus = &"text" [node name="Music" type="AudioStreamPlayer" parent="AnimationPlayer"] diff --git a/src/base-environments/youth_room/scnees/jui_jutsu.tscn b/src/base-environments/youth_room/scnees/jui_jutsu.tscn index e13ba5e..4f6d290 100644 --- a/src/base-environments/youth_room/scnees/jui_jutsu.tscn +++ b/src/base-environments/youth_room/scnees/jui_jutsu.tscn @@ -830,6 +830,7 @@ libraries = { } [node name="Text" type="AudioStreamPlayer" parent="AnimationPlayer"] +mix_target = 2 bus = &"text" [node name="Music" type="AudioStreamPlayer" parent="AnimationPlayer"] diff --git a/src/base-environments/youth_room/scnees/voice_training.tscn b/src/base-environments/youth_room/scnees/voice_training.tscn index 1a82365..148357b 100644 --- a/src/base-environments/youth_room/scnees/voice_training.tscn +++ b/src/base-environments/youth_room/scnees/voice_training.tscn @@ -639,4 +639,5 @@ libraries = { } [node name="Text" type="AudioStreamPlayer" parent="AnimationPlayer"] +mix_target = 2 bus = &"text" diff --git a/src/base-environments/youth_room/youth_room.tscn b/src/base-environments/youth_room/youth_room.tscn index e40b2bc..25ccd07 100644 --- a/src/base-environments/youth_room/youth_room.tscn +++ b/src/base-environments/youth_room/youth_room.tscn @@ -1639,6 +1639,7 @@ autoplay = "RESET" script = SubResource("GDScript_tfc2r") [node name="Lisa" type="AudioStreamPlayer" parent="logic/ScenePlayer"] +mix_target = 2 bus = &"text" [node name="Moving" type="AudioStreamPlayer" parent="logic/ScenePlayer"] diff --git a/src/logic-scenes/board/card-board.gd b/src/logic-scenes/board/card-board.gd index 26f40df..1271daa 100644 --- a/src/logic-scenes/board/card-board.gd +++ b/src/logic-scenes/board/card-board.gd @@ -222,6 +222,7 @@ func handle_mouse_button(input: InputEventMouseButton, to_handle = currently_act to_handle.attached_to = sticky_note_container.get_child(current_sticky_note_id) to_handle.reset_drag() current_context = NAVIGATE + _return_sticky_notes_to_panels() return else: area.attach_sticky_note(to_handle) @@ -266,6 +267,10 @@ func handle_mouse_button(input: InputEventMouseButton, to_handle = currently_act func _return_sticky_notes_to_panels(): for panel:StickyNotePanel in sticky_note_container.get_children(): panel.reclaim_sticky_note() + + for node in dropzone.get_children(): + if node is StickyNote: + node.is_dragable = true func is_board_complete() -> bool: if mementos_collected == 4: @@ -315,6 +320,7 @@ func insert_area(parent: Control, node: Area2D): if node is StickyNote: node.attached_to = self + node.is_dragable = true # Takes the inputs for control inputs func _input(event): diff --git a/src/logic-scenes/board/card.gd b/src/logic-scenes/board/card.gd index f58934f..85e4389 100644 --- a/src/logic-scenes/board/card.gd +++ b/src/logic-scenes/board/card.gd @@ -217,6 +217,7 @@ func attach_sticky_note(sticky_note: StickyNote) -> bool: sticky_note.reparent(self) sticky_note.position = sticky_note_position sticky_note.on_board = false + sticky_note.is_dragable = false current_sticky_note = sticky_note sticky_note.attached_to = self diff --git a/src/logic-scenes/card_picker/card_picker.gd b/src/logic-scenes/card_picker/card_picker.gd index 865e1cd..0b6f30d 100644 --- a/src/logic-scenes/card_picker/card_picker.gd +++ b/src/logic-scenes/card_picker/card_picker.gd @@ -159,7 +159,7 @@ func pick(id: int): var winning_id print(options[1].text) - if !(options[1].text == "" and not id == 1): + if !(options[1].text == "void" and not id == 1): randomize() winning_id = randi() % options.size() diff --git a/src/thank-you.tscn b/src/thank-you.tscn index c7e8ae2..80f1db2 100644 --- a/src/thank-you.tscn +++ b/src/thank-you.tscn @@ -153,21 +153,29 @@ stretch_mode = 4 [node name="card" parent="childhood/PanelContainer" instance=ExtResource("4_48hwg")] process_mode = 4 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")] position = Vector2(39, 120) rotation = -0.103332 +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 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")] position = Vector2(-208.193, 96.8376) rotation = 0.123092 +collision_layer = 0 +collision_mask = 0 text = "I didn't say stop" [node name="Button" type="Button" parent="."]