From 808ffb337e71b94eaea259fda4dc153e1ab8b074 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Melvin=20Wei=C3=9F?= Date: Wed, 22 Oct 2025 02:23:16 +0200 Subject: [PATCH] Journal no longer contains duplicates Added some documentation to grid.gd --- ui/journal/journal.gd | 18 +++++++++++------- world/grid.gd | 1 + 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ui/journal/journal.gd b/ui/journal/journal.gd index 21a16a1..72ae6d9 100644 --- a/ui/journal/journal.gd +++ b/ui/journal/journal.gd @@ -1,20 +1,24 @@ extends Control @onready var item_list : ItemList = $ItemList +var item_list_no_dupes = [] -# Add items from each pool to journal. TODO: Deal with multiplicities. +# Add items from each pool to journal. func _ready() -> void: - await get_tree().create_timer(0.3).timeout for item_scene in ItemSpawn.item_pool.common: - add_item_to_journal(item_scene.instantiate()) + add_item_to_journal(item_scene) for item_scene in ItemSpawn.item_pool.rare: - add_item_to_journal(item_scene.instantiate()) + add_item_to_journal(item_scene) for item_scene in ItemSpawn.item_pool.unique: - add_item_to_journal(item_scene.instantiate()) + add_item_to_journal(item_scene) func _process(_delta: float) -> void: if Input.is_action_just_pressed("journal"): visible = not visible -func add_item_to_journal(item: Item): - item_list.add_item(item.item_name, item.icon) +# Adds an item to the journal if it was not yet added +func add_item_to_journal(item_scene): + if not item_list_no_dupes.has(item_scene): + item_list_no_dupes.append(item_scene) + var item = item_scene.instantiate() + item_list.add_item(item.item_name, item.icon) diff --git a/world/grid.gd b/world/grid.gd index afb702f..6147f41 100644 --- a/world/grid.gd +++ b/world/grid.gd @@ -45,6 +45,7 @@ func add_building_to_collumn(building : Building, collumn : int): add_child(building) return true +# Adds children of given node to the grid and their building. func place_object_list(obj_list : Node2D, building): obj_list.reparent(self, false) var objects_to_be_placed = obj_list.get_children()