diff --git a/docs/addressables-cut.md b/docs/addressables-cut.md index 61c17a2f8..97004fb41 100644 --- a/docs/addressables-cut.md +++ b/docs/addressables-cut.md @@ -21,7 +21,7 @@ Operator ruling (2026-09-17): engine asset references from CultCache data are Un Addressables, stored as the asset's `.meta` GUID and loaded through Addressables by GUID. One rule for every engine asset reference from data. No dual Resources/Addressables path. -Rulings: none yet. Open: Q1 (blocks Cut 1). +Rulings: Q1 (A), one `Assets/Content` folder entry (operator, 2026-09-17: "I take your recommendation"). Open: none. ## 0. Target diff --git a/docs/settings-globals-cut.md b/docs/settings-globals-cut.md index 267ee2238..b031ba4bf 100644 --- a/docs/settings-globals-cut.md +++ b/docs/settings-globals-cut.md @@ -191,6 +191,14 @@ Fork M decides whether any of this counts as "settings". ## 2. Global shape +> **Superseded in part (2026-09-17):** wherever this map stores an engine asset as an +> `Assets/Resources/...` path or loads it with `UnityHelpers.LoadAsset`/`Resources.Load`, read +> instead: the asset's GUID under `[CultInspectorAssetGuid]`, loaded with `EngineAssets.Load`, +> the asset living under `Assets/Content` (`docs/addressables-cut.md`, which lands first). That +> covers `ItemIcons`/`WeaponTypeIcons`/... (2.1), the 3.2 import's `{fileID, guid}` resolution (store +> the guid directly, no path), the body presets (the 7 `CelestialBodySettings` assets move to +> `Assets/Content`, not `Resources`), and Cut 1's picker check. Forks I and B are history. + ### 2.1 Document This is fork D, recommended (a). One catalog global in a new file, @@ -511,6 +519,14 @@ landed type differs from it by the one attribute. ## 6. Operator forks (ordered by how much they block) +> **Superseded in part (2026-09-17):** wherever this map stores an engine asset as an +> `Assets/Resources/...` path or loads it with `UnityHelpers.LoadAsset`/`Resources.Load`, read +> instead: the asset's GUID under `[CultInspectorAssetGuid]`, loaded with `EngineAssets.Load`, +> the asset living under `Assets/Content` (`docs/addressables-cut.md`, which lands first). That +> covers `ItemIcons`/`WeaponTypeIcons`/... (2.1), the 3.2 import's `{fileID, guid}` resolution (store +> the guid directly, no path), the body presets (the 7 `CelestialBodySettings` assets move to +> `Assets/Content`, not `Resources`), and Cut 1's picker check. Forks I and B are history. + **K. How the first catalog global gets written.** Blocks Cut 1. - (a) A scratch-only authoring build without `[CultGlobal]` writes the record under the explicit `global:` key, and the landed type adds the attribute (probed, 3.1). No landed