Fix for inventory item use

mapedorr · mapedorr · commit d0ed7d48b749 · 2024-06-01T05:22:53.000-05:00
Cherry-pick code updated from a fix in `carenalgas:popochiu:develop` to
make using inventory items to work again.

- Update project icon.
- Update introductory dialog to English.
- Update navigation agent radius to 0 in walkable areas.
diff --git a/addons/popochiu/engine/objects/inventory_item/popochiu_inventory_item.gd b/addons/popochiu/engine/objects/inventory_item/popochiu_inventory_item.gd
@@ -343,6 +343,12 @@ func _on_gui_input(event: InputEvent) -> void:
 	if not PopochiuUtils.is_click_or_touch_pressed(event): return
 	
 	var event_index := PopochiuUtils.get_click_or_touch_index(event)
+	
+	# Fix #224 Clean E.clicked when an inventory item is clicked to ensure that the event is not
+	# mishandled by the GUI
+	if E.clicked:
+		E.clicked = null
+	
 	I.clicked = self
 	last_click_button = event_index
 	
diff --git a/addons/popochiu/engine/objects/room/popochiu_room.gd b/addons/popochiu/engine/objects/room/popochiu_room.gd
@@ -114,8 +114,16 @@ func _physics_process(delta):
 
 
 func _unhandled_input(event: InputEvent):
-	if not has_player: return
+	if (
+		not PopochiuUtils.get_click_or_touch_index(event) in [
+			MOUSE_BUTTON_LEFT, MOUSE_BUTTON_RIGHT
+		]
+		or (not event is InputEventScreenTouch and E.hovered)
+	):
+		return
 	
+	# Fix #224 Item should be removed only if the click was done anywhere in the room when the
+	# cursor is not hovering another object
 	if I.active:
 		if event.is_action_released("popochiu-look")\
 		or event.is_action_pressed("popochiu-interact"):
@@ -125,13 +133,7 @@ func _unhandled_input(event: InputEvent):
 			I.set_active_item()
 		return
 	
-	if PopochiuUtils.get_click_or_touch_index(event) != MOUSE_BUTTON_LEFT:
-		return
-	
-	if not event is InputEventScreenTouch and E.hovered:
-		return
-	
-	if is_instance_valid(C.player) and C.player.can_move:
+	if has_player and is_instance_valid(C.player) and C.player.can_move:
 		# Set this property to null in order to cancel any running interaction with a
 		# PopochiuClickable (check PopochiuCharacter.walk_to_clicked(...))
 		E.clicked = null
diff --git a/game/rooms/house/room_house.gd b/game/rooms/house/room_house.gd
@@ -21,8 +21,8 @@ func _on_room_entered() -> void:
 # is visible.
 func _on_room_transition_finished() -> void:
 	if state.visited_first_time:
-		await C.Goddiu.say("[wave]¡¡Holaaaa!![/wave]")
-		await C.Popsy.say("[rainbow]Holaaaaaaaaaa[/rainbow]")
+		await C.Goddiu.say("[wave]¡¡Hiiiii!![/wave]")
+		await C.Popsy.say("[rainbow]Hiiiiiiiiiiiiiiiii[/rainbow]")
 
 
 # What happens before Popochiu unloads the room.
diff --git a/game/rooms/house/room_house.tscn b/game/rooms/house/room_house.tscn
@@ -15,10 +15,11 @@
 [ext_resource type="PackedScene" uid="uid://bil27y44847wc" path="res://game/characters/popsy/character_popsy.tscn" id="12_yd7us"]
 
 [sub_resource type="NavigationPolygon" id="NavigationPolygon_kuj1q"]
-vertices = PackedVector2Array(125, 28, 49, 40, -16, 40, -135, 31, -122, 0, 80, -7)
+vertices = PackedVector2Array(149, 35, 51, 50, -17, 50, -150, 40, -129, -10, 84, -18)
 polygons = Array[PackedInt32Array]([PackedInt32Array(0, 1, 2, 3, 4, 5)])
 outlines = Array[PackedVector2Array]([PackedVector2Array(-129, -10, 84, -18, 149, 35, 51, 50, -17, 50, -150, 40)])
 source_geometry_group_name = &"navigation_polygon_source_group"
+agent_radius = 0.0
 
 [node name="RoomHouse" type="Node2D"]
 script = ExtResource("1_qtcms")
@@ -70,6 +71,7 @@ polygon = PackedVector2Array(-11, 21, -11, -14, 8, -29, 28, -17, 30, 23)
 [node name="ToyCar" parent="Props" instance=ExtResource("10_hcj88")]
 position = Vector2(81, 110)
 texture = ExtResource("11_54r3c")
+walk_to_point = Vector2(21, -5)
 interaction_polygon = PackedVector2Array(-7, -7, 7, -6, 11, 6, -10, 6)
 
 [node name="Hotspots" type="Node2D" parent="."]
diff --git a/game/rooms/outside/room_outside.tscn b/game/rooms/outside/room_outside.tscn
@@ -12,10 +12,11 @@
 [ext_resource type="Script" path="res://game/rooms/outside/hotspots/door/hotspot_door.gd" id="11_10688"]
 
 [sub_resource type="NavigationPolygon" id="NavigationPolygon_ow5ee"]
-vertices = PackedVector2Array(36, 7, 202, 62, 200, 70, -19, 22, -38, 9, -33, 47, -202, 69, -74, 51, -107, 36, -197, 27, -122, 6, -79, 7)
-polygons = Array[PackedInt32Array]([PackedInt32Array(0, 1, 2, 3, 4), PackedInt32Array(5, 3, 2), PackedInt32Array(5, 2, 6, 7), PackedInt32Array(8, 7, 6, 9), PackedInt32Array(8, 9, 10, 11), PackedInt32Array(11, 10, 0), PackedInt32Array(4, 11, 0)])
+vertices = PackedVector2Array(36, -3, 214, 56, 209, 81, -32, 25, -41, 19, -39, 38, -214, 79, -72, 41, -90, 33, -207, 19, -125, -4, -75, 17)
+polygons = Array[PackedInt32Array]([PackedInt32Array(0, 1, 2, 3, 4), PackedInt32Array(5, 3, 2), PackedInt32Array(5, 2, 6, 7), PackedInt32Array(8, 7, 6, 9), PackedInt32Array(8, 9, 10, 11), PackedInt32Array(11, 10, 0, 4)])
 outlines = Array[PackedVector2Array]([PackedVector2Array(-207, 19, -125, -4, 36, -3, 214, 56, 209, 81, -214, 79), PackedVector2Array(-41, 19, -75, 17, -90, 33, -72, 41, -39, 38, -32, 25)])
 source_geometry_group_name = &"navigation_polygon_source_group"
+agent_radius = 0.0
 
 [node name="RoomOutside" type="Node2D"]
 script = ExtResource("1_1vr1w")
diff --git a/icon_v2-sample_project.png b/icon_v2-sample_project.png
