From d6b87f34b3f95ace8558eae9813000a68b136057 Mon Sep 17 00:00:00 2001 From: VinPropane Date: Fri, 29 May 2026 20:07:25 -0400 Subject: [PATCH] NEO-99: Fix gdlint duplicated-load and gdformat line wrap Extract shared TARGET_ALPHA preload for melee and elite NPC props; reformat interactable_world_builder prop lookup to satisfy max-line-length. --- client/scripts/interactable_world_builder.gd | 4 +++- client/scripts/prototype_district_visual_catalog.gd | 9 ++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/client/scripts/interactable_world_builder.gd b/client/scripts/interactable_world_builder.gd index 99d1ab3..fe94a30 100644 --- a/client/scripts/interactable_world_builder.gd +++ b/client/scripts/interactable_world_builder.gd @@ -97,7 +97,9 @@ static func _make_marker_mesh() -> MeshInstance3D: static func _add_prop_visual( body: StaticBody3D, interactable_id: String, kind: String, anchor_y: float ) -> void: - var packed: Variant = PrototypeDistrictVisualCatalog.INTERACTABLE_PROPS.get(interactable_id, null) + var packed: Variant = PrototypeDistrictVisualCatalog.INTERACTABLE_PROPS.get( + interactable_id, null + ) if packed is PackedScene: var visual: Node3D = PrototypeDistrictVisualCatalog.instantiate_prop( packed as PackedScene, anchor_y diff --git a/client/scripts/prototype_district_visual_catalog.gd b/client/scripts/prototype_district_visual_catalog.gd index 887b61e..fa392ce 100644 --- a/client/scripts/prototype_district_visual_catalog.gd +++ b/client/scripts/prototype_district_visual_catalog.gd @@ -14,10 +14,13 @@ const INTERACTABLE_PROPS: Dictionary = { "prototype_urban_bulk_delta": preload("res://assets/district/props/urban_delta.glb"), } +const TARGET_ALPHA: PackedScene = preload("res://assets/district/props/target_alpha.glb") +const TARGET_BETA: PackedScene = preload("res://assets/district/props/target_beta.glb") + const TARGET_PROPS: Dictionary = { - "prototype_npc_melee": preload("res://assets/district/props/target_alpha.glb"), - "prototype_npc_ranged": preload("res://assets/district/props/target_beta.glb"), - "prototype_npc_elite": preload("res://assets/district/props/target_alpha.glb"), + "prototype_npc_melee": TARGET_ALPHA, + "prototype_npc_ranged": TARGET_BETA, + "prototype_npc_elite": TARGET_ALPHA, }