Réparation de bug, paufinnage du rayon tracteur et insert de l'outil dans l'histoire

entities/player/inventory/scripts/item.gd

@@ -33,6 +33,12 @@ func get_icon() -> Texture2D:
 func get_pointer() -> Texture2D:
     return null
 
+func get_clicked_pointer() -> Texture2D:
+    return null
+
+func is_pointer_center() -> bool:
+    return false
+
 func get_energy_used() -> int:
     return energy_usage
 
@@ -48,11 +54,11 @@ func is_action_need_press_time() -> bool:
 func get_action_press_time() -> float:
     return DEFAULT_PRESS_TIME
 
-func get_action_is_hold() -> bool:
+func deactivate_interactable() -> bool:
     return false
 
-func get_usage_object_affected(_i : Area2D) -> bool:
-    return false
+func get_usage_objects_affected(_areas : Array[Area2D], _zone : Player.ActionZone) -> Array[Area2D]:
+    return []
 
 func is_one_time_use():
     return false

entities/player/inventory/scripts/items/fork.gd

@@ -27,26 +27,32 @@ func get_energy_used() -> int:
 func get_usage_zone_radius() -> int:
     return 10
 
-func get_usage_object_affected(i : Area2D) -> bool:
-    return i is Plant and Pointer.inspected == i
+func get_usage_objects_affected(areas : Array[Area2D],  zone : Player.ActionZone) -> Array[Area2D]:
+    areas = areas.filter(
+        func (a): return a is Plant and a.position.distance_to(zone.area.position) < 5
+    )
+    if len(areas) == 0:
+        return []
+    else:
+        return [areas[0]]
 
 func use_text() -> String:
     return tr("HARVEST")
 
 func can_use(_player : Player, zone : Player.ActionZone) -> bool:
-    var areas = zone.get_affected_areas()
-    for area in areas :
-        if area is Plant and Pointer.inspected == area:
-            return true
+    print(zone)
+    var areas = get_usage_objects_affected(zone.get_affected_areas(), zone)
+    if len(areas) > 0:
+        return true
+    print("nope")
     return false
 
 func use(player : Player, zone : Player.ActionZone) -> bool:
     var has_plant = false
-    for area in zone.get_affected_areas():
-        if area and area is Plant and Pointer.inspected == area:
-            harvest(area, player)
-            await player.get_tree().create_timer(USE_INTERVAL).timeout
-            has_plant = true
+    var areas = get_usage_objects_affected(zone.get_affected_areas(), zone)
+    if len(areas) > 0:
+        harvest(areas[0], player)
+        has_plant = true
     return has_plant
 
 func harvest(p : Plant, _player: Player):

entities/player/inventory/scripts/items/seed.gd

@@ -74,8 +74,10 @@ func get_energy_used() -> int:
 func get_usage_zone_radius() -> int:
     return 10
 
-func get_usage_object_affected(i : Area2D) -> bool:
-    return i is PlantSprite
+func get_usage_objects_affected(areas : Array[Area2D], _zone : Player.ActionZone) -> Array[Area2D]:
+    return areas.filter(
+        func(a): return a is PlantSprite
+    )
 
 func snap_usage_to_grid():
     return true

entities/player/inventory/scripts/items/shovel.gd

@@ -17,8 +17,14 @@ func get_icon() -> Texture2D:
 func get_usage_zone_radius() -> int:
     return SHOVEL_ZONE_RADIUS
 
-func get_usage_object_affected(i : Area2D) -> bool:
-    return i is Plant
+func get_usage_objects_affected(areas : Array[Area2D], zone : Player.ActionZone) -> Array[Area2D]:
+    areas.sort_custom(
+        func (a1,a2): return a1.position.distance_to(zone.area.position) - a2.position.distance_to(zone.area.position)
+    )
+    if len(areas) == 0:
+        return []
+    else:
+        return [areas[0]]
 
 func use_text() -> String:
     return tr("DIG")

entities/player/inventory/scripts/items/tractor_beam.gd

@@ -10,8 +10,16 @@ func get_description() -> String:
     return tr("TRACTOR_BEAM_DESC_TEXT")
 
 func get_icon() -> Texture2D:
-    # return preload("res://common/icons/tractor_beam.svg")
-    return preload("res://common/icons/alert-triangle.svg")
+    return preload("res://common/icons/tractor-beam.svg")
+
+func get_pointer() -> Texture2D:
+    return preload("res://gui/pointer/assets/cursors/pointer-hand.svg")
+
+func get_clicked_pointer() -> Texture2D:
+    return preload("res://gui/pointer/assets/cursors/pointer-grab.svg")
+
+func is_pointer_center() -> bool:
+    return true
 
 func get_item_type() -> ItemType:
     return Item.ItemType.TOOL_ITEM
@@ -20,16 +28,16 @@ func get_energy_used() -> int:
     return 0
 
 func get_usage_zone_radius() -> int:
-    return 1
+    return 0
 
 func is_usage_need_proximity() -> bool:
     return false
 
-func get_action_is_hold() -> bool:
+func deactivate_interactable() -> bool:
     return true
 
 func use_text() -> String:
-    return tr("MOVE")
+    return tr("")
 
 func can_use(_player: Player, _zone: Player.ActionZone) -> bool:
     return Pointer.inspected != null
@@ -38,12 +46,14 @@ func use(_player: Player, _zone: Player.ActionZone) -> bool:
     if Pointer.dragging_inspected:
         Pointer.stop_dragging()
         if !Pointer.dragging_inspected:
+            AudioManager.play_sfx("TractorBeamDrop")
             return true
         else:
             return false
     else:
         Pointer.start_dragging()
         if Pointer.dragging_inspected:
+            AudioManager.play_sfx("TractorBeamTake")
             return true
         else:
             return false

entities/player/scripts/player.gd

@@ -32,6 +32,7 @@ var instruction : Instruction = null :
 
 var just_dropped_item_objects : Array = []
 var last_just_dropped_item_objects_updated := 0.
+var last_instruction_done := 0.
 
 var elapsed_time := 0.
 
@@ -89,6 +90,7 @@ func _process(delta):
             and instruction and instruction.can_be_done(self)
             ):
             instruction.do(self)
+            last_instruction_done = elapsed_time
             instruction = null
 
 
@@ -97,7 +99,7 @@ func _process(delta):
                 instruction = null
             input_direction = calculate_direction_instruction_direction()
 
-        if instruction == null and action_zone:
+        if instruction == null and action_zone and elapsed_time > last_instruction_done + 0.1:
             action_zone.destroy()
             action_zone = null
 
@@ -371,7 +373,7 @@ class Instruction:
 
         player.get_tree().create_tween().tween_property(indicator, "modulate:a", 0.8, 0.2)
 
-    func abort(player : Player):
+    func abort(_player : Player):
         indicator.queue_free()
     
 class MoveInstruction extends Instruction:
@@ -467,10 +469,11 @@ class ActionZone:
         var detected_areas = get_affected_areas()
         clear_preview_on_affected_area()
         var new_affected_areas : Array[Area2D] = []
-        for a in detected_areas:
-            if a is Area2D and item.get_usage_object_affected(a) and a.has_method("affect_preview"):
-                a.affect_preview(true)
-                new_affected_areas.append(a)
+        if item:
+            for a in item.get_usage_objects_affected(detected_areas, self):
+                if a.has_method("affect_preview"):
+                    a.affect_preview(true)
+                    new_affected_areas.append(a)
         affected_areas = new_affected_areas
 
     func get_affected_areas() -> Array[Area2D]: