GameCult/Aetheria
Watch
9
0
Fork
You've already forked Aetheria
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

StationKinds.HullKindFor takes a stand-in's kind only when some maker offers it

Browse source 
The any-maker fallback in Choose could seat a faction on a kind it has a dead stand-in for; the hull draw then looked for the dead stand-in's kind and returned
null. A stand-in no maker offers is no longer followed, so a kind Choose places is a kind the hull draw can fill. FieldableKindsOf reads the same two helpers.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
soul 2026-10-23 18:04:24 +02:00
commit b481363b9b
1 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Assets/Scripts/ServerShared/StationKinds.cs
View file

@ -54,11 +54,8 @@ public static class StationKinds
// The kinds this faction places that a station can be drawn for: those whose hull kind (its own model, else its stand-in's) some // The kinds this faction places that a station can be drawn for: those whose hull kind (its own model, else its stand-in's) some
// maker offers. A stand-in whose model has not landed leaves its kind out. // maker offers. A stand-in whose model has not landed leaves its kind out.
public static CultRecordRef<StationKindData>[] FieldableKindsOf(CultCache catalog, Faction faction) public static CultRecordRef<StationKindData>[] FieldableKindsOf(CultCache catalog, Faction faction) =>
{ KindsOf(catalog, faction).Where(kind => HasModel(catalog, faction, kind) || LiveStandIn(catalog, faction, kind).IsSet()).ToArray();
var offered = OfferedKinds(catalog);
return KindsOf(catalog, faction).Where(kind => offered.Contains(HullKindFor(catalog, faction, kind).Key.Value)).ToArray();
}
// A station's kind: a stable pick among the faction's kinds it can field, by the station's site, which generation names by the // A station's kind: a stable pick among the faction's kinds it can field, by the station's site, which generation names by the
// zone's seed and the station's place in its orbit order (never by a key the cache mints). It draws nothing from any random // zone's seed and the station's place in its orbit order (never by a key the cache mints). It draws nothing from any random
@ -79,14 +76,23 @@ public static class StationKinds
} }
// The kind of hull a faction builds for a station kind: the kind itself when the faction offers a model of it (a model // The kind of hull a faction builds for a station kind: the kind itself when the faction offers a model of it (a model
// wins over a stale stand-in), else the kind its stand-in names, else the kind itself (the hull draw then falls back to // wins over a stale stand-in), else the kind its stand-in names when some maker offers that, else the kind itself (the hull
// any maker). // draw then falls back to any maker).
public static CultRecordRef<StationKindData> HullKindFor(CultCache catalog, Faction faction, CultRecordRef<StationKindData> kind) public static CultRecordRef<StationKindData> HullKindFor(CultCache catalog, Faction faction, CultRecordRef<StationKindData> kind)
{ {
if (!kind.IsSet()) return kind; if (!kind.IsSet() || HasModel(catalog, faction, kind)) return kind;
if (OfferedStationHulls(catalog, faction).Any(hull => hull.Kind.Key.Equals(kind.Key))) return kind; var standIn = LiveStandIn(catalog, faction, kind);
return standIn.IsSet() ? standIn : kind;
}
private static bool HasModel(CultCache catalog, Faction faction, CultRecordRef<StationKindData> kind) =>
OfferedStationHulls(catalog, faction).Any(hull => hull.Kind.Key.Equals(kind.Key));
// The kind the faction's stand-in names for this kind, when some maker offers a hull of it; else unset.
private static CultRecordRef<StationKindData> LiveStandIn(CultCache catalog, Faction faction, CultRecordRef<StationKindData> kind)
{
var standIn = catalog.Get(kind)?.StandIns.FirstOrDefault(entry => catalog.Get(entry.Faction) == faction); var standIn = catalog.Get(kind)?.StandIns.FirstOrDefault(entry => catalog.Get(entry.Faction) == faction);
return standIn != null && standIn.Kind.IsSet() ? standIn.Kind : kind; return standIn != null && standIn.Kind.IsSet() && OfferedKinds(catalog).Contains(standIn.Kind.Key.Value) ? standIn.Kind : default;
} }
// What is wrong with a hull's kind, or null: a Station hull names a kind the catalog holds, and no other hull names one. // What is wrong with a hull's kind, or null: a Station hull names a kind the catalog holds, and no other hull names one.