zacharie/seeding-planets
2
2
Fork 0
Code Issues 12 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

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

Browse Source
This commit is contained in:
Zacharie Guet
2026-06-14 16:19:36 +02:00
parent 7c66d8b9de
commit 33a8f022e5
30 changed files with 540 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
entities/player/inventory/scripts/items/fork.gd
View File

@@ -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):

6
entities/player/inventory/scripts/items/seed.gd
View File

@@ -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

10
entities/player/inventory/scripts/items/shovel.gd
View File

@@ -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")

20
entities/player/inventory/scripts/items/tractor_beam.gd
View File

@@ -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