From 0c12e13ac142bc1aecc4cbfec00c225ef0a2c6ee Mon Sep 17 00:00:00 2001 From: Phillip Tarrant Date: Fri, 10 Jul 2026 21:58:34 -0500 Subject: [PATCH] fix(theme): drop redundant const preloads shadowing global class_names palette.gd / theme_keys.gd already declare `class_name`, so `const Palette = preload(...)` in every consumer shadowed the global class and emitted 4 editor errors ("has the same name as a global class"). Reference the global class_names directly. Editor reload now clean; suite 125/125; runtime probe still builds all 75 showcase nodes with the theme applied. Co-Authored-By: Claude Opus 4.8 (1M context) --- client/scripts/theme/build_game_theme.gd | 2 -- client/scripts/theme/surfaces/dark_bay.gd | 1 - client/scripts/theme/surfaces/parchment_panel.gd | 1 - client/scripts/theme/theme_showcase.gd | 2 -- client/tests/unit/test_palette.gd | 2 -- client/tests/unit/test_theme_resource.gd | 1 - 6 files changed, 9 deletions(-) diff --git a/client/scripts/theme/build_game_theme.gd b/client/scripts/theme/build_game_theme.gd index 091dbf0..96b08f6 100644 --- a/client/scripts/theme/build_game_theme.gd +++ b/client/scripts/theme/build_game_theme.gd @@ -13,8 +13,6 @@ extends SceneTree ## — so this is safe to call from a test without side effects. ## §2: presentation. -const Palette = preload("res://scripts/theme/palette.gd") -const ThemeKeys = preload("res://scripts/theme/theme_keys.gd") const OUT := "res://assets/theme/game_theme.tres" const SERIF := "res://assets/theme/fonts/EBGaramond-VariableFont_wght.ttf" diff --git a/client/scripts/theme/surfaces/dark_bay.gd b/client/scripts/theme/surfaces/dark_bay.gd index ef08178..a48abd9 100644 --- a/client/scripts/theme/surfaces/dark_bay.gd +++ b/client/scripts/theme/surfaces/dark_bay.gd @@ -4,7 +4,6 @@ extends Panel ## Uniforms are set at runtime from Palette (deliberate deviation from spec §5.4's ## "baked into the .tscn/material" approach) — keeps Palette the single source of ## truth at the cost of an editor preview; the surface renders once the scene runs. -const Palette = preload("res://scripts/theme/palette.gd") func _ready() -> void: diff --git a/client/scripts/theme/surfaces/parchment_panel.gd b/client/scripts/theme/surfaces/parchment_panel.gd index 11a07f5..7f1c83e 100644 --- a/client/scripts/theme/surfaces/parchment_panel.gd +++ b/client/scripts/theme/surfaces/parchment_panel.gd @@ -4,7 +4,6 @@ extends Panel ## Uniforms are set at runtime from Palette (deliberate deviation from spec §5.4's ## "baked into the .tscn/material" approach) — keeps Palette the single source of ## truth at the cost of an editor preview; the surface renders once the scene runs. -const Palette = preload("res://scripts/theme/palette.gd") func _ready() -> void: diff --git a/client/scripts/theme/theme_showcase.gd b/client/scripts/theme/theme_showcase.gd index 0eb0878..20a0d82 100644 --- a/client/scripts/theme/theme_showcase.gd +++ b/client/scripts/theme/theme_showcase.gd @@ -2,8 +2,6 @@ extends Control ## The eyeball proof for the shared Theme (spec §7). Builds every token, stylebox, ## font, surface, and bar on one scrollable screen. No AI, no state. §2: presentation. -const Palette = preload("res://scripts/theme/palette.gd") -const ThemeKeys = preload("res://scripts/theme/theme_keys.gd") const GAME_THEME := "res://assets/theme/game_theme.tres" const SERIF_ITALIC := "res://assets/theme/fonts/EBGaramond-Italic-VariableFont_wght.ttf" diff --git a/client/tests/unit/test_palette.gd b/client/tests/unit/test_palette.gd index 8bddb80..1cb204f 100644 --- a/client/tests/unit/test_palette.gd +++ b/client/tests/unit/test_palette.gd @@ -1,7 +1,5 @@ extends "res://addons/gut/test.gd" -const Palette = preload("res://scripts/theme/palette.gd") - func test_core_tokens_are_colors(): assert_true(Palette.BLOOD is Color) diff --git a/client/tests/unit/test_theme_resource.gd b/client/tests/unit/test_theme_resource.gd index 2d555ad..212c651 100644 --- a/client/tests/unit/test_theme_resource.gd +++ b/client/tests/unit/test_theme_resource.gd @@ -1,7 +1,6 @@ # client/tests/unit/test_theme_resource.gd extends "res://addons/gut/test.gd" -const ThemeKeys = preload("res://scripts/theme/theme_keys.gd") const Builder = preload("res://scripts/theme/build_game_theme.gd") const THEME_PATH := "res://assets/theme/game_theme.tres"