mirror of
https://github.com/soarqin/DSP_Mods.git
synced 2026-11-19 17:05:20 +08:00
feat(uxassist): make quick miner restoration and burial optional
This commit is contained in:
1 parent
bc8a0b0189
commit
bffab3c7ca
9 files changed
+136
-54
No files matched your search
@@ -4,7 +4,7 @@
|
||||
## Changlog
|
||||
|
||||
* 1.6.3 - Unreleased
|
||||
* `Quick build Mining Machines`: Add a Factory-tab button that restores available buried nodes at the nearest solid vein group and searches dense layouts using native collision shapes, including interleaving feet, joint placement of nearby miners, and a final pass to fill remaining compatible positions. Optimizes summed vein coverage, requires at least 3 covered nodes per miner after burial, may bury unused nodes, 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.
|
||||
* `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.
|
||||
* 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.
|
||||
@@ -437,7 +437,7 @@
|
||||
## 更新日志
|
||||
|
||||
* 1.6.3 - Unreleased
|
||||
* `快速铺设采矿机`:在「工厂」页增加按钮,还原最近固体矿脉中可还原的掩埋矿点,并按游戏实际碰撞体搜索密集布局,支持脚部交错、邻近矿机联动调整及结束前补入剩余可用位置。以各台矿机覆盖矿点数之和为目标,要求每台在掩埋后仍覆盖至少 3 个矿点,允许掩埋未被使用的矿点,不受库存限制地生成完整布局,缺少采矿机的位置保留待建造虚影。使用最多 4 个后台线程加速布局搜索,线程数不超过可用逻辑线程数的一半。功能调试期间输出可离线重放的 JSON 数据,完成提示保留约 8 秒。
|
||||
* `快速铺设采矿机`:在「工厂」页增加按钮,按游戏实际碰撞体在最近的固体矿脉搜索密集布局,支持脚部交错、邻近矿机联动调整及结束前补入剩余可用位置。「允许恢复/掩埋矿物」默认关闭:仅使用可见矿点,跳过所有恢复和掩埋计算;开启后,恢复可恢复的掩埋矿点,并允许掩埋未被使用的矿点来提高覆盖数。以各台矿机覆盖矿点数之和为目标,要求每台在掩埋后仍覆盖至少 3 个矿点,不受库存限制地生成完整布局,缺少采矿机的位置保留待建造虚影。使用最多 4 个后台线程加速布局搜索,线程数不超过可用逻辑线程数的一半。功能调试期间输出可离线重放的 JSON 数据,完成提示保留约 8 秒。
|
||||
* 1.6.2
|
||||
* `提升物流塔和大型采矿机的最大功耗`:修复启用后调整大型采矿机开采速度时出现 0% 或异常速度的问题。
|
||||
* `调整建筑输入缓冲`:修复 DSP 0.10.35.29104 及后续版本中射线接收器透镜缓冲设置不生效的问题,并将显示的游戏原始值更正为 2。
|
||||
|
||||
@@ -174,6 +174,7 @@ public static class I18NKeys
|
||||
public const string QuickBuildOrbitalCollectors = "Quick build Orbital Collectors";
|
||||
public const string QuickBuildMiningMachines = "Quick build Mining Machines";
|
||||
public const string QuickBuildMiningMachinesTips = "Quick build Mining Machines tips";
|
||||
public const string QuickMinerAllowVeinReform = "Allow restoring/burying veins";
|
||||
public const string QuickMinerCancelSearch = "Cancel miner layout search";
|
||||
public const string QuickMinerSearching = "Searching for a dense miner layout";
|
||||
public const string QuickMinerCancelled = "Miner layout search cancelled";
|
||||
@@ -449,7 +450,8 @@ You can set 2 shortcut keys in Settings panel:
|
||||
I18N.Add(DismantleAllBuildingsConfirm, "This operation will dismantle all buildings on this planet, are you sure?", "此操作将会拆除本行星上的所有建筑,确定吗?");
|
||||
I18N.Add(QuickBuildOrbitalCollectors, "Quick build Orbital Collectors", "快速建造轨道采集器");
|
||||
I18N.Add(QuickBuildMiningMachines, "Quick build Mining Machines", "快速铺设采矿机");
|
||||
I18N.Add(QuickBuildMiningMachinesTips, "Places ordinary Mining Machine prebuilds at the nearest solid vein group. Restores buried nodes when no building obstructs them and no Dark Fog Planetary Base is nearby. Searches native collision shapes and maximizes the sum of each miner's vein count, counting shared nodes repeatedly. Every placed miner must retain at least 3 covered nodes after all planned burials. May bury unused nodes to improve the total. Places the full layout regardless of carried stock; missing miners remain as ghosts awaiting materials. Respects ground and construction range; does not lay belts or power poles. Click again to cancel the search.", "在最近的固体矿脉生成普通采矿机待建造对象。先还原未被建筑阻挡且不在黑雾行星基地附近的掩埋矿点,按游戏实际碰撞体搜索布局,以各台矿机覆盖矿点数之和为目标,同一矿点被多台矿机覆盖时重复计数。所有计划掩埋完成后,每台矿机仍须覆盖至少 3 个矿点。允许掩埋未被现有矿机使用的矿点,以提高总覆盖数。布局数量不受库存限制,采矿机不足的位置保留待建造虚影,等待补充材料。遵守地面和建造范围要求,不铺设传送带和电力设施。计算期间再次点击可取消。");
|
||||
I18N.Add(QuickBuildMiningMachinesTips, "Places ordinary Mining Machine prebuilds at the nearest solid vein group. Allow restoring/burying veins is off by default: only visible nodes are used, and all restoration and burial calculations are skipped. Enable it to restore buried nodes when no building obstructs them and no Dark Fog Planetary Base is nearby, and to allow burying unused nodes to improve total coverage. Searches native collision shapes and maximizes the sum of each miner's vein count, counting shared nodes repeatedly. Every placed miner must retain at least 3 covered nodes after any planned burials. Places the full layout regardless of carried stock; missing miners remain as ghosts awaiting materials. Respects ground and construction range; does not lay belts or power poles. Option changes apply to the next calculation. Click again to cancel the search.", "在最近的固体矿脉生成普通采矿机待建造对象。「允许恢复/掩埋矿物」默认关闭:仅使用可见矿点,跳过所有恢复和掩埋计算。开启后,先恢复未被建筑阻挡且不在黑雾行星基地附近的掩埋矿点,并允许掩埋未被现有矿机使用的矿点来提高总覆盖数。按游戏实际碰撞体搜索布局,以各台矿机覆盖矿点数之和为目标,同一矿点被多台矿机覆盖时重复计数。所有计划掩埋完成后,每台矿机仍须覆盖至少 3 个矿点。布局数量不受库存限制,采矿机不足的位置保留待建造虚影,等待补充材料。遵守地面和建造范围要求,不铺设传送带和电力设施。选项变更从下次计算生效。计算期间再次点击可取消。");
|
||||
I18N.Add(QuickMinerAllowVeinReform, "Allow restoring/burying veins", "允许恢复/掩埋矿物");
|
||||
I18N.Add(QuickMinerCancelSearch, "Cancel miner layout search", "取消采矿机布局计算");
|
||||
I18N.Add(QuickMinerSearching, "Searching for a dense miner layout... Click the button again to cancel.", "正在计算密集采矿机布局,再次点击按钮可取消。");
|
||||
I18N.Add(QuickMinerCancelled, "Miner layout search cancelled", "已取消采矿机布局计算");
|
||||
|
||||
@@ -14,14 +14,14 @@ internal static class MinerPlacementDebug
|
||||
[Serializable]
|
||||
internal sealed class Snapshot
|
||||
{
|
||||
public int schema = 3;
|
||||
public int schema = 4;
|
||||
public string algorithm = "parallel-repack-v5-pose-exploration-min3-unlimited-stock";
|
||||
public int minimumCoverage = MinerPlacementSolver.MinimumCoverage;
|
||||
public string version, gameVersion, startedUtc, outcome, error;
|
||||
public int planetId, veinType, veinGroup, initialStock, placedCount, totalCoverage, buriedCount;
|
||||
public int logicalProcessors, workerCount;
|
||||
public float planetRadius, buildRange;
|
||||
public bool unlimitedRange;
|
||||
public bool unlimitedRange, allowVeinReform;
|
||||
public long elapsedMilliseconds;
|
||||
public float[] playerPosition, center, right, forward;
|
||||
public Node[] nodes;
|
||||
|
||||
@@ -27,14 +27,17 @@ internal sealed class MinerPlacementSolver
|
||||
|
||||
private readonly List<Candidate> _candidates;
|
||||
private readonly int _nodeCount;
|
||||
private readonly bool _allowVeinReform;
|
||||
private int _bestBuriedCount;
|
||||
public List<Candidate> Best { get; private set; } = [];
|
||||
public int BestScore { get; private set; }
|
||||
|
||||
public MinerPlacementSolver(List<Candidate> candidates, int nodeCount)
|
||||
// With reform disabled, the caller supplies only burial-free candidates.
|
||||
public MinerPlacementSolver(List<Candidate> candidates, int nodeCount, bool allowVeinReform = true)
|
||||
{
|
||||
_candidates = candidates;
|
||||
_nodeCount = nodeCount;
|
||||
_allowVeinReform = allowVeinReform;
|
||||
}
|
||||
|
||||
public IEnumerator Search(int passes) => Search(passes, 0, CancellationToken.None);
|
||||
@@ -109,7 +112,7 @@ internal sealed class MinerPlacementSolver
|
||||
private IEnumerator GreedyPass(int pass, uint[] keys, SeedCollisions seeds, int removed, SearchResult[] results, int resultIndex,
|
||||
CancellationToken cancellationToken)
|
||||
{
|
||||
var layout = new Layout(_nodeCount);
|
||||
var layout = new Layout(_nodeCount, _allowVeinReform);
|
||||
// Selected miners already proven compatible with each candidate, or -1 once it cannot
|
||||
// join. Layouts and burials only grow during a pass, so every exclusion is permanent.
|
||||
var verified = new int[_candidates.Count];
|
||||
@@ -121,7 +124,7 @@ internal sealed class MinerPlacementSolver
|
||||
verified[i] = (removed >= 0 && ReferenceEquals(_candidates[i], seeds.Seeds[removed])) || !seeds.AllowsWithout(i, removed)
|
||||
? -1 : layout.Selected.Count;
|
||||
}
|
||||
else if (pass == 0)
|
||||
else if (_allowVeinReform && pass == 0)
|
||||
{
|
||||
for (var i = 0; i < verified.Length; i++)
|
||||
if (_candidates[i].Buried.Length != 0) verified[i] = -1;
|
||||
@@ -159,7 +162,8 @@ internal sealed class MinerPlacementSolver
|
||||
hash ^= hash >> 16;
|
||||
jitter = 0.65f + (hash & 65535) / 65535f * 0.7f;
|
||||
}
|
||||
var value = gain * jitter - candidate.Buried.Length * 0.0001f;
|
||||
var value = gain * jitter;
|
||||
if (_allowVeinReform) value -= candidate.Buried.Length * 0.0001f;
|
||||
if (value <= priority) continue;
|
||||
if (!layout.FitsFrom(candidate, verified[i]) || !layout.PreservesCoverage(candidate))
|
||||
{
|
||||
@@ -319,7 +323,7 @@ internal sealed class MinerPlacementSolver
|
||||
|
||||
private IEnumerator RepackRegion(SeedCollisions seeds, (int, int, int) region, SearchResult result, CancellationToken cancellationToken)
|
||||
{
|
||||
var layout = new Layout(_nodeCount);
|
||||
var layout = new Layout(_nodeCount, _allowVeinReform);
|
||||
var removed = new List<Candidate>();
|
||||
var centerX = 0f;
|
||||
var centerZ = 0f;
|
||||
@@ -423,15 +427,17 @@ internal sealed class MinerPlacementSolver
|
||||
|
||||
// A partial layout. Score counts each visible node once per covering miner; RawScore
|
||||
// ignores burials and is therefore an upper bound for pruning.
|
||||
private sealed class Layout(int nodeCount)
|
||||
private sealed class Layout(int nodeCount, bool allowVeinReform)
|
||||
{
|
||||
public readonly List<Candidate> Selected = [];
|
||||
private readonly int[] _buried = new int[nodeCount], _uses = new int[nodeCount];
|
||||
private readonly int[] _buried = allowVeinReform ? new int[nodeCount] : null,
|
||||
_uses = allowVeinReform ? new int[nodeCount] : null;
|
||||
public int Score, RawScore, BuriedCount;
|
||||
|
||||
public int Gain(Candidate candidate, out int coverage)
|
||||
{
|
||||
coverage = Coverage(candidate);
|
||||
if (_buried == null) return coverage;
|
||||
var gain = coverage;
|
||||
foreach (var index in candidate.Buried) if (_buried[index] == 0) gain -= _uses[index];
|
||||
return gain;
|
||||
@@ -439,6 +445,7 @@ internal sealed class MinerPlacementSolver
|
||||
|
||||
private int Coverage(Candidate candidate)
|
||||
{
|
||||
if (_buried == null) return candidate.Covered.Length;
|
||||
var coverage = 0;
|
||||
foreach (var index in candidate.Covered) if (_buried[index] == 0) coverage++;
|
||||
return coverage;
|
||||
@@ -457,6 +464,7 @@ internal sealed class MinerPlacementSolver
|
||||
// Every selected miner already keeps the minimum, so only newly buried used nodes matter.
|
||||
public bool PreservesCoverage(Candidate candidate)
|
||||
{
|
||||
if (_buried == null) return true;
|
||||
var affected = false;
|
||||
foreach (var index in candidate.Buried)
|
||||
if (_buried[index] == 0 && _uses[index] > 0) { affected = true; break; }
|
||||
@@ -474,6 +482,12 @@ internal sealed class MinerPlacementSolver
|
||||
public void Add(Candidate candidate)
|
||||
{
|
||||
RawScore += candidate.Covered.Length;
|
||||
if (_buried == null)
|
||||
{
|
||||
Score = RawScore;
|
||||
Selected.Add(candidate);
|
||||
return;
|
||||
}
|
||||
foreach (var index in candidate.Buried)
|
||||
if (_buried[index]++ == 0) { Score -= _uses[index]; BuriedCount++; }
|
||||
foreach (var index in candidate.Covered)
|
||||
@@ -489,6 +503,11 @@ internal sealed class MinerPlacementSolver
|
||||
var candidate = Selected[Selected.Count - 1];
|
||||
Selected.RemoveAt(Selected.Count - 1);
|
||||
RawScore -= candidate.Covered.Length;
|
||||
if (_buried == null)
|
||||
{
|
||||
Score = RawScore;
|
||||
return;
|
||||
}
|
||||
foreach (var index in candidate.Covered)
|
||||
{
|
||||
if (_buried[index] == 0) Score--;
|
||||
|
||||
@@ -7,6 +7,7 @@ using System.Linq;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using BepInEx;
|
||||
using BepInEx.Configuration;
|
||||
using UnityEngine;
|
||||
using UXAssist.Common;
|
||||
using UXAssist.Common.GameConstants;
|
||||
@@ -21,6 +22,8 @@ namespace UXAssist.Functions.Factory;
|
||||
[ModFeature("QuickMinerBuild")]
|
||||
public static class QuickMinerBuild
|
||||
{
|
||||
public static ConfigEntry<bool> AllowVeinReform;
|
||||
|
||||
private static Job _job;
|
||||
private static readonly Stopwatch FrameTimer = new();
|
||||
private static UIRealtimeTip _resultTip;
|
||||
@@ -55,7 +58,7 @@ public static class QuickMinerBuild
|
||||
}
|
||||
try
|
||||
{
|
||||
_job = new Job(player, planet);
|
||||
_job = new Job(player, planet, AllowVeinReform.Value);
|
||||
UIRealtimeTip.Popup(I18NKeys.QuickMinerSearching.Translate());
|
||||
}
|
||||
catch (Exception exception)
|
||||
@@ -177,12 +180,13 @@ public static class QuickMinerBuild
|
||||
private readonly List<ColliderData> _obstacles = [], _nearObstacles = [];
|
||||
private readonly List<Vector3> _ejectors = [];
|
||||
private readonly List<Candidate> _candidates = [];
|
||||
private readonly List<int> _covered = [], _buried = [], _reachable = [], _touching = [];
|
||||
private readonly List<int> _covered = [], _reachable = [], _touching = [];
|
||||
private readonly List<int> _buried;
|
||||
private readonly Box[] _buildBoxes, _obstacleBoxes;
|
||||
private readonly ColliderData[] _nativeObstacles;
|
||||
private readonly ColliderData _body;
|
||||
private readonly float _footprintRadius, _halfDiagonal;
|
||||
private readonly bool _capsule;
|
||||
private readonly bool _capsule, _allowVeinReform;
|
||||
private readonly MinerPlacementDebug.Snapshot _debug = new();
|
||||
private readonly List<MinerPlacementDebug.Phase> _phases = [];
|
||||
private readonly List<MinerPlacementDebug.Placement> _placements = [];
|
||||
@@ -202,10 +206,12 @@ public static class QuickMinerBuild
|
||||
GameMain.localPlanet == _planet && _planet.factory == _factory && _planet.physics == _physics && _planet.factoryLoaded;
|
||||
public bool WaitingForWorkers => _search != null && !_search.IsCompleted;
|
||||
|
||||
public Job(Player player, PlanetData planet)
|
||||
public Job(Player player, PlanetData planet, bool allowVeinReform)
|
||||
{
|
||||
_player = player;
|
||||
_planet = planet;
|
||||
_allowVeinReform = allowVeinReform;
|
||||
_buried = allowVeinReform ? [] : null;
|
||||
_factory = planet.factory;
|
||||
_physics = planet.physics;
|
||||
_item = LDB.items.Select(ItemIds.MiningMachine);
|
||||
@@ -237,6 +243,7 @@ public static class QuickMinerBuild
|
||||
_debug.playerPosition = MinerPlacementDebug.Vector(player.position);
|
||||
_debug.buildRange = player.mecha.buildArea;
|
||||
_debug.unlimitedRange = FactoryPatch.RemoveBuildRangeLimitEnabled.Value;
|
||||
_debug.allowVeinReform = allowVeinReform;
|
||||
_debug.buildColliders = desc.buildColliders.Select(MinerPlacementDebug.Collider.Capture).ToArray();
|
||||
_debug.minerColliders = _nativeObstacles.Select(MinerPlacementDebug.Collider.Capture).ToArray();
|
||||
_debug.outcome = "cancelled";
|
||||
@@ -276,7 +283,7 @@ public static class QuickMinerBuild
|
||||
_result = I18NKeys.QuickMinerNoVeins.Translate();
|
||||
yield break;
|
||||
}
|
||||
RestoreTargetVeins();
|
||||
if (_allowVeinReform) RestoreTargetVeins();
|
||||
var reach = 9.5f * _planet.realRadius / 200f;
|
||||
var width = _maxX - _minX + reach * 2;
|
||||
var depth = _maxZ - _minZ + reach * 2;
|
||||
@@ -291,7 +298,7 @@ public static class QuickMinerBuild
|
||||
yield return null;
|
||||
}
|
||||
}
|
||||
var solver = new MinerPlacementSolver(_candidates, _nodes.Count);
|
||||
var solver = new MinerPlacementSolver(_candidates, _nodes.Count, _allowVeinReform);
|
||||
var work = Search(solver, "coarse", 10);
|
||||
while (work.MoveNext()) yield return null;
|
||||
work = Expand(solver.Best, 0.35f, 3f);
|
||||
@@ -371,6 +378,7 @@ public static class QuickMinerBuild
|
||||
{
|
||||
ref var vein = ref _factory.veinPool[i];
|
||||
if (vein.id != i || vein.amount <= 0 || vein.type is EVeinType.None or EVeinType.Oil) continue;
|
||||
if (!_allowVeinReform && vein.pos.magnitude < _planet.realRadius - 40f) continue;
|
||||
var distance = (vein.pos.normalized * _planet.realRadius - _player.position).sqrMagnitude;
|
||||
if (distance >= nearest) continue;
|
||||
nearest = distance;
|
||||
@@ -420,7 +428,7 @@ public static class QuickMinerBuild
|
||||
}
|
||||
}
|
||||
FindEjectors(radius);
|
||||
var reserved = ReservedNodes();
|
||||
var reserved = _allowVeinReform ? ReservedNodes() : null;
|
||||
for (var i = 1; i < _factory.veinCursor; i++)
|
||||
{
|
||||
ref var vein = ref _factory.veinPool[i];
|
||||
@@ -432,7 +440,7 @@ public static class QuickMinerBuild
|
||||
Id = i, Target = vein.groupIndex == group, Type = vein.type,
|
||||
Position = vein.pos, OriginalPosition = vein.pos, Collider = _physics.GetColliderData(vein.colliderId),
|
||||
Visible = vein.pos.magnitude >= _planet.realRadius - 40f,
|
||||
CanBury = vein.groupIndex == group && vein.minerCount == 0 && !reserved.Contains(i)
|
||||
CanBury = _allowVeinReform && vein.groupIndex == group && vein.minerCount == 0 && !reserved.Contains(i)
|
||||
});
|
||||
}
|
||||
var existing = new List<MinerPlacementDebug.ExistingMiner>();
|
||||
@@ -605,7 +613,7 @@ public static class QuickMinerBuild
|
||||
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();
|
||||
_buried?.Clear();
|
||||
foreach (var i in _touching)
|
||||
{
|
||||
var node = _nodes[i];
|
||||
@@ -613,8 +621,11 @@ public static class QuickMinerBuild
|
||||
if (!node.CanBury) { _debug.rejections.veinCollision++; return; }
|
||||
_buried.Add(i);
|
||||
}
|
||||
foreach (var index in _buried) _covered.Remove(index);
|
||||
if (_covered.Count < MinerPlacementSolver.MinimumCoverage) { _debug.rejections.noCoverage++; return; }
|
||||
if (_allowVeinReform)
|
||||
{
|
||||
foreach (var index in _buried) _covered.Remove(index);
|
||||
if (_covered.Count < MinerPlacementSolver.MinimumCoverage) { _debug.rejections.noCoverage++; return; }
|
||||
}
|
||||
foreach (var obstacle in _nearObstacles)
|
||||
if (Hits(obstacle)) { _debug.rejections.buildingCollision++; return; }
|
||||
if (!HasGround(pos, rotation)) { _debug.rejections.ground++; return; }
|
||||
@@ -623,7 +634,7 @@ public static class QuickMinerBuild
|
||||
_candidates.Add(new Candidate
|
||||
{
|
||||
X = x, Z = z, Yaw = yaw, Position = pos, Rotation = rotation, Radius = _footprintRadius,
|
||||
Covered = _covered.ToArray(), Buried = _buried.ToArray(),
|
||||
Covered = _covered.ToArray(), Buried = _buried?.ToArray() ?? [],
|
||||
BuildBoxes = (Box[])_buildBoxes.Clone(), ObstacleBoxes = (Box[])_obstacleBoxes.Clone()
|
||||
});
|
||||
}
|
||||
@@ -715,8 +726,9 @@ public static class QuickMinerBuild
|
||||
return;
|
||||
}
|
||||
var placed = new List<(Candidate Candidate, int Prebuild, MinerPlacementDebug.Placement Debug)>();
|
||||
var plannedBurial = layout.SelectMany(candidate => candidate.Buried).Select(index => _nodes[index].Id).ToHashSet();
|
||||
var hidden = new Dictionary<int, Vector3>();
|
||||
var plannedBurial = _allowVeinReform
|
||||
? layout.SelectMany(candidate => candidate.Buried).Select(index => _nodes[index].Id).ToHashSet() : null;
|
||||
var hidden = _allowVeinReform ? new Dictionary<int, Vector3>() : null;
|
||||
var coverage = 0;
|
||||
var buriedCount = 0;
|
||||
var validator = new BuildTool_Click();
|
||||
@@ -738,13 +750,16 @@ public static class QuickMinerBuild
|
||||
};
|
||||
_placements.Add(debug);
|
||||
// No yield between burial, native validation, item consumption, and creation.
|
||||
foreach (var index in candidate.Buried)
|
||||
if (_allowVeinReform)
|
||||
{
|
||||
var node = _nodes[index];
|
||||
ref var vein = ref _factory.veinPool[node.Id];
|
||||
if (vein.id != node.Id || hidden.ContainsKey(node.Id)) continue;
|
||||
hidden.Add(node.Id, vein.pos);
|
||||
SetVeinPosition(node.Id, vein.pos.normalized * (_planet.realRadius - 50f));
|
||||
foreach (var index in candidate.Buried)
|
||||
{
|
||||
var node = _nodes[index];
|
||||
ref var vein = ref _factory.veinPool[node.Id];
|
||||
if (vein.id != node.Id || hidden.ContainsKey(node.Id)) continue;
|
||||
hidden.Add(node.Id, vein.pos);
|
||||
SetVeinPosition(node.Id, vein.pos.normalized * (_planet.realRadius - 50f));
|
||||
}
|
||||
}
|
||||
// Validation needs current Unity colliders; GPU buffers are synced once at the end.
|
||||
_physics.RefreshColliders();
|
||||
@@ -775,11 +790,15 @@ public static class QuickMinerBuild
|
||||
{
|
||||
validator._Free();
|
||||
// A failed/shortened layout must not leave nodes buried for unplaced miners.
|
||||
var needed = new HashSet<int>();
|
||||
foreach (var entry in placed)
|
||||
foreach (var index in entry.Candidate.Buried) needed.Add(_nodes[index].Id);
|
||||
foreach (var entry in hidden)
|
||||
if (!needed.Contains(entry.Key)) SetVeinPosition(entry.Key, entry.Value);
|
||||
if (_allowVeinReform)
|
||||
{
|
||||
var needed = new HashSet<int>();
|
||||
foreach (var entry in placed)
|
||||
foreach (var index in entry.Candidate.Buried) needed.Add(_nodes[index].Id);
|
||||
foreach (var entry in hidden)
|
||||
if (!needed.Contains(entry.Key)) SetVeinPosition(entry.Key, entry.Value);
|
||||
buriedCount = needed.Count;
|
||||
}
|
||||
foreach (var entry in placed)
|
||||
{
|
||||
var ids = new List<int>();
|
||||
@@ -796,8 +815,7 @@ public static class QuickMinerBuild
|
||||
entry.Debug.finalVeins = ids.ToArray();
|
||||
coverage += ids.Count;
|
||||
}
|
||||
buriedCount = needed.Count;
|
||||
RefreshVeins(buriedCount > 0 ? 1 : 0);
|
||||
if (_allowVeinReform) RefreshVeins(buriedCount > 0 ? 1 : 0);
|
||||
}
|
||||
_debug.placedCount = placed.Count;
|
||||
_debug.totalCoverage = coverage;
|
||||
@@ -816,6 +834,7 @@ public static class QuickMinerBuild
|
||||
if (vein.id != node.Id || vein.type != node.Type || vein.amount <= 0 || vein.colliderId <= 0 ||
|
||||
(vein.pos - node.Position).sqrMagnitude > 0.0001f) return false;
|
||||
}
|
||||
if (!_allowVeinReform) return true;
|
||||
var reserved = ReservedNodes();
|
||||
foreach (var candidate in layout)
|
||||
foreach (var index in candidate.Buried)
|
||||
@@ -870,7 +889,8 @@ public static class QuickMinerBuild
|
||||
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 = debug.nativeVeins.Where(id => !plannedBurial.Contains(id)).ToArray();
|
||||
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; }
|
||||
for (var i = 0; i < preview.paramCount; i++)
|
||||
|
||||
+6
-6
@@ -83,12 +83,12 @@
|
||||
* 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.
|
||||
* Restores buried nodes unless obstructed by buildings or near Dark Fog Planetary Bases, then searches individual native collision shapes so the miner's feet can interleave where the game permits.
|
||||
* `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.
|
||||
* 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.
|
||||
* 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 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.
|
||||
* 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.
|
||||
* 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.
|
||||
@@ -283,12 +283,12 @@
|
||||
* 可设置单次建造数量上限;设为 0 时尽可能多地建造
|
||||
* 快速铺设采矿机
|
||||
* 点击「工厂」页中轨道采集器按钮附近的按钮,在最近的固体矿脉生成完整的普通采矿机布局,数量不受库存限制。有采矿机时正常消耗背包和手持物品,不足的位置保留待建造虚影,等待补充材料。所有计划掩埋完成后,每台矿机仍须覆盖至少 3 个矿点;少于 3 个的视为无效,不予铺设。
|
||||
* 先还原未被建筑阻挡且不在黑雾行星基地附近的掩埋矿点,再按原版独立碰撞体搜索布局,保留游戏允许的矿机脚部交叉空间。
|
||||
* 「允许恢复/掩埋矿物」默认关闭。关闭时仅使用可见矿点,跳过所有恢复和掩埋计算;开启后,先恢复未被建筑阻挡且不在黑雾行星基地附近的掩埋矿点。选项变更从下次计算生效。按原版独立碰撞体搜索布局,保留游戏允许的矿机脚部交叉空间。
|
||||
* 比较多种铺设顺序,同时按候选序号及位置朝向探索不同布局,细调位置和朝向,按机身宽度补充紧邻候选,并允许邻近的两三台矿机一起重新布局,尽量提高各台矿机覆盖矿点数之和。结束前再扫描全部候选,继续补入能提高总覆盖数、且不破坏每台至少覆盖 3 点要求的矿机。同一矿点被多台矿机覆盖时重复计数。计算有界,不保证全局最优。
|
||||
* 复用碰撞检查结果,使用最多 4 个后台线程并行搜索独立布局,线程数不超过可用逻辑线程数的一半。单逻辑线程系统继续在主线程按每帧预算计算。原生地形检查和实际铺设保留在主线程;并行调度与顺序搜索生成相同布局。
|
||||
* 允许掩埋未被使用的矿点来提高总覆盖数;保护已有矿机及待建造矿机使用的矿点。仍需满足地面、水面、现有建筑、建造范围及游戏的其他放置间距要求。
|
||||
* 开启「允许恢复/掩埋矿物」后,允许掩埋未被使用的矿点来提高总覆盖数;保护已有矿机及待建造矿机使用的矿点。仍需满足地面、水面、现有建筑、建造范围及游戏的其他放置间距要求。
|
||||
* 计算期间再次点击可取消,切换行星或退出游戏自动取消。待建造对象由建设机器人完成,不自动铺设传送带和电力设施。
|
||||
* 功能调试期间,每次计算都会在当前游戏配置目录的 `BepInEx/debug/UXAssist/QuickMiner/` 下写入带时间戳的 JSON 文件,记录矿点、原生碰撞体、有效候选、搜索阶段及其搜索耗时、逻辑线程数和工作线程数、现有矿机和原生铺设校验结果。完成提示保留约 8 秒,日志也会记录结果摘要和文件的完整路径。在仓库根目录运行 `powershell -File tools/tests/Test-QuickMinerPlacement.ps1 -Snapshot <file.json>`,即可离线重放并比较顺序与并行搜索结果,无需读取存档。总覆盖数低于记录结果时,重放检查会失败;可追加 `-MinimumTotalCoverage <数量>`,要求达到更高的总覆盖数。
|
||||
* 功能调试期间,每次计算都会在当前游戏配置目录的 `BepInEx/debug/UXAssist/QuickMiner/` 下写入带时间戳的 JSON 文件,记录恢复/掩埋选项、矿点、原生碰撞体、有效候选、搜索阶段及其搜索耗时、逻辑线程数和工作线程数、现有矿机和原生铺设校验结果。完成提示保留约 8 秒,日志也会记录结果摘要和文件的完整路径。在仓库根目录运行 `powershell -File tools/tests/Test-QuickMinerPlacement.ps1 -Snapshot <file.json>`,即可离线重放并比较顺序与并行搜索结果,无需读取存档。总覆盖数低于记录结果时,重放检查会失败;可追加 `-MinimumTotalCoverage <数量>`,要求达到更高的总覆盖数。
|
||||
* 用于自动购买黑雾物品的传送带信号
|
||||
* 在信号面板上添加了6个传送带信号,可以用于自动购买黑雾道具。
|
||||
* 生成的物品堆叠数为4。
|
||||
|
||||
@@ -373,6 +373,8 @@ public static class UIConfigWindow
|
||||
var quickMinerLocalizer = _quickMinerText.GetComponent<Localizer>();
|
||||
if (quickMinerLocalizer != null) UnityEngine.Object.DestroyImmediate(quickMinerLocalizer);
|
||||
wnd.AddTipsButton2(x + 250f, y + 6f, tab2, I18NKeys.QuickBuildMiningMachines, I18NKeys.QuickBuildMiningMachinesTips, "quick-miners-tips");
|
||||
y += 30f;
|
||||
wnd.AddCheckBox(x + 10f, y, tab2, QuickMinerBuild.AllowVeinReform, I18NKeys.QuickMinerAllowVeinReform, 13);
|
||||
y += 36f;
|
||||
wnd.AddButton(x, y, 200, tab2, I18NKeys.QuickBuildOrbitalCollectors, 16, "button-init-planet", PlanetFunctions.BuildOrbitalCollectors);
|
||||
y += 30f;
|
||||
|
||||
@@ -13,6 +13,7 @@ using UnityEngine;
|
||||
using UXAssist.Common;
|
||||
using UXAssist.Common.ModFeatures;
|
||||
using UXAssist.Functions;
|
||||
using UXAssist.Functions.Factory;
|
||||
using UXAssist.Patches;
|
||||
using UXAssist.Patches.Factory;
|
||||
using UXAssist.Patches.Logistics;
|
||||
@@ -114,6 +115,8 @@ public class UXAssist : BaseUnityPlugin, IModCanSave
|
||||
"Return logistic storage items to player when initializing planet");
|
||||
PlanetFunctions.ReturnBeltAFactoryItemsOnInitializeEnabled = Config.Bind("Planet", "ReturnBeltAFactoryItemsOnInitialize", false,
|
||||
"Return belt and factory items to player when initializing planet");
|
||||
QuickMinerBuild.AllowVeinReform = Config.Bind("Factory", "QuickMinerAllowVeinReform", false,
|
||||
"Allow quick miner placement to restore and bury veins. When disabled, skip all vein restoration and burial calculations.");
|
||||
FactoryPatch.RemoveBuildRangeLimitEnabled = Config.Bind("Factory", "RemoveBuildRangeLimit", false,
|
||||
"Remove limit for build range and maximum count of drag building belts/buildings\nNote: this does not affect range limit for mecha drones' action");
|
||||
FactoryPatch.LargerAreaForUpgradeAndDismantleEnabled = Config.Bind("Factory", "LargerAreaForUpgradeAndDismantle", false,
|
||||
|
||||
@@ -40,15 +40,15 @@ internal static class QuickMinerPlacementTests
|
||||
ObstacleBoxes = [new Box(Collider(new Vector3(x, 0, 0), new Vector3(halfWidth, 0.4f, 0.4f), Quaternion.identity))]
|
||||
};
|
||||
|
||||
private static MinerPlacementSolver Solve(List<Candidate> candidates, int nodes, int passes = 12)
|
||||
private static MinerPlacementSolver Solve(List<Candidate> candidates, int nodes, int passes = 12, bool allowVeinReform = true)
|
||||
{
|
||||
var solver = new MinerPlacementSolver(candidates, nodes);
|
||||
var solver = new MinerPlacementSolver(candidates, nodes, allowVeinReform);
|
||||
var search = solver.Search(passes);
|
||||
var steps = 0;
|
||||
while (search.MoveNext()) if (++steps > 2000000) throw new InvalidOperationException("Search did not terminate.");
|
||||
if (MinerPlacementSolver.WorkerCount > 0)
|
||||
{
|
||||
var parallel = new MinerPlacementSolver(candidates, nodes);
|
||||
var parallel = new MinerPlacementSolver(candidates, nodes, allowVeinReform);
|
||||
parallel.SearchAsync(passes, CancellationToken.None).GetAwaiter().GetResult();
|
||||
Check(parallel.BestScore == solver.BestScore && parallel.Best.SequenceEqual(solver.Best),
|
||||
"Parallel scheduling must preserve the exact sequential layout, including ties.");
|
||||
@@ -70,6 +70,12 @@ internal static class QuickMinerPlacementTests
|
||||
return counts.All(count => count >= MinerPlacementSolver.MinimumCoverage) && counts.Sum() > expected;
|
||||
});
|
||||
Check(!canImprove, "Search left a legal positive-gain miner unplaced in its candidate set.");
|
||||
if (allowVeinReform && candidates.All(candidate => candidate.Buried.Length == 0))
|
||||
{
|
||||
var withoutReform = Solve(candidates, nodes, passes, false);
|
||||
Check(withoutReform.BestScore == solver.BestScore && withoutReform.Best.SequenceEqual(solver.Best),
|
||||
"Skipping reform calculations must preserve the exact layout for burial-free candidates.");
|
||||
}
|
||||
return solver;
|
||||
}
|
||||
|
||||
@@ -158,6 +164,28 @@ internal static class QuickMinerPlacementTests
|
||||
Check(Solve(sharedBurial, 13).BestScore == 10, "Joint search must replace the invalidated miner and charge shared burial only once.");
|
||||
}
|
||||
|
||||
private static void WithoutReformChecks()
|
||||
{
|
||||
var candidates = new List<Candidate>
|
||||
{
|
||||
Placement(0, [0, 1, 2, 3, 4], halfWidth: 1.1f), Placement(-1.4f, [0, 1, 2]),
|
||||
Placement(1.4f, [2, 3, 4]), Placement(4, [0, 1]), Placement(6, [0, 1, 2])
|
||||
};
|
||||
var expected = Solve(candidates, 5);
|
||||
// No burial metadata or per-node state is needed when reform is disabled.
|
||||
foreach (var candidate in candidates) candidate.Buried = null;
|
||||
var solver = new MinerPlacementSolver(candidates, 0, false);
|
||||
var search = solver.Search(12);
|
||||
while (search.MoveNext()) { }
|
||||
Check(solver.BestScore == expected.BestScore && solver.Best.SequenceEqual(expected.Best),
|
||||
"Disabled reform must work without burial metadata or per-node accounting.");
|
||||
if (MinerPlacementSolver.WorkerCount == 0) return;
|
||||
var parallel = new MinerPlacementSolver(candidates, 0, false);
|
||||
parallel.SearchAsync(12, CancellationToken.None).GetAwaiter().GetResult();
|
||||
Check(parallel.BestScore == solver.BestScore && parallel.Best.SequenceEqual(solver.Best),
|
||||
"Workers must also skip all burial calculations when reform is disabled.");
|
||||
}
|
||||
|
||||
private static bool CornerOracle(ColliderData a, ColliderData b)
|
||||
{
|
||||
var axesA = new[] { a.q * Vector3.right, a.q * Vector3.up, a.q * Vector3.forward };
|
||||
@@ -310,7 +338,7 @@ internal static class QuickMinerPlacementTests
|
||||
{
|
||||
version = "test", gameVersion = "test", startedUtc = "2026-10-19T00:00:00Z", outcome = "completed", error = "",
|
||||
planetId = 101, veinType = 1, veinGroup = 3, initialStock = 0, placedCount = 1, totalCoverage = 3, buriedCount = 0,
|
||||
planetRadius = 200, buildRange = 80, unlimitedRange = true, elapsedMilliseconds = 1,
|
||||
planetRadius = 200, buildRange = 80, unlimitedRange = true, allowVeinReform = false, elapsedMilliseconds = 1,
|
||||
logicalProcessors = Environment.ProcessorCount, workerCount = MinerPlacementSolver.WorkerCount,
|
||||
playerPosition = [0, 200, 0], center = [0, 200, 0], right = [1, 0, 0], forward = [0, 0, 1],
|
||||
nodes = Enumerable.Range(1, 3).Select(id => new MinerPlacementDebug.Node
|
||||
@@ -333,27 +361,34 @@ internal static class QuickMinerPlacementTests
|
||||
document.RootElement.GetProperty("buildColliders").GetArrayLength() == 3,
|
||||
"The production writer must serialize internal nested records, not just summary fields.");
|
||||
var roundtrip = JsonSerializer.Deserialize<MinerPlacementDebug.Snapshot>(snapshotJson, ReplayJson);
|
||||
Check(roundtrip.schema == 3 && roundtrip.minimumCoverage == 3 && roundtrip.existingMiners[0].prebuild &&
|
||||
Check(roundtrip.schema == 4 && !roundtrip.allowVeinReform && roundtrip.minimumCoverage == 3 && roundtrip.existingMiners[0].prebuild &&
|
||||
roundtrip.workerCount <= roundtrip.logicalProcessors / 2 && roundtrip.phases[0].searchMilliseconds == 1 &&
|
||||
roundtrip.initialStock == 0 && roundtrip.placements[0].itemRequired == 1 &&
|
||||
roundtrip.placements[0].plannedVeins.Length == 3 && roundtrip.placements[0].finalVeins[0] == 1 && roundtrip.rejections.attempted == 1,
|
||||
"Replay schema must retain existing miners, native placements and rejection counters.");
|
||||
Replay(path);
|
||||
snapshot.allowVeinReform = true;
|
||||
MinerPlacementDebug.Write(path, snapshot);
|
||||
Check(JsonSerializer.Deserialize<MinerPlacementDebug.Snapshot>(File.ReadAllText(path), ReplayJson).allowVeinReform,
|
||||
"Replay snapshots must preserve the enabled reform option.");
|
||||
Replay(path);
|
||||
}
|
||||
|
||||
private static void Replay(string path, int minimumTotalCoverage = 0)
|
||||
{
|
||||
var snapshot = JsonSerializer.Deserialize<MinerPlacementDebug.Snapshot>(File.ReadAllText(path), ReplayJson);
|
||||
// Schema 2 snapshots also recorded a stock limit, which the current search does not use.
|
||||
Check(snapshot.schema is 1 or 2 or 3, "Unsupported debug snapshot schema.");
|
||||
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.");
|
||||
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()}");
|
||||
var candidates = new List<Candidate>();
|
||||
var solver = new MinerPlacementSolver(candidates, snapshot.nodes.Length);
|
||||
var parallel = new MinerPlacementSolver(candidates, snapshot.nodes.Length);
|
||||
// Older snapshots always used restoration and burial, before the option existed.
|
||||
var allowVeinReform = snapshot.schema < 4 || snapshot.allowVeinReform;
|
||||
var solver = new MinerPlacementSolver(candidates, snapshot.nodes.Length, allowVeinReform);
|
||||
var parallel = new MinerPlacementSolver(candidates, snapshot.nodes.Length, allowVeinReform);
|
||||
foreach (var phase in snapshot.phases)
|
||||
{
|
||||
while (candidates.Count < phase.candidateCount)
|
||||
@@ -390,6 +425,7 @@ internal static class QuickMinerPlacementTests
|
||||
if (args.Length > 0) { Replay(args[0], args.Length > 1 ? int.Parse(args[1]) : 0); return; }
|
||||
GeometryChecks();
|
||||
SolverChecks();
|
||||
WithoutReformChecks();
|
||||
CancellationChecks();
|
||||
ReplayChecks();
|
||||
var desc = new PrefabDesc { veinMiner = true, minerType = EMinerType.Vein };
|
||||
|
||||
Reference in new issue
Block a user