jbourdon/space-game
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(backend): align station module production semantics

Browse Source
This commit is contained in:
Jonathan Bourdon
2026-03-27 16:44:50 -04:00
parent 3237735b08
commit 04d182e93f
10 changed files with 125 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
apps/backend/Universe/Scenario/DataCatalogLoader.cs
View File

@@ -103,12 +103,12 @@ internal sealed class DataCatalogLoader(string dataRoot)
private static List<ModuleRecipeDefinition> BuildModuleRecipes(IEnumerable<ModuleDefinition> modules) =>
modules
.Where(module => module.Construction is not null || module.Production.Count > 0)
.Where(module => module.BuildRecipes.Count > 0)
.Select(module => new ModuleRecipeDefinition
{
ModuleId = module.Id,
Duration = module.Construction?.ProductionTime ?? module.Production[0].Time,
Inputs = (module.Construction?.Requirements ?? module.Production[0].Wares)
Duration = module.BuildRecipes[0].Time,
Inputs = module.BuildRecipes[0].Wares
.Select(input => new RecipeInputDefinition
{
ItemId = input.ItemId,
@@ -122,8 +122,8 @@ internal sealed class DataCatalogLoader(string dataRoot)
{
var recipes = new List<RecipeDefinition>();
var preferredProducerByItemId = modules
.Where(module => module.Products.Count > 0)
.GroupBy(module => module.Products[0], StringComparer.Ordinal)
.Where(module => module.ProductItemIds.Count > 0)
.GroupBy(module => module.ProductItemIds[0], StringComparer.Ordinal)
.ToDictionary(
group => group.Key,
group => group.OrderBy(module => module.Id, StringComparer.Ordinal).First().Id,
@@ -271,23 +271,6 @@ internal sealed class DataCatalogLoader(string dataRoot)
module.Type = module.ModuleType.ToDataValue();
if (module.Products.Count == 0 && !string.IsNullOrWhiteSpace(module.Product))
{
module.Products = [module.Product];
}
if (string.IsNullOrWhiteSpace(module.ProductionMode))
{
module.ProductionMode = module.ModuleType == ModuleType.BuildModule
? "commanded"
: "passive";
}
if (module.WorkforceNeeded <= 0f)
{
module.WorkforceNeeded = module.WorkForce?.Max ?? 0f;
}
modules[index] = CreateSpecializedModuleDefinition(module);
}
@@ -313,9 +296,19 @@ internal sealed class DataCatalogLoader(string dataRoot)
}
}
if (module.Products.Count > 0)
if (module.ModuleType == ModuleType.Habitation)
{
return new ProductionModuleDefinition(module);
return new HabitationModuleDefinition(module, module.SerializedWorkforce?.SupportedPopulation ?? 0f);
}
if (module.ModuleType == ModuleType.BuildModule)
{
return new BuildModuleDefinition(module, module.SerializedWorkforce?.RequiredWorkforce ?? 0f);
}
if (module.ModuleType == ModuleType.Production)
{
return new ProductionModuleDefinition(module, module.SerializedWorkforce?.RequiredWorkforce ?? 0f);
}
return module;