fix(@projects/@magic-civilization): 🎨 make tech token aliases value-preserving (no colour change)
Cluster-1 aliased the tech fills to DIFFERENT-valued tokens (semantic.positive,
accent.gold, accent.science), which silently shifted the tech-tree colours.
That conflated two separate decisions: "tier the tokens" (intended) and "unify
to the canonical palette" (not authorised). Aliasing must be value-preserving.
- Add primitives palette.{green,greenBright,gold,goldBright,blue} holding the
EXACT original tech-state hexes (kept distinct from the brighter semantic.*/
accent.* values on purpose).
- Re-point tech.{researchedBg,researchedBorder,availableBg,availableBorder,
currentBg} aliases at those primitives. locked*/selected already matched.
Result: tech.* is fully layered (component → primitive, zero component-level
hex) AND pixel-identical to the pre-cluster-1 appearance. Verified on plum:
baked meta blob resolves every tech.* to its original hex; render matches the
original muted colours. Whether researched-green SHOULD equal semantic.positive
is now an explicit future choice, not a silent one.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Natalie
parent
0eaa979171
commit
43fabc8f98
2 changed files with 36 additions and 11 deletions
|
|
@ -26,28 +26,53 @@
|
|||
"$value": "#808080ff",
|
||||
"$type": "color",
|
||||
"$description": "Primitive — neutral border (disabled/locked outlines)"
|
||||
},
|
||||
"green": {
|
||||
"$value": "#33b333e6",
|
||||
"$type": "color",
|
||||
"$description": "Primitive — muted state-fill green (distinct from the brighter semantic.positive)"
|
||||
},
|
||||
"greenBright": {
|
||||
"$value": "#4de64dff",
|
||||
"$type": "color",
|
||||
"$description": "Primitive — bright green edge"
|
||||
},
|
||||
"gold": {
|
||||
"$value": "#d9bf1ae6",
|
||||
"$type": "color",
|
||||
"$description": "Primitive — yellow-gold state fill (distinct from accent.gold)"
|
||||
},
|
||||
"goldBright": {
|
||||
"$value": "#ffe64dff",
|
||||
"$type": "color",
|
||||
"$description": "Primitive — bright yellow edge"
|
||||
},
|
||||
"blue": {
|
||||
"$value": "#4d80e6e6",
|
||||
"$type": "color",
|
||||
"$description": "Primitive — state-fill blue (distinct from accent.science)"
|
||||
}
|
||||
},
|
||||
"tech": {
|
||||
"researchedBg": {
|
||||
"$value": "{color.semantic.positive}",
|
||||
"$value": "{color.palette.green}",
|
||||
"$type": "color",
|
||||
"$description": "Knowledge-tree node card — researched fill (alias → success green)"
|
||||
"$description": "Knowledge-tree node card — researched fill (alias → palette.green)"
|
||||
},
|
||||
"researchedBorder": {
|
||||
"$value": "{color.semantic.positive}",
|
||||
"$value": "{color.palette.greenBright}",
|
||||
"$type": "color",
|
||||
"$description": "Knowledge-tree node card — researched border (alias → success green)"
|
||||
"$description": "Knowledge-tree node card — researched border (alias → palette.greenBright)"
|
||||
},
|
||||
"availableBg": {
|
||||
"$value": "{color.accent.gold}",
|
||||
"$value": "{color.palette.gold}",
|
||||
"$type": "color",
|
||||
"$description": "Knowledge-tree node card — available fill (alias → actionable gold)"
|
||||
"$description": "Knowledge-tree node card — available fill (alias → palette.gold)"
|
||||
},
|
||||
"availableBorder": {
|
||||
"$value": "{color.accent.goldBright}",
|
||||
"$value": "{color.palette.goldBright}",
|
||||
"$type": "color",
|
||||
"$description": "Knowledge-tree node card — available border (alias → bright gold)"
|
||||
"$description": "Knowledge-tree node card — available border (alias → palette.goldBright)"
|
||||
},
|
||||
"lockedBg": {
|
||||
"$value": "{color.palette.neutralMuted}",
|
||||
|
|
@ -60,9 +85,9 @@
|
|||
"$description": "Knowledge-tree node card — locked border (alias → neutral border)"
|
||||
},
|
||||
"currentBg": {
|
||||
"$value": "{color.accent.science}",
|
||||
"$value": "{color.palette.blue}",
|
||||
"$type": "color",
|
||||
"$description": "Knowledge-tree node card — researching fill (alias → science blue)"
|
||||
"$description": "Knowledge-tree node card — researching fill (alias → palette.blue)"
|
||||
},
|
||||
"selectedBorder": {
|
||||
"$value": "{color.palette.white}",
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@ corner_radius_bottom_left = 2
|
|||
corner_radius_bottom_right = 2
|
||||
|
||||
[resource]
|
||||
metadata/tokens = "{\"accent.gold\":\"d9a020\",\"accent.goldBright\":\"d9b33f\",\"accent.goldPress\":\"ffd14d\",\"accent.goldResource\":\"f2d133\",\"accent.ping\":\"ffd973\",\"accent.sage\":\"66b866\",\"accent.science\":\"66bfff\",\"background.base\":\"1a1410\",\"background.deepest\":\"171219\",\"background.happiness\":\"0f0d07\",\"background.hud\":\"00000099\",\"background.list\":\"120e1e\",\"background.listSelected\":\"3f2d0d\",\"background.menu\":\"0e0a17\",\"background.overlay\":\"0000009e\",\"background.panel\":\"17121e\",\"background.raised\":\"2a2018\",\"background.surface\":\"221a14\",\"border.divider\":\"99731f80\",\"border.focus\":\"d9b340ff\",\"border.happiness\":\"b39940d9\",\"border.list\":\"4d4014b2\",\"border.listSelected\":\"d9b340cc\",\"border.panel\":\"73591fcc\",\"button.bgHover\":\"331a0d\",\"button.bgNormal\":\"1f1733\",\"button.bgPressed\":\"472f0f\",\"climate.cold\":\"1a4dff\",\"climate.hot\":\"ff260d\",\"climate.textCold\":\"66b3ff\",\"climate.textNeutral\":\"d9e0d9\",\"climate.textWarming\":\"ff731a\",\"climate.warm\":\"26cc40\",\"fog.explored\":\"000000b2\",\"fog.unexplored\":\"1a160fff\",\"guide.bgPrimary\":\"1a1410\",\"guide.bgSecondary\":\"221a14\",\"guide.bgTertiary\":\"2a2018\",\"guide.dwarfAccent\":\"8b6a1a\",\"guide.dwarfPrimary\":\"c07040\",\"guide.dwarfPrimaryDark\":\"8a4a28\",\"guide.dwarfPrimaryLight\":\"e09868\",\"guide.textMuted\":\"7a6048\",\"guide.textPrimary\":\"f0e4d0\",\"guide.textSecondary\":\"b8a078\",\"palette.neutralBorder\":\"808080ff\",\"palette.neutralMuted\":\"666666b3\",\"palette.white\":\"ffffffff\",\"player.blue\":\"3366ff\",\"player.brown\":\"806659\",\"player.cyan\":\"1accd9\",\"player.gray\":\"999999\",\"player.green\":\"33cc4d\",\"player.magenta\":\"cc4d80\",\"player.navy\":\"4d4d99\",\"player.orange\":\"e6801a\",\"player.purple\":\"b24de6\",\"player.red\":\"e63333\",\"player.sage\":\"66b366\",\"player.yellow\":\"e6cc1a\",\"semantic.diplomacy\":\"e68c73\",\"semantic.goldenAge\":\"ffeb66\",\"semantic.negative\":\"d95940\",\"semantic.positive\":\"66e666\",\"semantic.trade\":\"ccbf73\",\"semantic.warning\":\"e69933\",\"tech.availableBg\":\"d9a020\",\"tech.availableBorder\":\"d9b33f\",\"tech.currentBg\":\"66bfff\",\"tech.lockedBg\":\"666666b3\",\"tech.lockedBorder\":\"808080ff\",\"tech.researchedBg\":\"66e666\",\"tech.researchedBorder\":\"66e666\",\"tech.selectedBorder\":\"ffffffff\",\"text.button\":\"e0d199\",\"text.buttonHover\":\"ffeb80\",\"text.buttonPressed\":\"ffffb3\",\"text.disabled\":\"80806680\",\"text.muted\":\"b2b2b2\",\"text.primary\":\"e0d8c8\",\"text.secondary\":\"bfb7a6\",\"text.title\":\"f2d973\",\"throne.court\":\"665947\",\"throne.default\":\"40382e\",\"throne.forge\":\"804714\",\"throne.garden\":\"1f522e\",\"throne.mapTable\":\"264d59\",\"throne.pedestal\":\"8c7a33\",\"throne.provisions\":\"4d6626\",\"throne.seat\":\"8c6b1a\",\"throne.shrine\":\"334766\",\"throne.special\":\"73528c\",\"throne.structure\":\"4d3824\",\"throne.trophy\":\"802e1a\",\"unlockAccent.building\":\"8b6914\",\"unlockAccent.dim\":\"ffffff8c\",\"unlockAccent.improvement\":\"4a7c3f\",\"unlockAccent.lens\":\"2d5a8b\",\"unlockAccent.mechanic\":\"6b3fa0\",\"unlockAccent.resource\":\"a0522d\",\"unlockAccent.unit\":\"c9a84c\",\"unlockAccent.wonder\":\"a06a3f\"}"
|
||||
metadata/tokens = "{\"accent.gold\":\"d9a020\",\"accent.goldBright\":\"d9b33f\",\"accent.goldPress\":\"ffd14d\",\"accent.goldResource\":\"f2d133\",\"accent.ping\":\"ffd973\",\"accent.sage\":\"66b866\",\"accent.science\":\"66bfff\",\"background.base\":\"1a1410\",\"background.deepest\":\"171219\",\"background.happiness\":\"0f0d07\",\"background.hud\":\"00000099\",\"background.list\":\"120e1e\",\"background.listSelected\":\"3f2d0d\",\"background.menu\":\"0e0a17\",\"background.overlay\":\"0000009e\",\"background.panel\":\"17121e\",\"background.raised\":\"2a2018\",\"background.surface\":\"221a14\",\"border.divider\":\"99731f80\",\"border.focus\":\"d9b340ff\",\"border.happiness\":\"b39940d9\",\"border.list\":\"4d4014b2\",\"border.listSelected\":\"d9b340cc\",\"border.panel\":\"73591fcc\",\"button.bgHover\":\"331a0d\",\"button.bgNormal\":\"1f1733\",\"button.bgPressed\":\"472f0f\",\"climate.cold\":\"1a4dff\",\"climate.hot\":\"ff260d\",\"climate.textCold\":\"66b3ff\",\"climate.textNeutral\":\"d9e0d9\",\"climate.textWarming\":\"ff731a\",\"climate.warm\":\"26cc40\",\"fog.explored\":\"000000b2\",\"fog.unexplored\":\"1a160fff\",\"guide.bgPrimary\":\"1a1410\",\"guide.bgSecondary\":\"221a14\",\"guide.bgTertiary\":\"2a2018\",\"guide.dwarfAccent\":\"8b6a1a\",\"guide.dwarfPrimary\":\"c07040\",\"guide.dwarfPrimaryDark\":\"8a4a28\",\"guide.dwarfPrimaryLight\":\"e09868\",\"guide.textMuted\":\"7a6048\",\"guide.textPrimary\":\"f0e4d0\",\"guide.textSecondary\":\"b8a078\",\"palette.blue\":\"4d80e6e6\",\"palette.gold\":\"d9bf1ae6\",\"palette.goldBright\":\"ffe64dff\",\"palette.green\":\"33b333e6\",\"palette.greenBright\":\"4de64dff\",\"palette.neutralBorder\":\"808080ff\",\"palette.neutralMuted\":\"666666b3\",\"palette.white\":\"ffffffff\",\"player.blue\":\"3366ff\",\"player.brown\":\"806659\",\"player.cyan\":\"1accd9\",\"player.gray\":\"999999\",\"player.green\":\"33cc4d\",\"player.magenta\":\"cc4d80\",\"player.navy\":\"4d4d99\",\"player.orange\":\"e6801a\",\"player.purple\":\"b24de6\",\"player.red\":\"e63333\",\"player.sage\":\"66b366\",\"player.yellow\":\"e6cc1a\",\"semantic.diplomacy\":\"e68c73\",\"semantic.goldenAge\":\"ffeb66\",\"semantic.negative\":\"d95940\",\"semantic.positive\":\"66e666\",\"semantic.trade\":\"ccbf73\",\"semantic.warning\":\"e69933\",\"tech.availableBg\":\"d9bf1ae6\",\"tech.availableBorder\":\"ffe64dff\",\"tech.currentBg\":\"4d80e6e6\",\"tech.lockedBg\":\"666666b3\",\"tech.lockedBorder\":\"808080ff\",\"tech.researchedBg\":\"33b333e6\",\"tech.researchedBorder\":\"4de64dff\",\"tech.selectedBorder\":\"ffffffff\",\"text.button\":\"e0d199\",\"text.buttonHover\":\"ffeb80\",\"text.buttonPressed\":\"ffffb3\",\"text.disabled\":\"80806680\",\"text.muted\":\"b2b2b2\",\"text.primary\":\"e0d8c8\",\"text.secondary\":\"bfb7a6\",\"text.title\":\"f2d973\",\"throne.court\":\"665947\",\"throne.default\":\"40382e\",\"throne.forge\":\"804714\",\"throne.garden\":\"1f522e\",\"throne.mapTable\":\"264d59\",\"throne.pedestal\":\"8c7a33\",\"throne.provisions\":\"4d6626\",\"throne.seat\":\"8c6b1a\",\"throne.shrine\":\"334766\",\"throne.special\":\"73528c\",\"throne.structure\":\"4d3824\",\"throne.trophy\":\"802e1a\",\"unlockAccent.building\":\"8b6914\",\"unlockAccent.dim\":\"ffffff8c\",\"unlockAccent.improvement\":\"4a7c3f\",\"unlockAccent.lens\":\"2d5a8b\",\"unlockAccent.mechanic\":\"6b3fa0\",\"unlockAccent.resource\":\"a0522d\",\"unlockAccent.unit\":\"c9a84c\",\"unlockAccent.wonder\":\"a06a3f\"}"
|
||||
Button/colors/font_color = Color(0.878431, 0.819608, 0.6, 1)
|
||||
Button/colors/font_hover_color = Color(1, 0.921569, 0.501961, 1)
|
||||
Button/colors/font_pressed_color = Color(1, 1, 0.701961, 1)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue