Author SHA1 Message Date
soarqin 58d08cbcd7 fix(uxassist): use standard blueprint option controls
Match the native description title baseline, add clearance from the popup corner, and use the rectangular settings selector. Let its list overlay the footer without resizing the popup, and reduce checkbox spacing. Reset cloned resolution rows and external events locally.

Assisted-by: Cindy (https://cindy.app)
2026-11-05 21:43:21 +08:00
soarqin 19d19ce38d fix(uxassist): respect blueprint text and icon bounds
Account for the native background's trimmed border, keep checkbox captions independently sized, and place Auto-fill after the measured title while reserving the native icon. Limit changes to owned controls.

Assisted-by: Cindy (https://cindy.app)
2026-11-05 11:41:51 +08:00
soarqin 51af1430bc fix(uxassist): anchor blueprint options and use native popup controls
Follow the Auto-fill entry after native layout and scrolling, flip or constrain placement at canvas edges, and close detached or hidden popups.

Use the native close-X artwork with an isolated callback, compact settings, and one footer Generate action. Keep dropdown choices above the action and preserve native blueprint layout and production calculations.
2026-11-04 22:57:23 +08:00
soarqin 8fd449d991 fix(uxassist): correct blueprint description selector layout
Remove the cloned star-panel Localizer before sizing the production-basis selector so reopening options or changing languages cannot overwrite its stretched width.

Fill the main button and left-align selector text while preserving native inspector geometry and production calculations.
2026-11-04 22:02:55 +08:00
soarqin 64a23e9772 fix(cheatenabler): restore mecha and fleet invincibility
Patch the native mecha damage and shield consumers so an inlined Player.invincible getter cannot bypass protection. Replace the fleet damage matcher with target-type prefixes to cover both space paths.

Synchronize the English and Chinese documentation without changing version 2.4.8.
2026-11-04 20:46:44 +08:00
soarqin 2eae91fa18 fix(uxassist): restore tech-tree arrows across save changes
Grow missing connection arrows when Peace-mode filtering is restored, preserving existing controls and native connection updates. Record the fix in UXAssist 1.7.0 and synchronize the manifest and bilingual documentation.
2026-11-02 21:02:08 +08:00
soarqin d728e8b4ae fix(uxassist): preserve blueprint layout and add production bases 2026-11-02 21:00:52 +08:00
soarqin 8fbb244ba2 chore: release dustbin v1.5.0 2026-10-31 16:21:03 +08:00
soarqin d68329ff9a fix: ZipMod target 2026-10-31 15:45:55 +08:00
soarqin 6263775dc1 fix(uxassist): limit quick miner diagnostics to Debug builds 2026-10-31 15:35:59 +08:00
soarqin 3580e9623f chore: release CheatEnabler 2.4.8 and UXAssist 1.6.3 2026-10-31 15:29:47 +08:00
soarqin 35f5cfcdd8 feat(uxassist): abbreviate exact blueprint material rates
Use the largest K/M/G suffix that preserves existing display precision with at most one decimal place, falling back to ordinary numbers otherwise.

Cover all material categories and formatting boundaries, and update English and Chinese documentation.
2026-10-31 13:58:54 +08:00
soarqin 0cd6008673 fix(uxassist): keep quick miners within the selected vein group
Restrict layout coverage and miner vein lists to the selected group so nearby deposits of the same resource cannot attract placement. Preserve neighboring vein collision checks and enforce the three-node minimum after planned burials.

Tag debug snapshots with target-group semantics, validate group membership during replay, and synchronize the English and Chinese documentation.
2026-10-31 13:58:14 +08:00
soarqin 5f9c6e05cb fix(cheatenabler): defer instant construction until prologue ends 2026-10-26 23:20:26 +08:00
soarqin ca884fe6af fix(uxassist): name item ID constants after their items
The game-constant centralization attached wrong names to many item IDs, such
as Steel for Titanium Alloy (1107) and HydrogenFuelRod for the Electromagnetic
Matrix (6001). Every remaining usage relies on the IDs, which match the items
in the belt-signal proliferation tips, the matrix metadata types, and the Dark
Fog buy-out definitions. Rename the constants after their actual items and
current Dark Fog item names, and remove the mislabeled constants that only the
retired proliferator source table used. Item groups and compiled values are
unchanged.
2026-10-25 22:04:50 +08:00
soarqin 3ca7b62ec6 fix(cheatenabler): track signal belts by their owning planet
The belt hooks keyed signal belts by the local planet's factory index. Battlefield
Analysis Base drones can finish belts on other planets and Dark Fog attacks can
destroy them there, so such changes started or stopped generation on a belt of
the current planet, or were dropped while in space, and a destroyed remote belt
kept its signal entry for any belt later built in its place. Use the factory that
owns the CargoTraffic instead.
2026-10-25 22:01:05 +08:00
soarqin a6225cf750 fix(cheatenabler): keep the rare-recipe preference for belt statistics
The planner migration switched belt-signal upstream statistics to each item's
standard recipe. Capture the native RecipeProto.Explicit flag in the production
catalog and let the belt preset prefer explicit recipes again, which include the
rare-resource alternatives such as Graphene from Fire Ice and Diamond from
Kimberlite Ore. As before, explicit recipes that consume their own product
(X-ray Cracking and Reforming Refine) never supply an item, and natural items
stay raw. Proliferation modes now follow the selected recipe.
2026-10-25 22:01:05 +08:00
soarqin 6d86e1f5dd docs: consolidate production documentation
Move the blueprint description notes to the unreleased 1.6.3 entry and limit
them to user-visible behavior, list the feature in the README, condense the
production guidance in AGENTS.md to durable rules, and remove the completed
planning documents that duplicated the architecture reference.
2026-10-25 22:01:05 +08:00
soarqin 79c736d90c fix(cheatenabler): plan belt-signal statistics outside the logic tick
Signals can change inside the logic tick when drones finish a blueprint, so a
cache miss now queues the belt and the production planner runs from the next
frame update; the tick only applies cached rates. Document the recipe-based
upstream statistics in the unreleased changelog.
2026-10-25 22:01:05 +08:00
soarqin f0773ffb9b fix(production): correct blueprint power and planner edge cases
Read the Advanced Mining Machine speed stored with station settings in prebuild
and blueprint captures, and count charging power nodes such as Satellite
Substations at their idle draw. Skip recipes that consume their own product when
choosing an item's default recipe, so Refined Oil uses Plasma Refining instead
of Reforming Refine.

Run each planner recipe in one proliferation mode and report conflicting
explicit modes, keep material flows for recipe types the catalog does not know,
and attribute receiver warnings to their recipe. Compare simplex ratio ties
relatively and drive out near-zero artificials without amplifying residuals.
Bound the steady-state reduction so lossless cycles cannot stall blueprint
descriptions, and choose power units after rounding.

Remove redundant code: share the numeric and flow helpers, and drop the unused
IsExcessIntermediate threshold, legacy constructor and Capture overloads, the
multi-field updater, and the unused proliferator source table.
2026-10-25 22:01:05 +08:00
soarqin 6345562c66 build: exclude nested test artifacts from parent projects 2026-10-25 22:01:05 +08:00
soarqin e2b8433252 feat(uxassist): generate blueprint production descriptions
Add native blueprint description generation with proliferation controls, separate power categories, and steady-state material and research reporting.

Distinguish necessary coproducts from overbuild and fractional headroom, with regression checks and updated architecture documentation.

Validation: 464 ProductionCheck checks and Release builds of UXAssist, CheatEnabler, and UniverseGenTweaks.
2026-10-25 22:01:05 +08:00
soarqin cada02fbf4 feat(production): include logistics charging in black-box power 2026-10-25 22:01:05 +08:00
soarqin 51e90a8e1d 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.
2026-10-25 22:01:05 +08:00
soarqin 97f032a5af feat(production): add shared planner and factory analysis
Add Proto-backed planning, fixed-building analysis, blueprint capture, and facility-specific material and power calculations.

Migrate belt-signal upstream statistics, include review fixes, and document the architecture and manual validation workflow.
2026-10-25 22:01:05 +08:00
30 changed files with 1282 additions and 238 deletions

No files matched your search

+12 -4
View File
@@ -3,8 +3,12 @@
## Changlog
* 2.4.8 - Unreleased
* `Belt signal item generation`: Calculate raw-material, intermediate, and proliferator statistics from the game's current recipe data, counting by-products and consumption separately. If an item's recipe data is incomplete, only its upstream statistics pause, with the reason logged; item generation is unaffected. Fix signal belts built or destroyed on another planet, for example by Battlefield Analysis Base drones or Dark Fog attacks, affecting a belt on the current planet instead of their own; a destroyed belt could also keep generating items on a belt later built in its place.
* 2.4.8
* `Mecha and Drones/Fleets invincible`: Fix mecha HP and energy shield protection failing when enabled after taking damage, and restore protection for space fleets.
* `Finish build immediately`: Fix possible errors when starting a new game. Construction begins after the opening cutscene ends or is skipped.
* `Belt signal item generation`:
* Improve raw-material, intermediate, by-product and proliferator statistics using current recipes, with production and consumption counted separately. Incomplete recipe data only pauses the affected upstream statistics; item generation continues.
* Fix signal belts built or destroyed on other planets, such as by Battlefield Analysis Base drones or Dark Fog attacks, affecting belts on the current planet. Destroyed signal belts no longer cause replacement belts to keep generating items.
* 2.4.7
* `Dev Shortcuts`: Work immediately when enabled after loading a save, and process each key press once per frame at accelerated game speeds.
* Extend `Unlock Tech with Key-Modifiers` with a downgrade mode.
@@ -203,8 +207,12 @@
## 更新日志
* 2.4.8 - Unreleased
* `传送带信号物品生成`:原料、中间产物和增产剂的统计改为按游戏当前配方数据计算,并分别计入副产物和消耗。某物品的配方数据不完整时,仅暂停该物品的上游统计并在日志中说明原因,不影响物品生成。修复在其他星球上建造或被摧毁的信号传送带(例如由战场分析基站的无人机建造或被黑雾摧毁)错误影响当前星球上传送带的问题;被摧毁的传送带也可能让之后在原处新建的传送带继续生成物品。
* 2.4.8
* `机甲和战斗无人机无敌`:修复受伤后启用时机甲耐久度和能量护盾保护可能失效的问题,并恢复太空编队的无敌保护。
* `建造秒完成`:修复开始新游戏时可能报错的问题。建造会在开场动画播放结束或跳过后开始。
* `传送带信号物品生成`:
* 按当前配方完善原料、中间产物、副产物和增产剂的统计,分别记录生产和消耗。配方数据不完整时,仅暂停受影响物品的上游统计,物品仍会正常生成。
* 修复其他星球上的信号传送带在建造或被摧毁时,错误影响当前星球上传送带的问题,例如战场分析基站无人机建造或黑雾摧毁传送带。被摧毁的信号传送带也不会再让之后替换它的传送带继续生成物品。
* 2.4.7
* `开发模式快捷键`:修复载入存档后启用时不生效的问题;加速游戏时每次按键仍只执行一次。
* `使用组合键点击解锁科技` 新增降级模式。
+10 -10
View File
@@ -81,10 +81,10 @@ public static class PlayerFunctions
var propertySystem = DSPGame.propertySystem;
if (propertySystem == null) return;
PurgePropertySystem(propertySystem);
var itemCnt = new int[ItemIds.Metaverse - ItemIds.HydrogenFuelRod + 1];
foreach (var cons in propertySystem.propertyDatas.SelectMany(data => data.totalConsumption.Where(cons => cons.id is >= ItemIds.HydrogenFuelRod and <= ItemIds.Metaverse)))
var itemCnt = new int[ItemIds.UniverseMatrix - ItemIds.ElectromagneticMatrix + 1];
foreach (var cons in propertySystem.propertyDatas.SelectMany(data => data.totalConsumption.Where(cons => cons.id is >= ItemIds.ElectromagneticMatrix and <= ItemIds.UniverseMatrix)))
{
itemCnt[cons.id - ItemIds.HydrogenFuelRod] += cons.count;
itemCnt[cons.id - ItemIds.ElectromagneticMatrix] += cons.count;
}
if (itemCnt.All(cnt => cnt == 0))
@@ -97,7 +97,7 @@ public static class PlayerFunctions
{
if (itemCnt[i] > 0)
{
msg += $"\n {LDB.items.Select(i + ItemIds.HydrogenFuelRod).propertyName} x{itemCnt[i]}";
msg += $"\n {LDB.items.Select(i + ItemIds.ElectromagneticMatrix).propertyName} x{itemCnt[i]}";
}
}
UIMessageBox.Show(Localization.RemoveAllMetadataConsumptionRecords.Translate(), msg, Localization.Cancel.Translate(), Localization.OK.Translate(), UIMessageBox.QUESTION, null, () =>
@@ -121,7 +121,7 @@ public static class PlayerFunctions
var propertySystem = DSPGame.propertySystem;
if (propertySystem == null) return;
PurgePropertySystem(propertySystem);
var itemCnt = new int[ItemIds.Metaverse - ItemIds.HydrogenFuelRod + 1];
var itemCnt = new int[ItemIds.UniverseMatrix - ItemIds.ElectromagneticMatrix + 1];
var seedKey = DSPGame.GameDesc.seedKey64;
var clusterPropertyData = propertySystem.propertyDatas.FirstOrDefault(cpd => cpd.seedKey == seedKey);
if (clusterPropertyData == null)
@@ -130,9 +130,9 @@ public static class PlayerFunctions
return;
}
var currentGamePropertyData = GameMain.data.history.propertyData;
foreach (var cons in currentGamePropertyData.totalConsumption.Where(cons => cons.id is >= ItemIds.HydrogenFuelRod and <= ItemIds.Metaverse))
foreach (var cons in currentGamePropertyData.totalConsumption.Where(cons => cons.id is >= ItemIds.ElectromagneticMatrix and <= ItemIds.UniverseMatrix))
{
itemCnt[cons.id - ItemIds.HydrogenFuelRod] += cons.count;
itemCnt[cons.id - ItemIds.ElectromagneticMatrix] += cons.count;
}
if (itemCnt.All(cnt => cnt == 0))
@@ -145,7 +145,7 @@ public static class PlayerFunctions
{
if (itemCnt[i] > 0)
{
msg += $"\n {LDB.items.Select(i + ItemIds.HydrogenFuelRod).propertyName} x{itemCnt[i]}";
msg += $"\n {LDB.items.Select(i + ItemIds.ElectromagneticMatrix).propertyName} x{itemCnt[i]}";
}
}
UIMessageBox.Show(Localization.RemoveMetadataConsumptionRecordInCurrentGame.Translate(), msg, Localization.Cancel.Translate(), Localization.OK.Translate(), UIMessageBox.QUESTION, null, () =>
@@ -154,8 +154,8 @@ public static class PlayerFunctions
{
if (clusterPropertyData.totalConsumption[i].count == 0) continue;
var id = clusterPropertyData.totalConsumption[i].id;
if (id < ItemIds.HydrogenFuelRod || id > ItemIds.Metaverse) continue;
var currentGameCount = itemCnt[id - ItemIds.HydrogenFuelRod];
if (id < ItemIds.ElectromagneticMatrix || id > ItemIds.UniverseMatrix) continue;
var currentGameCount = itemCnt[id - ItemIds.ElectromagneticMatrix];
if (currentGameCount == 0) continue;
var totalCount = clusterPropertyData.totalConsumption[i].count;
clusterPropertyData.totalConsumption[i] = new IDCNT(id, totalCount > currentGameCount ? totalCount - currentGameCount : 0);
+30 -19
View File
@@ -1,10 +1,11 @@
using System.Collections.Generic;
using System.Reflection;
using System.Linq;
using System.Reflection.Emit;
using BepInEx.Configuration;
using HarmonyLib;
using UXAssist.Common;
using UXAssist.Common.ModFeatures;
using UXAssist.Common.Patching;
namespace CheatEnabler.Patches;
@@ -48,27 +49,37 @@ public static class CombatPatch
);
return matcher.InstructionEnumeration();
}
// Harmony transpiler: SkillSystem_DamageObject_Transpiler
// Target: SkillSystem.DamageGroundObjectByLocalCaster, SkillSystem.DamageGroundObjectByRemoteCaster, SkillSystem.DamageObject
// Fallback: None — patch will fail loudly if the target method body changes.
// Harmony transpiler: Mecha_Invincible_Transpiler
// Target: Mecha.TakeDamage, Mecha.EnergyShieldResist (both overloads)
// Fallback: Return original instructions if the invincibility check is not found.
[HarmonyTranspiler]
[HarmonyPatch(typeof(Mecha), nameof(Mecha.TakeDamage))]
[HarmonyPatch(typeof(Mecha), nameof(Mecha.EnergyShieldResist), [typeof(int)], [ArgumentType.Ref])]
[HarmonyPatch(typeof(Mecha), nameof(Mecha.EnergyShieldResist), [typeof(int), typeof(int)], [ArgumentType.Ref, ArgumentType.Out])]
private static IEnumerable<CodeInstruction> Mecha_Invincible_Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
{
// Repatch the consumers too: an already inlined getter bypasses its own Harmony patch.
var original = instructions.ToList();
var matcher = new CodeMatcher(original, generator);
matcher.MatchForward(false, new CodeMatch(ci => ci.Calls(AccessTools.PropertyGetter(typeof(Player), nameof(Player.invincible)))));
if (matcher.IsInvalid) return matcher.Finish(original, CheatEnabler.Logger, nameof(Mecha_Invincible_Transpiler));
matcher.Set(OpCodes.Pop, null).Advance(1).Insert(new CodeInstruction(OpCodes.Ldc_I4_1));
return matcher.InstructionEnumeration();
}
[HarmonyPrefix]
[HarmonyPatch(typeof(SkillSystem), nameof(SkillSystem.DamageGroundObjectByLocalCaster))]
[HarmonyPatch(typeof(SkillSystem), nameof(SkillSystem.DamageGroundObjectByRemoteCaster))]
[HarmonyPatch(typeof(SkillSystem), nameof(SkillSystem.DamageObject))]
private static IEnumerable<CodeInstruction> SkillSystem_DamageObject_Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator, MethodBase __originalMethod)
private static void SkillSystem_DamageGroundObject_Prefix(ref int damage, ref SkillTargetLocal target)
{
var matcher = new CodeMatcher(instructions, generator);
matcher.MatchForward(false,
new CodeMatch(ci => ci.IsLdarg()),
new CodeMatch(OpCodes.Ldfld, AccessTools.Field(typeof(SkillTargetLocal), nameof(SkillTargetLocal.type))),
new CodeMatch(OpCodes.Ldc_I4_6),
new CodeMatch(ci => ci.opcode == OpCodes.Bne_Un || ci.opcode == OpCodes.Bne_Un_S)
);
matcher.Repeat(m => m.Advance(4).InsertAndAdvance(
new CodeInstruction(OpCodes.Ldc_I4_0),
new CodeInstruction(OpCodes.Starg_S, __originalMethod.Name == "DamageObject" ? 1 : 2)
));
return matcher.InstructionEnumeration();
if (target.type == ETargetType.Craft) damage = 0;
}
[HarmonyPrefix]
[HarmonyPatch(typeof(SkillSystem), nameof(SkillSystem.DamageObject))]
private static void SkillSystem_DamageObject_Prefix(ref int damage, ref SkillTarget target)
{
if (target.type == ETargetType.Craft) damage = 0;
}
}
@@ -95,4 +106,4 @@ public static class CombatPatch
return matcher.InstructionEnumeration();
}
}
}
}
+7 -4
View File
@@ -88,14 +88,14 @@ public class FactoryPatch : PatchImpl<FactoryPatch>
ControlPanelRemoteLogistics.Enable(ControlPanelRemoteLogisticsEnabled.Value);
Enable(true);
CargoTrafficPatch.Enable(true);
GameLogicProc.OnGameBegin += OnGameBegin_For_ImmBuild;
GameLogicProc.OnGameBegin += OnGameBeginOrGuideComplete;
GameLogicProc.OnDataLoaded += OnDataLoaded;
}
public static void Uninit()
{
GameLogicProc.OnDataLoaded -= OnDataLoaded;
GameLogicProc.OnGameBegin -= OnGameBegin_For_ImmBuild;
GameLogicProc.OnGameBegin -= OnGameBeginOrGuideComplete;
CargoTrafficPatch.Enable(false);
Enable(false);
ImmediateBuild.Enable(false);
@@ -152,7 +152,8 @@ public class FactoryPatch : PatchImpl<FactoryPatch>
if (factory.prebuildCount <= 0) return;
var imm = ImmediateEnabled.Value;
var architect = ArchitectModeEnabled.Value;
if ((!imm && !architect) || GameMain.gameScenario == null) return;
if ((!imm && !architect) || GameMain.gameScenario == null ||
GameMain.data?.guideComplete != true) return;
var prebuilds = factory.prebuildPool;
if (imm)
{
@@ -193,7 +194,9 @@ public class FactoryPatch : PatchImpl<FactoryPatch>
}
}
private static void OnGameBegin_For_ImmBuild()
[HarmonyPostfix]
[HarmonyPatch(typeof(GameData), nameof(GameData.EndStandardModeGuide))]
private static void OnGameBeginOrGuideComplete()
{
if (DSPGame.IsMenuDemo) return;
var factory = GameMain.mainPlayer?.factory;
@@ -174,6 +174,7 @@ internal class ImmediateBuild : PatchImpl<ImmediateBuild>
[HarmonyPatch(typeof(GameLogic), nameof(GameLogic.FactoryConstructionSystemGameTick))]
private static void GameLogic_FactoryConstructionSystemGameTick_Prefix(GameLogic __instance)
{
if (GameMain.data?.guideComplete != true || GameMain.gameScenario == null) return;
var time = __instance.timei;
if (time % 6 != 0) return;
var planet = GameMain.localPlanet;
+5 -1
View File
@@ -26,6 +26,7 @@
* Factory:
* Finish build immediately
* Completes pending buildings as soon as their required building items are available
* Starts after the opening cutscene has ended or been skipped
* Architect mode
* Unlimited use of buildings, Logistics Bots, Logistics Drones and Interstellar Logistics Vessels
* Construction and inventory availability checks show at least 999 of each supported item.
@@ -74,7 +75,8 @@
* Keep the highest-production shells and remove the others
* Duplicate the highest-production shells with a configurable shell count
* Mecha/Combat:
* Mecha and Drones/Fleets invicible
* Mecha and Drones/Fleets invincible
* Protects mecha HP and energy shields, ground combat drones, and space fleets, including when enabled during combat.
* Buildings invicible
* Enable warp without space warpers
* Teleport to outer space
@@ -129,6 +131,7 @@ The item icon selects the output; no hotkey is needed.
* 工厂:
* 建造秒完成
* 所需建筑物品齐备后立即完成待建造建筑
* 开场动画播放结束或跳过后生效
* 建筑师模式
* 建筑、配送运输机、物流运输机和星际物流运输船可无限使用
* 建造及库存可用数量检查中,每种受支持物品至少显示 999 个。
@@ -178,6 +181,7 @@ The item icon selects the output; no hotkey is needed.
* 从发电量最高的壳复制戴森壳,可设置壳面数量
* 机甲/战斗:
* 机甲和战斗无人机无敌
* 保护机甲耐久度和能量护盾、地面战斗无人机和太空编队,战斗中开启同样生效。
* 建筑无敌
* 无需空间翘曲器即可曲速飞行
* 传送到外太空
-14
View File
@@ -4,8 +4,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UXAssist", "UXAssist\UXAssi
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CheatEnabler", "CheatEnabler\CheatEnabler.csproj", "{F9F16B62-D1D3-466B-BE22-E64B9EA957C2}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LogisticMiner", "LogisticMiner\LogisticMiner.csproj", "{7149D717-C913-4153-9425-38CB9D087F83}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HideTips", "HideTips\HideTips.csproj", "{4EABD71D-477F-448B-801B-48F8745A3FA7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dustbin", "Dustbin\Dustbin.csproj", "{931F0230-5941-4E49-AB19-66921AF14096}"
@@ -65,18 +63,6 @@ Global
{F9F16B62-D1D3-466B-BE22-E64B9EA957C2}.Release|x64.Build.0 = Release|Any CPU
{F9F16B62-D1D3-466B-BE22-E64B9EA957C2}.Release|x86.ActiveCfg = Release|Any CPU
{F9F16B62-D1D3-466B-BE22-E64B9EA957C2}.Release|x86.Build.0 = Release|Any CPU
{7149D717-C913-4153-9425-38CB9D087F83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7149D717-C913-4153-9425-38CB9D087F83}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7149D717-C913-4153-9425-38CB9D087F83}.Debug|x64.ActiveCfg = Debug|Any CPU
{7149D717-C913-4153-9425-38CB9D087F83}.Debug|x64.Build.0 = Debug|Any CPU
{7149D717-C913-4153-9425-38CB9D087F83}.Debug|x86.ActiveCfg = Debug|Any CPU
{7149D717-C913-4153-9425-38CB9D087F83}.Debug|x86.Build.0 = Debug|Any CPU
{7149D717-C913-4153-9425-38CB9D087F83}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7149D717-C913-4153-9425-38CB9D087F83}.Release|Any CPU.Build.0 = Release|Any CPU
{7149D717-C913-4153-9425-38CB9D087F83}.Release|x64.ActiveCfg = Release|Any CPU
{7149D717-C913-4153-9425-38CB9D087F83}.Release|x64.Build.0 = Release|Any CPU
{7149D717-C913-4153-9425-38CB9D087F83}.Release|x86.ActiveCfg = Release|Any CPU
{7149D717-C913-4153-9425-38CB9D087F83}.Release|x86.Build.0 = Release|Any CPU
{4EABD71D-477F-448B-801B-48F8745A3FA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4EABD71D-477F-448B-801B-48F8745A3FA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4EABD71D-477F-448B-801B-48F8745A3FA7}.Debug|x64.ActiveCfg = Debug|Any CPU
+5
View File
@@ -26,6 +26,11 @@
<_ZipPath>$(_PackageDir)\$(ProjectName)-$(Version).zip</_ZipPath>
</PropertyGroup>
<!-- Refresh referenced preloaders before collecting patchers; other projects skip this target. -->
<MSBuild Projects="@(ProjectReference)" Targets="CopyToParentPackage"
Properties="Configuration=$(Configuration)"
Condition="'$(PackUsePluginsLayout)' == 'true'" />
<!-- Sync manifest.json version_number from .csproj $(Version) before packaging -->
<Exec Condition="Exists('$(_PackageDir)\manifest.json')"
Command="powershell.exe -NoProfile -ExecutionPolicy Bypass -Command &quot;$f='$(_PackageDir)\manifest.json'; $c=[IO.File]::ReadAllText($f); $c=$c -replace '(\u0022version_number\u0022\s*:\s*\u0022)[^\u0022]*(\u0022)','${1}$(Version)${2}'; [IO.File]::WriteAllText($f,$c,[Text.UTF8Encoding]::new($true))&quot;" />
+6 -2
View File
@@ -3,10 +3,12 @@
## Changelog
* 1.4.0
* 1.5.0
* `Storage dustbin`: Destroy splitter input to a storage placed above it, including stacked and proliferated cargo. Enabling dustbin mode also clears cached full-storage state.
* `Tank dustbin`: Fix single tanks blocking liquid input after receiving their first stack, both with and without dustbin mode.
* `Belt signal dustbin`: Restore item disposal and startup compatibility with the current game simulation loop after DSP 0.10.33/0.10.34 updates.
* 1.4.0
* Refactorying Tank input logic codes, for better performance, and resolve a bug [#53](https://github.com/soarqin/DSP_Mods/issues/53)
* Remove use of AssetBundle, move the belt signal icon into `Assembly Resources`, for better flexibility.
@@ -46,10 +48,12 @@
## 更新日志
* 1.4.0
* 1.5.0
* `储物仓垃圾桶`:销毁四向分流器送入上方储物仓的物品,包括堆叠和喷涂增产剂的物品;启用垃圾桶时清除已满状态缓存。
* `储液罐垃圾桶`:修复单层储液罐装入第一批液体后停止输入的问题,普通储存和垃圾桶模式均可正常工作。
* `传送带信号垃圾桶`:适配当前游戏的模拟循环,修复 DSP 0.10.33/0.10.34 更新后的启动报错和物品无法销毁问题。
* 1.4.0
* 重构储液罐的输入逻辑代码,以提高性能并解决bug [#53](https://github.com/soarqin/DSP_Mods/issues/53)
* 移除了AssetBundle的使用,将传送带信号图标移入`Assembly资源`,以获得更好的灵活性
+1 -1
View File
@@ -3,7 +3,7 @@
<PropertyGroup>
<BepInExPluginGuid>org.soardev.dustbin</BepInExPluginGuid>
<Description>DSP MOD - Dustbin</Description>
<Version>1.4.0</Version>
<Version>1.5.0</Version>
<PackageId>Dustbin</PackageId>
<RootNamespace>Dustbin</RootNamespace>
<PackHasChangelog>true</PackHasChangelog>
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "Dustbin",
"version_number": "1.4.0",
"version_number": "1.5.0",
"website_url": "https://github.com/soarqin/DSP_Mods/tree/master/Dustbin",
"description": "Can turn Storages and Tanks into Dustbin(Destroy incoming items) / 储物仓和储液罐可以转变为垃圾桶(销毁送进的物品)",
"dependencies": [
+26 -8
View File
@@ -3,10 +3,19 @@
## Changlog
* 1.6.3 - Unreleased
* `Sunlight at night`: Base lighting on the camera and the viewed surface instead of Icarus's facing direction, including planet view. Keep building, terrain, solar-panel, and belt lighting directions synchronized, recover when the active light or planet changes, and restore native lighting when sailing, disabling the feature, or using white rendering mode.
* `Quick build Mining Machines`: Add a Factory-tab button that searches dense layouts at the nearest solid vein group using native collision shapes, including interleaving feet, joint placement of nearby miners, and a final pass to fill remaining compatible positions. `Allow restoring/burying veins` is off by default: uses only visible nodes and skips all restoration and burial calculations. When enabled, restores available buried nodes and may bury unused nodes to improve coverage. Optimizes summed vein coverage, requires at least 3 covered nodes per miner after any burial, and places the full ordinary miner layout regardless of stock, leaving ghosts awaiting missing materials. Accelerates layout searches with up to 4 background workers, capped at half the available logical processors. Writes replayable JSON snapshots during feature tuning and keeps the completion tip visible for about 8 seconds.
* `Blueprint descriptions`: Add an `Auto-fill description` button and a `Proliferation` checkbox above the description boxes in the blueprint browser, copy, and paste panels. The button replaces the main description with the blueprint's full-load material flows per minute on separate `Missing`, `Excess`, `Input`, `Output`, and `Research` lines, and writes factory and logistics power demand to a `Power` custom field. Inputs are limited to what downstream buildings can use, matrices made in a blueprint with a research-mode lab are listed under `Research`, and research-mode labs are budgeted at full working power. The checkbox defaults to on when the blueprint contains a Spray Coater. Unknown values are marked instead of shown as zero, other custom fields are preserved, and nothing is saved automatically.
* 1.6.4
* `Blueprint descriptions`: Align `Auto-fill` with the description title while reserving space for the native icon button. Generation options follow the entry while scrolling and adjust at screen edges, with extra title padding, compact checkbox spacing, and text sized for the current language. Use a standard rectangular dropdown that overlays the footer without resizing the panel or moving its single `Generate` action. Close with the native X, an outside click, or Esc; Esc first closes an expanded list. Preserve the native inspector layout.
* `Hide battle-related techs in Peace mode`: Fix an array index error when opening the tech tree after switching from a Peace-mode save to a Combat-mode save in the same game process, including when disabling the option after loading another Peace-mode save.
* 1.6.3
* `Quick build Mining Machines`:
* Add a Factory-tab button to arrange ordinary Mining Machines densely around the nearest solid vein group. Each miner covers at least 3 nodes from that group, without including nearby groups. Layouts are not limited by stock; missing miners remain as ghosts awaiting materials. Placement respects construction range and does not include belts or power facilities. Click again to cancel a search.
* `Allow restoring/burying veins` is off by default, using only visible nodes without restoring or burying any. Enable it to restore unobstructed nodes away from Dark Fog Planetary Bases and allow unused nodes to be buried for better coverage. Nodes used by existing miners or miner ghosts are protected.
* `Blueprint descriptions`:
* Add an `Auto-fill` entry to the native description header in the blueprint browser, copy, and paste inspectors. It opens generation options without moving native fields or covering the file list. Generation replaces the main description with material flows per minute, separating shortages, surpluses, inputs, outputs, and research use, and adds factory and logistics power demand to a `Power` custom field.
* Choose `Final-product output` (the default on opening the inspector) to retain rated final outputs and show intermediate shortages and excess, or `Lowest intermediate throughput` to scale the final-product mix to the bottleneck using recipe ratios. Complete, balanceable chains have no internal shortages in the latter mode; unused intermediate capacity appears as excess. External inputs use the selected basis; power still covers every selected building at full load. If a balanced basis cannot be determined, the original description is kept.
* A `Proliferation` checkbox controls whether calculations include proliferation, defaulting to on when the blueprint contains a Spray Coater. Large rates use K/M/G where display precision is preserved, and numbers with four or more integer digits use comma thousands separators, including before suffixes; unknown values are marked separately. Other custom fields are preserved, and the blueprint still needs to be saved manually.
* `Sunlight at night`: Lighting now follows the camera, including planet view, and stays consistent across buildings, terrain, solar panels, and belts. Restore lighting correctly after switching planets, and return to native lighting when sailing, disabling the feature, or using white rendering mode.
* `Protect veins from exhaustion`: Fix the option failing to take effect in 1.6.2, restoring protection of configured vein reserves and minimum oil rates, along with the corresponding mining statistics.
* 1.6.2
* `Increase maximum power usage in Logistic Stations and Advanced Mining Machines`: Fix zero or corrupted mining speeds when adjusting an Advanced Mining Machine's speed slider with the option enabled.
* `Tweak building buffers`: Restore the Ray Receiver Graviton Lens buffer setting on DSP 0.10.35.29104 and later, and correct the displayed native buffer value to 2.
@@ -438,10 +447,19 @@
## 更新日志
* 1.6.3 - Unreleased
* `夜间日光灯`:按镜头和当前观察位置的地表方向计算光照,不再跟随机甲朝向,行星视图也适用。统一建筑、地表、太阳能板和传送带的光照方向,在光源或行星切换后恢复功能,并在航行、关闭功能或白模渲染时恢复原版光照。
* `快速铺设采矿机`:在「工厂」页增加按钮,按游戏实际碰撞体在最近的固体矿脉搜索密集布局,支持脚部交错、邻近矿机联动调整及结束前补入剩余可用位置。「允许恢复/掩埋矿物」默认关闭:仅使用可见矿点,跳过所有恢复和掩埋计算;开启后,恢复可恢复的掩埋矿点,并允许掩埋未被使用的矿点来提高覆盖数。以各台矿机覆盖矿点数之和为目标,要求每台在掩埋后仍覆盖至少 3 个矿点,不受库存限制地生成完整布局,缺少采矿机的位置保留待建造虚影。使用最多 4 个后台线程加速布局搜索,线程数不超过可用逻辑线程数的一半。功能调试期间输出可离线重放的 JSON 数据,完成提示保留约 8 秒。
* `蓝图说明`:在蓝图浏览、复制和粘贴界面的说明框上方增加「自动填写说明」按钮和「增产」复选框。点击按钮会用蓝图满负荷运行时每分钟的物料流量替换原说明,按需分行列出「缺少」「多余」「输入」「输出」「研究」,并将工厂与物流耗电写入「耗电」自定义字段。输入量以下游建筑实际能消耗的量为限;蓝图含研究模式研究站时,蓝图内产出的矩阵列入「研究」行,研究模式研究站均按满负荷计入耗电。蓝图含喷涂机时,复选框默认勾选。无法计算的数值会单独标注而不显示为零,其他自定义字段保持不变,也不会自动保存蓝图。
* 1.6.4
* `蓝图说明`:「自动填写」入口与说明标题的文字基线对齐,并为原生图标按钮保留空间。生成选项滚动时跟随入口,在屏幕边缘调整位置;标题保留边距,复选框间距紧凑,文字尺寸适应当前语言。使用原生直边下拉框,展开时覆盖底部操作区域,面板尺寸和单个「生成说明」按钮的位置保持不变。可通过原生叉号、点击外部或 Esc 关闭;下拉列表展开时,Esc 先收起列表。保留原生检查面板布局。
* `在和平模式下隐藏战斗相关科技`:修复在同一次游戏运行中从和平模式存档切换到战斗模式存档后打开科技树时的数组越界,以及再次加载和平模式存档后关闭选项时的同类问题。
* 1.6.3
* `快速铺设采矿机`:
* 在「工厂」页增加按钮,自动在最近的固体矿脉周围密集铺设普通采矿机。每台至少覆盖选中矿脉的 3 个矿点,不混入附近其他矿脉。布局数量不受库存限制,采矿机不足的位置保留待建造虚影。遵守建造范围,不自动铺设传送带和电力设施。计算期间再次点击可取消。
* 「允许恢复/掩埋矿物」默认关闭,仅使用可见矿点,不恢复或掩埋矿点。开启后可恢复未被建筑阻挡、且远离黑雾行星基地的矿点,并允许掩埋未使用的矿点来提高覆盖数;已有矿机和待建造矿机使用的矿点会受到保护。
* `蓝图说明`:
* 在蓝图浏览、复制和粘贴检查面板的说明标题行增加「自动填写」入口,点击展开生成选项,不移动原生字段或遮挡文件列表。生成时用每分钟的物料流量替换原说明,分别列出「缺少」「多余」「输入」「输出」「研究」,并将工厂与物流耗电写入「耗电」自定义字段。
* 可选择「最终产物产量」(每次打开检查面板时的默认值),保留最终产物的额定产量并显示中间产物的缺口和余量;也可选择「最低产量中间产物」,按配方比例换算瓶颈,等比例缩放各最终产物。后一种模式下,数据完整且可平衡的生产链没有内部缺口,未使用的中间产能列为「多余」。外部输入采用所选基准,耗电仍按所选全部建筑满载估算。无法确定平衡基准时保留原说明。
* 可用「增产」复选框选择是否计入增产效果,蓝图含喷涂机时默认勾选。较大的流量在保留显示精度的前提下使用 K/M/G 单位;整数部分达到四位的数字用逗号每三位分隔,带单位时也适用。无法计算的数值单独标注。保留其他自定义字段,填写后仍需手动保存蓝图。
* `夜间日光灯`:光照改为随镜头变化,行星视图也适用;建筑、地表、太阳能板和传送带的光照方向保持一致。切换行星后正确恢复光照,航行、关闭功能或进入白模渲染时恢复原版光照。
* `保护矿脉不会枯竭`:修复 1.6.2 中开启后仍不生效的问题,恢复设定的矿脉剩余量、油井最低流速保护及相应开采统计。
* 1.6.2
* `提升物流塔和大型采矿机的最大功耗`:修复启用后调整大型采矿机开采速度时出现 0% 或异常速度的问题。
* `调整建筑输入缓冲`:修复 DSP 0.10.35.29104 及后续版本中射线接收器透镜缓冲设置不生效的问题,并将显示的游戏原始值更正为 2。
+50 -55
View File
@@ -13,49 +13,44 @@ public static class ItemIds
public const int SulfuricAcid = 1116;
public const int Hydrogen = 1120;
public const int Deuterium = 1121;
public const int Photon = 1208;
public const int CriticalPhoton = 1208;
/* Materials used by recipes */
public const int OrganicCrystal = 1015;
public const int FireIce = 1012;
public const int CriticalPhoton = 1124;
public const int CircuitBoard = 1112; // used in proliferator mk.III recipe
public const int Steel = 1107;
public const int TitaniumGlass = 1111;
public const int GravitonLens = 1125;
/* Materials and components */
public const int TitaniumAlloy = 1107;
public const int Prism = 1111;
public const int FrameMaterial = 1125;
public const int CasimirCrystal = 1126;
public const int MagneticCoil = 1202;
public const int ElectricMotor = 1203;
public const int ElectromagneticTurbine = 1204;
public const int SuperMagneticRing = 1205;
public const int GravitonLens = 1209;
public const int CircuitBoard = 1301;
public const int QuantumChip = 1305;
public const int PlasmaExciter = 1401;
public const int ParticleBroadband = 1402;
public const int AnnihilationConstraintSphere = 1403;
public const int Thruster = 1405;
public const int ReinforcedThruster = 1406;
/* Proliferators */
public const int ProliferatorMkI = 1141;
public const int ProliferatorMkII = 1142;
public const int ProliferatorMkIII = 1143;
/* Logistics carriers */
/* Logistics */
public const int SpaceWarper = 1210;
public const int LogisticsDrone = 5001;
public const int LogisticsVessel = 5002;
public const int LogisticsBot = 5003;
public const int SpaceWarper = 1126;
/* Matrices */
public const int ElectromagneticMatrix = 1202;
public const int EnergyMatrix = 1203;
public const int StructureMatrix = 1204;
public const int InformationMatrix = 1205;
public const int UniverseMatrix = 1209;
public const int Antimatter = 1210;
/* Components */
public const int PlasmaExciter = 1301;
public const int ParticleBroadband = 1305;
public const int Processor = 1401;
public const int QuantumChip = 1402;
public const int MicrocrystallineComponent = 1403;
public const int PlaneFilter = 1405;
public const int ParticleContainer = 1406;
/* Dyson sphere materials */
public const int SolarSail = 1502;
public const int FrameMaterial = 1503;
public const int DysonSphereComponent = 1802;
public const int DysonSphereComponent = 1502;
public const int SmallCarrierRocket = 1503;
/* Fuel rods */
public const int DeuteronFuelRod = 1802;
public const int StrangeAnnihilationFuelRod = 1804;
/* Power nodes */
public const int TeslaTower = 2201;
@@ -67,49 +62,49 @@ public static class ItemIds
public const int MiningMachine = 2301;
/* Dark Fog items (combat expansion) */
public const int DarkFogMemoryUnit = 5201;
public const int DarkFogMatrix = 5201;
public const int DarkFogSiliconNeuron = 5202;
public const int DarkFogMatterReassembler = 5203;
public const int DarkFogMatterRecombinator = 5203;
public const int DarkFogNegentropySingularity = 5204;
public const int DarkFogVirtualParticle = 5205;
public const int DarkFogEnergyFragment = 5206;
public const int DarkFogCoreElement = 5205;
public const int DarkFogEnergyShard = 5206;
/* Fuel and advanced items */
public const int HydrogenFuelRod = 6001;
public const int DeuteronFuelRod = 6002;
public const int AntimatterFuelRod = 6003;
public const int StrangeAnnihilationFuelRod = 1804;
public const int StrangeMatter = 6004;
public const int Foundation = 6005;
public const int Metaverse = 6006; // also called property/meta-data item
/* Matrices. Metadata types use the same IDs; the Universe Matrix's metadata is Metaverse. */
public const int ElectromagneticMatrix = 6001;
public const int EnergyMatrix = 6002;
public const int StructureMatrix = 6003;
public const int InformationMatrix = 6004;
public const int GravityMatrix = 6005;
public const int UniverseMatrix = 6006;
/* Item groups used by belt signal recipe calculations. */
public static readonly int[] ExtraOreItemIds =
[
Water, SulfuricAcid, Hydrogen, Deuterium, Photon,
DarkFogMemoryUnit, DarkFogSiliconNeuron, DarkFogMatterReassembler,
DarkFogNegentropySingularity, DarkFogVirtualParticle, DarkFogEnergyFragment
Water, SulfuricAcid, Hydrogen, Deuterium, CriticalPhoton,
DarkFogMatrix, DarkFogSiliconNeuron, DarkFogMatterRecombinator,
DarkFogNegentropySingularity, DarkFogCoreElement, DarkFogEnergyShard
];
// Listed in the same order as the belt signal option tips.
public static readonly HashSet<int> ExtraProliferationItemIds =
[
Steel, TitaniumGlass, GravitonLens, ProliferatorMkII, ProliferatorMkIII,
ElectromagneticMatrix, EnergyMatrix, StructureMatrix, InformationMatrix,
UniverseMatrix, Antimatter, PlasmaExciter, ParticleBroadband,
Processor, QuantumChip, MicrocrystallineComponent, PlaneFilter, ParticleContainer,
SolarSail, FrameMaterial, DysonSphereComponent,
HydrogenFuelRod, AntimatterFuelRod, StrangeMatter, Foundation, Metaverse
TitaniumAlloy, Prism, FrameMaterial, ProliferatorMkII, ProliferatorMkIII,
MagneticCoil, ElectricMotor, ElectromagneticTurbine, SuperMagneticRing,
CircuitBoard, Thruster, ReinforcedThruster, PlasmaExciter, ParticleBroadband,
GravitonLens, QuantumChip, AnnihilationConstraintSphere, DeuteronFuelRod, SpaceWarper,
DysonSphereComponent, SmallCarrierRocket, ElectromagneticMatrix, StructureMatrix,
InformationMatrix, GravityMatrix, UniverseMatrix
];
public static readonly HashSet<int> NoProliferationItemIds =
[
SpaceWarper, DeuteronFuelRod
CasimirCrystal, EnergyMatrix
];
/* Dark Fog materials used by production calculations. */
public static readonly int[] DarkFogItemIds =
[
DarkFogMemoryUnit, DarkFogSiliconNeuron, DarkFogMatterReassembler,
DarkFogNegentropySingularity, DarkFogVirtualParticle, DarkFogEnergyFragment
DarkFogMatrix, DarkFogSiliconNeuron, DarkFogMatterRecombinator,
DarkFogNegentropySingularity, DarkFogCoreElement, DarkFogEnergyShard
];
}
+25
View File
@@ -6,7 +6,15 @@ public static class I18NKeys
{
public const string Unknown = "Unknown";
public const string BlueprintAutoFillDescription = "UXAssist Blueprint Auto-fill description";
public const string BlueprintGenerateDescription = "UXAssist Blueprint Generate Description";
public const string BlueprintDescriptionOptions = "UXAssist Blueprint Description Options";
public const string BlueprintDescriptionOptionsTip = "UXAssist Blueprint Description Options Tip";
public const string BlueprintProliferation = "UXAssist Blueprint Proliferation";
public const string BlueprintProductionBasis = "UXAssist Blueprint Production Basis";
public const string BlueprintFinalProducts = "UXAssist Blueprint Final Products";
public const string BlueprintBottleneckIntermediate = "UXAssist Blueprint Bottleneck Intermediate";
public const string BlueprintProductionBasisTip = "UXAssist Blueprint Production Basis Tip";
public const string BlueprintBasisUnavailable = "Cannot determine a balanced intermediate throughput. Check building settings and production-chain outputs, or use final-product output.";
public const string BlueprintPower = "UXAssist Blueprint Power";
public const string BlueprintPowerEnglish = "Power";
public const string BlueprintPowerChinese = "耗电";
@@ -205,8 +213,10 @@ public static class I18NKeys
public const string QuickMinerFailed = "Miner placement stopped; check the log before retrying";
public const string QuickMinerVeinsChanged = "Veins changed during miner layout search";
public const string QuickMinerResult = "Placed {0} Mining Machines, {1} total vein coverage, {2} buried nodes";
#if DEBUG
public const string QuickMinerDebugSaved = "Miner layout debug data: {0}";
public const string QuickMinerDebugFailed = "Could not save miner layout debug data";
#endif
public const string MaximumCountToBuild = "Maximum count to build";
public const string Max = "max";
public const string StopEjectorsWhenAvailableNodesAreAllFilledUp = "Stop ejectors when available nodes are all filled up";
@@ -235,7 +245,20 @@ public static class I18NKeys
{
I18N.Add(Unknown, "Unknown", "未知");
I18N.Add(BlueprintAutoFillDescription, "Auto-fill description", "自动填写说明");
I18N.Add(BlueprintGenerateDescription, "Generate", "生成说明");
I18N.Add(BlueprintDescriptionOptions, "Auto-fill…", "自动填写…");
I18N.Add(BlueprintDescriptionOptionsTip,
"Choose production basis and proliferation, then fill the blueprint description.",
"选择产量基准和增产后,自动填写蓝图说明。");
I18N.Add(BlueprintProliferation, "Proliferation", "增产");
I18N.Add(BlueprintProductionBasis, "Production basis", "产量基准");
I18N.Add(BlueprintFinalProducts, "Final-product output", "最终产物产量");
I18N.Add(BlueprintBottleneckIntermediate, "Lowest intermediate throughput", "最低产量中间产物");
I18N.Add(BlueprintProductionBasisTip,
"Final-product output (default): keep rated final outputs and show intermediate shortages and excess.\nLowest intermediate throughput: convert capacities through recipe ratios and scale all final outputs together to the bottleneck; complete, balanceable chains have no internal shortages. Excess shows unused intermediate capacity. Power still sizes all selected buildings at full load.\nUnknown settings or an unresolved output prevent balanced generation; the existing description is kept.",
"最终产物产量(默认):保留最终产物的额定产量,显示中间产物的缺口和余量。\n最低产量中间产物:按配方比例换算产能,以瓶颈等比例缩放各最终产物;数据完整且可平衡时没有内部缺口,「多余」表示未使用的中间产能。耗电仍按所选全部建筑满载估算。\n缺少参数或无法确定输出时,不生成平衡说明,保留原说明。");
I18N.Add(BlueprintBasisUnavailable, BlueprintBasisUnavailable,
"无法确定可平衡的中间产物产量,原说明已保留。请检查建筑参数和生产链输出,或改用最终产物产量基准。");
I18N.Add(BlueprintPower, BlueprintPowerEnglish, BlueprintPowerChinese);
I18N.Add(BlueprintInputLine, "Input: ", "输入:");
I18N.Add(BlueprintOutputLine, "Output: ", "输出:");
@@ -501,8 +524,10 @@ You can set 2 shortcut keys in Settings panel:
I18N.Add(QuickMinerFailed, "Miner placement stopped. Check the UXAssist log before retrying.", "采矿机铺设已停止,请查看 UXAssist 日志后重试。");
I18N.Add(QuickMinerVeinsChanged, "The veins changed during calculation. Click the button again to recalculate the layout.", "计算期间矿点状态已变化,请再次点击按钮重新计算布局。");
I18N.Add(QuickMinerResult, "Placed {0} Mining Machines; total vein coverage: {1} (shared nodes counted per miner); buried nodes: {2}.", "已铺设 {0} 台采矿机,总覆盖 {1} 个矿点(各台分别计数),掩埋 {2} 个矿点。");
#if DEBUG
I18N.Add(QuickMinerDebugSaved, "Debug data: {0}", "调试数据:{0}");
I18N.Add(QuickMinerDebugFailed, "Could not save debug data. Check the UXAssist log before retrying.", "调试数据保存失败,请查看 UXAssist 日志后重试。");
#endif
I18N.Add(MaximumCountToBuild, "Maximum count to build", "最大建造数量");
I18N.Add(Max, "max", "最大");
I18N.Add(StopEjectorsWhenAvailableNodesAreAllFilledUp, "Stop ejectors when available nodes are all filled up", "可用节点全部造完时停止弹射");
@@ -15,7 +15,7 @@ internal static class MinerPlacementDebug
internal sealed class Snapshot
{
public int schema = 4;
public string algorithm = "parallel-repack-v5-pose-exploration-min3-unlimited-stock";
public string algorithm = "parallel-repack-v5-pose-exploration-min3-unlimited-stock-target-group";
public int minimumCoverage = MinerPlacementSolver.MinimumCoverage;
public string version, gameVersion, startedUtc, outcome, error;
public int planetId, veinType, veinGroup, initialStock, placedCount, totalCoverage, buriedCount;
+172 -28
View File
@@ -2,11 +2,15 @@ using System;
using System.Collections;
using System.Collections.Generic;
using System.Diagnostics;
#if DEBUG
using System.IO;
#endif
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
#if DEBUG
using BepInEx;
#endif
using BepInEx.Configuration;
using UnityEngine;
using UXAssist.Common;
@@ -99,12 +103,13 @@ public static class QuickMinerBuild
private static void Fail(Exception exception)
{
UXAssist.Logger.LogError($"Quick miner placement failed: {exception}");
#if DEBUG
_job?.RecordFailure(exception);
#endif
Stop();
UIRealtimeTip.Popup(I18NKeys.QuickMinerFailed.Translate());
}
// Completion, failure and cancellation all finish the job, which records its debug data.
private static void Stop()
{
var job = _job;
@@ -120,7 +125,9 @@ public static class QuickMinerBuild
private static void ShowResult(string message)
{
#if DEBUG
UXAssist.Logger.LogInfo($"Quick miner result: {message.Replace("\n", " | ")}");
#endif
UIRealtimeTip.Popup(message);
foreach (var tip in UIRoot.instance.uiGame.generalTips.realtimeTips)
{
@@ -160,7 +167,10 @@ public static class QuickMinerBuild
private sealed class Node
{
public int Id;
public Vector3 Position, OriginalPosition;
public Vector3 Position;
#if DEBUG
public Vector3 OriginalPosition;
#endif
public ColliderData Collider;
public bool Target, Visible, CanBury;
public EVeinType Type;
@@ -187,10 +197,12 @@ public static class QuickMinerBuild
private readonly ColliderData _body;
private readonly float _footprintRadius, _halfDiagonal;
private readonly bool _capsule, _allowVeinReform;
#if DEBUG
private readonly MinerPlacementDebug.Snapshot _debug = new();
private readonly List<MinerPlacementDebug.Phase> _phases = [];
private readonly List<MinerPlacementDebug.Placement> _placements = [];
private readonly Stopwatch _timer = Stopwatch.StartNew();
#endif
private readonly CancellationTokenSource _cancellation = new();
private readonly int _workers = MinerPlacementSolver.WorkerCount;
private IEnumerator _work;
@@ -200,6 +212,7 @@ public static class QuickMinerBuild
private float _probeX = float.NaN, _probeZ = float.NaN;
private bool _probeRestricted;
private EVeinType _type;
private int _group;
private float _minX, _maxX, _minZ, _maxZ;
public bool IsCurrent => GameMain.isRunning && GameMain.mainPlayer == _player &&
@@ -231,6 +244,7 @@ public static class QuickMinerBuild
// Native clearance checks measure from the encompassing build collider.
_halfDiagonal = Mathf.Sqrt(desc.buildCollider.ext.x * desc.buildCollider.ext.x + desc.buildCollider.ext.z * desc.buildCollider.ext.z);
_capsule = planet.id == planet.galaxy.birthPlanetId && GameMain.history.SpaceCapsuleExist();
#if DEBUG
_debug.version = PluginInfo.PLUGIN_VERSION;
_debug.gameVersion = GameConfig.gameVersion.ToString();
_debug.startedUtc = DateTime.UtcNow.ToString("O");
@@ -247,15 +261,18 @@ public static class QuickMinerBuild
_debug.buildColliders = desc.buildColliders.Select(MinerPlacementDebug.Collider.Capture).ToArray();
_debug.minerColliders = _nativeObstacles.Select(MinerPlacementDebug.Collider.Capture).ToArray();
_debug.outcome = "cancelled";
#endif
}
public bool Step() => (_work ??= Run()).MoveNext();
#if DEBUG
public void RecordFailure(Exception exception)
{
_debug.outcome = "failed";
_debug.error = exception.ToString();
}
#endif
public void Finish()
{
@@ -271,15 +288,20 @@ public static class QuickMinerBuild
_cancellation.Dispose();
}, CancellationToken.None, TaskContinuationOptions.ExecuteSynchronously, TaskScheduler.Default);
(_work as IDisposable)?.Dispose();
#if DEBUG
var location = WriteDebug();
if (_result != null) ShowResult(_result + "\n" + location);
if (_result != null) _result += "\n" + location;
#endif
if (_result != null) ShowResult(_result);
}
private IEnumerator Run()
{
if (!FindNodes())
{
#if DEBUG
_debug.outcome = "no-veins";
#endif
_result = I18NKeys.QuickMinerNoVeins.Translate();
yield break;
}
@@ -299,23 +321,43 @@ public static class QuickMinerBuild
}
}
var solver = new MinerPlacementSolver(_candidates, _nodes.Count, _allowVeinReform);
var work = Search(solver, "coarse", 10);
#if DEBUG
var work = Search(solver, 10, "coarse");
#else
var work = Search(solver, 10);
#endif
while (work.MoveNext()) yield return null;
work = Expand(solver.Best, 0.35f, 3f);
while (work.MoveNext()) yield return null;
work = Search(solver, "refine-position", 6);
#if DEBUG
work = Search(solver, 6, "refine-position");
#else
work = Search(solver, 6);
#endif
while (work.MoveNext()) yield return null;
work = Expand(solver.Best, 0.12f, 1f);
while (work.MoveNext()) yield return null;
work = Search(solver, "refine-angle", 4);
#if DEBUG
work = Search(solver, 4, "refine-angle");
#else
work = Search(solver, 4);
#endif
while (work.MoveNext()) yield return null;
#if DEBUG
_debug.outcome = "completed";
#endif
Commit(solver.Best);
}
private IEnumerator Search(MinerPlacementSolver solver, string phase, int passes)
#if DEBUG
private IEnumerator Search(MinerPlacementSolver solver, int passes, string phase)
#else
private IEnumerator Search(MinerPlacementSolver solver, int passes)
#endif
{
#if DEBUG
var timer = Stopwatch.StartNew();
#endif
if (_workers > 0)
{
_search = solver.SearchAsync(passes, _cancellation.Token, _workers);
@@ -328,14 +370,17 @@ public static class QuickMinerBuild
var work = solver.Search(passes);
while (work.MoveNext()) yield return null;
}
#if DEBUG
_phases.Add(new MinerPlacementDebug.Phase
{
name = phase, candidateCount = _candidates.Count, passes = passes, score = solver.BestScore,
searchMilliseconds = timer.ElapsedMilliseconds, elapsedMilliseconds = _timer.ElapsedMilliseconds,
selected = solver.Best.Select(candidate => _candidates.IndexOf(candidate)).ToArray()
});
#endif
}
#if DEBUG
private string WriteDebug()
{
try
@@ -369,6 +414,7 @@ public static class QuickMinerBuild
return I18NKeys.QuickMinerDebugFailed.Translate();
}
}
#endif
private bool FindNodes()
{
@@ -386,7 +432,10 @@ public static class QuickMinerBuild
_type = vein.type;
}
if (group == 0) return false;
_group = group;
#if DEBUG
_debug.veinGroup = group;
#endif
var count = 0;
for (var i = 1; i < _factory.veinCursor; i++)
{
@@ -438,11 +487,15 @@ public static class QuickMinerBuild
_nodes.Add(new Node
{
Id = i, Target = vein.groupIndex == group, Type = vein.type,
Position = vein.pos, OriginalPosition = vein.pos, Collider = _physics.GetColliderData(vein.colliderId),
Position = vein.pos, Collider = _physics.GetColliderData(vein.colliderId),
#if DEBUG
OriginalPosition = vein.pos,
#endif
Visible = vein.pos.magnitude >= _planet.realRadius - 40f,
CanBury = _allowVeinReform && vein.groupIndex == group && vein.minerCount == 0 && !reserved.Contains(i)
});
}
#if DEBUG
var existing = new List<MinerPlacementDebug.ExistingMiner>();
for (var i = 1; i < _factory.entityCursor; i++)
{
@@ -468,6 +521,7 @@ public static class QuickMinerBuild
});
}
_debug.existingMiners = existing.ToArray();
#endif
return _nodes.Count > 0;
}
@@ -593,13 +647,26 @@ public static class QuickMinerBuild
private void TryCandidate(float x, float z, float yaw)
{
#if DEBUG
_debug.rejections.attempted++;
#endif
if (x != _probeX || z != _probeZ) Probe(x, z);
var pos = _probe;
if (!FactoryPatch.RemoveBuildRangeLimitEnabled.Value &&
(pos - _player.position).sqrMagnitude > _player.mecha.buildArea * _player.mecha.buildArea)
{ _debug.rejections.range++; return; }
if (_probeRestricted) { _debug.rejections.clearance++; return; }
{
#if DEBUG
_debug.rejections.range++;
#endif
return;
}
if (_probeRestricted)
{
#if DEBUG
_debug.rejections.clearance++;
#endif
return;
}
var rotation = Maths.SphericalRotation(pos, yaw);
var pose = new Pose(pos, rotation);
_covered.Clear();
@@ -607,10 +674,22 @@ public static class QuickMinerBuild
{
var node = _nodes[i];
if (!MinerComponent.IsTargetVeinInRange(node.Position, pose, _item.prefabDesc)) continue;
if (node.Type != _type) { _debug.rejections.mixedType++; return; }
_covered.Add(i);
if (node.Type != _type)
{
#if DEBUG
_debug.rejections.mixedType++;
#endif
return;
}
if (node.Target) _covered.Add(i);
}
if (_covered.Count < MinerPlacementSolver.MinimumCoverage)
{
#if DEBUG
_debug.rejections.noCoverage++;
#endif
return;
}
if (_covered.Count < MinerPlacementSolver.MinimumCoverage) { _debug.rejections.noCoverage++; return; }
for (var i = 0; i < _buildBoxes.Length; i++)
_buildBoxes[i] = new Box(_item.prefabDesc.buildColliders[i].BindToObject(0, 0, EObjectType.None, pos, rotation));
_buried?.Clear();
@@ -618,17 +697,41 @@ public static class QuickMinerBuild
{
var node = _nodes[i];
if (!Hits(node.Collider)) continue;
if (!node.CanBury) { _debug.rejections.veinCollision++; return; }
if (!node.CanBury)
{
#if DEBUG
_debug.rejections.veinCollision++;
#endif
return;
}
_buried.Add(i);
}
if (_allowVeinReform)
{
foreach (var index in _buried) _covered.Remove(index);
if (_covered.Count < MinerPlacementSolver.MinimumCoverage) { _debug.rejections.noCoverage++; return; }
if (_covered.Count < MinerPlacementSolver.MinimumCoverage)
{
#if DEBUG
_debug.rejections.noCoverage++;
#endif
return;
}
}
foreach (var obstacle in _nearObstacles)
if (Hits(obstacle)) { _debug.rejections.buildingCollision++; return; }
if (!HasGround(pos, rotation)) { _debug.rejections.ground++; return; }
{
if (!Hits(obstacle)) continue;
#if DEBUG
_debug.rejections.buildingCollision++;
#endif
return;
}
if (!HasGround(pos, rotation))
{
#if DEBUG
_debug.rejections.ground++;
#endif
return;
}
for (var i = 0; i < _nativeObstacles.Length; i++)
_obstacleBoxes[i] = new Box(_nativeObstacles[i].BindToObject(0, 0, EObjectType.None, pos, rotation));
_candidates.Add(new Candidate
@@ -715,17 +818,25 @@ public static class QuickMinerBuild
{
if (layout.Count == 0)
{
#if DEBUG
_debug.outcome = "no-placement";
#endif
_result = I18NKeys.QuickMinerNoPlacement.Translate();
return;
}
if (!NodesUnchanged(layout))
{
#if DEBUG
_debug.outcome = "veins-changed";
#endif
_result = I18NKeys.QuickMinerVeinsChanged.Translate();
return;
}
#if DEBUG
var placed = new List<(Candidate Candidate, int Prebuild, MinerPlacementDebug.Placement Debug)>();
#else
var placed = new List<(Candidate Candidate, int Prebuild)>();
#endif
var plannedBurial = _allowVeinReform
? layout.SelectMany(candidate => candidate.Buried).Select(index => _nodes[index].Id).ToHashSet() : null;
var hidden = _allowVeinReform ? new Dictionary<int, Vector3>() : null;
@@ -744,11 +855,13 @@ public static class QuickMinerBuild
validator.buildPreviews.Add(preview);
foreach (var candidate in layout)
{
#if DEBUG
var debug = new MinerPlacementDebug.Placement
{
candidate = _candidates.IndexOf(candidate), outcome = "pending", nativeCondition = "not-checked", nativeVeins = [], plannedVeins = [], finalVeins = []
};
_placements.Add(debug);
#endif
// No yield between burial, native validation, item consumption, and creation.
if (_allowVeinReform)
{
@@ -763,7 +876,11 @@ public static class QuickMinerBuild
}
// Validation needs current Unity colliders; GPU buffers are synced once at the end.
_physics.RefreshColliders();
if (!Validate(validator, preview, candidate, plannedBurial, debug)) continue;
#if DEBUG
if (!Validate(validator, preview, candidate, plannedBurial, out var plannedVeins, debug)) continue;
#else
if (!Validate(validator, preview, candidate, plannedBurial, out var plannedVeins)) continue;
#endif
var itemId = ItemIds.MiningMachine;
var count = 1;
if (_player.inhandItemId == itemId && _player.inhandItemCount > 0) _player.UseHandItems(1, out _);
@@ -776,14 +893,20 @@ public static class QuickMinerBuild
itemRequired = count == 1 ? 0 : 1,
filterId = _factory.veinPool[_nodes[candidate.Covered[0]].Id].productId
};
prebuild.InitParametersArray(debug.plannedVeins.Length);
Array.Copy(debug.plannedVeins, prebuild.parameters, debug.plannedVeins.Length);
prebuild.InitParametersArray(plannedVeins.Length);
Array.Copy(plannedVeins, prebuild.parameters, plannedVeins.Length);
var id = _factory.AddPrebuildDataWithComponents(prebuild);
#if DEBUG
debug.prebuildId = id;
debug.itemRequired = prebuild.itemRequired;
debug.outcome = id > 0 ? "placed" : "prebuild-failed";
#endif
if (id == 0 && count == 1) _player.TryAddItemToPackage(ItemIds.MiningMachine, 1, 0, true);
#if DEBUG
if (id > 0) placed.Add((candidate, id, debug));
#else
if (id > 0) placed.Add((candidate, id));
#endif
}
}
finally
@@ -806,21 +929,25 @@ public static class QuickMinerBuild
foreach (var node in _nodes)
{
ref var vein = ref _factory.veinPool[node.Id];
if (vein.id == node.Id && vein.amount > 0 && vein.type == _type && vein.pos.magnitude >= _planet.realRadius - 40f &&
if (node.Target && vein.id == node.Id && vein.amount > 0 && vein.type == _type && vein.pos.magnitude >= _planet.realRadius - 40f &&
MinerComponent.IsTargetVeinInRange(vein.pos, pose, _item.prefabDesc)) ids.Add(node.Id);
}
ref var prebuild = ref _factory.prebuildPool[entry.Prebuild];
prebuild.InitParametersArray(ids.Count);
if (ids.Count > 0) ids.CopyTo(prebuild.parameters);
#if DEBUG
entry.Debug.finalVeins = ids.ToArray();
#endif
coverage += ids.Count;
}
if (_allowVeinReform) RefreshVeins(buriedCount > 0 ? 1 : 0);
}
#if DEBUG
_debug.placedCount = placed.Count;
_debug.totalCoverage = coverage;
_debug.buriedCount = buriedCount;
if (placed.Count == 0) _debug.outcome = "no-placement";
#endif
_result = placed.Count == 0 ? I18NKeys.QuickMinerNoPlacement.Translate() :
string.Format(I18NKeys.QuickMinerResult.Translate(), placed.Count, coverage, buriedCount);
}
@@ -846,9 +973,16 @@ public static class QuickMinerBuild
}
// CheckBuildConditions repeats the search's land-point tests, so ground needs no separate check.
private bool Validate(BuildTool_Click validator, BuildPreview preview, Candidate candidate, HashSet<int> plannedBurial, MinerPlacementDebug.Placement debug)
#if DEBUG
private bool Validate(BuildTool_Click validator, BuildPreview preview, Candidate candidate, HashSet<int> plannedBurial, out int[] plannedVeins, MinerPlacementDebug.Placement debug)
#else
private bool Validate(BuildTool_Click validator, BuildPreview preview, Candidate candidate, HashSet<int> plannedBurial, out int[] plannedVeins)
#endif
{
plannedVeins = [];
#if DEBUG
debug.outcome = "native-rejected";
#endif
preview.ResetAll();
preview.item = _item;
preview.desc = _item.prefabDesc;
@@ -883,16 +1017,26 @@ public static class QuickMinerBuild
}
Physics.SyncTransforms();
var valid = validator.CheckBuildConditions();
#if DEBUG
debug.nativeCondition = preview.condition.ToString();
debug.coverObjectId = preview.coverObjId;
debug.nativeVeins = preview.parameters?.Take(preview.paramCount).ToArray() ?? [];
#endif
if (!valid || preview.condition != EBuildCondition.Ok || preview.coverObjId != 0) return false;
// Include every planned burial now, so a later miner cannot reduce this one
// below the minimum after its item has already been consumed.
debug.plannedVeins = _allowVeinReform
? debug.nativeVeins.Where(id => !plannedBurial.Contains(id)).ToArray() : debug.nativeVeins;
if (debug.plannedVeins.Length < MinerPlacementSolver.MinimumCoverage)
{ debug.outcome = "below-minimum-coverage"; return false; }
// Native selection includes nearby groups of the same type. Keep only this
// group and exclude all planned burials before enforcing the minimum.
plannedVeins = preview.parameters?.Take(preview.paramCount).Where(id => _factory.veinPool[id].groupIndex == _group &&
(!_allowVeinReform || !plannedBurial.Contains(id))).ToArray() ?? [];
#if DEBUG
debug.plannedVeins = plannedVeins;
#endif
if (plannedVeins.Length < MinerPlacementSolver.MinimumCoverage)
{
#if DEBUG
debug.outcome = "below-minimum-coverage";
#endif
return false;
}
for (var i = 0; i < preview.paramCount; i++)
{
ref var vein = ref _factory.veinPool[preview.parameters[i]];
+328 -50
View File
@@ -70,6 +70,12 @@ public class BlueprintDescriptionPatch : PatchImpl<BlueprintDescriptionPatch>
}
}
[HarmonyPostfix, HarmonyPatch(typeof(UIBlueprintInspector), nameof(UIBlueprintInspector._OnUpdate))]
private static void OnUpdate(UIBlueprintInspector __instance)
{
if (Inspectors.TryGetValue(__instance, out var controls)) controls.HandleInput();
}
[HarmonyPostfix, HarmonyPatch(typeof(UIBlueprintInspector), nameof(UIBlueprintInspector.OnLanguageChanged))]
private static void OnLanguageChanged(UIBlueprintInspector __instance)
{
@@ -102,38 +108,134 @@ public class BlueprintDescriptionPatch : PatchImpl<BlueprintDescriptionPatch>
private sealed class InspectorControls
{
private const float Left = 22f;
private const float ControlsGap = 12f;
private const float Left = 12f;
private const float ControlsGap = 6f;
private readonly UIBlueprintInspector _inspector;
private readonly float _controlsHeight;
private RectTransform _panel;
private UIButton _entry;
private Text _entryText;
private UIButton _button;
private Text _buttonText;
private UIButton _closeButton;
private Text _title;
private readonly Vector3[] _corners = new Vector3[4];
private readonly Canvas _canvas;
private readonly RectTransform _viewport;
private readonly Text _descriptionLabel;
private readonly RectTransform _descriptionIcon;
private bool _optionsOpen;
private MyCheckBox _checkbox;
private UIComboBox _basisCombo;
private Text _basisLabel;
private UIButton _basisHelp;
private BlueprintData _currentBlueprint;
private bool _manualProliferation;
private bool _layoutApplied;
public InspectorControls(UIBlueprintInspector inspector)
{
_inspector = inspector;
_canvas = inspector.rectTrans.GetComponentInParent<Canvas>().rootCanvas;
_viewport = inspector.descGroupTrans.GetComponentInParent<ScrollRect>()?.viewport;
_descriptionLabel = inspector.descGroupTrans.Find("label").GetComponent<Text>();
_descriptionIcon = (RectTransform)inspector.descTextInput.transform.Find("sel-icon-btn");
try
{
_button = LayoutHelper.AddButton(Left, 0, inspector.group1,
I18NKeys.BlueprintAutoFillDescription, 15, "blueprint-auto-fill-description", Generate);
// The native description has a 22px title row above its editable text.
_entry = LayoutHelper.AddButton(0, 0, inspector.descGroupTrans,
I18NKeys.BlueprintDescriptionOptions, 12, "blueprint-description-options", ToggleOptions);
_entryText = _entry.transform.Find("button-text").GetComponent<Text>();
_entry.tips = inspector.tipButton2.tips;
_entry.tips.topLevel = true;
_entryText.resizeTextForBestFit = false;
Util.NormalizeRectWithMargin(_entryText, 0, 8, 0, 8);
// Reuse the native background, including its blur material, only while options are open.
var source = UIRoot.instance.uiGame.inserterWindow.transform.Find("panel-bg").GetComponent<Image>();
_panel = UnityEngine.Object.Instantiate(source, inspector.rectTrans).rectTransform;
_panel.gameObject.name = "uxassist-blueprint-description-options";
_panel.gameObject.SetActive(false);
for (var i = _panel.childCount - 1; i >= 0; i--)
{
var child = _panel.GetChild(i).gameObject;
child.SetActive(false);
UnityEngine.Object.Destroy(child);
}
_panel.anchorMin = _panel.anchorMax = new Vector2(0, 1);
_panel.pivot = new Vector2(0, 1);
_panel.GetComponent<Image>().raycastTarget = true;
_title = LayoutHelper.AddText(Left, 10, _panel, I18NKeys.BlueprintAutoFillDescription, 16);
_title.color = _entryText.color;
var closeSource = UIRoot.instance.uiGame.inserterWindow.transform
.Find("panel-bg/btn-box/close-wnd-btn").GetComponent<UIButton>();
_closeButton = UnityEngine.Object.Instantiate(closeSource, _panel);
Util.ResetButton(_closeButton);
// The source's persistent callback closes the original inserter window.
_closeButton.button.onClick = new Button.ButtonClickedEvent();
_closeButton.button.onClick.AddListener(CloseOptions);
Util.NormalizeRectWithTopRight(_closeButton, 0, 0, _panel);
_button = LayoutHelper.AddButton(0, 0, _panel,
I18NKeys.BlueprintGenerateDescription, 15, "blueprint-auto-fill-description", Generate);
_buttonText = _button.transform.Find("button-text").GetComponent<Text>();
_checkbox = MyCheckBox.CreateCheckBox(Left, 0, inspector.group1, false,
I18NKeys.BlueprintProliferation.Translate(), 15).WithSmallerBox(22f);
_buttonText.resizeTextForBestFit = false;
_buttonText.alignment = TextAnchor.MiddleCenter;
Util.NormalizeRectWithMargin(_buttonText, 4, 10, 4, 10);
_checkbox = MyCheckBox.CreateCheckBox(Left, 42, _panel, false,
I18NKeys.BlueprintProliferation.Translate(), 15);
_checkbox.rectTrans.sizeDelta = new Vector2(20, 20);
_checkbox.checkImage.rectTransform.sizeDelta = new Vector2(20, 20);
_checkbox.labelText.verticalOverflow = VerticalWrapMode.Overflow;
_checkbox.gameObject.name = "blueprint-proliferation";
_checkbox.OnChecked += OnProliferationChecked;
_basisLabel = LayoutHelper.AddText(Left, 68, _panel, I18NKeys.BlueprintProductionBasis, 14);
_basisCombo = UnityEngine.Object.Instantiate(UIRoot.instance.optionWindow.resolutionComp, _panel);
_basisCombo.gameObject.name = "blueprint-production-basis";
_basisCombo.gameObject.SetActive(true);
foreach (var button in _basisCombo.GetComponentsInChildren<UIButton>(true)) Util.ResetButton(button);
var combo = _basisCombo;
// Runtime resolution rows are cloned as children, but their private tracking list is not serialized.
for (var i = combo.m_DropDownContent.childCount - 1; i >= 0; i--)
{
var button = combo.m_DropDownContent.GetChild(i).GetComponent<Button>();
if (!button || button == combo.m_ListItemRes) continue;
button.gameObject.SetActive(false);
UnityEngine.Object.Destroy(button.gameObject);
}
combo.ItemButtons.Clear();
combo.Items.Clear();
combo.onSubmit = new UIComboBox.SubmitEvent();
combo.onItemIndexChange = new UIComboBox.ChangeEvent();
combo.CanInput = false;
combo.autoWidth = false;
combo.parentSibling = false;
combo.itemIndex = -1;
combo.isDroppedDown = false;
combo.m_DropDownContent.anchoredPosition = Vector2.zero;
combo.m_DropDownList.gameObject.SetActive(false);
combo.m_EmptyItemRes.gameObject.SetActive(false);
combo.m_SelectionBG.gameObject.SetActive(false);
combo.m_Scrollbar.gameObject.SetActive(false);
Util.NormalizeRectWithMargin(_basisCombo.transform.Find("Main Button"), 0, 0, 0, 0);
combo.m_Text.alignment = TextAnchor.MiddleLeft;
combo.m_Text.fontSize = 14;
combo.m_Text.resizeTextForBestFit = false;
combo.m_Text.horizontalOverflow = HorizontalWrapMode.Overflow;
combo.m_Text.verticalOverflow = VerticalWrapMode.Overflow;
Util.NormalizeRectWithMargin(combo.m_Text, 2, 8, 2, 30);
var itemText = combo.m_ListItemRes.GetComponentInChildren<Text>();
itemText.alignment = TextAnchor.MiddleLeft;
itemText.fontSize = 14;
itemText.resizeTextForBestFit = false;
itemText.horizontalOverflow = HorizontalWrapMode.Overflow;
itemText.verticalOverflow = VerticalWrapMode.Overflow;
Util.NormalizeRectWithMargin(itemText, 2, 8, 2, 8);
_basisHelp = LayoutHelper.AddTipsButton(Left, 68, _panel,
I18NKeys.BlueprintProductionBasis.Translate(), I18NKeys.BlueprintProductionBasisTip.Translate(), "");
UpdateLabels();
_controlsHeight = Math.Max(_button.transform.GetComponent<RectTransform>().rect.height,
_checkbox.rectTrans.rect.height) + 10f;
}
catch
{
if (_button) UnityEngine.Object.Destroy(_button.gameObject);
if (_checkbox) UnityEngine.Object.Destroy(_checkbox.gameObject);
Destroy();
throw;
}
}
@@ -142,65 +244,232 @@ public class BlueprintDescriptionPatch : PatchImpl<BlueprintDescriptionPatch>
{
_currentBlueprint = null;
_manualProliferation = false;
_basisCombo.itemIndex = 0;
if (_inspector.blueprint != null) SyncDefault();
else _checkbox.Checked = false;
CloseOptions();
UpdateLabels();
}
public void Refresh()
{
SyncDefault();
if (!_layoutApplied)
_inspector.group1.anchoredPosition += new Vector2(0, -_controlsHeight);
PositionControls();
_inspector.group2.anchoredPosition += new Vector2(0, -_controlsHeight);
_inspector.group3.anchoredPosition += new Vector2(0, -_controlsHeight);
_inspector.group4.anchoredPosition += new Vector2(0, -_controlsHeight);
_inspector.contentTrans.sizeDelta += new Vector2(0, _controlsHeight);
_layoutApplied = true;
PositionEntry();
}
private void ToggleOptions()
{
if (_optionsOpen)
{
CloseOptions();
return;
}
_optionsOpen = true;
_panel.SetAsLastSibling();
_panel.gameObject.SetActive(true);
PositionOptions();
if (_optionsOpen) Canvas.willRenderCanvases += PositionOptions;
}
private void CloseOptions()
{
Canvas.willRenderCanvases -= PositionOptions;
_optionsOpen = false;
if (_panel) _panel.gameObject.SetActive(false);
}
public void HandleInput()
{
PositionEntry();
if (!_optionsOpen) return;
var combo = _basisCombo;
if (VFInput.escape)
{
if (combo.isDroppedDown)
{
combo.isDroppedDown = false;
combo.m_DropDownList.gameObject.SetActive(false);
}
else CloseOptions();
VFInput.UseEscape();
return;
}
if (!Input.GetMouseButtonDown(0) && !Input.GetMouseButtonDown(1) && !Input.GetMouseButtonDown(2)) return;
var mouse = (Vector2)Input.mousePosition;
if (RectTransformUtility.RectangleContainsScreenPoint(_panel, mouse, _canvas.worldCamera) ||
RectTransformUtility.RectangleContainsScreenPoint((RectTransform)_entry.transform, mouse, _canvas.worldCamera) ||
combo.isDroppedDown && RectTransformUtility.RectangleContainsScreenPoint(combo.m_DropDownList, mouse, _canvas.worldCamera))
return;
CloseOptions();
}
private Rect BoundsIn(RectTransform rect, Transform parent)
{
rect.GetWorldCorners(_corners);
var min = new Vector2(float.PositiveInfinity, float.PositiveInfinity);
var max = new Vector2(float.NegativeInfinity, float.NegativeInfinity);
foreach (var corner in _corners)
{
var point = parent.InverseTransformPoint(corner);
min = Vector2.Min(min, point);
max = Vector2.Max(max, point);
}
return Rect.MinMaxRect(min.x, min.y, max.x, max.y);
}
private void PositionEntry()
{
var parent = _inspector.descGroupTrans;
var label = BoundsIn(_descriptionLabel.rectTransform, parent);
var labelWidth = parent.InverseTransformVector(_descriptionLabel.transform.TransformVector(
new Vector3(Util.GetPreferredWidth(_descriptionLabel), 0, 0))).x;
var left = label.xMin + labelWidth + 8;
var right = Math.Min(parent.rect.xMax, BoundsIn(_descriptionIcon, parent).xMin) - 8;
var entryRect = (RectTransform)_entry.transform;
var visible = _inspector.blueprint != null && left + entryRect.rect.width <= right;
_entry.gameObject.SetActive(visible);
if (!visible) return;
Util.NormalizeRectWithTopLeft(_entry, left - parent.rect.xMin,
parent.rect.yMax - label.yMax, parent);
}
private void PositionOptions()
{
if (!_optionsOpen) return;
if (!_entry || !_entry.gameObject.activeInHierarchy)
{
CloseOptions();
return;
}
var anchor = BoundsIn((RectTransform)_entry.transform, _panel.parent);
var screen = BoundsIn((RectTransform)_canvas.transform, _panel.parent);
if (!anchor.Overlaps(screen) || _viewport && !anchor.Overlaps(BoundsIn(_viewport, _panel.parent)))
{
CloseOptions();
return;
}
if (!TryGetPopupPosition(anchor, screen, _panel.sizeDelta, out var position))
{
CloseOptions();
return;
}
var parent = (RectTransform)_panel.parent;
_panel.anchoredPosition = position - new Vector2(parent.rect.xMin, parent.rect.yMax);
}
private static bool TryGetPopupPosition(Rect anchor, Rect screen, Vector2 size, out Vector2 position)
{
const float gap = 6;
const float margin = 8;
position = default;
if (size.x > screen.width - margin * 2 || size.y > screen.height - margin * 2) return false;
var left = Math.Max(screen.xMin + margin,
Math.Min(anchor.xMax - size.x, screen.xMax - margin - size.x));
var top = anchor.yMin - gap;
if (top - size.y < screen.yMin + margin)
top = anchor.yMax + gap + size.y;
top = Math.Min(screen.yMax - margin, Math.Max(screen.yMin + margin + size.y, top));
position = new Vector2(left, top);
return true;
}
public void UpdateLabels()
{
_buttonText.text = I18NKeys.BlueprintAutoFillDescription.Translate();
_entryText.font = _descriptionLabel.font;
_entryText.fontSize = _descriptionLabel.fontSize;
_entryText.fontStyle = _descriptionLabel.fontStyle;
_entryText.lineSpacing = _descriptionLabel.lineSpacing;
_entryText.alignment = _descriptionLabel.alignment;
_entryText.text = I18NKeys.BlueprintDescriptionOptions.Translate();
((RectTransform)_entry.transform).sizeDelta =
new Vector2(Util.GetPreferredWidth(_entryText) + 20, 22);
_entry.tips.tipTitle = I18NKeys.BlueprintAutoFillDescription.Translate();
_entry.tips.tipText = I18NKeys.BlueprintDescriptionOptionsTip.Translate();
_entry.UpdateTip();
_title.text = I18NKeys.BlueprintAutoFillDescription.Translate();
_buttonText.text = I18NKeys.BlueprintGenerateDescription.Translate();
_checkbox.SetLabelText(I18NKeys.BlueprintProliferation.Translate());
var width = Math.Max(160f, Util.GetPreferredWidth(_buttonText) + 26f);
_button.transform.GetComponent<RectTransform>().sizeDelta =
new Vector2(width, _button.transform.GetComponent<RectTransform>().sizeDelta.y);
if (_layoutApplied) PositionControls();
_basisLabel.text = I18NKeys.BlueprintProductionBasis.Translate();
var combo = _basisCombo;
var index = Math.Max(0, combo.itemIndex);
combo.Items = [I18NKeys.BlueprintFinalProducts.Translate(), I18NKeys.BlueprintBottleneckIntermediate.Translate()];
combo.DropDownCount = combo.Items.Count;
_basisHelp.tips.tipTitle = I18NKeys.BlueprintProductionBasis.Translate();
_basisHelp.tips.tipText = I18NKeys.BlueprintProductionBasisTip.Translate();
_basisHelp.UpdateTip();
var image = _panel.GetComponent<Image>();
// Sliced window artwork has transparent borders; content margins start inside its visible fill.
var padding = UnityEngine.Sprites.DataUtility.GetPadding(image.sprite) / image.pixelsPerUnit;
var left = Mathf.Ceil(padding.x) + Left;
var right = Mathf.Ceil(padding.z) + Left;
var top = Mathf.Ceil(padding.w) + 18;
var titleHeight = Math.Max(30, Mathf.Ceil(_title.preferredHeight) + 4);
var titleLeft = left + 12;
Util.NormalizeRectWithTopLeft(_title, titleLeft, top, _panel);
Util.NormalizeRectWithTopRight(_closeButton, right, top, _panel);
var rowTop = top + titleHeight + 8;
var labelHeight = Math.Max(26, Mathf.Ceil(_checkbox.labelText.preferredHeight) + 4);
Util.NormalizeRectWithTopLeft(_checkbox, left, rowTop + (labelHeight - 20) / 2, _panel);
var checkLabel = _checkbox.labelText.rectTransform;
checkLabel.anchorMin = checkLabel.anchorMax = new Vector2(0, 0.5f);
checkLabel.pivot = new Vector2(0, 0.5f);
checkLabel.anchoredPosition = new Vector2(24, 0);
checkLabel.sizeDelta = new Vector2(Util.GetPreferredWidth(_checkbox.labelText) + 4, labelHeight);
rowTop += labelHeight + 8;
var labelWidth = Util.GetPreferredWidth(_basisLabel);
var itemText = combo.m_ListItemRes.GetComponentInChildren<Text>();
var comboWidth = 180f;
var textHeight = 0f;
foreach (var item in combo.Items)
{
combo.m_Text.text = item;
itemText.text = item;
comboWidth = Math.Max(comboWidth, Util.GetPreferredWidth(combo.m_Text) + 42);
textHeight = Math.Max(textHeight, Math.Max(combo.m_Text.preferredHeight, itemText.preferredHeight));
}
combo.itemIndex = index;
combo.ItemHeight = (int)Math.Max(24, Mathf.Ceil(textHeight) + 4);
var rowHeight = Math.Max(28, Math.Max(Mathf.Ceil(_basisLabel.preferredHeight), Mathf.Ceil(textHeight)) + 4);
Util.NormalizeRectWithTopLeft(_basisLabel, left, rowTop, _panel);
_basisLabel.rectTransform.sizeDelta = new Vector2(labelWidth, rowHeight);
var helpRect = (RectTransform)_basisHelp.transform;
Util.NormalizeRectWithTopLeft(_basisHelp, left + labelWidth + ControlsGap,
rowTop + (rowHeight - helpRect.rect.height) / 2, _panel);
var comboLeft = left + labelWidth + ControlsGap + helpRect.rect.width + ControlsGap;
Util.NormalizeRectWithTopLeft(_basisCombo, comboLeft, rowTop, _panel);
var comboRect = (RectTransform)_basisCombo.transform;
comboRect.sizeDelta = new Vector2(comboWidth, rowHeight);
var width = Math.Max(90f, Util.GetPreferredWidth(_buttonText) + 20);
((RectTransform)_button.transform).sizeDelta = new Vector2(width,
Math.Max(30, Mathf.Ceil(_buttonText.preferredHeight) + 8));
var popupWidth = Math.Max(320, Math.Max(comboLeft + comboWidth + right,
Util.GetPreferredWidth(_title) + titleLeft + right + 50));
var footerTop = rowTop + rowHeight + 16;
var bottom = Mathf.Ceil(padding.y) + Left;
_panel.sizeDelta = new Vector2(popupWidth, footerTop + ((RectTransform)_button.transform).rect.height + bottom);
Util.NormalizeRectWithTopRight(_button, right, footerTop, _panel);
_title.rectTransform.sizeDelta = new Vector2(popupWidth - titleLeft - right - 50, titleHeight);
PositionEntry();
PositionOptions();
}
public void Destroy()
{
if (_layoutApplied && _inspector)
CloseOptions();
if (_entry)
{
_inspector.group1.anchoredPosition += new Vector2(0, _controlsHeight);
_inspector.group2.anchoredPosition += new Vector2(0, _controlsHeight);
_inspector.group3.anchoredPosition += new Vector2(0, _controlsHeight);
_inspector.group4.anchoredPosition += new Vector2(0, _controlsHeight);
_inspector.contentTrans.sizeDelta += new Vector2(0, -_controlsHeight);
_layoutApplied = false;
_entry.button.onClick.RemoveListener(ToggleOptions);
UnityEngine.Object.Destroy(_entry.gameObject);
}
if (_button)
{
_button.button.onClick.RemoveListener(Generate);
UnityEngine.Object.Destroy(_button.gameObject);
}
if (_closeButton)
_closeButton.button.onClick.RemoveListener(CloseOptions);
if (_checkbox)
{
_checkbox.OnChecked -= OnProliferationChecked;
UnityEngine.Object.Destroy(_checkbox.gameObject);
}
}
private void PositionControls()
{
var buttonRect = _button.transform.GetComponent<RectTransform>();
var top = 4f - _controlsHeight;
Util.NormalizeRectWithTopLeft(_button, Left, top, _inspector.group1);
Util.NormalizeRectWithTopLeft(_checkbox, Left + buttonRect.rect.width + ControlsGap,
top + (buttonRect.rect.height - _checkbox.rectTrans.rect.height) / 2f, _inspector.group1);
if (!_panel) return;
_panel.gameObject.SetActive(false);
UnityEngine.Object.Destroy(_panel.gameObject);
}
private void SyncDefault()
@@ -208,6 +477,7 @@ public class BlueprintDescriptionPatch : PatchImpl<BlueprintDescriptionPatch>
var blueprint = _inspector.blueprint;
if (!ReferenceEquals(blueprint, _currentBlueprint))
{
CloseOptions();
_currentBlueprint = blueprint;
_manualProliferation = false;
}
@@ -266,7 +536,14 @@ public class BlueprintDescriptionPatch : PatchImpl<BlueprintDescriptionPatch>
return;
}
var report = new FactoryBlackBoxAnalyzer(catalog).Analyze(capture.CreateRequest(_checkbox.Checked));
var request = capture.CreateRequest(_checkbox.Checked);
request.ProductionBasis = (BlueprintProductionBasis)_basisCombo.itemIndex;
var report = new FactoryBlackBoxAnalyzer(catalog).Analyze(request);
if (report.Diagnostics.Any(diagnostic => diagnostic.Code == ProductionDiagnosticCode.BlueprintBasisUnavailable))
{
UIRealtimeTip.Popup(I18NKeys.BlueprintBasisUnavailable.Translate());
return;
}
if (report.Status == ProductionStatus.Failed || report.Status == ProductionStatus.DataNotReady)
{
UIRealtimeTip.Popup((report.Status == ProductionStatus.DataNotReady
@@ -320,6 +597,7 @@ public class BlueprintDescriptionPatch : PatchImpl<BlueprintDescriptionPatch>
throw;
}
CloseOptions();
if (!report.MaterialComplete || !report.PowerBreakdown.FactoryComplete ||
!report.PowerBreakdown.LogisticsComplete)
UIRealtimeTip.Popup(I18NKeys.BlueprintPartial.Translate());
+8 -7
View File
@@ -63,12 +63,12 @@ internal static class BeltSignalPatch
// A belt selects one material, so its equivalent single-material rate is 30.
private static readonly (int ItemId, int ExchangeRate, string NameKey, string IconPath)[] DarkFogBuyOutDefinitions =
[
(ItemIds.DarkFogMemoryUnit, 20, I18NKeys.MemoryUnit, "assets/signal/dark-fog-matrix.png"),
(ItemIds.DarkFogEnergyFragment, 60, I18NKeys.EnergyFragment, "assets/signal/energy-shard.png"),
(ItemIds.DarkFogMatrix, 20, I18NKeys.MemoryUnit, "assets/signal/dark-fog-matrix.png"),
(ItemIds.DarkFogEnergyShard, 60, I18NKeys.EnergyFragment, "assets/signal/energy-shard.png"),
(ItemIds.DarkFogSiliconNeuron, 30, I18NKeys.SiliconNeuron, "assets/signal/silicon-based-neuron.png"),
(ItemIds.DarkFogNegentropySingularity, 30, I18NKeys.NegentropySingularity, "assets/signal/negentropy-singularity.png"),
(ItemIds.DarkFogMatterReassembler, 30, I18NKeys.MatterReassembler, "assets/signal/matter-recombinator.png"),
(ItemIds.DarkFogVirtualParticle, 10, I18NKeys.VirtualParticle, "assets/signal/core-element.png")
(ItemIds.DarkFogMatterRecombinator, 30, I18NKeys.MatterReassembler, "assets/signal/matter-recombinator.png"),
(ItemIds.DarkFogCoreElement, 10, I18NKeys.VirtualParticle, "assets/signal/core-element.png")
];
public static readonly int[] DarkFogItemsInVoid = [0, 0, 0, 0, 0, 0];
private static Dictionary<int, uint>[] _signalBelts = new Dictionary<int, uint>[64];
@@ -327,13 +327,14 @@ internal static class BeltSignalPatch
var consume = (byte)Math.Min(DarkFogItemsInVoid[itemIdx], 4);
if (consume < 4)
{
var metaverseLong = propertySystem.GetItemAvaliableProperty(_clusterSeedKey, ItemIds.Metaverse);
// Metaverse is the metadata of the Universe Matrix.
var metaverseLong = propertySystem.GetItemAvaliableProperty(_clusterSeedKey, ItemIds.UniverseMatrix);
if (metaverseLong > 0L)
{
var metaverse = metaverseLong > 10 ? 10 : (int)metaverseLong;
propertySystem.AddItemConsumption(_clusterSeedKey, ItemIds.Metaverse, metaverse);
propertySystem.AddItemConsumption(_clusterSeedKey, ItemIds.UniverseMatrix, metaverse);
var mainPlayer = GameMain.mainPlayer;
GameMain.history.AddPropertyItemConsumption(ItemIds.Metaverse, metaverse, true);
GameMain.history.AddPropertyItemConsumption(ItemIds.UniverseMatrix, metaverse, true);
var count = definition.ExchangeRate * metaverse;
DarkFogItemsInVoid[itemIdx] += count;
consume = (byte)Math.Min(DarkFogItemsInVoid[itemIdx], 4);
+12 -1
View File
@@ -222,11 +222,22 @@ public static class TechPatch
foreach (var item in nodes)
{
var node = item.Value;
var postTechArray = node.techProto.postTechArray;
// A new session can initialize nodes while the peace-mode graph is still filtered.
var arrowCount = node.arrows.Length;
if (arrowCount < postTechArray.Length)
{
System.Array.Resize(ref node.arrows, postTechArray.Length);
for (var i = arrowCount; i < postTechArray.Length; i++)
{
node.arrows[i] = UnityEngine.Object.Instantiate(node.arrowPrefab, node.arrowPrefab.parent);
node.arrows[i].SetAsFirstSibling();
}
}
foreach (var arrow in node.arrows)
{
arrow.gameObject.SetActive(false);
}
var postTechArray = node.techProto.postTechArray;
var active = postTechArray.Length > 0;
node.connGroup.gameObject.SetActive(active);
node.connImages = active ? node.connGroup.GetComponentsInChildren<Image>(true) : [];
@@ -0,0 +1,148 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using static UXAssist.Production.ProductionMath;
namespace UXAssist.Production;
internal static class BlueprintBottleneckBalance
{
private const double Tolerance = 1e-7;
internal static bool TryCalculate(IReadOnlyList<BlackBoxProcessGroup> processes,
IReadOnlyDictionary<int, double> production, IReadOnlyDictionary<int, double> consumption,
ISet<int> researchMatrixSinks,
out SortedDictionary<int, double> balancedProduction, out SortedDictionary<int, double> balancedConsumption,
out IReadOnlyDictionary<int, BlackBoxItemClassification> balancedClassifications,
out IReadOnlyDictionary<int, double> balancedNet)
{
balancedProduction = null;
balancedConsumption = null;
balancedClassifications = null;
balancedNet = null;
if (production.Count == 0 && consumption.Count == 0)
{
balancedProduction = new SortedDictionary<int, double>();
balancedConsumption = new SortedDictionary<int, double>();
balancedClassifications = new Dictionary<int, BlackBoxItemClassification>();
balancedNet = new Dictionary<int, double>();
return true;
}
var groups = processes.GroupBy(process => process.StableKey, StringComparer.Ordinal)
.OrderBy(group => group.Key, StringComparer.Ordinal)
.Select(group => (source: group.First(), count: group.Sum(process => process.Count))).ToArray();
var produced = new HashSet<int>(groups.SelectMany(group => group.source.NetPerBuilding)
.Where(flow => flow.Value > BlackBoxMaterialClassifier.Tolerance).Select(flow => flow.Key));
var consumed = new HashSet<int>(groups.SelectMany(group => group.source.NetPerBuilding)
.Where(flow => flow.Value < -BlackBoxMaterialClassifier.Tolerance).Select(flow => flow.Key));
var items = produced.OrderBy(itemId => itemId).ToArray();
// Normalize only the scale variable; the solver still resolves shared demand, recipe ratios, and cycles together.
var commonScale = items.Where(consumed.Contains).Select(itemId => production[itemId] / consumption[itemId])
.Aggregate(1.0, Math.Min);
var targets = items.Where(itemId => !consumed.Contains(itemId) || researchMatrixSinks.Contains(itemId))
.ToDictionary(itemId => itemId, itemId => Math.Max(0, production[itemId] -
(consumption.TryGetValue(itemId, out var amount) ? amount : 0)));
// Launchers, generators, and precise research can terminate a chain without an item output.
var sinks = Enumerable.Range(0, groups.Length).Where(index =>
groups[index].source.NetPerBuilding.Values.Any(value => value < -BlackBoxMaterialClassifier.Tolerance) &&
!groups[index].source.NetPerBuilding.Values.Any(value => value > BlackBoxMaterialClassifier.Tolerance))
.ToArray();
if (!targets.Values.Any(FinitePositive) && sinks.Length == 0) return false;
var scaleColumn = groups.Length;
var surplusStart = scaleColumn + 1;
var capacitySlackStart = surplusStart + items.Length;
var columnCount = capacitySlackStart + groups.Length + 1;
var matrix = new double[items.Length + groups.Length + 1 + sinks.Length, columnCount];
var rhs = new double[matrix.GetLength(0)];
var maximizeOutput = new double[columnCount];
var minimizeUse = new double[columnCount];
var minimizeSurplus = new double[columnCount];
maximizeOutput[scaleColumn] = -1;
for (var row = 0; row < items.Length; row++)
{
var itemId = items[row];
var rowScale = Math.Max(production[itemId], consumption.TryGetValue(itemId, out var amount) ? amount : 0);
for (var index = 0; index < groups.Length; index++)
if (groups[index].source.NetPerBuilding.TryGetValue(itemId, out var net))
matrix[row, index] = net * groups[index].count / rowScale;
if (targets.TryGetValue(itemId, out var target)) matrix[row, scaleColumn] = -target / rowScale * commonScale;
matrix[row, surplusStart + row] = -1;
minimizeSurplus[surplusStart + row] = 1;
}
for (var index = 0; index <= groups.Length; index++)
{
var row = items.Length + index;
matrix[row, index] = index < groups.Length ? 1 : commonScale;
matrix[row, capacitySlackStart + index] = 1;
rhs[row] = 1;
if (index < groups.Length) minimizeUse[index] = groups[index].count;
}
for (var index = 0; index < sinks.Length; index++)
{
var row = items.Length + groups.Length + 1 + index;
matrix[row, sinks[index]] = 1;
matrix[row, scaleColumn] = -commonScale;
}
var solution = TwoPhaseSimplex.Solve(matrix, rhs,
new[] { maximizeOutput, minimizeUse, minimizeSurplus }, 20000, CancellationToken.None);
if (solution.Status != LinearSolveStatus.Optimal || !FinitePositive(solution.Values[scaleColumn])) return false;
for (var row = 0; row < rhs.Length; row++)
{
var residual = -rhs[row];
for (var column = 0; column < columnCount; column++) residual += matrix[row, column] * solution.Values[column];
if (Math.Abs(residual) > Tolerance) return false;
}
balancedProduction = new SortedDictionary<int, double>(production.ToDictionary(flow => flow.Key, _ => 0.0));
balancedConsumption = new SortedDictionary<int, double>(consumption.ToDictionary(flow => flow.Key, _ => 0.0));
var unusedProduction = new Dictionary<int, double>();
for (var index = 0; index < groups.Length; index++)
{
var group = groups[index];
var utilized = Math.Min(1, solution.Values[index]) * group.count;
var executions = group.source.Process.CyclesPerBuildingPerMinute * utilized;
foreach (var flow in group.source.Process.OutputsPerCycle)
AddFlow(balancedProduction, flow.Key, flow.Value * executions);
foreach (var flow in group.source.Process.InputsPerCycle)
AddFlow(balancedConsumption, flow.Key, flow.Value * executions);
foreach (var flow in group.source.NetPerBuilding)
if (flow.Value > 0) AddFlow(unusedProduction, flow.Key, flow.Value * (group.count - utilized));
}
var netFlows = new Dictionary<int, double>();
var result = new Dictionary<int, BlackBoxItemClassification>();
var allItems = new SortedSet<int>(production.Keys);
allItems.UnionWith(consumption.Keys);
foreach (var itemId in allItems)
{
var grossProduced = balancedProduction.TryGetValue(itemId, out var p) ? p : 0;
var grossConsumed = balancedConsumption.TryGetValue(itemId, out var c) ? c : 0;
var net = grossProduced - grossConsumed;
if (targets.TryGetValue(itemId, out var target))
{
var required = target * solution.Values[scaleColumn] * commonScale;
if (net < required - Tolerance * Math.Max(1, required)) return false;
}
if (Math.Abs(net) <= Tolerance * Math.Max(1, Math.Max(grossProduced, grossConsumed))) net = 0;
netFlows[itemId] = net;
var intermediate = produced.Contains(itemId) && consumed.Contains(itemId);
if (intermediate && net < 0) return false;
var research = researchMatrixSinks.Contains(itemId);
var researchProduct = research && net > 0;
result[itemId] = new BlackBoxItemClassification(produced.Contains(itemId) && !consumed.Contains(itemId) || researchProduct,
researchProduct, 0,
intermediate && !research && unusedProduction.TryGetValue(itemId, out var unused) ? unused : 0,
intermediate && !research ? Math.Max(0, net) : 0);
}
balancedClassifications = result;
balancedNet = netFlows;
return true;
}
}
@@ -64,6 +64,7 @@ public sealed class BlueprintDescriptionText
public static class BlueprintDescriptionFormatter
{
private const double Tolerance = 1e-9;
private static readonly string[] RateUnits = { "K", "M", "G" };
private static readonly string[] PowerUnits = { "W", "kW", "MW", "GW", "TW" };
public static BlueprintDescriptionText Format(ProductionReport report, Func<int, string> itemTag,
@@ -147,7 +148,21 @@ public static class BlueprintDescriptionFormatter
var tag = itemTag(itemId);
if (string.IsNullOrEmpty(tag))
throw new InvalidOperationException("An item in the blueprint report has no native icon tag.");
return tag + " x" + FormatNumber(rate);
return tag + " x" + FormatRate(rate);
}
private static string FormatRate(double value)
{
var rounded = RoundForDisplay(value);
for (var unit = RateUnits.Length - 1; unit >= 0; unit--)
{
var scale = Math.Pow(1000, unit + 1);
// Keep the existing display precision; abbreviate only exact tenths of a unit.
if (rounded >= scale && rounded % (scale / 10) == 0)
return (rounded / scale).ToString("#,##0.#", CultureInfo.InvariantCulture) + RateUnits[unit];
}
return FormatNumber(value);
}
private static string FormatPower(double? watts, BlueprintDescriptionLabels labels)
@@ -176,7 +191,7 @@ public static class BlueprintDescriptionFormatter
throw new InvalidOperationException("A blueprint report contains an invalid rate or power value.");
var rounded = RoundForDisplay(value);
if (rounded > 0 || value == 0)
return rounded.ToString(value < 1 ? "0.###" : "0.##", CultureInfo.InvariantCulture);
return rounded.ToString(value < 1 ? "0.###" : "#,##0.##", CultureInfo.InvariantCulture);
var precise = value.ToString("0.######", CultureInfo.InvariantCulture);
return precise != "0" ? precise : value.ToString("0.###E+0", CultureInfo.InvariantCulture);
}
+28 -2
View File
@@ -31,11 +31,18 @@ public sealed class ProductionBuildingSnapshot
}
}
public enum BlueprintProductionBasis
{
FinalProducts,
BottleneckIntermediate
}
public sealed class FactoryBlackBoxRequest
{
public List<ProductionBuildingSnapshot> Buildings { get; } = new List<ProductionBuildingSnapshot>();
public List<ProductionDiagnostic> CaptureDiagnostics { get; } = new List<ProductionDiagnostic>();
public bool ProliferationEnabled { get; set; }
public BlueprintProductionBasis ProductionBasis { get; set; }
}
public sealed class FactoryBlackBoxAnalyzer
@@ -250,8 +257,27 @@ public sealed class FactoryBlackBoxAnalyzer
var matrixSinkItems = hasResearchMatrixSink
? new HashSet<int>(_catalog.ResearchMatrixItemIds) : new HashSet<int>();
var classifications = BlackBoxMaterialClassifier.Classify(processGroups, grossProduction, grossConsumption,
materialComplete, uncertainDemandItems, unknownDemand, matrixSinkItems, out var steadyStateBalance);
IReadOnlyDictionary<int, BlackBoxItemClassification> classifications = null;
IReadOnlyDictionary<int, double> steadyStateBalance = null;
if (request.ProductionBasis == BlueprintProductionBasis.BottleneckIntermediate)
{
if (!materialComplete || !BlueprintBottleneckBalance.TryCalculate(processGroups,
grossProduction, grossConsumption, matrixSinkItems,
out var balancedProduction, out var balancedConsumption, out var balancedClassifications,
out var balancedNet))
diagnostics.Add(new ProductionDiagnostic(ProductionDiagnosticCode.BlueprintBasisUnavailable,
"A complete material selection with a feasible final output is required for the bottleneck basis."));
else
{
grossProduction = balancedProduction;
grossConsumption = balancedConsumption;
classifications = balancedClassifications;
steadyStateBalance = balancedNet;
}
}
if (classifications == null)
classifications = BlackBoxMaterialClassifier.Classify(processGroups, grossProduction, grossConsumption,
materialComplete, uncertainDemandItems, unknownDemand, matrixSinkItems, out steadyStateBalance);
var flows = new List<ProductionItemFlow>();
var allItems = new SortedSet<int>(grossProduction.Keys);
allItems.UnionWith(grossConsumption.Keys);
+2 -1
View File
@@ -116,7 +116,8 @@ public enum ProductionDiagnosticCode
Unbounded,
IterationLimit,
Cancelled,
ConservationFailure
ConservationFailure,
BlueprintBasisUnavailable
}
public sealed class ProductionDiagnostic
+18 -6
View File
@@ -17,7 +17,12 @@
* Strict hotkey dectection for build menu, thus building hotkeys(0~9, F1~F10, X, U) are not triggered while holding Ctrl/Alt/Shift.
* Fix a bug that warning popup on `Veins Utilization` upgraded to level 8000+
* Sort blueprint structures before saving, to reduce generated blueprint data size a little
* Add an `Auto-fill description` button and a `Proliferation` checkbox to the blueprint browser, copy, and paste panels, to fill the description with the blueprint's material flows per minute and its power demand
* Add an `Auto-fill` entry to the description header in the blueprint browser, copy, and paste inspectors. Click it to open options beside the entry without moving or resizing native fields; the popup follows the entry while scrolling and adjusts its position at screen edges
* The popup has an `Auto-fill description` title, a native X close button, proliferation and production-basis options, and one `Generate` button at the bottom. The dropdown overlays the footer without resizing the popup or moving the action. Close with the X, an outside click, or Esc; when the dropdown is open, Esc closes it first. Successful generation closes the popup.
* `Production basis` defaults to `Final-product output` each time the inspector opens, retaining rated final outputs and showing intermediate shortages and excess. Choose `Lowest intermediate throughput` to scale the final-product mix together to the bottleneck, using recipe ratios and shared intermediate demand. Complete, balanceable chains then have no internal shortages; unused intermediate capacity appears as excess. External inputs and final outputs use the same basis.
* `Proliferation` defaults to on when the blueprint contains a Spray Coater; it can be changed manually. Power demand still estimates all selected buildings at full load in either production basis.
* Replaces the main description with material flows per minute and writes power demand to a `Power` custom field, preserving other custom fields. If the bottleneck basis cannot be determined, the existing description is kept; check missing building settings and chain outputs, or select `Final-product output`. Save the blueprint manually to keep generated changes.
* Large material rates use the largest exact `K`/`M`/`G` suffix with at most one decimal place; rates that cannot be shortened without losing display precision keep their ordinary format. Numbers with four or more integer digits use comma thousands separators, including before suffixes (for example, `12,345` and `1,234.5K`).
* Increase maximum count of Metadata Instantiations to 20000 (from 2000)
* Increase capacity of player order queue to 128 (from 16)
* Enable `Hide UI` (`F11` by default) in Star Map view, hiding UI and other scene elements
@@ -85,13 +90,13 @@
* Quick build Orbital Collectors
* Set a maximum number to build per operation; 0 builds as many as possible
* Quick build Mining Machines
* Use the button on the Factory tab near Quick build Orbital Collectors. Places the full ordinary Mining Machine layout at the nearest solid vein group regardless of carried stock. Uses available miners from the inventory and hand; missing miners remain as ghosts awaiting materials. Every placed miner must retain at least 3 covered nodes after all planned burials; miners below that minimum are invalid.
* Use the button on the Factory tab near Quick build Orbital Collectors. Places the full ordinary Mining Machine layout at the nearest solid vein group regardless of carried stock. Mines only the selected group, even when another group of the same resource is nearby. Uses available miners from the inventory and hand; missing miners remain as ghosts awaiting materials. Every placed miner must retain at least 3 covered nodes in the selected group after all planned burials; miners below that minimum are invalid.
* `Allow restoring/burying veins` is off by default. When disabled, uses only visible nodes and skips all restoration and burial calculations. Enable it to restore buried nodes unless obstructed by buildings or near Dark Fog Planetary Bases. Changes apply to the next calculation. Searches individual native collision shapes so the miner's feet can interleave where the game permits.
* Uses multiple packing orders, exploration keyed by placement pose as well as candidate index, local position/rotation refinement, body-width neighbor candidates, and coordinated repacking of up to three nearby miners to seek a high sum of vein counts across all placed miners. A final pass fills remaining compatible candidates when they increase total coverage while preserving the three-node minimum. Shared nodes count once per miner; this bounded search does not guarantee a global optimum.
* Reuses collision checks and runs independent layout searches on up to 4 background workers, capped at half the available logical processors. Systems with one logical processor keep the search on the main thread with a frame budget. Native terrain checks and placement stay on the main thread; worker scheduling preserves the same layout as sequential search.
* With `Allow restoring/burying veins` enabled, may bury unused nodes when that improves total coverage. Nodes already assigned to miners or miner prebuilds are protected. Ground, water, existing buildings, construction range, and the game's other placement clearances still apply.
* Click again during calculation to cancel. Changing planets or leaving the game cancels automatically. Construction drones finish the prebuilds; belts and power supply are not placed.
* While tuning this feature, each calculation writes a timestamped JSON snapshot to `BepInEx/debug/UXAssist/QuickMiner/` in the active game profile, including the restoration/burial option, nodes, native colliders, accepted candidates, search phases and their search times, logical processor and worker counts, existing miners, and native placement results. The completion tip stays visible for about 8 seconds; the log also records the result summary and full file path. Replay and compare sequential/parallel results without loading a save using `powershell -File tools/tests/Test-QuickMinerPlacement.ps1 -Snapshot <file.json>` from the repository root. Replay fails if total coverage falls below the recorded result; add `-MinimumTotalCoverage <count>` to require a higher total.
* Debug builds capture a timestamped JSON snapshot for each calculation and export it to `BepInEx/debug/UXAssist/QuickMiner/` in the active game profile, including the restoration/burial option, nodes, native colliders, accepted candidates, search phases and their search times, logical processor and worker counts, existing miners, and native placement results. Only Debug builds log the result summary and full file path; Release builds exclude this debug functionality. The completion tip stays visible for about 8 seconds in both builds. Replay and compare sequential/parallel results without loading a save using `powershell -File tools/tests/Test-QuickMinerPlacement.ps1 -Snapshot <file.json>` from the repository root. Replay fails if total coverage falls below the recorded result; add `-MinimumTotalCoverage <count>` to require a higher total.
* Belt signals for buy out dark fog items automatically
* 6 belt signals are added to the signal panel, which can be used to buy out dark fog items automatically.
* Generated items are stacked in 4 items.
@@ -167,6 +172,7 @@
* Buy out techs with their prerequisites
* This enables batch buying out techs with their prerequisites. Buy-out buttons are shown for locked techs/upgrades.
* Hide battle-related techs in Peace mode
* Battle-related techs and their connections return when disabling the option or loading a Combat-mode save; switching saves does not require restarting the game.
* Unlock all techs with metadata
* Use the config-panel button to confirm the metadata cost and buy out eligible techs in a batch; unlimited upgrade chains are excluded.
* Combat
@@ -220,7 +226,12 @@
* 更严格的建造菜单热键检测,因此在按住Ctrl/Alt/Shift时不再会触发建造热键(0~9, F1~F10, X, U)
* 修复了`矿物利用`升级到8000级以上时弹出警告的bug
* 保存蓝图前对建筑进行排序,以减少生成的蓝图数据大小
* 在蓝图浏览、复制和粘贴界面增加「自动填写说明」按钮和「增产」复选框,用蓝图每分钟的物料流量和耗电自动填写说明
* 在蓝图浏览、复制和粘贴检查面板的说明标题行增加「自动填写」入口,点击后在入口旁打开生成选项,不移动或缩放原生字段;滚动时弹出面板跟随入口,并在屏幕边缘调整位置
* 面板包含「自动填写说明」标题、原生叉号关闭按钮、增产和产量基准选项,以及底部单个「生成说明」按钮。展开下拉列表时,列表覆盖在底部操作区域前方,面板尺寸和按钮位置保持不变。可通过叉号、点击外部或 Esc 关闭;下拉列表展开时,Esc 先收起列表。生成成功后关闭面板。
* 每次打开检查面板时,「产量基准」默认为「最终产物产量」,保留最终产物的额定产量,并显示中间产物的缺口和余量。选择「最低产量中间产物」后,按配方比例和共享中间物料的需求换算瓶颈,等比例缩放各最终产物。数据完整且可平衡的生产链没有内部缺口,未使用的中间产能列为「多余」;外部输入和最终输出采用同一基准。
* 蓝图含喷涂机时默认勾选「增产」,也可手动修改。两种产量基准均按所选全部建筑满载估算耗电。
* 用每分钟的物料流量替换原说明,将耗电写入「耗电」自定义字段,保留其他自定义字段。无法确定瓶颈基准时保留原说明;可检查缺失的建筑参数和生产链输出,或改选「最终产物产量」。填写后需手动保存蓝图。
* 较大的物料流量使用能精确表示的最大 `K`/`M`/`G` 单位,小数最多一位;无法在保留显示精度的前提下缩写时,保留普通数字格式。整数部分达到四位的数字用逗号每三位分隔,带单位时也适用,例如 `12,345` 和 `1,234.5K`。
* 将元数据提取的最大数量增加到20000(原来为2000)
* 将玩家指令队列的容量增加到128(原来为16)
* 在星图视图中启用 `隐藏 UI` 功能(默认按键为 `F11`),同时隐藏 UI 和场景中的其他元素
@@ -288,13 +299,13 @@
* 快速建造轨道采集器
* 可设置单次建造数量上限;设为 0 时尽可能多地建造
* 快速铺设采矿机
* 点击「工厂」页中轨道采集器按钮附近的按钮,在最近的固体矿脉生成完整的普通采矿机布局,数量不受库存限制。有采矿机时正常消耗背包和手持物品,不足的位置保留待建造虚影,等待补充材料。所有计划掩埋完成后,每台矿机仍须覆盖至少 3 个矿点;少于 3 个的视为无效,不予铺设。
* 点击「工厂」页中轨道采集器按钮附近的按钮,在最近的固体矿脉生成完整的普通采矿机布局,数量不受库存限制。仅开采选中的矿脉,即使附近有同种资源的其他矿脉也不会混入。有采矿机时正常消耗背包和手持物品,不足的位置保留待建造虚影,等待补充材料。所有计划掩埋完成后,每台矿机仍须覆盖选中矿脉的至少 3 个矿点;少于 3 个的视为无效,不予铺设。
* 「允许恢复/掩埋矿物」默认关闭。关闭时仅使用可见矿点,跳过所有恢复和掩埋计算;开启后,先恢复未被建筑阻挡且不在黑雾行星基地附近的掩埋矿点。选项变更从下次计算生效。按原版独立碰撞体搜索布局,保留游戏允许的矿机脚部交叉空间。
* 比较多种铺设顺序,同时按候选序号及位置朝向探索不同布局,细调位置和朝向,按机身宽度补充紧邻候选,并允许邻近的两三台矿机一起重新布局,尽量提高各台矿机覆盖矿点数之和。结束前再扫描全部候选,继续补入能提高总覆盖数、且不破坏每台至少覆盖 3 点要求的矿机。同一矿点被多台矿机覆盖时重复计数。计算有界,不保证全局最优。
* 复用碰撞检查结果,使用最多 4 个后台线程并行搜索独立布局,线程数不超过可用逻辑线程数的一半。单逻辑线程系统继续在主线程按每帧预算计算。原生地形检查和实际铺设保留在主线程;并行调度与顺序搜索生成相同布局。
* 开启「允许恢复/掩埋矿物」后,允许掩埋未被使用的矿点来提高总覆盖数;保护已有矿机及待建造矿机使用的矿点。仍需满足地面、水面、现有建筑、建造范围及游戏的其他放置间距要求。
* 计算期间再次点击可取消,切换行星或退出游戏自动取消。待建造对象由建设机器人完成,不自动铺设传送带和电力设施。
* 功能调试期间,每次计算都会在当前游戏配置目录的 `BepInEx/debug/UXAssist/QuickMiner/` 下写入带时间戳的 JSON 文件,记录恢复/掩埋选项、矿点、原生碰撞体、有效候选、搜索阶段及其搜索耗时、逻辑线程数和工作线程数、现有矿机和原生铺设校验结果。完成提示保留约 8 秒,日志也会记录结果摘要和文件的完整路径。在仓库根目录运行 `powershell -File tools/tests/Test-QuickMinerPlacement.ps1 -Snapshot <file.json>`,即可离线重放并比较顺序与并行搜索结果,无需读取存档。总覆盖数低于记录结果时,重放检查会失败;可追加 `-MinimumTotalCoverage <数量>`,要求达到更高的总覆盖数。
* 仅 Debug 版本会为每次计算采集带时间戳的 JSON 快照,并导出到当前游戏配置目录的 `BepInEx/debug/UXAssist/QuickMiner/`,记录恢复/掩埋选项、矿点、原生碰撞体、有效候选、搜索阶段及其搜索耗时、逻辑线程数和工作线程数、现有矿机和原生铺设校验结果。结果摘要和文件完整路径的日志也仅在 Debug 版本中输出;Release 版本不编译这些调试功能。两个版本的完成提示均保留约 8 秒。在仓库根目录运行 `powershell -File tools/tests/Test-QuickMinerPlacement.ps1 -Snapshot <file.json>`,即可离线重放并比较顺序与并行搜索结果,无需读取存档。总覆盖数低于记录结果时,重放检查会失败;可追加 `-MinimumTotalCoverage <数量>`,要求达到更高的总覆盖数。
* 用于自动购买黑雾物品的传送带信号
* 在信号面板上添加了6个传送带信号,可以用于自动购买黑雾道具。
* 生成的物品堆叠数为4。
@@ -370,6 +381,7 @@
* 买断科技也同时买断所有前置科技
* 可批量买断科技及其前置科技,未解锁的科技和升级会显示买断按钮。
* 在和平模式下隐藏战斗相关科技
* 关闭选项或加载战斗模式存档后恢复相关科技及连线,切换存档无需重启游戏。
* 使用元数据解锁所有科技
* 在配置面板点击按钮并确认元数据消耗,批量买断符合条件的科技;不包含无限升级科技链。
* 战斗
+3 -2
View File
@@ -3,7 +3,7 @@
<PropertyGroup>
<BepInExPluginGuid>org.soardev.uxassist</BepInExPluginGuid>
<Description>DSP MOD - UXAssist</Description>
<Version>1.6.3</Version>
<Version>1.6.4</Version>
<PackageId>UXAssist</PackageId>
<RootNamespace>UXAssist</RootNamespace>
<PackHasChangelog>true</PackHasChangelog>
@@ -11,7 +11,8 @@
<ItemGroup>
<Compile Remove="tools/**/*.cs" />
<Reference Include="System.Runtime.Serialization" />
<Compile Remove="Functions/Factory/MinerPlacementDebug.cs" Condition="'$(Configuration)' != 'Debug'" />
<Reference Include="System.Runtime.Serialization" Condition="'$(Configuration)' == 'Debug'" />
<PackageReference Include="DysonSphereProgram.Modding.CommonAPI" Version="1.*" />
<PackageReference Include="DysonSphereProgram.Modding.DSPModSave" Version="1.*" />
</ItemGroup>
@@ -0,0 +1,82 @@
# Blueprint Description Validation
This document records the native layout evidence for the UXAssist description-header entry and the checks needed for in-game acceptance. Compilation and managed production checks do not establish compatibility with other blueprint mods.
## Native evidence
Original installed DSP sources, rechecked on 2026-11-05 after discovery through the Steam registry and `steamapps/libraryfolders.vdf`:
- Original assembly: `D:/Steam/steamapps/common/Dyson Sphere Program/DSPGAME_Data/Managed/Assembly-CSharp.dll`, SHA-256 `EF314425DADE51F529F184F07BE136CD3C2660A6A81515603C7226FBE7AB1D8C`.
- Original `UnityEngine.UI.dll`, SHA-256 `C5ACC25EBD597B586D323AF506FB88E760322550940F1A3B0EA4FC8143FCB26C`.
- Native UI assets: `DSPGAME_Data/level0`, SHA-256 `04655A46BBEB113113688BCDC0E0EA8EC5F128B348E32194FC9743ADB48C8E91`.
- The installed version history ends at `0.10.35.29151`; the Steam manifest reports build ID `25955035`. Assembly file version `0.0.0.0` alone does not identify this game build.
Native `UIBlueprintInspector.Refresh` owns description and group sizes, later group positions, and scroll content height. UXAssist positions only its own entry and popup.
The relevant original methods can be reproduced by decompiling the following types from the original assembly:
| Native method | Observed behavior |
| --- | --- |
| `UIBlueprintInspector.Refresh(bool forModify, bool refreshComponent, bool refreshCode, bool loadExistHead = false)` | Controls native group sizes, later group positions, and content height; reloads the main description input only when `forModify` is false. |
| `UIBlueprintInspector._OnOpen()` and `_OnClose()` | Refresh and open native settings for the relevant mode; clear the blueprint on close. |
| `ManualBehaviour._Close()` | Deactivates the inspector GameObject, hiding children. |
| `UIBlueprintInspector.OnCustomFieldEndEdit(string str)` and `CollectExternalFields(int excludeTargetId = -1)` | Collect, escape, and validate pending custom-field edits through the native path. |
| `UIBlueprintInspector.OnCopyClick()`, `OnSaveChangesClick()`, and `OnSaveClick()` | Serialize or save the current blueprint with the game's native workflow. |
The native description input starts 22 pixels below its title. The entry copies the title's font, size, style, line spacing, and alignment, with zero top text inset, while its hit rectangle stays 22 pixels high. It follows the title's measured text width plus 8 pixels and reserves 8 pixels before the actual native icon, including when the icon is inactive. It hides if it cannot fit. The title's 30-pixel Text rectangle must not become the button's hit rectangle, which would extend into the input below. Native labels, inputs, groups, scroll content, and settings retain their layout.
`UIBlueprintInspector.Refresh(forModify: true)` does not reload `descTextInput`. Successful generation must assign both the blueprint description and its input before using the native modification refresh. Pending custom fields must first pass through the native field collection and escaping rules. Native copy and save handlers serialize the current blueprint, so they remain the actions used to share or persist a generated description.
Reinspect the installed original assemblies and assets after a game update; the publicized compile-time references omit method bodies.
## Anchored options and native conventions
The popup uses the entry's world corners, transformed into its parent's coordinates, and actual root-canvas bounds. Placement prefers below the entry with a 6-pixel gap and aligned right edges, flips above when needed, and clamps against an 8-pixel canvas inset. A panel too large for that area is closed. `Canvas.willRenderCanvases` reconciles placement while open. An inactive or fully clipped entry closes its popup.
The panel has a title and native X, proliferation, production basis with help, and one footer `Generate` action. Content insets include the sliced sprite's approximately 13-pixel horizontal and 11-pixel vertical trim before pixels-per-unit conversion. The title has extra left and top clearance from the visible border. The 20-pixel checkbox has an independently sized label with a 4-pixel gap and vertical overflow allowed; label height remains at least 26 pixels or preferred glyph height plus padding. The panel and footer are sized from the form alone. Opening the dropdown overlays the footer without resizing the popup or moving the action.
The X comes from `inserterWindow/panel-bg/btn-box/close-wnd-btn`: a 40-by-30 native button with a centered 16-by-16 icon and a transparent 30-by-19 raycast child. Its original serialized `Button.onClick` targets the original inserter window's `_Close`. The owned clone replaces the entire `Button.ButtonClickedEvent` before adding its popup callback; removing runtime listeners alone would leave that persistent callback active.
The production-basis selector directly clones the standard rectangular `optionWindow.resolutionComp`. Cloned runtime resolution rows are removed and submit/change events are replaced before the two production choices are assigned, so changing the owned selection cannot change native resolution settings. The main caption uses 8-pixel left and 30-pixel right insets; row text uses 8-pixel horizontal insets. Native row selection closes the list, with no extra submit-close handler. The shared combo helper is unchanged.
| Original source | Behavior used by the popup |
| --- | --- |
| `UIRoot._OnUpdate()` and `EscapeInputLogic()` | Give native message boxes Escape priority before the game UI updates. |
| `UIGame._OnUpdate()` | Updates blueprint inspectors before later native picker and function-window Escape handlers. The owned inspector postfix consumes Escape after closing an expanded dropdown or its popup. |
| `UIItemPicker._OnUpdate()` | Tests left, right, and middle clicks outside a screen rectangle using the overlay canvas camera. The owned test also accepts the entry and an open dropdown. |
| `UIPopupMenu.SetState()` | Constrains popup placement to game UI bounds and brings it to the front. |
| Native inserter close-button subtree and combo row event routing | Supply the actual X artwork/hit area and the select-then-close event order. |
Original font, sprite, header, standard-resolution-control, and close-button captures and focused decompilations are retained in the external task evidence under `2026-11-05-UXAssist-BlueprintTextLayout/`, including `standard-controls/`. Native generator rules support keeping glyph height independent of checkbox size; native header captures identify the icon's actual 20-pixel slot. Source analysis and embedded-font calculations do not execute Unity's runtime preferred-size calculation, rasterization, or interaction. Investigation reports remain outside the repository.
## Recorded checks
The placement harness extracts the actual private `TryGetPopupPosition` method and compiles it with data-only `Rect` and `Vector2` substitutes. It checks supplied bounds, including parent transforms, canvas edges, below/above placement, and oversized-panel rejection. This validates the placement calculation, not current text rendering. Run font and sprite analysis against the current source and captured standard control.
For this revision, the normal Release build passed with 0 warnings and 0 errors, and `git diff --check` passed. These checks do not execute Unity rendering or interaction.
## Managed production checks
Run the production checks and normal UXAssist build from the repository root:
```powershell
dotnet run --project UXAssist/tools/ProductionCheck/ProductionCheck.csproj -c Release
dotnet build UXAssist/UXAssist.csproj -c Release --no-restore
git diff --check
```
The production-basis cases check an undersupplied chain, recipe-ratio conversion, shared intermediate demand, joint products, a cycle with an output, research-matrix outlets, no internal intermediate, power-only selections, very different capacity scales, and unavailable material settings or final output. A successful bottleneck report must conserve material, normalize inputs and outputs to the same throughput, preserve rated group capacity and power, and avoid internal shortages. Existing default-mode expectations must continue to pass.
## Manual acceptance
No in-game, Unity event-loop, or third-party mod integration test has been performed for this change. Repeat these checks at the target profile's resolutions and UI scales, with each installed blueprint UI mod. The header entry avoids native layout writes but another mod may use the same extension space.
1. Open each inspector in English and Simplified Chinese with different custom-field counts. Confirm the entry text shares the native title's baseline. Focus the description input so its icon appears; the entry must remain before that icon and its clickable area must not cover the input below. Open the options and check title clearance, compact checkbox spacing, visible captions, native X, and one footer action. At screen edges, confirm it flips or shifts into available canvas space.
2. Scroll while the popup is open. Confirm it follows the entry after native layout and closes when the entry is fully clipped. Expand native foundation, fill-only, and reform settings; all native fields must retain their positions and sizes, and scrolling must reach every field.
3. Open the rectangular production-basis list. Confirm text has clear left padding and space for the arrow. The list must overlay the footer without changing panel size or footer position. Select each item and confirm it closes the list without generating text or changing the native resolution setting. Reopen the popup and change language; selector dimensions and text spacing must remain valid.
4. Close the popup with its X; the inspector and an open inserter window must remain open. Reopen and click outside with the left, right, and middle mouse buttons: the popup should close, and the clicked native control or world target should retain its normal behavior. Press Esc with the list expanded: only the list should close. Press Esc again: the popup should close while the inspector stays open. With a native message box present, its Escape handler must retain priority.
5. Reopen each inspector and repeatedly refresh or change the blueprint selection. Confirm there is one entry, options are initially closed, the production basis resets to final-product output on opening, Spray Coaters set the automatic proliferation default, and a manual checkbox choice survives content refreshes in the current session. Successful generation, a replacement blueprint, and inspector closure must dismiss the popup.
6. Generate both production bases for an unbalanced chain. Final-product output should retain rated final capacity and show the missing intermediate; lowest intermediate throughput should reduce the common final-output mix, use correspondingly reduced external inputs, and show no internal shortage when the chain is complete and balanceable. Power should remain the same full-load estimate. Check necessary coproduct output separately from unused intermediate capacity.
7. Edit the description and unrelated custom fields before generating. Generate twice, including with 20 custom fields and with existing English or Chinese power fields. Confirm unrelated edits survive, duplicate power fields are consolidated, and failed generation leaves the prior description and fields intact. Include missing building settings, an unavailable bottleneck basis, and the native description length limit.
8. Save, copy the share code, and reopen or paste the blueprint through the native buttons. Confirm the generated main description, power field, and unrelated fields persist correctly. With a research-mode lab, confirm net produced matrices appear under Research without fabricated matrix imports or research speed.
9. Restart the test profile without UXAssist, then restore it and restart again. Confirm the entry and options are absent without UXAssist, native fields keep their normal layout in both cases, and repeated opening and generation work with the installed blueprint mods. `OnDisable` and inspector-destruction cleanup are code-review checks unless a development harness exercises them; a supported user-facing hot-disable workflow is not assumed.
+18 -5
View File
@@ -40,12 +40,16 @@ When proliferation is enabled, ordinary recipes default to their native extra-pr
## Fixed-building analysis
The black box evaluates each selected building at full load, even if another selected building cannot provide all its inputs. It does not simulate belt layouts, startup storage, or logistics throughput. Missing inputs appear as `RequiredExternalSupply`; byproducts and internal deficits retain producer and consumer group attribution. `GrossProduction` and `GrossConsumption` remain separate even when a recipe returns some of its own input. Material classification uses each process's net per-item flow, so that return cannot become a false external requirement or coproduct.
By default, the black box evaluates each selected building at full load, even if another selected building cannot provide all its inputs. It does not simulate belt layouts, startup storage, or logistics throughput. Missing inputs appear as `RequiredExternalSupply`; byproducts and internal deficits retain producer and consumer group attribution. `GrossProduction` and `GrossConsumption` remain separate even when a recipe returns some of its own input. Material classification uses each process's net per-item flow, so that return cannot become a false external requirement or coproduct. The optional blueprint production basis below changes material ledgers only when explicitly requested.
`IntermediateShortage` records the missing externally supplied portion of an item produced and consumed within the selection. `OverbuildSurplus` and `CoproductSurplus` are independent nullable amounts; both can be positive for the same item. Equivalent buildings are grouped by recipe, building, proliferation mode, speed, and operating settings in stable order. Whole-building reductions are tested against every item's shared balance: no final-product capacity may decrease and no internal shortage may increase. The reduction identifies redundancy only; gross flows, original full-load inputs, outputs, and power never change. Coproduct supply counts only retained whole buildings required by a process's other products, and internal net consumption is credited before exposing the remainder. Headroom from a single-output producer or a joint process's limiting product remains ordinary balance, not a coproduct. When materials are incomplete, overbuild and coproduct amounts are unknown rather than fabricated from a partial layout.
`SteadyStateExternalSupply` is a separate input estimate from the known processes. After whole-building classification for complete selections, a fractional reduction of surplus intermediate producers propagates downstream limits through upstream processes. The reduction stops after a bounded number of passes, because a lossless cycle such as charging and discharging accumulators can otherwise pass a tiny leftover around indefinitely; stopping early only keeps the input estimate conservative. Every reduction applies to the entire process, keeps rated final-product capacity, and never worsens an existing intermediate shortage; deterministic grouping and ordering keep results independent of blueprint building order. For partial selections, skip whole-building classification but still cap independently known upstream inputs against known demand. Protect any known inputs of an unresolved downstream process, or all known products if its possible inputs are unknown, instead of treating its demand as zero. Only the blueprint description uses this estimate, marked as a known portion when incomplete. Gross ledgers, `RequiredExternalSupply`, uncertain overbuild and coproduct classification, independently known rated outputs, and power retain their original meaning.
`FactoryBlackBoxRequest.ProductionBasis` defaults to `BlueprintProductionBasis.FinalProducts`, preserving these existing full-load semantics for all callers. The blueprint inspector can explicitly select `BottleneckIntermediate`. This mode reuses `TwoPhaseSimplex` to maximize one common fraction, no greater than 1, of the selected final-product mix, bounded by each selected process's capacity. Terminal consumers without item outputs, such as launchers, fuel generators, or precisely configured research, operate at that same fraction. Every internally produced material must balance without external imports; only materials with no selected producer can enter from outside. Capacities are converted through recipe ratios and shared consumption, rather than comparing different items' absolute per-minute rates. Joint products and selected cycles participate in the same balance; no unselected recipe is introduced. After maximizing the common fraction, the solver minimizes used building capacity, then remaining normalized surplus.
On a successful bottleneck calculation, all material ledgers, external inputs, final outputs, and research-matrix outlets use the normalized process rates. Unused positive intermediate capacity, including fractional building capacity, is reported as excess. This measures spare rated capacity rather than actual surplus stock or extra throughput; that capacity may not be simultaneously attainable from the normalized upstream flow. Surplus necessarily produced alongside required joint products remains coproduct output. A complete, balanceable chain therefore has no internal shortage within numerical tolerance. `Groups` and power retain the full selected building capacities, so normalized material rates must not be used to infer reduced power demand. Unknown material data, an unidentified final outlet, zero feasible throughput, or a failed or limited solve produces `BlueprintBasisUnavailable`; the inspector then preserves the existing description and fields. A pure cycle without a final outlet cannot establish this basis. A selection with no internal intermediate can retain its rated final output; a known selection with no material flows can still generate its power field without a material solve. Independently unknown power does not become known through balancing.
```csharp
var capture = BlueprintSelectionReader.Capture(factory, selectedObjectIds);
var selection = capture.CreateRequest(proliferationEnabled: true);
@@ -66,11 +70,19 @@ Native research uses the current lab technology's matrix point requirements, wit
## Blueprint descriptions
The shared `UIBlueprintInspector` in browser, copy, and paste modes hosts `Auto-fill description` with `Proliferation` immediately to its right in one row above every description box. Move the first native inspector group down once, and offset later groups and the scroll height after each native refresh so the controls do not split the smaller fields from the main description. The checkbox initially reflects the blueprint's Spray Coater prefab capability and tracks content changes until manually changed in the current editing session; changing it does not modify the blueprint. Clicking the button captures only `blueprint.buildings` with `BlueprintSelectionReader.FromBlueprint` on the game thread, then runs `FactoryBlackBoxAnalyzer` against the captured catalog. The maximum supported proliferation level applies while each building keeps its acceleration or extra-products mode. Input coating is assumed to be supplied externally; no spray routing or spray consumption is inferred from the Spray Coater.
The shared `UIBlueprintInspector` in browser, copy, and paste modes adds a compact `Auto-fill` entry after the measured native description title, with an 8-pixel gap. Its text copies the native title's font, size, style, line spacing, and alignment, with a zero top inset; its hit rectangle stays within the 22-pixel header. Reserve the actual native icon button's bounds and another 8-pixel gap even when that icon is inactive; hide the owned entry if it cannot fit. Its options panel is an owned child of `inspector.rectTrans`, outside the scroll mask. On opening, actual entry corners and root-canvas bounds are converted into that parent's coordinates. The private placement method in `InspectorControls` prefers a position below the entry with their right edges aligned, flips above when needed, and clamps against canvas bounds; a panel too large for those bounds is closed. A `Canvas.willRenderCanvases` subscription follows the entry after native layout and scrolling only while the options are open; hiding the entry or scrolling it completely outside its viewport closes the popup. Native fields, groups, anchors, and scroll height remain owned by the game. Closing, disabling, and destruction unsubscribe the positioning callback and remove only owned controls as appropriate.
`BlueprintDescriptionFormatter` builds replacement multiline `blueprint.desc` text in this order: optional `Missing:` and `Excess:` lines for intermediate shortages and true overbuild; `Input:` for external inputs capped by downstream demand; `Output:` for ordinary final products and necessary coproduct surplus; and `Research:` for positive net matrix production accepted by a selected research-mode lab. Each warning category has one label followed by comma-separated items; warnings do not repeat in Input, and a matrix on Research does not repeat in Output. It uses `SteadyStateExternalSupply` for complete and independently known partial inputs, labeling partial values as known portions. The assumed lab adds no numerical matrix consumption or external input; other buildings' known matrix demand is subtracted from the Research rate. Omit each empty line, including Research when no produced matrix remains. A single optional `Power` custom field separates factory and configured logistics consumption, omitting categories with no demand and removing the field altogether if neither consumes power; a present but unknown category displays `Unknown` rather than zero. Material rates remain items per minute even though the description labels omit the unit. Rates are rounded only for display, ordered by item ID within each category, and use native item icon/name tags with comma-separated entries inside each description line. Uncertain final-product, overbuild, or coproduct conclusions are omitted. Veins and other scene objects are not blueprint entries or requested parameters.
The options use a title and the actual native X subtree, followed by proliferation, production basis with help, and one `Generate` action at the lower right. Content margins start inside the sliced background's visible fill: add `DataUtility.GetPadding(sprite) / image.pixelsPerUnit` to the desired gaps. The title has 12 pixels more left inset than the body and 18 pixels after the top sprite trim. Keep the 20-pixel checkbox independent of its label's height, at least 26 pixels or preferred glyph height plus padding, with vertical overflow allowed and a 4-pixel horizontal gap. Owned button and combo captions disable inherited best-fit sizing and have explicit text insets. Localized preferred sizes determine the form dimensions; opening the dropdown overlays the footer without changing panel size or footer position. The cloned X must receive a new `Button.ButtonClickedEvent`: its source has a persistent callback to the original inserter window that `RemoveAllListeners` does not remove.
`BlueprintDescriptionFields` matches only exact English or Simplified Chinese power field titles, updates or removes matching power fields, and collapses duplicate matches; all other fields, including input/output custom fields, stay intact. The inspector first collects pending custom-field edits, checks the native 2,000-character description limit and `kMaxFieldCount`, and applies native `ExternalFieldEscape` and `ExternalFieldUnescape` rules to the remaining power field. An invalid blueprint, unavailable catalog, failed calculation, malformed fields, overlong description, or insufficient capacity does not overwrite the description or generated fields. A successful update replaces the original description, synchronizes its native input control, and refreshes the inspector and share-code preview through the native modification path, leaving save and copy actions to the native buttons. Native `Refresh` recalculates the later groups' positions and the scroll height but not the first group's position, and `Refresh(forModify: true)` does not reload `descTextInput`, so assign it explicitly. `BlueprintData.Validate` strips newlines from custom fields, so multiline text belongs only in the main description. Recheck these inspector behaviors against the original DLL after game updates. The formatting and field updater remain pure-managed so `ProductionCheck` can verify them without loading Unity.
The production-basis selector directly clones the standard rectangular `optionWindow.resolutionComp` as an owned `UIComboBox`. Remove cloned runtime resolution rows, clear items, and replace its submit/change events before assigning the two production choices. Keep the native row-selection and dropdown behavior; the main caption has 8-pixel left and 30-pixel right insets, and the row template has 8-pixel horizontal insets. Main and item captions use single-line overflow so measuring preferred height before the new width is assigned cannot wrap against the previous width. The shared combo helper is unchanged.
Handle dismissal in the owning inspector's `_OnUpdate` postfix. Processed `VFInput.escape` respects an earlier native message-box handler; close an expanded dropdown first, otherwise close the popup, then consume Escape before later native window-closing handlers run. Left, right, or middle clicks outside the popup, entry, and open dropdown close the options while preserving the clicked native target's normal behavior. Successful generation, blueprint replacement, and inspector closure also close the options.
Each inspector open resets the basis to `Final-product output`, retaining existing calculation behavior; selecting `Lowest intermediate throughput` opts into `BottleneckIntermediate` for generation. The checkbox initially reflects the blueprint's Spray Coater prefab capability and tracks content changes until manually changed in the current editing session; changing it does not modify the blueprint. Generation captures only `blueprint.buildings` with `BlueprintSelectionReader.FromBlueprint` on the game thread, then runs `FactoryBlackBoxAnalyzer` against the captured catalog. A successful bottleneck solve supplies classification and steady-state balances directly; the original classifier runs only in final-product mode or after an unavailable bottleneck result. The maximum supported proliferation level applies while each building keeps its acceleration or extra-products mode. Input coating is assumed to be supplied externally; no spray routing or spray consumption is inferred from the Spray Coater.
`BlueprintDescriptionFormatter` builds replacement multiline `blueprint.desc` text in this order: optional `Missing:` and `Excess:` lines for intermediate shortages and excess classified by the selected production basis; `Input:` for external inputs capped by downstream demand; `Output:` for ordinary final products and necessary coproduct surplus; and `Research:` for positive net matrix production accepted by a selected research-mode lab. Each warning category has one label followed by comma-separated items; warnings do not repeat in Input, and a matrix on Research does not repeat in Output. It uses `SteadyStateExternalSupply` for complete and independently known partial inputs, labeling partial values as known portions. The assumed lab adds no numerical matrix consumption or external input; other buildings' known matrix demand is subtracted from the Research rate. Omit each empty line, including Research when no produced matrix remains. A single optional `Power` custom field separates factory and configured logistics consumption, omitting categories with no demand and removing the field altogether if neither consumes power; a present but unknown category displays `Unknown` rather than zero. Material rates remain items per minute even though the description labels omit the unit. Rates are rounded only for display. Large displayed rates use the largest exact K/M/G suffix with at most one decimal place (for example, 1,234,000 becomes 1,234K); if no suffix preserves that display precision, keep the ordinary number. Numbers with four or more integer digits use comma thousands separators, including coefficients before material or power units. Rates are ordered by item ID within each category, and use native item icon/name tags with comma-separated entries inside each description line. Uncertain final-product, overbuild, or coproduct conclusions are omitted. Veins and other scene objects are not blueprint entries or requested parameters.
`BlueprintDescriptionFields` matches only exact English or Simplified Chinese power field titles, updates or removes matching power fields, and collapses duplicate matches; all other fields, including input/output custom fields, stay intact. The inspector first collects pending custom-field edits, checks the native 2,000-character description limit and `kMaxFieldCount`, and applies native `ExternalFieldEscape` and `ExternalFieldUnescape` rules to the remaining power field. An invalid blueprint, unavailable catalog, failed calculation or bottleneck basis, malformed fields, overlong description, or insufficient capacity does not overwrite the description or generated fields. A successful update replaces the original description, synchronizes its native input control, and refreshes the inspector and share-code preview through the native modification path, leaving save and copy actions to the native buttons. Native `Refresh` owns the groups' positions and scroll height. `Refresh(forModify: true)` does not reload `descTextInput`, so assign it explicitly. `BlueprintData.Validate` strips newlines from custom fields, so multiline text belongs only in the main description. Recheck these inspector behaviors against the original DLL after game updates. The formatting and field updater remain pure-managed so `ProductionCheck` can verify them without loading Unity. See [blueprint description validation](BlueprintDescriptionValidation.md) for native layout evidence and manual compatibility checks.
## Special-process settings
@@ -123,7 +135,8 @@ Use a test game for the following manual checks. Compare full-load rates only wi
- Select miners at different machine speeds, including one with a backed-up output, a gas collector, and renewable generators. Check native miner power scaling, full-load miner output regardless of the output backlog, per-minute gas output without added grid demand, and ideal rated renewable power rather than local conditions.
- Select ray receivers in both modes, fuel generators, ejectors, and silos. Toggle proliferation and compare working power, generation, accumulator exchange, and Dyson demand as separate quantities. In a sandbox game, capture boosted artificial stars and launchers, and confirm that blueprint analysis of boosted buildings requires `BoostEnabled`.
- Remove an upstream producer from a mixed production selection. Confirm that downstream capacity is unchanged and the missing material appears as required external supply. Add one producer more than downstream demand needs, and confirm that only that whole building's output is reported as excess.
- In browser, copy, and paste inspectors, check localized control placement, Spray Coater defaults and manual overrides, and native item tags in the generated description and `Power` field. Generate twice and at the 20-field limit; verify that pending manual edits, unrelated fields, save/copy behavior, and ordinary blueprint sharing remain intact. Compare joint-production overbuild with necessary coproduct output without replacing original full-load rates or power.
- In browser, copy, and paste inspectors, check that the localized options follow their header entry when scrolling and use the available canvas space. Verify the native X, outside-click dismissal, and Escape priority, including an expanded dropdown and a native message box. Confirm both dropdown rows fit above the footer, options close after successful generation or inspector closure, and native settings and description fields retain their positions. Check Spray Coater defaults and manual overrides, generate twice and at the 20-field limit, and verify pending edits, unrelated fields, native item tags, and save/copy behavior.
- Compare both production bases on an undersupplied chain, uneven recipe ratios, shared intermediate branches, and a joint-product chain. Final-product mode must retain rated final outputs and expose intermediate shortages. Bottleneck mode must scale final outputs together, update raw inputs to the same throughput, and leave no internal shortage for a complete, balanceable chain. Confirm unused intermediate capacity and necessary coproduct output remain distinct, and that power stays at the same full-load estimate. Test a chain without internal intermediates, missing building settings, and a cycle without a final outlet; an unavailable bottleneck basis must preserve existing description and fields.
- Place one research-mode lab alongside one or all six matrix production chains. Confirm the matrices' positive net production appears only in the Research line, other final products stay in Output, and known in-blueprint matrix consumption reduces the Research rate. Do not fabricate lab matrix imports, excess, or an estimated lab consumption rate; change current technology, add more labs, and toggle proliferation to check matrix routing stays independent while full working power updates. Without the lab, normal matrix output and overbuild rules resume.
- Combine planner targets with shared coproducts, explicit raw-material boundaries, and alternate selected recipes. Confirm material conservation, shared surplus reuse, and no introduction of unselected recipes.
- Toggle belt-signal proliferation and reload a game. Confirm that existing belts use the new catalog, item generation continues, and fractional production and consumption statistics remain independent.
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "UXAssist",
"version_number": "1.6.3",
"version_number": "1.6.4",
"website_url": "https://github.com/soarqin/DSP_Mods/tree/master/UXAssist",
"description": "Some functions and patches for better user experience / 一些提升用户体验的功能和补丁",
"dependencies": [
+256 -13
View File
@@ -31,6 +31,7 @@ internal static class Program
BlueprintMixedProducersAndCycles();
SteadyStateLosslessCycle();
BlueprintProliferationAndCompleteness();
BlueprintProductionBases();
BlueprintDescriptionFormattingAndFields();
LogisticsChargingPower();
FractionationFlow();
@@ -1037,35 +1038,35 @@ internal static class Program
{
new ProductionItem(ItemIds.Water, 0, true, false, 0, 0),
new ProductionItem(ItemIds.ProliferatorMkIII, 201, false, false, 4, 75),
new ProductionItem(ItemIds.Steel, 202, false, false, 0, 0),
new ProductionItem(ItemIds.SpaceWarper, 203, false, false, 0, 0),
new ProductionItem(ItemIds.TitaniumGlass, 204, false, false, 0, 0)
new ProductionItem(ItemIds.TitaniumAlloy, 202, false, false, 0, 0),
new ProductionItem(ItemIds.CasimirCrystal, 203, false, false, 0, 0),
new ProductionItem(ItemIds.Prism, 204, false, false, 0, 0)
};
var recipes = new[]
{
Recipe(201, new[] { (ItemIds.Water, 1.0) },
new[] { (ItemIds.ProliferatorMkIII, 1.0) }),
Recipe(202, new[] { (ItemIds.Water, 1.0) }, new[] { (ItemIds.Steel, 1.0) }),
Recipe(203, new[] { (ItemIds.Water, 1.0) }, new[] { (ItemIds.SpaceWarper, 1.0) }),
Recipe(204, new[] { (ItemIds.Water, 1.0) }, new[] { (ItemIds.TitaniumGlass, 1.0) },
Recipe(202, new[] { (ItemIds.Water, 1.0) }, new[] { (ItemIds.TitaniumAlloy, 1.0) }),
Recipe(203, new[] { (ItemIds.Water, 1.0) }, new[] { (ItemIds.CasimirCrystal, 1.0) }),
Recipe(204, new[] { (ItemIds.Water, 1.0) }, new[] { (ItemIds.Prism, 1.0) },
productive: false)
};
var catalog = new ProductionCatalog(items, recipes, Array.Empty<ProductionBuilding>(),
new[] { 0.0, 0.25, 0.5, 0.75, 1.0 },
new[] { 0.0, 0.125, 0.2, 0.225, 0.25 },
new[] { 1.0, 1.3, 1.7, 2.1, 2.5 });
var request = BeltSignalSourcePreset.Create(catalog, ItemIds.Steel, true, true);
var request = BeltSignalSourcePreset.Create(catalog, ItemIds.TitaniumAlloy, true, true);
Check(request.ExternalMaterials.SetEquals(new[] { ItemIds.Water }),
"only known natural belt source IDs become external materials");
Equal(ItemIds.ProliferatorMkIII, request.ProliferatorItemId,
"belt policy uses the available proliferator item");
Check(request.SelfSprayProliferator && request.SprayDeliveredItems.Contains(ItemIds.Steel),
Check(request.SelfSprayProliferator && request.SprayDeliveredItems.Contains(ItemIds.TitaniumAlloy),
"self-spray and delivered-item spraying are request settings");
Check(request.ProliferationModeByItem[ItemIds.Steel] == ProliferationMode.ExtraProducts,
Check(request.ProliferationModeByItem[ItemIds.TitaniumAlloy] == ProliferationMode.ExtraProducts,
"productive legacy extra-products choice maps to a native mode");
Check(request.ProliferationModeByItem[ItemIds.SpaceWarper] == ProliferationMode.None,
Check(request.ProliferationModeByItem[ItemIds.CasimirCrystal] == ProliferationMode.None,
"legacy disabled item keeps its no-proliferation preset");
Check(request.ProliferationModeByItem[ItemIds.TitaniumGlass] == ProliferationMode.Speedup,
Check(request.ProliferationModeByItem[ItemIds.Prism] == ProliferationMode.Speedup,
"unsupported extra-products choice falls back to native speedup");
var report = new ProductionPlanner(catalog).Calculate(request);
Check(report.MaterialComplete, "belt preset resolves the proliferator's recipe and raw materials");
@@ -1084,7 +1085,7 @@ internal static class Program
Array.Empty<ProductionBuilding>(), new[] { 0.0, 0.25, 0.5, 0.75, 1.0 },
new[] { 0.0, 0.125, 0.2, 0.225, 0.25 },
new[] { 1.0, 1.3, 1.7, 2.1, 2.5 });
var updated = BeltSignalSourcePreset.Create(updatedCatalog, ItemIds.Steel, true, false);
var updated = BeltSignalSourcePreset.Create(updatedCatalog, ItemIds.TitaniumAlloy, true, false);
Equal(9999, updated.ProliferatorItemId, "updated game data selects a valid proliferator instead of a stale ID");
var alternativeCatalog = new ProductionCatalog(new[]
@@ -2020,6 +2021,206 @@ internal static class Program
"an unresolved but known downstream input prevents underestimating its upstream supply");
}
private static void BlueprintProductionBases()
{
var analyzer = new FactoryBlackBoxAnalyzer(BlueprintCatalog());
var request = BlueprintRequest(1);
var rated = analyzer.Analyze(request);
Equal(60, rated.ItemFlows[2].IntermediateShortage,
"default final-product basis retains the selected downstream shortage");
request.ProductionBasis = BlueprintProductionBasis.BottleneckIntermediate;
var balanced = analyzer.Analyze(request);
Check(balanced.MaterialComplete && !balanced.Diagnostics.Any(), "bottleneck coproduct chain is complete");
Equal(0.5, balanced.ItemFlows[4].NetFlow, "limiting A capacity halves final output");
Equal(1, balanced.ItemFlows[1].SteadyStateExternalSupply.Value, "raw input uses the same feasible basis");
Equal(45, balanced.ItemFlows[3].CoproductSurplus.Value, "joint output retains its unavoidable B45 surplus");
Equal(0, balanced.ItemFlows[2].IntermediateShortage, "bottleneck mode solves rather than hides missing A");
Equal(60, balanced.ItemFlows[2].GrossConsumption, "downstream consumption is actually reduced");
Equal(rated.Power.ConsumptionWatts, balanced.Power.ConsumptionWatts,
"power still sizes all selected facilities at rated load");
Equal(rated.Groups[1].ExecutionsPerMinute, balanced.Groups[1].ExecutionsPerMinute,
"selected group capacities stay available separately from basis material flows");
var labels = new BlueprintDescriptionLabels("Factory power", "Logistics power", "Missing: ",
"Excess: ", "Unknown", "(known portion)", "Input: ", "Output: ", "Research: ");
var balancedText = BlueprintDescriptionFormatter.Format(balanced, TestItemTag, labels);
Check(!balancedText.Warnings.Contains("Missing:"), "a solved bottleneck does not format an internal shortage");
Check(balancedText.Input == TestItemTag(1) + " x1", "formatted input uses normalized raw demand");
Check(balancedText.Output == TestItemTag(3) + " x45, " + TestItemTag(4) + " x0.5",
"formatted output uses the same normalized final and coproduct rates");
var ratioCatalog = BasisCatalog(new[]
{
Recipe(801, new[] { (1, 1.0) }, new[] { (2, 0.5) }),
Recipe(802, new[] { (1, 1.0) }, new[] { (3, 100.0) }),
Recipe(803, new[] { (2, 1.0), (3, 100.0) }, new[] { (4, 10.0) })
});
var ratioRequest = BasisRequest(801, 802, 803);
var ratio = new FactoryBlackBoxAnalyzer(ratioCatalog).Analyze(ratioRequest);
Equal(5, ratio.ItemFlows[4].NetFlow, "different intermediate units are converted through recipe ratios");
Equal(50, ratio.ItemFlows[3].GrossConsumption, "large-count ingredient uses normalized demand");
Equal(50, ratio.ItemFlows[3].OverbuildSurplus.Value, "unused intermediate capacity is excess");
Equal(1.5, ratio.ItemFlows[1].SteadyStateExternalSupply.Value, "external inputs share the selected basis");
Check(ratio.ItemFlows.Values.All(flow => flow.IntermediateShortage == 0),
"ratio-scaled complete chain has no internal missing material");
var ratioReverse = BasisRequest(803, 802, 801);
var reversed = new FactoryBlackBoxAnalyzer(ratioCatalog).Analyze(ratioReverse);
foreach (var flow in ratio.ItemFlows.Values)
{
Equal(flow.GrossProduction, reversed.ItemFlows[flow.ItemId].GrossProduction,
"bottleneck production is independent of selection order");
Equal(flow.GrossConsumption, reversed.ItemFlows[flow.ItemId].GrossConsumption,
"bottleneck consumption is independent of selection order");
}
var unevenCatalog = BasisCatalog(new[]
{
Recipe(804, new[] { (1, 1.0) }, new[] { (2, 0.5) }),
Recipe(805, new[] { (2, 1e8) }, new[] { (4, 1e8) })
});
var uneven = new FactoryBlackBoxAnalyzer(unevenCatalog).Analyze(BasisRequest(804, 805));
Check(!uneven.Diagnostics.Any(), "a small common fraction can still represent meaningful known throughput");
Equal(0.5, uneven.ItemFlows[4].NetFlow, "large capacity ratios do not become a false zero-throughput failure");
var sharedCatalog = BasisCatalog(new[]
{
Recipe(811, new[] { (1, 1.0) }, new[] { (2, 3.0) }),
Recipe(812, new[] { (2, 2.0) }, new[] { (3, 3.0) }),
Recipe(813, new[] { (2, 3.0) }, new[] { (4, 4.0) })
});
var shared = new FactoryBlackBoxAnalyzer(sharedCatalog).Analyze(BasisRequest(811, 812, 813));
Equal(1.8, shared.ItemFlows[3].NetFlow, "shared material scales the first final branch by 3/5");
Equal(2.4, shared.ItemFlows[4].NetFlow, "shared material scales the second final branch by 3/5");
Equal(3, shared.ItemFlows[2].GrossConsumption, "shared demand sums both branches");
Equal(1, shared.ItemFlows[1].RequiredExternalSupply, "shared branches use one common raw-input ledger");
Equal(1, shared.ItemFlows[1].SteadyStateExternalSupply.Value,
"steady-state supply matches the normalized shared-branch ledger");
foreach (var report in new[] { balanced, ratio, shared })
foreach (var flow in report.ItemFlows.Values.Where(flow => flow.ProducerGroups.Count > 0 &&
flow.ConsumerGroups.Count > 0))
Check(flow.NetFlow >= -1e-7 * Math.Max(1, Math.Max(flow.GrossProduction, flow.GrossConsumption)),
"normalized gross ledgers conserve internal material within relative tolerance");
var knownMaterialsRequest = BlueprintRequest(1);
knownMaterialsRequest.ProductionBasis = BlueprintProductionBasis.BottleneckIntermediate;
knownMaterialsRequest.Buildings.Add(new ProductionBuildingSnapshot(3, 30, 0, 1, ProliferationMode.None));
var unknownPower = analyzer.Analyze(knownMaterialsRequest);
Check(unknownPower.MaterialComplete && !unknownPower.PowerComplete && !unknownPower.Diagnostics.Any(
diagnostic => diagnostic.Code == ProductionDiagnosticCode.BlueprintBasisUnavailable),
"unknown logistics power does not discard independently known bottleneck materials");
Equal(0.5, unknownPower.ItemFlows[4].NetFlow, "known material throughput survives unknown power");
var powerOnlyRequest = new FactoryBlackBoxRequest
{ ProductionBasis = BlueprintProductionBasis.BottleneckIntermediate };
powerOnlyRequest.Buildings.Add(new ProductionBuildingSnapshot(1, 31, 0, 1, ProliferationMode.None));
powerOnlyRequest.Buildings.Add(new ProductionBuildingSnapshot(2, 30, 0, 1, ProliferationMode.None,
operatingParameters: new Dictionary<string, double> { ["ChargePowerWatts"] = 500 }));
var powerOnly = analyzer.Analyze(powerOnlyRequest);
Check(powerOnly.MaterialComplete && powerOnly.PowerComplete && !powerOnly.Diagnostics.Any(),
"known power-only blueprints have an empty material ledger that needs no basis reduction");
Check(powerOnly.ItemFlows.Count == 0, "power-only blueprints do not fabricate material rates");
var powerOnlyText = BlueprintDescriptionFormatter.Format(powerOnly, TestItemTag, labels);
Check(powerOnlyText.Description.Length == 0 && powerOnlyText.Power == "Factory power 900W | Logistics power 500W",
"power-only generation keeps its useful power field under the bottleneck option");
powerOnlyRequest.ProductionBasis = BlueprintProductionBasis.FinalProducts;
Equal(analyzer.Analyze(powerOnlyRequest).Power.ConsumptionWatts, powerOnly.Power.ConsumptionWatts,
"power-only layouts have the same selected capacity under either material basis");
var cycleCatalog = BasisCatalog(new[]
{
Recipe(821, new[] { (1, 1.0) }, new[] { (2, 0.5) }),
Recipe(822, new[] { (2, 2.0) }, new[] { (3, 1.0) }),
Recipe(823, new[] { (3, 1.0) }, new[] { (2, 1.0), (4, 1.0) })
});
var cycle = new FactoryBlackBoxAnalyzer(cycleCatalog).Analyze(BasisRequest(821, 822, 823));
Equal(0.5, cycle.ItemFlows[4].NetFlow, "returned intermediate participates in the bottleneck solve");
Equal(0, cycle.ItemFlows[2].NetFlow, "cyclic first material conserves at normalized throughput");
Equal(0, cycle.ItemFlows[3].NetFlow, "cyclic second material conserves at normalized throughput");
Check(cycle.ItemFlows.Values.All(flow => flow.IntermediateShortage == 0),
"a feasible cycle has no internal missing material");
var single = new FactoryBlackBoxAnalyzer(ratioCatalog).Analyze(BasisRequest(801));
Equal(0.5, single.ItemFlows[2].NetFlow, "no-intermediate selection keeps final capacity");
Equal(1, single.ItemFlows[1].SteadyStateExternalSupply.Value, "no-intermediate raw input remains known");
var subset = new FactoryBlackBoxAnalyzer(ratioCatalog).Analyze(BasisRequest(803));
Equal(10, subset.ItemFlows[4].NetFlow, "a blueprint subset treats absent upstream stages as external");
Equal(100, subset.ItemFlows[3].SteadyStateExternalSupply.Value,
"an absent producer remains a real external input");
var unknownRequest = BasisRequest(801, 803, 9999);
var unknown = new FactoryBlackBoxAnalyzer(ratioCatalog).Analyze(unknownRequest);
Check(!unknown.MaterialComplete && unknown.Diagnostics.Any(diagnostic =>
diagnostic.Code == ProductionDiagnosticCode.BlueprintBasisUnavailable),
"unknown production prevents claiming a complete bottleneck balance");
Equal(0.5, unknown.ItemFlows[2].IntermediateShortage,
"unavailable basis preserves the original known shortage");
var closed = new FactoryBlackBoxAnalyzer(BlueprintCatalog()).Analyze(BasisRequest(621, 622));
Check(closed.Diagnostics.Any(diagnostic => diagnostic.Code == ProductionDiagnosticCode.BlueprintBasisUnavailable),
"a pure closed loop has no final output from which to choose a common basis");
var infeasibleCatalog = BasisCatalog(new[]
{
Recipe(831, new[] { (2, 1.0) }, new[] { (3, 1.0), (4, 1.0) }),
Recipe(832, new[] { (3, 1.0) }, new[] { (2, 0.5) })
});
var infeasible = new FactoryBlackBoxAnalyzer(infeasibleCatalog).Analyze(BasisRequest(831, 832));
Check(infeasible.Diagnostics.Any(diagnostic =>
diagnostic.Code == ProductionDiagnosticCode.BlueprintBasisUnavailable),
"zero feasible final throughput cannot masquerade as a balanced zero-output description");
Equal(1, infeasible.ItemFlows[4].NetFlow, "infeasible basis keeps the original known final rate");
var sinkCatalog = BasisCatalog(new[]
{
Recipe(841, new[] { (1, 1.0) }, new[] { (2, 0.5) }),
Recipe(842, new[] { (2, 1.0) }, Array.Empty<(int, double)>())
});
var sink = new FactoryBlackBoxAnalyzer(sinkCatalog).Analyze(BasisRequest(841, 842));
Check(!sink.Diagnostics.Any(), "a consuming terminal process supplies a non-item final target");
Equal(0.5, sink.ItemFlows[2].GrossConsumption,
"a non-item terminal consumer follows the bottleneck instead of silently idling");
var researchCatalog = new ProductionCatalog(ratioCatalog.Items.Values, ratioCatalog.Recipes.Values,
ratioCatalog.Buildings.Values, new[] { 0.0 }, new[] { 0.0 }, new[] { 1.0 },
researchMatrixItemIds: new[] { 2 });
var researchRequest = BasisRequest(801, 803);
researchRequest.Buildings.Add(new ProductionBuildingSnapshot(9, 11, 0, 1, ProliferationMode.None,
operatingParameters: new Dictionary<string, double>
{ ["ResearchMode"] = 1, ["ResearchMatrixSink"] = 1 }));
var research = new FactoryBlackBoxAnalyzer(researchCatalog).Analyze(researchRequest);
Equal(5, research.ItemFlows[4].NetFlow, "known matrix consumption still constrains the final product");
Equal(0, research.ItemFlows[2].NetFlow, "matrix outlet does not fabricate extra matrix consumption");
Check(!research.ItemFlows[2].IsResearchProduct, "no positive matrix net means no research output");
var matrixOnlyRequest = BasisRequest(801);
matrixOnlyRequest.Buildings.Add(researchRequest.Buildings.Last());
var matrixOnly = new FactoryBlackBoxAnalyzer(researchCatalog).Analyze(matrixOnlyRequest);
Equal(0.5, matrixOnly.ItemFlows[2].NetFlow, "research outlet preserves produced matrices as a final target");
Check(matrixOnly.ItemFlows[2].IsResearchProduct, "positive matrix net remains a research product");
var researchConsumedRequest = BasisRequest(801, 803);
researchConsumedRequest.Buildings[0] = new ProductionBuildingSnapshot(1, 10, 801, 3,
ProliferationMode.None);
researchConsumedRequest.Buildings.Add(researchRequest.Buildings.Last());
var researchConsumed = new FactoryBlackBoxAnalyzer(researchCatalog).Analyze(researchConsumedRequest);
Equal(0.5, researchConsumed.ItemFlows[2].NetFlow,
"positive research matrix output subtracts real downstream matrix use");
Check(researchConsumed.ItemFlows[2].IsResearchProduct,
"matrix outlets preserve the positive net target alongside an ordinary final product");
}
private static ProductionCatalog BasisCatalog(IEnumerable<ProductionRecipe> recipes)
{
return new ProductionCatalog(Enumerable.Range(1, 4)
.Select(id => new ProductionItem(id, 0, id == 1, false, 0, 0)), recipes,
new[]
{
new ProductionBuilding(10, ProductionRecipeCategory.Assemble, 1, 1000, 100),
new ProductionBuilding(11, ProductionRecipeCategory.Research, 1, 2000, 200)
}, new[] { 0.0 }, new[] { 0.0 }, new[] { 1.0 });
}
private static FactoryBlackBoxRequest BasisRequest(params int[] recipes)
{
var request = new FactoryBlackBoxRequest { ProductionBasis = BlueprintProductionBasis.BottleneckIntermediate };
for (var index = 0; index < recipes.Length; index++)
request.Buildings.Add(new ProductionBuildingSnapshot(index + 1, 10, recipes[index], 1,
ProliferationMode.None));
return request;
}
private static void BlueprintDescriptionFormattingAndFields()
{
var labels = new BlueprintDescriptionLabels("工厂耗电", "物流耗电", "缺少:", "多余:", "未知",
@@ -2074,7 +2275,11 @@ internal static class Program
"gigawatt and megawatt display matches the native Chinese field example");
Check(large.Input == "" && large.Output == "" && large.Description == "",
"empty material categories add no description lines");
foreach (var (watts, expected) in new[] { (999.999, "1kW"), (999999.0, "1MW"), (999.994, "999.99W") })
foreach (var (watts, expected) in new[]
{
(999.999, "1kW"), (999999.0, "1MW"), (999.994, "999.99W"),
(1234567890000000.0, "1,234.57TW")
})
{
var boundary = new ProductionReport(ProductionStatus.Complete, true, true,
Array.Empty<ProductionItemFlow>(), Array.Empty<ProductionGroupFlow>(),
@@ -2157,6 +2362,44 @@ internal static class Program
rounded.Description == "输出:" + rounded.Output,
"no consumers means no power field and an output-only report has one line");
foreach (var (rate, expected) in new[]
{
(1000.0, "1K"), (1200.0, "1.2K"), (1200.0000000001, "1.2K"),
(1000000.0, "1M"), (1200000.0, "1.2M"),
(1000000000.0, "1G"), (1200000000.0, "1.2G"),
(1234000.0, "1,234K"), (1234500.0, "1,234.5K"), (1230000000.0, "1,230M"),
(12345.0, "12,345"), (1200.01, "1,200.01"),
(999.99, "999.99"), (1000.01, "1,000.01"),
(999999.0, "999,999"), (999999.99, "999,999.99"),
(1234567890123.0, "1,234,567,890,123"), (1234000000000.0, "1,234G"),
(0.125, "0.125"), (0.00001, "0.00001"), (0.0000001, "1E-7")
})
{
var materialReport = new ProductionReport(ProductionStatus.Complete, true, true,
new[]
{
new ProductionItemFlow(61, 0, rate, 0, 0, 0, 0, rate,
false, Array.Empty<int>(), Array.Empty<int>(), intermediateShortage: rate),
new ProductionItemFlow(62, rate, 0, 0, 0, 0, rate, 0,
false, Array.Empty<int>(), Array.Empty<int>(), overbuildSurplus: rate),
new ProductionItemFlow(63, 0, rate, 0, 0, 0, 0, rate,
false, Array.Empty<int>(), Array.Empty<int>()),
new ProductionItemFlow(64, rate, 0, 0, 0, 0, rate, 0,
true, Array.Empty<int>(), Array.Empty<int>()),
new ProductionItemFlow(65, rate, 0, 0, 0, 0, rate, 0,
true, Array.Empty<int>(), Array.Empty<int>(), isResearchProduct: true)
}, Array.Empty<ProductionGroupFlow>(), Array.Empty<ProductionDiagnostic>(),
new ProductionPower(0, 0, 0, 0, 0, 0, ProductionPowerScope.SelectedFacilities),
new ProductionPowerBreakdown(0, 0, true, true));
var materialText = BlueprintDescriptionFormatter.Format(materialReport, TestItemTag, labels);
Check(materialText.Warnings == "缺少:" + TestItemTag(61) + " x" + expected +
"\n多余:" + TestItemTag(62) + " x" + expected &&
materialText.Input == TestItemTag(63) + " x" + expected &&
materialText.Output == TestItemTag(64) + " x" + expected &&
materialText.Research == TestItemTag(65) + " x" + expected,
$"all material categories abbreviate {rate} without additional display rounding");
}
var inputOnlyReport = new ProductionReport(ProductionStatus.Complete, true, true,
new[] { new ProductionItemFlow(51, 0, 3, 0, 0, 0, 0, 3,
false, Array.Empty<int>(), Array.Empty<int>()) },
+9
View File
@@ -381,6 +381,15 @@ internal static class QuickMinerPlacementTests
Check(snapshot.schema is 1 or 2 or 3 or 4, "Unsupported debug snapshot schema.");
Check(snapshot.nodes != null && snapshot.candidates != null && snapshot.buildColliders != null && snapshot.minerColliders != null && snapshot.phases != null,
"This snapshot contains summary data only and cannot be replayed. Run quick miner placement again with the updated build.");
if (snapshot.algorithm?.EndsWith("-target-group", StringComparison.Ordinal) == true)
{
var targetIds = snapshot.nodes.Where(node => node.target).Select(node => node.id).ToHashSet();
Check(snapshot.candidates.All(candidate => candidate.covered.All(index => snapshot.nodes[index].target)),
"Candidate coverage must exclude neighboring vein groups, including those of the same type.");
Check((snapshot.placements ?? []).All(placement =>
(placement.plannedVeins ?? []).Concat(placement.finalVeins ?? []).All(targetIds.Contains)),
"Planned and final miner parameters must contain only nodes from the selected vein group.");
}
Console.WriteLine($"Snapshot: outcome={snapshot.outcome}, nodes={snapshot.nodes.Length}, candidates={snapshot.candidates.Length}, placed={snapshot.placedCount}, actual coverage={snapshot.totalCoverage}");
foreach (var failure in (snapshot.placements ?? []).Where(p => p.outcome != "placed").GroupBy(p => (p.outcome, p.nativeCondition)))
Console.WriteLine($"Placement {failure.Key.outcome}: native={failure.Key.nativeCondition}, count={failure.Count()}");