Refactor item management and unlock logic; remove unused item update list and signal

This commit is contained in:
Kirill
2026-08-28 00:07:18 +03:00
parent 57cc023558
commit e531e7d9b6
2 changed files with 36 additions and 36 deletions
+9 -22
View File
@@ -75,7 +75,6 @@ var owniverse:Owniverse = Owniverse.new()
var owniverse_items: Dictionary[String, OwniverseItem] = {}
var locked_items: Array = []
var item_list_to_update: Dictionary = {}
func set_datetime(value: float):
date_time.text = str(snapped(value, 0.1))
@@ -83,24 +82,16 @@ func set_datetime(value: float):
#region Item manipulations: update and visibility
func add_to_update_list(item_id: String, amount: int) -> void:
if item_list_to_update.has(item_id):
item_list_to_update[item_id] += amount
else:
item_list_to_update[item_id] = amount
func set_owniverse_item_value() -> void:
for item_id in owniverse.items_to_update:
if owniverse_items.has(item_id):
owniverse_items[item_id].set_label(owniverse.items_to_update[item_id])
owniverse.items_to_update = {}
for _item_id in owniverse_items:
owniverse_items[_item_id].set_label(owniverse.state.amount[_item_id])
#endregion
func _unlock_items():
if locked_items.size() == 0: return
var _new_locked_items = []
for _item_id in locked_items:
#print(_item_id ' | ', _entity.unlock)
@@ -114,6 +105,7 @@ func _unlock_items():
owniverse_items[_item_id].set_visible(true)
else:
_new_locked_items.append(_item_id)
locked_items = _new_locked_items
func _on_indicator_pressed(indicator_name: String, page: int = 0):
@@ -187,12 +179,8 @@ func item_activated(item: OwniverseItem) -> void:
_set_item_description(item)
if item.item_id == "S" or item.item_id == "H":
owniverse.produce(item.item_id, 100_000)
func _unlock_item(item_id: String):
pass
#owniverse_items[item_id].set_visible(true)
var _value = owniverse.produce_hs(item.item_id, 100_000)
func _check_counters(delta: float) -> Array:
var actions: Array = []
@@ -272,11 +260,9 @@ func _page_action_pressed(page_id: int, action_amount: float) -> void:
func _ready() -> void:
var _output = owniverse.init_enitities()
locked_items = _output.locked_items
print(locked_items)
owniverse.load_data()
_init_owniverse_items()
owniverse.unlock_item.connect(_unlock_item)
g_counters.swipe.sec = 0.2
for pa in page_actions:
@@ -289,7 +275,7 @@ func _process(delta: float) -> void:
owniverse = owniverse.evolute(delta)
set_datetime(owniverse.state.year)
owniverse.cycle(delta)
#owniverse.cycle(delta)
#owniverse.cycle_legacy(year_delta)
@@ -333,4 +319,5 @@ func _on_topmenu_button_pressed(ButtonName) -> void:
func _on_unlock_and_save_timeout() -> void:
owniverse.save_data()
_unlock_items()