diff --git a/src/base-environments/youth_room/interactive_sprite.gd b/src/base-environments/youth_room/interactive_sprite.gd index e174930..17b84f0 100644 --- a/src/base-environments/youth_room/interactive_sprite.gd +++ b/src/base-environments/youth_room/interactive_sprite.gd @@ -20,6 +20,7 @@ var revealed: bool = false: distance_tween = get_tree().create_tween() distance_tween.tween_property($UiWrapper/Frame, ^":visibility_range_end", 3.0, 1.0) else: + wrapper.hide() ui.vanish() if distance_tween != null: if distance_tween.is_running(): distance_tween.stop() diff --git a/src/base-environments/youth_room/youth_room.tscn b/src/base-environments/youth_room/youth_room.tscn index a4abdd8..1ad265a 100644 --- a/src/base-environments/youth_room/youth_room.tscn +++ b/src/base-environments/youth_room/youth_room.tscn @@ -1707,7 +1707,7 @@ anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -mouse_filter = 1 +mouse_filter = 2 [node name="ending_button" type="Button" parent="logic/UI"] visible = false @@ -1740,6 +1740,7 @@ mouse_filter = 2 script = SubResource("GDScript_uy50s") [node name="Opening" type="CenterContainer" parent="logic/UI"] +visible = false layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 @@ -1893,28 +1894,34 @@ omni_range = 16.8518 [node name="MaskMemento" parent="logic" instance=ExtResource("30_ypa88")] transform = Transform3D(-0.8630245, 0, 0.5051597, 0, 1, 0, -0.5051597, 0, -0.8630245, 0.0754588, 0.948372, 2.42068) +visible = false interaction_ui = ExtResource("12_viwxf") [node name="ClothesMemento" parent="logic" instance=ExtResource("30_ypa88")] transform = Transform3D(0.8604294, 0, -0.5095667, 0, 1, 0, 0.5095667, 0, 0.8604294, 1.3658599, 1.17096, -0.6365988) +visible = false interaction_ui = ExtResource("12_x3dlb") [node name="ComicMemento" parent="logic" instance=ExtResource("30_ypa88")] transform = Transform3D(0.9699434, 0, 0.24332686, 0, 1, 0, -0.24332686, 0, 0.9699434, 2.91664, 0.595014, -0.75655603) +visible = false interaction_ui = ExtResource("13_v3447") [node name="CeilingMemento" parent="logic" instance=ExtResource("30_ypa88")] transform = Transform3D(0.71489924, 0, 0.6992255, 0, 1, 0, -0.6992255, 0, 0.71489924, -0.13478619, 2.0720484, -0.42032808) +visible = false interaction_ui = ExtResource("19_d3c7p") [node name="MindBoard" parent="logic" instance=ExtResource("30_ypa88")] unique_name_in_owner = true transform = Transform3D(-4.3711374e-08, 0, 0.9999984, 0, 1, 0, -0.9999984, 0, -4.3711374e-08, -0.907206, 1.17661, 1.74337) +visible = false interaction_ui = ExtResource("4_gyjxx") [node name="Door" parent="logic" instance=ExtResource("30_ypa88")] unique_name_in_owner = true transform = Transform3D(0.9999984, 0, 4.973797e-14, 0, 1, 0, -4.973797e-14, 0, 0.9999984, 0.115203, 1.3931, -0.954428) +visible = false [node name="AnimationPlayer" type="AnimationPlayer" parent="."] libraries = { diff --git a/src/logic-scenes/board/card.tscn b/src/logic-scenes/board/card.tscn index 0c0c8c5..43fa6c1 100644 --- a/src/logic-scenes/board/card.tscn +++ b/src/logic-scenes/board/card.tscn @@ -13,6 +13,10 @@ text = "asdf" metadata/_custom_type_script = "uid://ddy8kb2hjvgss" metadata/type = "card" +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +position = Vector2(5.5, 0) +shape = SubResource("RectangleShape2D_mai6h") + [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] scale = Vector2(0.6, 0.6) sprite_frames = ExtResource("2_mai6h") @@ -34,9 +38,5 @@ horizontal_alignment = 1 vertical_alignment = 1 autowrap_mode = 3 -[node name="CollisionShape2D" type="CollisionShape2D" parent="."] -position = Vector2(5.5, 0) -shape = SubResource("RectangleShape2D_mai6h") - [connection signal="mouse_entered" from="." to="." method="_on_mouse_entered"] [connection signal="mouse_exited" from="." to="." method="_on_mouse_exited"] diff --git a/src/logic-scenes/card_burner/card_burner.gd b/src/logic-scenes/card_burner/card_burner.gd index 865e5bc..1ba711d 100644 --- a/src/logic-scenes/card_burner/card_burner.gd +++ b/src/logic-scenes/card_burner/card_burner.gd @@ -1,18 +1,16 @@ class_name CardBurner extends CenterContainer -var has_stage = false: +var has_stage: bool = false: set(focus): if is_node_ready(): if not focus == has_stage: if focus: process_mode = Node.PROCESS_MODE_INHERIT self.show() - self.mouse_filter = Control.MOUSE_FILTER_PASS Input.mouse_mode = Input.MOUSE_MODE_HIDDEN if not PromptManager.icons == InputPrompt.Icons.KEYBOARD or true: handle_direction_input(Vector2.UP) else: - self.mouse_filter = Control.MOUSE_FILTER_IGNORE self.hide() process_mode = Node.PROCESS_MODE_DISABLED has_stage = focus diff --git a/src/logic-scenes/interactive_sprite/interactive_sprite.tscn b/src/logic-scenes/interactive_sprite/interactive_sprite.tscn index e4d1ce5..cf7a821 100644 --- a/src/logic-scenes/interactive_sprite/interactive_sprite.tscn +++ b/src/logic-scenes/interactive_sprite/interactive_sprite.tscn @@ -43,7 +43,6 @@ script = ExtResource("4_uwc8q") unique_name_in_owner = true transparent_bg = true size = Vector2i(400, 350) -render_target_update_mode = 4 [node name="CollectableUi" parent="UiWrapper/UiSprite/SubViewport" instance=ExtResource("5_kqyl2")] diff --git a/src/logic-scenes/player_controller/player_controller.tscn b/src/logic-scenes/player_controller/player_controller.tscn index a2f8a43..bcca2dc 100644 --- a/src/logic-scenes/player_controller/player_controller.tscn +++ b/src/logic-scenes/player_controller/player_controller.tscn @@ -652,6 +652,7 @@ grow_horizontal = 2 grow_vertical = 2 scale = Vector2(1.5, 1.5) pivot_offset = Vector2(960, 960) +mouse_filter = 2 texture = SubResource("GradientTexture2D_x6v75") expand_mode = 4 diff --git a/src/project.godot b/src/project.godot index b4965cf..aaec698 100644 --- a/src/project.godot +++ b/src/project.godot @@ -41,7 +41,6 @@ window/size/viewport_width=1920 window/size/viewport_height=1080 window/stretch/mode="canvas_items" window/stretch/aspect="expand" -display_server/driver.linuxbsd="wayland" mouse_cursor/custom_image="res://import/interface-elements/cursor.png" window/hdr/enabled=true window/hdr/prefer_high_precision=true diff --git a/src/singletons/main/main.tscn b/src/singletons/main/main.tscn index bc967d5..0378037 100644 --- a/src/singletons/main/main.tscn +++ b/src/singletons/main/main.tscn @@ -91,7 +91,7 @@ anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -mouse_filter = 2 +mouse_filter = 1 script = ExtResource("1_rqkns") youth_room_path = "uid://b3b0gyvklqn50" transition_room_path = "uid://fgp3s28h7msy" diff --git a/src/ui/loading/loading.tscn b/src/ui/loading/loading.tscn index b5249c3..ba0bc9c 100644 --- a/src/ui/loading/loading.tscn +++ b/src/ui/loading/loading.tscn @@ -49,6 +49,8 @@ offset_top = -80.16669 offset_right = 500.0 offset_bottom = 0.00036621094 grow_vertical = 0 +mouse_filter = 2 +mouse_force_pass_scroll_events = false script = ExtResource("1_aeyqy") [node name="CanvasLayer" type="CanvasLayer" parent="."] diff --git a/src/ui/menu_main/main_menu.gd b/src/ui/menu_main/main_menu.gd index f6bd5a4..d6c01a3 100644 --- a/src/ui/menu_main/main_menu.gd +++ b/src/ui/menu_main/main_menu.gd @@ -76,7 +76,6 @@ func _activate() -> void: for child: Control in $PanelContainer.get_children(): child.focus_mode = Control.FOCUS_ALL child.modulate = Color.WHITE - child.mouse_filter = Control.MOUSE_FILTER_STOP if continue_button.visible: continue_button.grab_focus() @@ -88,7 +87,7 @@ func _deactivate() -> void: for child: Control in $PanelContainer.get_children(): child.focus_mode = FOCUS_NONE child.modulate = Color.WEB_GRAY - child.mouse_filter = Control.MOUSE_FILTER_IGNORE + func _appear() -> void: modulate.a = 0