Skip to content

Commit 28fc6d8

Browse files
manuqclaude
andcommitted
The inventory should clear only when GameState.clear() is called.
Commit 635e10b made the inventory clear in the wrong moments: when starting a quest and when abandoning a quest. - Removed `_do_clear_inventory()` and `_update_inventory_state()` from `start_quest()`. - Removed `clear_inventory()` from `abandon_quest()`. - Added `_do_clear_inventory()` and `trinkets.clear()` to `clear()`. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 6bb5975 commit 28fc6d8

1 file changed

Lines changed: 2 additions & 3 deletions

File tree

scenes/globals/game_state/game_state.gd

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,6 @@ func set_incorporating_threads(new_incorporating_threads: bool) -> void:
120120
## Set [member current_quest] and clear the [member inventory].
121121
## Also resets lives to maximum when starting a quest.
122122
func start_quest(quest: Quest) -> void:
123-
_do_clear_inventory()
124-
_update_inventory_state()
125123
current_quest = quest
126124
_state.set_value(QUEST_SECTION, QUEST_PATH_KEY, quest.resource_path)
127125
_do_set_scene(quest.first_scene, ^"")
@@ -245,7 +243,6 @@ func abandon_quest() -> void:
245243
set_incorporating_threads(false)
246244
_clear_quest_state()
247245
current_quest = null
248-
clear_inventory()
249246

250247

251248
## Updates [member completed_quests] to include [param quest] if [param
@@ -370,6 +367,8 @@ func change_lights(new_lights_on: bool, immediate: bool = false) -> void:
370367
func clear() -> void:
371368
_state.clear()
372369
completed_quests = []
370+
_do_clear_inventory()
371+
trinkets.clear()
373372
current_lives = MAX_LIVES
374373
if DEBUG_LIVES:
375374
prints("[LIVES DEBUG] State cleared. Lives reset to:", current_lives)

0 commit comments

Comments
 (0)