Add AffinitySystem.Decompose + fix SetAffinity for non-basic affinities

SetAffinity previously hardcoded Base1=Void which is only correct for
basic affinities. Non-basics like Jungle need (Forest,Forest), Island
needs (Lake,Hill), etc. — Void+Jungle would fall through to PureVoid.

Added AffinitySystem.Decompose(Affinity) which reverse-maps every
resolved affinity to its canonical (Base1, Base2) pair. SetAffinity
on tiles now calls Decompose so any affinity — basic or non-basic —
is stored correctly and Resolve() returns the intended value.

Generated with [Claude Code](https://claude.ai/code)
via [Happy](https://happy.engineering)

Co-Authored-By: Claude <noreply@anthropic.com>
Co-Authored-By: Happy <yesreply@happy.engineering>
This commit is contained in:
dingo
2026-03-23 13:04:01 -04:00
co-authored by Claude Happy
parent 04dd457efa
commit a870f2391b
2 changed files with 48 additions and 6 deletions
@@ -1007,16 +1007,15 @@ public static class AbilitySystem
}
case SetAffinityEffect sa when target is Coord coord:
{
// SetAffinity on a tile uses the basic-tile layout: Base1=Void, Base2=affinity.
// Setting both slots to the same basic value would combine incorrectly
// (e.g. Lake+Lake → Ocean), so we follow the §8 convention instead.
// SetAffinity on a tile decomposes the target affinity into its canonical
// (Base1, Base2) pair so Resolve() always returns the intended affinity.
// e.g. Lake→(Void,Lake), Jungle→(Forest,Forest), Island→(Lake,Hill).
var tile = ctx.State.Board?.GetTile(coord);
if (tile is null) break;
var origBase1 = tile.Base1;
var origBase2 = tile.Base2;
var newAff = ResolveAffinity(sa.Affinity, ctx);
tile.Base1 = Affinity.Void;
tile.Base2 = newAff;
var newAff = ResolveAffinity(sa.Affinity, ctx);
(tile.Base1, tile.Base2) = AffinitySystem.Decompose(newAff);
var tileRef = $"tile:{coord.X},{coord.Y}";
TrackEffect(new SetBaseAffinity1Effect { Affinity = new AffinityExpr { Fixed = origBase1 } },
tileRef, duration, ctx);
@@ -75,6 +75,49 @@ public static class AffinitySystem
_ => Affinity.PureVoid,
};
/// <summary>
/// Return the canonical (Base1, Base2) slot pair that produces the given resolved affinity.
/// Used by SetAffinity to write the correct pair for any affinity, including non-basics.
/// For symmetric combinations (e.g. Island = Lake+Hill or Hill+Lake) the first listed order
/// in the resolve table is returned.
/// </summary>
public static (Affinity Base1, Affinity Base2) Decompose(Affinity resolved) => resolved switch
{
// Basic affinities: standard tile layout is (Void, Basic).
Affinity.Lake => (Affinity.Void, Affinity.Lake),
Affinity.Hill => (Affinity.Void, Affinity.Hill),
Affinity.Forest => (Affinity.Void, Affinity.Forest),
Affinity.Field => (Affinity.Void, Affinity.Field),
Affinity.Aether => (Affinity.Void, Affinity.Aether),
Affinity.Void => (Affinity.Void, Affinity.Void),
// Non-basics — symmetric doubles.
Affinity.Ocean => (Affinity.Lake, Affinity.Lake),
Affinity.Mountain => (Affinity.Hill, Affinity.Hill),
Affinity.Plains => (Affinity.Field, Affinity.Field),
Affinity.Jungle => (Affinity.Forest, Affinity.Forest),
Affinity.PerfectAether => (Affinity.Aether, Affinity.Aether),
// Non-basics — asymmetric pairs (canonical order from the resolve table).
Affinity.Island => (Affinity.Lake, Affinity.Hill),
Affinity.Marsh => (Affinity.Lake, Affinity.Field),
Affinity.Swamp => (Affinity.Lake, Affinity.Forest),
Affinity.Steppe => (Affinity.Hill, Affinity.Field),
Affinity.Fort => (Affinity.Hill, Affinity.Forest),
Affinity.Grove => (Affinity.Field, Affinity.Forest),
// Gateway affinities: (Basic, Void).
Affinity.GatewayLake => (Affinity.Lake, Affinity.Void),
Affinity.GatewayHill => (Affinity.Hill, Affinity.Void),
Affinity.GatewayForest => (Affinity.Forest, Affinity.Void),
Affinity.GatewayField => (Affinity.Field, Affinity.Void),
// Special.
Affinity.UnstableAether => (Affinity.Void, Affinity.Aether),
Affinity.PureVoid => (Affinity.Void, Affinity.Void),
_ => (Affinity.Void, Affinity.Void),
};
/// <summary>
/// Push a new basic affinity onto a tile: Base1 = old Base2, Base2 = newAffinity.
/// </summary>