mirror of
https://github.com/soarqin/DSP_Mods.git
synced 2026-11-19 17:05:20 +08:00
fix(production): correct full-load capture and solver scaling
Stop capturing the transient miner output damper, apply the sandbox boost state to artificial stars as for launchers, and keep lens-free photon flows when no ray receiver is selected. Scale the planner conservation check by each ledger row and normalize the simplex right-hand side so large rates no longer fail. Skip non-production objects before copying native settings, decode blueprints through the native paste path, and simplify analyzer mode resolution. Update stale ProductionCheck expectations, add regression checks, and document the rules.
This commit is contained in:
1 parent
bcc82e1056
commit
d4ba72abf4
13 files changed
+418
-254
No files matched your search
@@ -145,36 +145,9 @@ public sealed class FactoryBlackBoxAnalyzer
|
||||
continue;
|
||||
}
|
||||
|
||||
if (snapshot.SpeedFactor.HasValue)
|
||||
building = new ProductionBuilding(building.ItemId, building.Category, snapshot.SpeedFactor.Value,
|
||||
building.WorkingPowerWatts, building.IdlePowerWatts, building.Kind,
|
||||
building.RatedGenerationWatts, building.ExchangeRateWatts,
|
||||
building.AccumulatorEnergyJoules, building.EmptyAccumulatorItemId,
|
||||
building.FullAccumulatorItemId, building.RenewableSource,
|
||||
building.MinerKind, building.MiningPeriodTicks,
|
||||
building.FuelMask, building.FuelUseWatts,
|
||||
building.PowerProductItemId, building.PowerProductEnergyJoules,
|
||||
building.CatalystMask, building.LaunchChargeTicks,
|
||||
building.LaunchCooldownTicks, building.AmmunitionItemId,
|
||||
building.CollectorSpeedMultiplier);
|
||||
if (snapshot.SpeedFactor.HasValue) building = building.WithSpeedFactor(snapshot.SpeedFactor.Value);
|
||||
var mode = request.ProliferationEnabled
|
||||
? building.Kind == ProductionBuildingKind.Fractionator
|
||||
? ProliferationMode.Speedup : building.Kind == ProductionBuildingKind.Exchanger &&
|
||||
snapshot.OperatingParameters.TryGetValue("Mode0", out var exchangerMode) && exchangerMode != 0
|
||||
? ProliferationMode.Speedup : building.Kind == ProductionBuildingKind.FuelGenerator
|
||||
? ProliferationMode.Speedup : building.Kind == ProductionBuildingKind.RayReceiver
|
||||
? snapshot.OperatingParameters.TryGetValue("LensItemId", out var lensId) && lensId > 0
|
||||
? ProliferationMode.Speedup : ProliferationMode.None
|
||||
: building.Kind == ProductionBuildingKind.Collector
|
||||
? ProliferationMode.None
|
||||
: building.Category == ProductionRecipeCategory.Research && snapshot.RecipeId == 0 &&
|
||||
snapshot.OperatingParameters.TryGetValue("ResearchMode", out var researchModeSetting) &&
|
||||
researchModeSetting > 0 ? ProliferationMode.ExtraProducts
|
||||
: building.Kind == ProductionBuildingKind.Ejector ||
|
||||
building.Kind == ProductionBuildingKind.Silo
|
||||
? ProliferationMode.Speedup
|
||||
: snapshot.ProliferationMode
|
||||
: ProliferationMode.None;
|
||||
? FullProliferationMode(building, snapshot) : ProliferationMode.None;
|
||||
if (!_evaluator.TryEvaluate(_catalog, recipe, building, mode,
|
||||
mode == ProliferationMode.None ? 0 : _catalog.MaximumProliferationLevel,
|
||||
snapshot.OperatingParameters, out var process, out var diagnostic))
|
||||
@@ -250,6 +223,32 @@ public sealed class FactoryBlackBoxAnalyzer
|
||||
return new ProductionReport(status, materialComplete, powerComplete, flows, groups, diagnostics, power);
|
||||
}
|
||||
|
||||
private static ProliferationMode FullProliferationMode(ProductionBuilding building,
|
||||
ProductionBuildingSnapshot snapshot)
|
||||
{
|
||||
var parameters = snapshot.OperatingParameters;
|
||||
switch (building.Kind)
|
||||
{
|
||||
case ProductionBuildingKind.Fractionator:
|
||||
case ProductionBuildingKind.FuelGenerator:
|
||||
case ProductionBuildingKind.Ejector:
|
||||
case ProductionBuildingKind.Silo:
|
||||
return ProliferationMode.Speedup;
|
||||
case ProductionBuildingKind.Exchanger:
|
||||
return parameters.TryGetValue("Mode0", out var exchangerMode) && exchangerMode != 0
|
||||
? ProliferationMode.Speedup : snapshot.ProliferationMode;
|
||||
case ProductionBuildingKind.RayReceiver:
|
||||
return parameters.TryGetValue("LensItemId", out var lensId) && lensId > 0
|
||||
? ProliferationMode.Speedup : ProliferationMode.None;
|
||||
case ProductionBuildingKind.Collector:
|
||||
return ProliferationMode.None;
|
||||
default:
|
||||
return building.Category == ProductionRecipeCategory.Research && snapshot.RecipeId == 0 &&
|
||||
parameters.TryGetValue("ResearchMode", out var researchMode) && researchMode > 0
|
||||
? ProliferationMode.ExtraProducts : snapshot.ProliferationMode;
|
||||
}
|
||||
}
|
||||
|
||||
private static Dictionary<int, double> Scale(IReadOnlyDictionary<int, double> flows, double factor)
|
||||
{
|
||||
return flows.ToDictionary(entry => entry.Key, entry => entry.Value * factor);
|
||||
|
||||
Reference in new issue
Block a user