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

résolution du bug de swap d'item #94

Browse Source
This commit is contained in:
Zacharie Guet 2025-10-17 10:56:58 +02:00
parent 63485078bd
commit 15175921c4
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/inventory/scripts/inventory.gd
View File

@ -86,8 +86,7 @@ func pop_item(ind: int = current_item_ind) -> Item:
emit_signal("inventory_changed", self) emit_signal("inventory_changed", self)
return item_removed return item_removed
func swap_items(item_to_add: Item, ind_to_get: int = current_item_ind) -> Item: func is_full():
var item_to_get := items[ind_to_get] for i in items:
items[ind_to_get] = item_to_add if i == null : return false
emit_signal("inventory_changed", self) return true
return item_to_get

9
entities/interactables/item_object/script/item_object.gd
View File

@ -24,7 +24,7 @@ func _ready():
object_sprite.apply_texture_to_sprite(item.icon, ITEM_SPRITE_SIZE) object_sprite.apply_texture_to_sprite(item.icon, ITEM_SPRITE_SIZE)
object_sprite.generate_particles(item.get_particles()) object_sprite.generate_particles(item.get_particles())
func pointer_text(): func pointer_text() -> String:
var name_suffix = "" var name_suffix = ""
if item is Seed: if item is Seed:
@ -41,12 +41,9 @@ func inspector_info() -> Inspector.Info:
return item.inspector_info() return item.inspector_info()
func interact(player : Player) -> bool: func interact(player : Player) -> bool:
var swapped_item = player.pick_item(item) player.pick_item(item)
if swapped_item: pickup_animation(player)
item = swapped_item
else :
pickup_animation(player)
return true return true

3
entities/player/scripts/player.gd
View File

@ -127,6 +127,9 @@ func try_move(move_to : Vector2):
func pick_item(item : Item) -> Item: func pick_item(item : Item) -> Item:
play_sfx("pick") play_sfx("pick")
if inventory.is_full():
drop_item()
var available_slot_ind = inventory.get_best_available_slot_ind() var available_slot_ind = inventory.get_best_available_slot_ind()
if available_slot_ind == inventory.current_item_ind && inventory.items[available_slot_ind] != null: if available_slot_ind == inventory.current_item_ind && inventory.items[available_slot_ind] != null:
var current_item : Item = inventory.get_item() var current_item : Item = inventory.get_item()