fix: Issue 336 - unclickable area with simplemouse

godot-escoria · Feb 13, 2023 · cbb7984 · cbb7984
1 parent 39165e4
commit cbb7984
Show file tree

Hide file tree

Showing 26 changed files with 72 additions and 19 deletions.
diff --git a/addons/escoria-core/ui_library/inventory/esc_inventory_button.gd b/addons/escoria-core/ui_library/inventory/esc_inventory_button.gd
@@ -81,6 +81,13 @@ func _on_inventory_item_gui_input(event: InputEvent):
 					global_id,
 					event
 				)
+			# Make sure fast right clicks in the inventory aren't ignored
+			elif event.button_index == BUTTON_RIGHT:
+					emit_signal(
+						"mouse_right_inventory_item",
+						global_id,
+						event
+					)
 		else:
 			if event.is_pressed():
 				if event.button_index == BUTTON_LEFT:

diff --git a/addons/escoria-ui-simplemouse/game.tscn b/addons/escoria-ui-simplemouse/game.tscn
@@ -35,16 +35,15 @@ __meta__ = {
 anchor_top = 0.9
 anchor_right = 1.0
 anchor_bottom = 1.0
+mouse_filter = 2
 size_flags_horizontal = 3
 size_flags_vertical = 3
 theme = ExtResource( 9 )
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [node name="HBoxContainer" type="HBoxContainer" parent="CanvasLayer/ui"]
 anchor_right = 1.0
 anchor_bottom = 1.0
+mouse_filter = 2
 size_flags_horizontal = 3
 size_flags_vertical = 3
 __meta__ = {
@@ -54,6 +53,7 @@ __meta__ = {
 [node name="VBoxContainer" type="VBoxContainer" parent="CanvasLayer/ui/HBoxContainer"]
 margin_right = 58.0
 margin_bottom = 90.0
+mouse_filter = 2
 
 [node name="MenuButton" type="Button" parent="CanvasLayer/ui/HBoxContainer/VBoxContainer"]
 margin_right = 58.0
@@ -64,6 +64,7 @@ text = "Menu"
 margin_left = 62.0
 margin_right = 1186.0
 margin_bottom = 90.0
+mouse_filter = 2
 size_flags_horizontal = 3
 
 [node name="inventory_ui" parent="CanvasLayer/ui/HBoxContainer" instance=ExtResource( 1 )]

diff --git a/addons/escoria-ui-simplemouse/inventory/inventory_ui.tscn b/addons/escoria-ui-simplemouse/inventory/inventory_ui.tscn
@@ -61,6 +61,7 @@ anchor_bottom = 1.0
 margin_left = -516.0
 margin_top = -160.0
 rect_min_size = Vector2( 0, 160 )
+mouse_filter = 2
 size_flags_horizontal = 3
 size_flags_vertical = 3
 texture = ExtResource( 2 )
@@ -72,27 +73,27 @@ __meta__ = {
 [node name="MarginContainer" type="MarginContainer" parent="FloatingInventory/panel"]
 anchor_right = 1.0
 anchor_bottom = 1.0
+mouse_filter = 2
 size_flags_horizontal = 3
 size_flags_vertical = 3
 custom_constants/margin_right = 20
 custom_constants/margin_top = 20
 custom_constants/margin_left = 20
 custom_constants/margin_bottom = 20
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [node name="ScrollContainer" type="ScrollContainer" parent="FloatingInventory/panel/MarginContainer"]
 margin_left = 20.0
 margin_top = 80.0
 margin_right = 496.0
 margin_bottom = 80.0
+mouse_filter = 2
 size_flags_horizontal = 3
 size_flags_vertical = 6
 scroll_vertical_enabled = false
 
 [node name="container" type="HBoxContainer" parent="FloatingInventory/panel/MarginContainer/ScrollContainer"]
 margin_right = 476.0
+mouse_filter = 2
 size_flags_horizontal = 3
 size_flags_vertical = 3
 custom_constants/separation = 20

diff --git a/game/rooms/room01/room1background.png b/game/rooms/room01/room1background.png
diff --git a/game/rooms/room02/room2background.png b/game/rooms/room02/room2background.png
diff --git a/game/rooms/room03/room3background.png b/game/rooms/room03/room3background.png
diff --git a/game/rooms/room04/assets/forrest.png b/game/rooms/room04/assets/forrest.png
diff --git a/game/rooms/room05/room5background.png b/game/rooms/room05/room5background.png
diff --git a/game/rooms/room06/esc/worker.esc b/game/rooms/room06/esc/worker.esc
@@ -83,4 +83,26 @@ set_active worker false
 set_gui_visible true
 accept_input ALL
 
+# use has to be supported as simplemouse has no "give" icon
+:use r5_filled_sheet
+set_gui_visible false
+accept_input SKIP
+
+inventory_remove r5_filled_sheet
+say worker "I've unlocked the door, in you go!"
+walk worker r6_r_exit
+
+# Open the door
+set_global r6_r_exit_locked false
+# Hide the closed door graphic
+set_state r6_r_exit open_door
+# Make the open exit visible
+set_active r6_r_exit true
+
+# Disappear!
+say worker "I will see you again... MUAHAHAHAHA!"
+wait 1
+set_active worker false
 
+set_gui_visible true
+accept_input ALL
diff --git a/game/rooms/room06/room6background.png b/game/rooms/room06/room6background.png
diff --git a/game/rooms/room08/room8background.png b/game/rooms/room08/room8background.png
diff --git a/game/rooms/room09/room9background.png b/game/rooms/room09/room9background.png
diff --git a/game/rooms/room10/room10background.png b/game/rooms/room10/room10background.png
diff --git a/game/rooms/room11/room11.tscn b/game/rooms/room11/room11.tscn
@@ -28,6 +28,8 @@ player_scene = ExtResource( 4 )
 camera_limits = [ Rect2( 0, 0, 1280, 555 ) ]
 
 [node name="background" parent="." instance=ExtResource( 2 )]
+margin_right = 1280.0
+margin_bottom = 900.0
 
 [node name="room_label" type="Label" parent="background"]
 margin_right = 92.0
@@ -58,6 +60,7 @@ esc_script = "res://game/rooms/room11/esc/left_exit.esc"
 is_exit = true
 tooltip_name = "Left exit"
 default_action = "walk"
+combine_when_selected_action_is_in = [  ]
 dialog_color = Color( 1, 1, 1, 1 )
 animations = null
 
@@ -71,6 +74,7 @@ script = ExtResource( 5 )
 [node name="r_door" parent="Hotspots" instance=ExtResource( 8 )]
 global_id = "r11_r_exit"
 esc_script = "res://game/rooms/room11/esc/right_exit.esc"
+combine_when_selected_action_is_in = [  ]
 
 [node name="ESCLocation" type="Position2D" parent="Hotspots/r_door"]
 position = Vector2( 1236.02, 366.281 )
@@ -84,6 +88,7 @@ global_id = "r11_circle_tk"
 esc_script = "res://game/rooms/room11/esc/mysterious_circle_tk.esc"
 tooltip_name = "Mysterious circle"
 default_action = "use"
+combine_when_selected_action_is_in = [  ]
 dialog_color = Color( 1, 1, 1, 1 )
 animations = null
 
@@ -117,6 +122,7 @@ global_id = "r11_circle_nott"
 esc_script = "res://game/rooms/room11/esc/mysterious_circle_nott.esc"
 tooltip_name = "Mysterious circle"
 default_action = "use"
+combine_when_selected_action_is_in = [  ]
 dialog_color = Color( 1, 1, 1, 1 )
 animations = null
 
@@ -150,6 +156,7 @@ global_id = "r11_circle_nohud"
 esc_script = "res://game/rooms/room11/esc/mysterious_circle_nohud.esc"
 tooltip_name = "Mysterious circle"
 default_action = "use"
+combine_when_selected_action_is_in = [  ]
 dialog_color = Color( 1, 1, 1, 1 )
 animations = null
 
@@ -183,6 +190,7 @@ global_id = "r11_circle_nosave"
 esc_script = "res://game/rooms/room11/esc/mysterious_circle_nosave.esc"
 tooltip_name = "Mysterious circle"
 default_action = "use"
+combine_when_selected_action_is_in = [  ]
 dialog_color = Color( 1, 1, 1, 1 )
 animations = null
 
@@ -216,6 +224,7 @@ global_id = "r11_circle_fadein"
 esc_script = "res://game/rooms/room11/esc/mysterious_circle_fadein.esc"
 tooltip_name = "Mysterious circle"
 default_action = "use"
+combine_when_selected_action_is_in = [  ]
 dialog_color = Color( 1, 1, 1, 1 )
 animations = null
 

diff --git a/game/rooms/room12/room12.tscn b/game/rooms/room12/room12.tscn
@@ -48,6 +48,7 @@ esc_script = "res://game/rooms/room12/esc/left_exit.esc"
 is_exit = true
 tooltip_name = "Left exit"
 default_action = "walk"
+combine_when_selected_action_is_in = [  ]
 dialog_color = Color( 1, 1, 1, 1 )
 animations = null
 
@@ -81,6 +82,7 @@ global_id = "r12_transition_default"
 esc_script = "res://game/rooms/room12/esc/transition_default.esc"
 tooltip_name = "transition_default"
 default_action = "use"
+combine_when_selected_action_is_in = [  ]
 dialog_color = Color( 1, 1, 1, 1 )
 animations = null
 
@@ -108,6 +110,7 @@ global_id = "r12_transition_black"
 esc_script = "res://game/rooms/room12/esc/transition_black.esc"
 tooltip_name = "transition_black"
 default_action = "use"
+combine_when_selected_action_is_in = [  ]
 dialog_color = Color( 1, 1, 1, 1 )
 animations = null
 
@@ -135,6 +138,7 @@ global_id = "r12_transition_white"
 esc_script = "res://game/rooms/room12/esc/transition_white.esc"
 tooltip_name = "transition_white"
 default_action = "use"
+combine_when_selected_action_is_in = [  ]
 dialog_color = Color( 1, 1, 1, 1 )
 animations = null
 
@@ -162,6 +166,7 @@ global_id = "r12_transition_shards"
 esc_script = "res://game/rooms/room12/esc/transition_shards.esc"
 tooltip_name = "transition_shards"
 default_action = "use"
+combine_when_selected_action_is_in = [  ]
 dialog_color = Color( 1, 1, 1, 1 )
 animations = null
 
@@ -189,6 +194,7 @@ global_id = "r12_transition_centre"
 esc_script = "res://game/rooms/room12/esc/transition_centre.esc"
 tooltip_name = "transition_centre"
 default_action = "use"
+combine_when_selected_action_is_in = [  ]
 dialog_color = Color( 1, 1, 1, 1 )
 animations = null
 
@@ -216,6 +222,7 @@ global_id = "r12_transition_blackout"
 esc_script = "res://game/rooms/room12/esc/transition_blackout.esc"
 tooltip_name = "transition_blackout"
 default_action = "use"
+combine_when_selected_action_is_in = [  ]
 dialog_color = Color( 1, 1, 1, 1 )
 animations = null
 

diff --git a/game/rooms/room12/room12background.png b/game/rooms/room12/room12background.png
diff --git a/game/rooms/room13/background.tscn b/game/rooms/room13/background.tscn
@@ -3,8 +3,8 @@
 [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_background.gd" type="Script" id=1]
 
 [node name="background" type="TextureRect"]
-margin_right = 1289.0
-margin_bottom = 555.0
+margin_right = 1280.0
+margin_bottom = 900.0
 mouse_filter = 2
 script = ExtResource( 1 )
 __meta__ = {

diff --git a/game/rooms/room14/background.tscn b/game/rooms/room14/background.tscn
@@ -3,8 +3,8 @@
 [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_background.gd" type="Script" id=1]
 
 [node name="background" type="TextureRect"]
-margin_right = 1289.0
-margin_bottom = 555.0
+margin_right = 1280.0
+margin_bottom = 900.0
 mouse_filter = 2
 script = ExtResource( 1 )
 __meta__ = {

diff --git a/game/rooms/room15/room15.png b/game/rooms/room15/room15.png
diff --git a/game/rooms/room15/room15.tscn b/game/rooms/room15/room15.tscn
@@ -123,6 +123,7 @@ esc_script = "res://game/rooms/room15/esc/left_exit.esc"
 is_exit = true
 tooltip_name = "Left exit"
 default_action = "walk"
+combine_when_selected_action_is_in = [  ]
 dialog_color = Color( 1, 1, 1, 1 )
 animations = null
 
@@ -143,6 +144,7 @@ esc_script = "res://game/rooms/room15/esc/right_exit.esc"
 is_exit = true
 tooltip_name = "Right exit"
 default_action = "walk"
+combine_when_selected_action_is_in = [  ]
 dialog_color = Color( 1, 1, 1, 1 )
 animations = null
 
@@ -171,6 +173,7 @@ global_id = "say_long_left"
 esc_script = "res://game/rooms/room15/esc/say_long.esc"
 tooltip_name = "Say long test left"
 default_action = "use"
+combine_when_selected_action_is_in = [  ]
 dialog_color = Color( 1, 1, 1, 1 )
 animations = null
 
@@ -188,6 +191,7 @@ global_id = "say_long_right"
 esc_script = "res://game/rooms/room15/esc/say_long.esc"
 tooltip_name = "Say long test right"
 default_action = "use"
+combine_when_selected_action_is_in = [  ]
 dialog_color = Color( 1, 1, 1, 1 )
 animations = null
 
@@ -205,6 +209,7 @@ global_id = "switch_animation"
 esc_script = "res://game/rooms/room15/esc/switch_animation.esc"
 tooltip_name = "Switch animation"
 default_action = "use"
+combine_when_selected_action_is_in = [  ]
 dialog_color = Color( 1, 1, 1, 1 )
 animations = null
 

diff --git a/game/rooms/room16/background.tscn b/game/rooms/room16/background.tscn
@@ -3,8 +3,8 @@
 [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_background.gd" type="Script" id=1]
 
 [node name="background" type="TextureRect"]
-margin_right = 1289.0
-margin_bottom = 555.0
+margin_right = 1280.0
+margin_bottom = 900.0
 mouse_filter = 2
 script = ExtResource( 1 )
 __meta__ = {

diff --git a/game/rooms/room16/room16.tscn b/game/rooms/room16/room16.tscn
@@ -106,13 +106,11 @@ align = 1
 position = Vector2( 789, 362 )
 global_id = "worker1"
 esc_script = "res://game/rooms/room16/esc/worker_script.esc"
-combine_when_selected_action_is_in = [  ]
 
 [node name="worker2" parent="." instance=ExtResource( 10 )]
 position = Vector2( 988, 364 )
 global_id = "worker2"
 esc_script = ""
-combine_when_selected_action_is_in = [  ]
 
 [node name="ESCLocation" type="Position2D" parent="."]
 position = Vector2( 45, 513 )

diff --git a/game/rooms/room17/background.tscn b/game/rooms/room17/background.tscn
@@ -3,13 +3,10 @@
 [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_background.gd" type="Script" id=1]
 
 [node name="background" type="TextureRect"]
-margin_right = 1289.0
-margin_bottom = 555.0
+margin_right = 1280.0
+margin_bottom = 900.0
 mouse_filter = 2
 script = ExtResource( 1 )
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [node name="l_platform" type="Line2D" parent="."]
 position = Vector2( 2, -266 )

diff --git a/game/rooms/room17/room17.tscn b/game/rooms/room17/room17.tscn
@@ -54,6 +54,7 @@ esc_script = "res://game/rooms/room17/esc/left_exit.esc"
 is_exit = true
 tooltip_name = "Left exit"
 default_action = "walk"
+combine_when_selected_action_is_in = [  ]
 dialog_color = Color( 1, 1, 1, 1 )
 animations = null
 
@@ -68,6 +69,7 @@ global_id = "r12_l_exit"
 [node name="r_door" parent="Hotspots" instance=ExtResource( 8 )]
 global_id = ""
 esc_script = ""
+combine_when_selected_action_is_in = [  ]
 
 [node name="ESCLocation" type="Position2D" parent="Hotspots/r_door"]
 position = Vector2( 1231.78, 360.624 )

diff --git a/game/rooms/room18/room18.tscn b/game/rooms/room18/room18.tscn
@@ -69,6 +69,8 @@ script = ExtResource( 1 )
 global_id = "room18"
 
 [node name="ESCBackground" type="TextureRect" parent="."]
+margin_right = 1280.0
+margin_bottom = 900.0
 mouse_filter = 2
 script = ExtResource( 2 )
 

diff --git a/game/rooms/room19/room19.tscn b/game/rooms/room19/room19.tscn
@@ -99,6 +99,8 @@ script = ExtResource( 1 )
 global_id = "room19"
 
 [node name="ESCBackground" type="TextureRect" parent="."]
+margin_right = 1280.0
+margin_bottom = 900.0
 mouse_filter = 2
 script = ExtResource( 2 )