Merge origin/master into mining: resolve five conflicts by owner, delete the belt-task machine
Mining owns belts, chunks and target picking; scenarios owns admission and run staging; master owns ships and fire control (rule scenarios-cut.md S4). - AetheriaStores.CatalogTypes: nine-type union, master's list plus FieldKindData, no Scenario. - tools/AetherDb/Program.cs: both cases (ship-authoring, field-kinds), one usage string. - Zone.cs: master's MineAsteroid dropped (mining deleted its inputs); scenarios' SettleBelts and its three calls deleted. - RunStartTests: the two belt-task tests deleted (they read belt.Transforms and MineAsteroid). - FireControlCut124Tests: master's strict Exact assertions; mining's CompatibleDrift allowance and its comment dropped. - GameData/Aetheria.cc: master's pointer 70a7b0a9. This commit lacks the Asteroid field kind in the catalog, so TheShippedCatalogHasAPickableFieldKind fails here by design; the next commit rebuilds it. Builds: this commit builds (verified at the end with commit 2); the catalog pin test fails at this commit. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
commit
d9f85dc639
154 changed files with 8764 additions and 4522 deletions
|
|
@ -35,7 +35,7 @@ public static class FireControl
|
|||
// GameplaySettings.FiringArc. Zero on the hardpoint means "use the default," not "no arc."
|
||||
public static float ArcFor(EquippedItem item)
|
||||
{
|
||||
var hardpoint = item.Entity.Hardpoints[item.Position.x, item.Position.y];
|
||||
var hardpoint = item.Hardpoint;
|
||||
var arc = hardpoint?.FiringArc ?? 0f;
|
||||
return arc > 0 ? arc : item.ItemManager.GameplaySettings.FiringArc;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue