From f8a36213a1c397d5c2ddce958e8f75de23267db6 Mon Sep 17 00:00:00 2001 From: VinPropane Date: Wed, 17 Jun 2026 21:12:54 -0400 Subject: [PATCH] NEO-142: clear GDScript linter warnings in faction HUD work Hoist quest progress label lines binding; drop redundant await on synchronous GdUnit assert_signal calls. --- client/scripts/quest_hud_controller.gd | 54 ++++++++++----------- client/test/faction_standing_client_test.gd | 4 +- client/test/quest_reward_hud_test.gd | 6 +-- 3 files changed, 31 insertions(+), 33 deletions(-) diff --git a/client/scripts/quest_hud_controller.gd b/client/scripts/quest_hud_controller.gd index fcda339..82a3323 100644 --- a/client/scripts/quest_hud_controller.gd +++ b/client/scripts/quest_hud_controller.gd @@ -364,41 +364,39 @@ func _render_progress_label() -> void: if not is_instance_valid(_progress_label): return var header := "Quests:" + var lines: PackedStringArray = [header] if _last_snapshot.is_empty(): - var lines: PackedStringArray = [header] if not _progress_error.is_empty(): lines.append("error — %s" % _progress_error) if not _defs_error.is_empty(): lines.append("definitions error — %s" % _defs_error) lines.append("Loading…") - _progress_label.text = "\n".join(lines) - return - var lines: PackedStringArray = [header] - if not _progress_error.is_empty(): - lines.append("sync error — %s" % _progress_error) - if not _defs_error.is_empty(): - lines.append("definitions error — %s" % _defs_error) - var defs: Array = _defs_snapshot() - if defs.is_empty(): - var quests: Variant = _last_snapshot.get("quests", null) - if quests is Array: - for row_variant in quests as Array: - if not row_variant is Dictionary: - continue - var row: Dictionary = row_variant - var qid: String = str(row.get("questId", "")) - lines.append(" %s" % _format_status_line(qid, qid, row)) else: - for def_variant in defs: - if not def_variant is Dictionary: - continue - var def: Dictionary = def_variant - var qid: String = str(def.get("id", "")) - if qid.is_empty(): - continue - var row: Dictionary = _quest_row(qid) - var label: String = _display_name(qid) - lines.append(" %s" % _format_status_line(qid, label, row)) + if not _progress_error.is_empty(): + lines.append("sync error — %s" % _progress_error) + if not _defs_error.is_empty(): + lines.append("definitions error — %s" % _defs_error) + var defs: Array = _defs_snapshot() + if defs.is_empty(): + var quests: Variant = _last_snapshot.get("quests", null) + if quests is Array: + for row_variant in quests as Array: + if not row_variant is Dictionary: + continue + var row: Dictionary = row_variant + var qid: String = str(row.get("questId", "")) + lines.append(" %s" % _format_status_line(qid, qid, row)) + else: + for def_variant in defs: + if not def_variant is Dictionary: + continue + var def: Dictionary = def_variant + var qid: String = str(def.get("id", "")) + if qid.is_empty(): + continue + var row: Dictionary = _quest_row(qid) + var label: String = _display_name(qid) + lines.append(" %s" % _format_status_line(qid, label, row)) _progress_label.text = "\n".join(lines) diff --git a/client/test/faction_standing_client_test.gd b/client/test/faction_standing_client_test.gd index a2fe6c2..fc1f3eb 100644 --- a/client/test/faction_standing_client_test.gd +++ b/client/test/faction_standing_client_test.gd @@ -149,7 +149,7 @@ func test_request_sync_emits_faction_standing_received() -> void: # Act c.call("request_sync_from_server") # Assert - await assert_signal(c).is_emitted("faction_standing_received", any()) + assert_signal(c).is_emitted("faction_standing_received", any()) assert_that(_standing_capture.has("factions")).is_true() assert_that(transport.last_url).contains("/faction-standing") @@ -163,7 +163,7 @@ func test_http_404_emits_faction_standing_sync_failed() -> void: # Act c.call("request_sync_from_server") # Assert - await assert_signal(c).is_emitted( + assert_signal(c).is_emitted( "faction_standing_sync_failed", "HTTP 404 (player unknown)" ) diff --git a/client/test/quest_reward_hud_test.gd b/client/test/quest_reward_hud_test.gd index 7921bd0..99a33b7 100644 --- a/client/test/quest_reward_hud_test.gd +++ b/client/test/quest_reward_hud_test.gd @@ -327,7 +327,7 @@ func test_completion_transition_emits_economy_refresh_signal() -> void: controller.call("_on_progress_received", _active_gather_snapshot()) controller.call("_on_progress_received", _completed_gather_with_summary_snapshot()) # Assert - await assert_signal(controller).is_emitted("quest_completion_reward_transition", any(), any()) + assert_signal(controller).is_emitted("quest_completion_reward_transition", any(), any()) func test_completion_transition_invokes_economy_refresh_callback() -> void: @@ -360,9 +360,9 @@ func test_boot_completed_does_not_emit_economy_refresh_signal() -> void: # Act controller.call("_on_progress_received", _completed_gather_with_summary_snapshot()) # Assert - await (assert_signal(controller).wait_until(200).is_not_emitted( + assert_signal(controller).wait_until(200).is_not_emitted( "quest_completion_reward_transition" - )) + ) func test_completion_transition_queues_economy_refresh_while_clients_busy() -> void: