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

我去忘记提交了

Browse Source
This commit is contained in:
Tourswen
2025-11-09 22:05:40 +08:00
parent 84f3fe33ab
commit 6e16cf3828
198 changed files with 4957 additions and 2388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
Source/WulaFallenEmpire/GlobalWorkTable/Building_GlobalWorkTable.cs
View File

@@ -1,4 +1,4 @@
// 在 Building_GlobalWorkTable.cs 中添加材质处理逻辑
// Building_GlobalWorkTable.cs (修改版本)
using RimWorld;
using System.Collections.Generic;
using System.Linq;
@@ -73,7 +73,7 @@ namespace WulaFallenEmpire
public GlobalWorkTableAirdropExtension AirdropExtension =>
def.GetModExtension<GlobalWorkTableAirdropExtension>();
// 新增：添加空投命令到技能栏
// 修改：添加空投命令到技能栏，添加工厂设施检查
public override IEnumerable<Gizmo> GetGizmos()
{
foreach (Gizmo g in base.GetGizmos())
@@ -81,9 +81,12 @@ namespace WulaFallenEmpire
yield return g;
}
// 只有在有输出物品时才显示空投按钮
// 只有在有输出物品且有工厂设施的飞行器时才显示空投按钮
var globalStorage = Find.World.GetComponent<GlobalStorageWorldComponent>();
if (globalStorage != null && globalStorage.outputStorage.Any(kvp => kvp.Value > 0))
bool hasOutputItems = globalStorage != null && globalStorage.outputStorage.Any(kvp => kvp.Value > 0);
bool hasFactoryFlyOver = HasFactoryFacilityFlyOver();
if (hasOutputItems && hasFactoryFlyOver)
{
yield return new Command_Action
{
@@ -91,9 +94,73 @@ namespace WulaFallenEmpire
defaultLabel = "WULA_AirdropProducts".Translate(),
defaultDesc = "WULA_AirdropProductsDesc".Translate(),
icon = ContentFinder<Texture2D>.Get("Wula/UI/Commands/WULA_AirdropProducts"),
disabledReason = "WULA_CannotAirdrop".Translate()
};
}
else if (hasOutputItems && !hasFactoryFlyOver)
{
yield return new Command_Action
{
action = () => Messages.Message("WULA_NoFactoryFlyOver".Translate(), MessageTypeDefOf.RejectInput),
defaultLabel = "WULA_AirdropProducts".Translate(),
defaultDesc = "WULA_NoFactoryFlyOverDesc".Translate(),
icon = ContentFinder<Texture2D>.Get("Wula/UI/Commands/WULA_AirdropProducts"),
};
}
}
// 新增：检查是否有拥有FactoryFacility设施的飞行器
private bool HasFactoryFacilityFlyOver()
{
Map map = Map;
if (map == null) return false;
try
{
// 检查所有FlyOver类型的物体
var allFlyOvers = new List<Thing>();
var dynamicObjects = map.dynamicDrawManager.DrawThings;
foreach (var thing in dynamicObjects)
{
if (thing is FlyOver)
{
allFlyOvers.Add(thing);
}
}
Log.Message($"[FactoryFacility Check] Found {allFlyOvers.Count} FlyOvers on map");
foreach (var thing in allFlyOvers)
{
if (thing is FlyOver flyOver && !flyOver.Destroyed)
{
// 检查设施
var facilitiesComp = flyOver.GetComp<CompFlyOverFacilities>();
if (facilitiesComp == null)
{
Log.Warning($"[FactoryFacility Check] FlyOver at {flyOver.Position} has no CompFlyOverFacilities");
continue;
}
if (facilitiesComp.HasFacility("FactoryFacility"))
{
Log.Message($"[FactoryFacility Check] Found valid FlyOver at {flyOver.Position} with FactoryFacility");
return true;
}
else
{
Log.Message($"[FactoryFacility Check] FlyOver at {flyOver.Position} missing FactoryFacility. Has: {string.Join(", ", facilitiesComp.GetActiveFacilities())}");
}
}
}
Log.Message("[FactoryFacility Check] No FlyOver with FactoryFacility found");
return false;
}
catch (System.Exception ex)
{
Log.Error($"[FactoryFacility Check] Error in HasFactoryFacilityFlyOver: {ex}");
return false;
}
}
// 新增：开始空投目标选择
@@ -106,6 +173,14 @@ namespace WulaFallenEmpire
Messages.Message("WULA_NoProductsToAirdrop".Translate(), MessageTypeDefOf.RejectInput);
return;
}
// 检查是否有工厂设施的飞行器
if (!HasFactoryFacilityFlyOver())
{
Messages.Message("WULA_NoFactoryFlyOver".Translate(), MessageTypeDefOf.RejectInput);
return;
}
// 启动目标选择
Find.Targeter.BeginTargeting(new TargetingParameters
{
@@ -133,6 +208,13 @@ namespace WulaFallenEmpire
if (globalStorage == null)
return;
// 再次检查是否有工厂设施的飞行器
if (!HasFactoryFacilityFlyOver())
{
Messages.Message("WULA_NoFactoryFlyOver".Translate(), MessageTypeDefOf.RejectInput);
return;
}
// 获取空投参数
var airdropExt = AirdropExtension;
float maxRange = airdropExt?.maxRange ?? 50f;

47
Source/WulaFallenEmpire/GlobalWorkTable/CompLaunchable_ToGlobalStorage.cs
View File

@@ -4,6 +4,7 @@ using UnityEngine;
using Verse;
using Verse.Sound;
using System.Text;
using System.Linq;
namespace WulaFallenEmpire
{
@@ -11,6 +12,9 @@ namespace WulaFallenEmpire
{
public new CompProperties_Launchable_ToGlobalStorage Props => (CompProperties_Launchable_ToGlobalStorage)this.props;
// 获取垃圾屏蔽组件
public CompGarbageShield GarbageShieldComp => this.parent.GetComp<CompGarbageShield>();
public override IEnumerable<Gizmo> CompGetGizmosExtra()
{
// 移除原有的发射按钮，替换为我们自己的
@@ -59,6 +63,30 @@ namespace WulaFallenEmpire
return;
}
// 检查垃圾屏蔽 - 如果启用了垃圾屏蔽并且有禁止物品，取消发射
if (GarbageShieldComp != null && GarbageShieldComp.GarbageShieldEnabled)
{
List<Thing> forbiddenItems = GarbageShieldComp.GetForbiddenItems(transporter.innerContainer);
if (forbiddenItems.Count > 0)
{
// 显示取消发射消息
StringBuilder forbiddenList = new StringBuilder();
foreach (Thing item in forbiddenItems)
{
if (forbiddenList.Length > 0) forbiddenList.Append(", ");
forbiddenList.Append($"{item.LabelCap} x{item.stackCount}");
}
Messages.Message("WULA_LaunchCancelledDueToForbiddenItems".Translate(forbiddenList.ToString()),
this.parent, MessageTypeDefOf.RejectInput);
// 触发垃圾屏蔽UI事件
GarbageShieldComp.ProcessGarbageShieldTrigger(forbiddenItems);
return; // 取消发射
}
}
// 统计发送的物品
int inputItemsCount = 0;
int outputItemsCount = 0;
@@ -87,7 +115,8 @@ namespace WulaFallenEmpire
}
// 2. 显示发送结果消息
string message = BuildTransferMessage(inputItemsCount, outputItemsCount, inputItemsList.ToString(), outputItemsList.ToString());
string message = BuildTransferMessage(inputItemsCount, outputItemsCount,
inputItemsList.ToString(), outputItemsList.ToString());
Messages.Message(message, this.parent, MessageTypeDefOf.PositiveEvent);
// 3. 清空容器，防止物品掉落
@@ -108,20 +137,13 @@ namespace WulaFallenEmpire
if (item.def.IsApparel)
return true;
// 活着的Pawn
//if (item is Pawn pawn && !pawn.Dead)
// return true;
// Pawn的尸体
if (item.def.IsCorpse)
return true;
// 其他物品发送到输入存储器
return false;
}
// 构建转移消息
private string BuildTransferMessage(int inputCount, int outputCount, string inputList, string outputList)
private string BuildTransferMessage(int inputCount, int outputCount,
string inputList, string outputList)
{
StringBuilder message = new StringBuilder();
@@ -156,6 +178,11 @@ namespace WulaFallenEmpire
message.Append(": ").Append(outputList);
}
}
else
{
// 没有任何物品
message.Append("WULA_NoItemsProcessed".Translate());
}
return message.ToString();
}

90
Source/WulaFallenEmpire/GlobalWorkTable/CompProperties_GarbageShield.cs Normal file
View File

@@ -0,0 +1,90 @@
using RimWorld;
using System.Collections.Generic;
using System.Text;
using UnityEngine;
using Verse;
namespace WulaFallenEmpire
{
public class CompProperties_GarbageShield : CompProperties
{
public bool garbageShieldEnabled = false; // 通过XML配置启用/禁用
public string garbageShieldUIEventDefName; // 垃圾屏蔽触发时弹出的UI事件defName
public CompProperties_GarbageShield()
{
this.compClass = typeof(CompGarbageShield);
}
}
public class CompGarbageShield : ThingComp
{
public CompProperties_GarbageShield Props => (CompProperties_GarbageShield)this.props;
// 垃圾屏蔽状态完全由XML配置决定，不提供玩家切换
public bool GarbageShieldEnabled => Props.garbageShieldEnabled;
// 检查物品是否是被禁止的垃圾物品
public bool IsForbiddenItem(Thing thing)
{
if (!GarbageShieldEnabled) return false;
// 检查是否是殖民者
if (thing is Pawn pawn && pawn.IsColonist)
return true;
// 检查是否是尸体
if (thing.def.IsCorpse)
return true;
// 检查是否是有毒垃圾
if (IsToxicWaste(thing))
return true;
return false;
}
// 获取所有禁止物品
public List<Thing> GetForbiddenItems(ThingOwner container)
{
List<Thing> forbiddenItems = new List<Thing>();
if (!GarbageShieldEnabled) return forbiddenItems;
foreach (Thing item in container)
{
if (IsForbiddenItem(item))
{
forbiddenItems.Add(item);
}
}
return forbiddenItems;
}
// 判断是否为有毒垃圾
private bool IsToxicWaste(Thing thing)
{
// 根据物品标签、类别或定义名称判断是否为有毒垃圾
return thing.def == ThingDefOf.Wastepack;
}
// 处理垃圾屏蔽触发并触发UI事件
public void ProcessGarbageShieldTrigger(List<Thing> forbiddenItems)
{
if (forbiddenItems.Count > 0 && !string.IsNullOrEmpty(Props.garbageShieldUIEventDefName))
{
// 弹出指定的自定义UI
EventDef uiDef = DefDatabase<EventDef>.GetNamed(Props.garbageShieldUIEventDefName, false);
if (uiDef != null)
{
Find.WindowStack.Add(new Dialog_CustomDisplay(uiDef));
}
else
{
Log.Error($"[CompGarbageShield] Could not find EventDef named '{Props.garbageShieldUIEventDefName}'.");
}
}
}
}
}

6
Source/WulaFallenEmpire/GlobalWorkTable/CompProperties_Launchable_ToGlobalStorage.cs
View File

@@ -7,10 +7,14 @@ namespace WulaFallenEmpire
{
public float fuelNeededToLaunch = 25f;
public SoundDef launchSound;
// 垃圾屏蔽配置 - 通过XML控制
public bool garbageShieldEnabled = false;
public string garbageShieldUIEventDefName = "Wula_UI_Legion_Reply_1";
public CompProperties_Launchable_ToGlobalStorage()
{
this.compClass = typeof(CompLaunchable_ToGlobalStorage);
}
}
}
}

30
Source/WulaFallenEmpire/GlobalWorkTable/CompProperties_ProductionCategory.cs Normal file
View File

@@ -0,0 +1,30 @@
// CompProperties_ProductionCategory.cs
using RimWorld;
using Verse;
namespace WulaFallenEmpire
{
public enum ProductionCategory
{
Equipment, // 装备
Weapon, // 武器
Mechanoid // 机械体
}
public class CompProperties_ProductionCategory : CompProperties
{
public ProductionCategory category = ProductionCategory.Equipment;
public CompProperties_ProductionCategory()
{
this.compClass = typeof(CompProductionCategory);
}
}
public class CompProductionCategory : ThingComp
{
public CompProperties_ProductionCategory Props => (CompProperties_ProductionCategory)props;
public ProductionCategory Category => Props.category;
}
}

329
Source/WulaFallenEmpire/GlobalWorkTable/ITab_GlobalBills.cs
View File

@@ -14,86 +14,271 @@ namespace WulaFallenEmpire
private float viewHeight = 1000f;
private Vector2 scrollPosition;
private GlobalProductionOrder mouseoverOrder;
private static readonly Vector2 WinSize = new Vector2(420f, 480f);
// 分类按钮状态
private ProductionCategory? selectedCategory = null;
protected Building_GlobalWorkTable SelTable => (Building_GlobalWorkTable)base.SelThing;
public ITab_GlobalBills()
{
size = WinSize;
labelKey = "WULA_GlobalBillsTab";
tutorTag = "GlobalBills";
}
protected override void FillTab()
{
Rect mainRect = new Rect(0f, 0f, WinSize.x, WinSize.y).ContractedBy(10f);
// 标题
Text.Font = GameFont.Medium;
Widgets.Label(new Rect(mainRect.x, mainRect.y, mainRect.width, 30f), "WULA_GlobalProduction".Translate());
Text.Font = GameFont.Small;
// 存储查看按钮 - 放在标题旁边
// 存储查看按钮
Rect storageButtonRect = new Rect(mainRect.xMax - 160f, mainRect.y, 120f, 25f);
DoStorageButton(storageButtonRect);
// 分类按钮区域
Rect categoryButtonsRect = new Rect(mainRect.x, mainRect.y + 35f, mainRect.width, 25f);
DoCategoryButtons(categoryButtonsRect);
// 上帝模式按钮区域
if (DebugSettings.godMode)
{
Rect godModeButtonRect = new Rect(mainRect.x, mainRect.y + 35f, mainRect.width, 25f);
Rect godModeButtonRect = new Rect(mainRect.x, mainRect.y + 65f, mainRect.width, 25f);
DoGodModeButtons(godModeButtonRect);
}
// 订单列表区域 - 调整位置
float ordersRectY = DebugSettings.godMode ? mainRect.y + 65f : mainRect.y + 35f;
Rect ordersRect = new Rect(mainRect.x, ordersRectY, mainRect.width, mainRect.height - (DebugSettings.godMode ? 110f : 80f));
// 订单列表区域
float ordersRectY = DebugSettings.godMode ? mainRect.y + 90f : mainRect.y + 65f;
Rect ordersRect = new Rect(mainRect.x, ordersRectY, mainRect.width, mainRect.height - (DebugSettings.godMode ? 130f : 100f));
mouseoverOrder = DoOrdersListing(ordersRect);
// 添加订单按钮
// 添加订单按钮（现在显示选中的分类）
Rect addButtonRect = new Rect(mainRect.x, mainRect.yMax - 35f, mainRect.width, 30f);
if (Widgets.ButtonText(addButtonRect, "WULA_AddProductionOrder".Translate()))
DoAddOrderButton(addButtonRect);
}
// 新增：分类按钮
private void DoCategoryButtons(Rect rect)
{
float buttonWidth = (rect.width - 10f) / 3f;
Rect equipmentRect = new Rect(rect.x, rect.y, buttonWidth, rect.height);
Rect weaponRect = new Rect(rect.x + buttonWidth + 5f, rect.y, buttonWidth, rect.height);
Rect mechanoidRect = new Rect(rect.x + (buttonWidth + 5f) * 2, rect.y, buttonWidth, rect.height);
// 装备按钮
string equipmentLabel = selectedCategory == ProductionCategory.Equipment ?
$"<color=yellow>{"WULA_Equipment".Translate()}</color>" :
"WULA_Equipment".Translate();
if (Widgets.ButtonText(equipmentRect, equipmentLabel))
{
Find.WindowStack.Add(new FloatMenu(GenerateRecipeOptions()));
selectedCategory = selectedCategory == ProductionCategory.Equipment ? null : ProductionCategory.Equipment;
SoundDefOf.Click.PlayOneShotOnCamera();
}
// 武器按钮
string weaponLabel = selectedCategory == ProductionCategory.Weapon ?
$"<color=yellow>{"WULA_Weapon".Translate()}</color>" :
"WULA_Weapon".Translate();
if (Widgets.ButtonText(weaponRect, weaponLabel))
{
selectedCategory = selectedCategory == ProductionCategory.Weapon ? null : ProductionCategory.Weapon;
SoundDefOf.Click.PlayOneShotOnCamera();
}
// 机械体按钮
string mechanoidLabel = selectedCategory == ProductionCategory.Mechanoid ?
$"<color=yellow>{"WULA_Mechanoid".Translate()}</color>" :
"WULA_Mechanoid".Translate();
if (Widgets.ButtonText(mechanoidRect, mechanoidLabel))
{
selectedCategory = selectedCategory == ProductionCategory.Mechanoid ? null : ProductionCategory.Mechanoid;
SoundDefOf.Click.PlayOneShotOnCamera();
}
}
// 修改：添加订单按钮，显示当前选择的分类
private void DoAddOrderButton(Rect rect)
{
string buttonLabel = selectedCategory.HasValue ?
$"{"WULA_AddProductionOrder".Translate()} ({GetCategoryLabel(selectedCategory.Value)})" :
"WULA_AddProductionOrder".Translate();
// 新增：存储查看按钮
if (Widgets.ButtonText(rect, buttonLabel))
{
Find.WindowStack.Add(new FloatMenu(GenerateRecipeOptions()));
SoundDefOf.Click.PlayOneShotOnCamera();
}
// 如果没有选择分类，显示提示
if (!selectedCategory.HasValue && Mouse.IsOver(rect))
{
TooltipHandler.TipRegion(rect, "WULA_SelectCategoryFirst".Translate());
}
}
// 获取分类标签
private string GetCategoryLabel(ProductionCategory category)
{
return category switch
{
ProductionCategory.Equipment => "WULA_Equipment".Translate(),
ProductionCategory.Weapon => "WULA_Weapon".Translate(),
ProductionCategory.Mechanoid => "WULA_Mechanoid".Translate(),
_ => "WULA_Unknown".Translate()
};
}
// 修改：根据选择的分类生成配方选项
private List<FloatMenuOption> GenerateRecipeOptions()
{
var options = new List<FloatMenuOption>();
// 如果没有选择分类，显示所有配方
if (!selectedCategory.HasValue)
{
foreach (var recipe in SelTable.def.AllRecipes)
{
if (recipe.AvailableNow && recipe.AvailableOnNow(SelTable))
{
options.Add(CreateRecipeOption(recipe));
}
}
}
else
{
// 根据选择的分类筛选配方
foreach (var recipe in SelTable.def.AllRecipes)
{
if (recipe.AvailableNow && recipe.AvailableOnNow(SelTable) &&
RecipeMatchesCategory(recipe, selectedCategory.Value))
{
options.Add(CreateRecipeOption(recipe));
}
}
}
if (options.Count == 0)
{
options.Add(new FloatMenuOption("WULA_NoAvailableRecipes".Translate(), null));
}
// 按显示优先级排序
options.SortByDescending(opt => opt.orderInPriority);
return options;
}
// 创建配方选项
private FloatMenuOption CreateRecipeOption(RecipeDef recipe)
{
string label = recipe.LabelCap;
// 添加分类标签
var category = GetRecipeCategory(recipe);
if (category.HasValue)
{
label += $" [{GetCategoryLabel(category.Value)}]";
}
return new FloatMenuOption(
label: label,
action: () =>
{
var newOrder = new GlobalProductionOrder
{
recipe = recipe,
targetCount = 1,
paused = true
};
SelTable.globalOrderStack.AddOrder(newOrder);
SoundDefOf.Click.PlayOneShotOnCamera();
},
shownItemForIcon: recipe.UIIconThing,
thingStyle: null,
forceBasicStyle: false,
priority: MenuOptionPriority.Default,
mouseoverGuiAction: null,
revalidateClickTarget: null,
extraPartWidth: 29f,
extraPartOnGUI: (Rect rect) =>
{
return Widgets.InfoCardButton(rect.x + 5f, rect.y + (rect.height - 24f) / 2f, recipe);
},
revalidateWorldClickTarget: null,
playSelectionSound: true,
orderInPriority: -recipe.displayPriority
);
}
// 检查配方是否匹配分类
private bool RecipeMatchesCategory(RecipeDef recipe, ProductionCategory category)
{
var recipeCategory = GetRecipeCategory(recipe);
return recipeCategory == category;
}
// 获取配方的分类
private ProductionCategory? GetRecipeCategory(RecipeDef recipe)
{
if (recipe.products == null || recipe.products.Count == 0)
return null;
ThingDef productDef = recipe.products[0].thingDef;
if (productDef == null)
return null;
// 检查产品是否有分类组件
var categoryComp = productDef.GetCompProperties<CompProperties_ProductionCategory>();
if (categoryComp != null)
return categoryComp.category;
// 如果没有分类组件，根据产品类型推断
return InferCategoryFromThingDef(productDef);
}
// 根据ThingDef推断分类
private ProductionCategory? InferCategoryFromThingDef(ThingDef thingDef)
{
if (thingDef.IsMeleeWeapon || thingDef.IsRangedWeapon)
return ProductionCategory.Weapon;
if (thingDef.IsApparel || thingDef.equipmentType != EquipmentType.None)
return ProductionCategory.Equipment;
if (thingDef.race != null && thingDef.race.IsMechanoid)
return ProductionCategory.Mechanoid;
return null;
}
// 其余方法保持不变（DoStorageButton, DoGodModeButtons, DoOrdersListing, DoOrderRow 等）
private void DoStorageButton(Rect rect)
{
// 绘制按钮
if (Widgets.ButtonText(rect, "WULA_ViewStorage".Translate()))
{
SoundDefOf.Click.PlayOneShotOnCamera();
}
// 鼠标悬停时显示存储信息Tooltip
if (Mouse.IsOver(rect))
{
TooltipHandler.TipRegion(rect, GetStorageTooltip());
}
}
// 新增：获取存储信息的Tooltip
private string GetStorageTooltip()
{
var globalStorage = Find.World.GetComponent<GlobalStorageWorldComponent>();
if (globalStorage == null)
return "WULA_NoGlobalStorage".Translate();
StringBuilder sb = new StringBuilder();
// 输入存储（原材料）
sb.AppendLine("WULA_InputStorage".Translate() + ":");
sb.AppendLine();
var inputItems = globalStorage.inputStorage
.Where(kvp => kvp.Value > 0)
.OrderByDescending(kvp => kvp.Value)
.ThenBy(kvp => kvp.Key.label)
.ToList();
if (inputItems.Count == 0)
{
sb.AppendLine("WULA_NoItems".Translate());
@@ -105,19 +290,15 @@ namespace WulaFallenEmpire
sb.AppendLine($" {kvp.Value} {kvp.Key.LabelCap}");
}
}
sb.AppendLine();
// 输出存储（产品）
sb.AppendLine("WULA_OutputStorage".Translate() + ":");
sb.AppendLine();
var outputItems = globalStorage.outputStorage
.Where(kvp => kvp.Value > 0)
.OrderByDescending(kvp => kvp.Value)
.ThenBy(kvp => kvp.Key.label)
.ToList();
if (outputItems.Count == 0)
{
sb.AppendLine("WULA_NoItems".Translate());
@@ -129,7 +310,6 @@ namespace WulaFallenEmpire
sb.AppendLine($" {kvp.Value} {kvp.Key.LabelCap}");
}
}
return sb.ToString();
}
@@ -138,12 +318,12 @@ namespace WulaFallenEmpire
{
Rect button1Rect = new Rect(rect.x, rect.y, rect.width / 2 - 5f, rect.height);
Rect button2Rect = new Rect(rect.x + rect.width / 2 + 5f, rect.y, rect.width / 2 - 5f, rect.height);
if (Widgets.ButtonText(button1Rect, "GOD: Add Resources"))
{
AddTestResources();
}
if (Widgets.ButtonText(button2Rect, "GOD: Spawn Products"))
{
SpawnOutputProducts();
@@ -158,11 +338,11 @@ namespace WulaFallenEmpire
// 添加200钢铁
ThingDef steelDef = ThingDefOf.Steel;
globalStorage.AddToInputStorage(steelDef, 200);
// 添加100零部件
ThingDef componentDef = ThingDefOf.ComponentIndustrial;
globalStorage.AddToInputStorage(componentDef, 100);
Messages.Message("Added 200 Steel and 100 Components to global storage", MessageTypeDefOf.PositiveEvent);
}
}
@@ -175,15 +355,15 @@ namespace WulaFallenEmpire
Map map = SelTable.Map;
IntVec3 spawnCell = SelTable.Position;
int totalSpawned = 0;
// 复制列表以避免修改时枚举
var outputCopy = new Dictionary<ThingDef, int>(globalStorage.outputStorage);
foreach (var kvp in outputCopy)
{
ThingDef thingDef = kvp.Key;
int count = kvp.Value;
if (count > 0)
{
// 创建物品并放置到地图上
@@ -192,7 +372,7 @@ namespace WulaFallenEmpire
int stackSize = Mathf.Min(count, thingDef.stackLimit);
Thing thing = ThingMaker.MakeThing(thingDef);
thing.stackCount = stackSize;
if (GenPlace.TryPlaceThing(thing, spawnCell, map, ThingPlaceMode.Near))
{
globalStorage.RemoveFromOutputStorage(thingDef, stackSize);
@@ -206,7 +386,7 @@ namespace WulaFallenEmpire
}
}
}
Messages.Message($"Spawned {totalSpawned} items at worktable location", MessageTypeDefOf.PositiveEvent);
}
}
@@ -214,28 +394,28 @@ namespace WulaFallenEmpire
private GlobalProductionOrder DoOrdersListing(Rect rect)
{
GlobalProductionOrder result = null;
Widgets.DrawMenuSection(rect);
Rect outRect = rect.ContractedBy(5f);
Rect viewRect = new Rect(0f, 0f, outRect.width - 16f, viewHeight);
Widgets.BeginScrollView(outRect, ref scrollPosition, viewRect);
float curY = 0f;
for (int i = 0; i < SelTable.globalOrderStack.orders.Count; i++)
{
var order = SelTable.globalOrderStack.orders[i];
// 增加订单行高度
Rect orderRect = new Rect(0f, curY, viewRect.width, 90f);
if (DoOrderRow(orderRect, order))
{
result = order;
}
curY += 95f; // 增加行间距
// 分隔线
if (i < SelTable.globalOrderStack.orders.Count - 1)
{
@@ -243,12 +423,12 @@ namespace WulaFallenEmpire
curY += 5f;
}
}
if (Event.current.type == EventType.Layout)
{
viewHeight = curY;
}
Widgets.EndScrollView();
return result;
}
@@ -387,53 +567,6 @@ namespace WulaFallenEmpire
return Mouse.IsOver(rect);
}
// 简化：在添加订单时移除材质初始化
private List<FloatMenuOption> GenerateRecipeOptions()
{
var options = new List<FloatMenuOption>();
foreach (var recipe in SelTable.def.AllRecipes)
{
if (recipe.AvailableNow && recipe.AvailableOnNow(SelTable))
{
string label = recipe.LabelCap;
options.Add(new FloatMenuOption(
label: label,
action: () =>
{
var newOrder = new GlobalProductionOrder
{
recipe = recipe,
targetCount = 1,
paused = true
};
SelTable.globalOrderStack.AddOrder(newOrder);
SoundDefOf.Click.PlayOneShotOnCamera();
},
shownItemForIcon: recipe.UIIconThing,
thingStyle: null,
forceBasicStyle: false,
priority: MenuOptionPriority.Default,
mouseoverGuiAction: null,
revalidateClickTarget: null,
extraPartWidth: 29f,
extraPartOnGUI: (Rect rect) =>
{
return Widgets.InfoCardButton(rect.x + 5f, rect.y + (rect.height - 24f) / 2f, recipe);
},
revalidateWorldClickTarget: null,
playSelectionSound: true,
orderInPriority: -recipe.displayPriority
));
}
}
if (options.Count == 0)
{
options.Add(new FloatMenuOption("WULA_NoAvailableRecipes".Translate(), null));
}
return options;
}
// 新增：立刻完成订单的方法
private void CompleteOrderImmediately(GlobalProductionOrder order)
{
@@ -446,7 +579,7 @@ namespace WulaFallenEmpire
// 检查是否有足够资源
bool hasEnoughResources = order.HasEnoughResources();
if (!hasEnoughResources)
{
// 上帝模式下，如果没有足够资源，显示确认对话框
@@ -478,13 +611,13 @@ namespace WulaFallenEmpire
// 计算需要完成的数量
int remainingCount = order.targetCount - order.currentCount;
if (remainingCount <= 0)
return;
// 尝试消耗资源（如果可能）
bool resourcesConsumed = order.ConsumeResources();
if (!resourcesConsumed)
{
Log.Message($"[GOD MODE] Could not consume resources for {order.recipe.defName}, completing without resource consumption");