Kalospacer/WulaFallenEmpireRW
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

暂存44

Browse Source
This commit is contained in:
ProjectKoi-Kalo\Kalo
2025-08-25 18:11:55 +08:00
parent 39966bc1f5
commit 5f43276fe8
2 changed files with 6 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
1.6/1.6/Assemblies/WulaFallenEmpire.dll
View File

Binary file not shown.

28
Source/WulaFallenEmpire/WULA_Shuttle/Dialog_ArmedShuttleTransfer.cs
View File

@@ -130,13 +130,6 @@ namespace WulaFallenEmpire
} }
} }
// 将物品添加到穿梭机的主容器 (CompTransporter.innerContainer)
CompTransporter transporter = shuttle.GetComp<CompTransporter>();
if (transporter == null)
{
Log.Error("[WULA-ERROR] Dialog_ArmedShuttleTransfer: CompTransporter is missing on shuttle!");
return false;
}
int transferredItemCount = 0; int transferredItemCount = 0;
foreach (Thing item in itemsToTransfer) foreach (Thing item in itemsToTransfer)
@@ -144,26 +137,17 @@ namespace WulaFallenEmpire
// 从当前地图移除物品 // 从当前地图移除物品
item.DeSpawn(); item.DeSpawn();
// 尝试添加到穿梭机主容器 // 尝试放置到口袋空间地上
if (transporter.innerContainer.TryAdd(item)) IntVec3 dropPos = CellFinder.RandomClosewalkCellNear(shuttle.PocketMap.Center, shuttle.PocketMap, 5); // 随机位置，避免重叠
if (dropPos.IsValid)
{ {
GenPlace.TryPlaceThing(item, dropPos, shuttle.PocketMap, ThingPlaceMode.Near);
transferredItemCount++; transferredItemCount++;
} }
else else
{ {
// 如果容器已满，尝试丢弃在穿梭机附近 Log.Error($"[WULA-ERROR] Could not find valid drop position for item {item.LabelShort} in pocket map.");
IntVec3 dropPos = CellFinder.RandomClosewalkCellNear(shuttle.Position, shuttle.Map, 3); item.Destroy(); // 实在没地方放，就销毁
if (dropPos.IsValid)
{
GenPlace.TryPlaceThing(item, dropPos, shuttle.Map, ThingPlaceMode.Near);
Messages.Message("容器已满：{0} 被放置在穿梭机附近".Translate(item.LabelShort), shuttle, MessageTypeDefOf.CautionInput);
}
else
{
Log.Error($"[WULA-ERROR] Could not find valid drop position for item {item.LabelShort}");
// 实在没地方放，就让它消失吧，或者抛出异常
item.Destroy();
}
} }
} }