diff --git a/1.6/Assemblies/WulaFallenEmpire.dll b/1.6/Assemblies/WulaFallenEmpire.dll
index 840552cf..c923ee85 100644
Binary files a/1.6/Assemblies/WulaFallenEmpire.dll and b/1.6/Assemblies/WulaFallenEmpire.dll differ
diff --git a/1.6/Defs/MentalBreakDefs/MentalBreaks_WULA.xml b/1.6/Defs/MentalBreakDefs/MentalBreaks_WULA.xml
index 8e8b2a24..e94b3925 100644
--- a/1.6/Defs/MentalBreakDefs/MentalBreaks_WULA.xml
+++ b/1.6/Defs/MentalBreakDefs/MentalBreaks_WULA.xml
@@ -6,6 +6,7 @@
Wula_BrokenPersonality
Extreme
+ WULA_BrokenPersonalityTrait
1.0
WulaFallenEmpire.MentalBreakWorker_BrokenPersonality
diff --git a/1.6/Defs/PawnKinds/PawnKinds_Wula.xml b/1.6/Defs/PawnKinds/PawnKinds_Wula.xml
index 8603b911..d2ea8184 100644
--- a/1.6/Defs/PawnKinds/PawnKinds_Wula.xml
+++ b/1.6/Defs/PawnKinds/PawnKinds_Wula.xml
@@ -197,7 +197,7 @@
- Wula/Things/Wula_AI_Engineer_Mother/Bodies/Naked_Thin
+ Wula/Things/Wula_AI_Bomb_Mother/Bodies/Naked_Thin
Wula/Things/WULA_Cat/AllegianceOverlays/None
CutoutWithOverlay
Graphic_Multi
@@ -208,7 +208,7 @@
99999~99999
- WULA_SP_Engineer_Mother_FakeWeapon
+ Wula_AI_Engineer_Mother_Weapon
1
@@ -225,7 +225,7 @@
- Wula/Things/Wula_AI_Engineer_Mother/Bodies/Naked_Thin
+ Wula/Things/Wula_AI_Bomb_Mother/Bodies/Naked_Thin
Wula/Things/WULA_Cat/AllegianceOverlays/None
CutoutWithOverlay
Graphic_Multi
@@ -236,7 +236,7 @@
99999~99999
- WULA_SP_Engineer_Mother_Attack_FakeWeapon
+ Wula_AI_Engineer_Mother_Attack_Weapon
1
@@ -343,6 +343,7 @@
Mech_WULA_Cat_Bomb
Mech_WULA_Cat_Bomb
+ true
@@ -359,6 +360,7 @@
Mech_WULA_Cat_Inf
Mech_WULA_Cat_Inf
+ true
Wula_Assault_Cat_Weapon
@@ -367,6 +369,7 @@
Mech_WULA_Cat_Commander
Mech_WULA_Cat_Commander
+ true
Wula_Assault_Cat_Weapon
diff --git a/1.6/Defs/ThingDefs_Buildings/Buildings_EventSource.xml b/1.6/Defs/ThingDefs_Buildings/Buildings_EventSource.xml
new file mode 100644
index 00000000..371efd85
--- /dev/null
+++ b/1.6/Defs/ThingDefs_Buildings/Buildings_EventSource.xml
@@ -0,0 +1,43 @@
+
+
+
+
+ Wula_EventConsole
+
+ 一个可以触发特殊事件的控制台。
+ Building
+
+ Things/Building/Misc/CommsConsole
+ Graphic_Multi
+ (3,3)
+
+
+ 250
+ 2000
+ 70
+ 0.5
+
+ (3,1)
+
+ 120
+ 8
+
+ Building
+ PassThroughOnly
+ 50
+ Misc
+
+
+ CompPowerTrader
+ 100
+
+
+
+ Wula_ExampleUI
+
+ 无法接触事件控制台。
+
+
+
+
+
diff --git a/1.6/Defs/WulaMiscSettingDefs/EventUIConfig.xml b/1.6/Defs/WulaMiscSettingDefs/EventUIConfig.xml
index 063feb23..86e2a347 100644
--- a/1.6/Defs/WulaMiscSettingDefs/EventUIConfig.xml
+++ b/1.6/Defs/WulaMiscSettingDefs/EventUIConfig.xml
@@ -18,6 +18,8 @@
0
0
+
+ (750, 500)
diff --git a/Documentation/EventSystem_Documentation.md b/Documentation/EventSystem_Documentation.md
index b0cc6ac0..0257f778 100644
--- a/Documentation/EventSystem_Documentation.md
+++ b/Documentation/EventSystem_Documentation.md
@@ -423,3 +423,37 @@
5. 在弹出的列表中,选择你想要测试的事件的 `defName`。
这会立即打开对应的事件窗口,让你可以在不满足游戏内触发条件的情况下快速预览和测试你的事件。
+---
+
+## 10. 组件:从建筑触发事件 (`CompOpenCustomUI`)
+
+我们提供了一个通用的 `ThingComp`,可以附加到任何建筑上,通过右键菜单来打开一个指定的事件窗口。
+
+**如何使用:**
+
+1. 在你的建筑 `ThingDef` 的 `` 列表中,添加一个新的 `li`。
+2. 将 `Class` 属性设置为 `WulaFallenEmpire.CompProperties_OpenCustomUI`。
+3. 在 `li` 内部,设置以下字段:
+ - `uiDefName`: (必须) 要打开的 `CustomUIDef` 的 `defName`。
+ - `label`: (必须) 显示在右键菜单中的文本。
+ - `failReason`: (可选) 当殖民者无法到达建筑时显示的提示文本。如果未提供,则默认为 "无法到达"。
+
+**示例 (`Buildings_EventSource.xml`):**
+```xml
+
+ Wula_EventConsole
+
+ ...
+
+ ...
+
+
+ Wula_ExampleUI
+
+ 无法接触事件控制台。
+
+
+
+```
+
+这个组件会自动处理电力检查(如果建筑有 `CompPowerTrader`)和可达性检查。
diff --git a/Source/WulaFallenEmpire/.vs/WulaFallenEmpire/v17/.suo b/Source/WulaFallenEmpire/.vs/WulaFallenEmpire/v17/.suo
index d12b70d1..ed461aec 100644
Binary files a/Source/WulaFallenEmpire/.vs/WulaFallenEmpire/v17/.suo and b/Source/WulaFallenEmpire/.vs/WulaFallenEmpire/v17/.suo differ
diff --git a/Source/WulaFallenEmpire/.vs/WulaFallenEmpire/v17/DocumentLayout.json b/Source/WulaFallenEmpire/.vs/WulaFallenEmpire/v17/DocumentLayout.json
index db33f4c4..e56e3d21 100644
--- a/Source/WulaFallenEmpire/.vs/WulaFallenEmpire/v17/DocumentLayout.json
+++ b/Source/WulaFallenEmpire/.vs/WulaFallenEmpire/v17/DocumentLayout.json
@@ -1,21 +1,21 @@
{
"Version": 1,
- "WorkspaceRootPath": "E:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\WulaFallenEmpireTest\\Source\\WulaFallenEmpire\\",
+ "WorkspaceRootPath": "C:\\Steam\\steamapps\\common\\RimWorld\\Mods\\3516260226\\Source\\WulaFallenEmpire\\",
"Documents": [
{
- "AbsoluteMoniker": "D:0:0:{F5AE8C3B-0221-4C16-A128-9A62D521A8FF}|WulaFallenEmpire.csproj|e:\\steamlibrary\\steamapps\\common\\rimworld\\mods\\wulafallenempiretest\\source\\wulafallenempire\\eventsystem\\dialog_customdisplay.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "AbsoluteMoniker": "D:0:0:{F5AE8C3B-0221-4C16-A128-9A62D521A8FF}|WulaFallenEmpire.csproj|c:\\steam\\steamapps\\common\\rimworld\\mods\\3516260226\\source\\wulafallenempire\\eventsystem\\dialog_customdisplay.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{F5AE8C3B-0221-4C16-A128-9A62D521A8FF}|WulaFallenEmpire.csproj|solutionrelative:eventsystem\\dialog_customdisplay.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
- "AbsoluteMoniker": "D:0:0:{F5AE8C3B-0221-4C16-A128-9A62D521A8FF}|WulaFallenEmpire.csproj|e:\\steamlibrary\\steamapps\\common\\rimworld\\mods\\wulafallenempiretest\\source\\wulafallenempire\\eventsystem\\debugactions.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "AbsoluteMoniker": "D:0:0:{F5AE8C3B-0221-4C16-A128-9A62D521A8FF}|WulaFallenEmpire.csproj|C:\\Steam\\steamapps\\common\\RimWorld\\Mods\\3516260226\\Source\\WulaFallenEmpire\\eventsystem\\debugactions.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{F5AE8C3B-0221-4C16-A128-9A62D521A8FF}|WulaFallenEmpire.csproj|solutionrelative:eventsystem\\debugactions.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
- "AbsoluteMoniker": "D:0:0:{F5AE8C3B-0221-4C16-A128-9A62D521A8FF}|WulaFallenEmpire.csproj|e:\\steamlibrary\\steamapps\\common\\rimworld\\mods\\wulafallenempiretest\\source\\wulafallenempire\\eventsystem\\customuidef.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "AbsoluteMoniker": "D:0:0:{F5AE8C3B-0221-4C16-A128-9A62D521A8FF}|WulaFallenEmpire.csproj|C:\\Steam\\steamapps\\common\\RimWorld\\Mods\\3516260226\\Source\\WulaFallenEmpire\\eventsystem\\customuidef.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{F5AE8C3B-0221-4C16-A128-9A62D521A8FF}|WulaFallenEmpire.csproj|solutionrelative:eventsystem\\customuidef.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
- "AbsoluteMoniker": "D:0:0:{F5AE8C3B-0221-4C16-A128-9A62D521A8FF}|WulaFallenEmpire.csproj|e:\\steamlibrary\\steamapps\\common\\rimworld\\mods\\wulafallenempiretest\\source\\wulafallenempire\\eventsystem\\condition.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "AbsoluteMoniker": "D:0:0:{F5AE8C3B-0221-4C16-A128-9A62D521A8FF}|WulaFallenEmpire.csproj|C:\\Steam\\steamapps\\common\\RimWorld\\Mods\\3516260226\\Source\\WulaFallenEmpire\\eventsystem\\condition.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{F5AE8C3B-0221-4C16-A128-9A62D521A8FF}|WulaFallenEmpire.csproj|solutionrelative:eventsystem\\condition.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
}
],
@@ -26,17 +26,21 @@
"DocumentGroups": [
{
"DockedWidth": 200,
- "SelectedChildIndex": 0,
+ "SelectedChildIndex": 1,
"Children": [
+ {
+ "$type": "Bookmark",
+ "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}"
+ },
{
"$type": "Document",
"DocumentIndex": 0,
"Title": "Dialog_CustomDisplay.cs",
- "DocumentMoniker": "E:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\WulaFallenEmpireTest\\Source\\WulaFallenEmpire\\EventSystem\\Dialog_CustomDisplay.cs",
+ "DocumentMoniker": "C:\\Steam\\steamapps\\common\\RimWorld\\Mods\\3516260226\\Source\\WulaFallenEmpire\\EventSystem\\Dialog_CustomDisplay.cs",
"RelativeDocumentMoniker": "EventSystem\\Dialog_CustomDisplay.cs",
- "ToolTip": "E:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\WulaFallenEmpireTest\\Source\\WulaFallenEmpire\\EventSystem\\Dialog_CustomDisplay.cs",
+ "ToolTip": "C:\\Steam\\steamapps\\common\\RimWorld\\Mods\\3516260226\\Source\\WulaFallenEmpire\\EventSystem\\Dialog_CustomDisplay.cs",
"RelativeToolTip": "EventSystem\\Dialog_CustomDisplay.cs",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAABAAAAAPAAAAAAAAAA==",
+ "ViewState": "AQIAAAAAAAAAAAAAAADwvwAAAAAAAAAA",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-07-27T10:59:13.84Z",
"EditorCaption": ""
@@ -45,44 +49,37 @@
"$type": "Document",
"DocumentIndex": 1,
"Title": "DebugActions.cs",
- "DocumentMoniker": "E:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\WulaFallenEmpireTest\\Source\\WulaFallenEmpire\\EventSystem\\DebugActions.cs",
+ "DocumentMoniker": "C:\\Steam\\steamapps\\common\\RimWorld\\Mods\\3516260226\\Source\\WulaFallenEmpire\\EventSystem\\DebugActions.cs",
"RelativeDocumentMoniker": "EventSystem\\DebugActions.cs",
- "ToolTip": "E:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\WulaFallenEmpireTest\\Source\\WulaFallenEmpire\\EventSystem\\DebugActions.cs",
+ "ToolTip": "C:\\Steam\\steamapps\\common\\RimWorld\\Mods\\3516260226\\Source\\WulaFallenEmpire\\EventSystem\\DebugActions.cs",
"RelativeToolTip": "EventSystem\\DebugActions.cs",
"ViewState": "AgIAAAAAAAAAAAAAAADwvwAAAAAAAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-27T10:59:11.817Z",
- "EditorCaption": ""
+ "WhenOpened": "2025-07-27T10:59:11.817Z"
},
{
"$type": "Document",
"DocumentIndex": 2,
"Title": "CustomUIDef.cs",
- "DocumentMoniker": "E:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\WulaFallenEmpireTest\\Source\\WulaFallenEmpire\\EventSystem\\CustomUIDef.cs",
+ "DocumentMoniker": "C:\\Steam\\steamapps\\common\\RimWorld\\Mods\\3516260226\\Source\\WulaFallenEmpire\\EventSystem\\CustomUIDef.cs",
"RelativeDocumentMoniker": "EventSystem\\CustomUIDef.cs",
- "ToolTip": "E:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\WulaFallenEmpireTest\\Source\\WulaFallenEmpire\\EventSystem\\CustomUIDef.cs",
+ "ToolTip": "C:\\Steam\\steamapps\\common\\RimWorld\\Mods\\3516260226\\Source\\WulaFallenEmpire\\EventSystem\\CustomUIDef.cs",
"RelativeToolTip": "EventSystem\\CustomUIDef.cs",
"ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-27T10:59:01.929Z",
- "EditorCaption": ""
+ "WhenOpened": "2025-07-27T10:59:01.929Z"
},
{
"$type": "Document",
"DocumentIndex": 3,
"Title": "Condition.cs",
- "DocumentMoniker": "E:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\WulaFallenEmpireTest\\Source\\WulaFallenEmpire\\EventSystem\\Condition.cs",
+ "DocumentMoniker": "C:\\Steam\\steamapps\\common\\RimWorld\\Mods\\3516260226\\Source\\WulaFallenEmpire\\EventSystem\\Condition.cs",
"RelativeDocumentMoniker": "EventSystem\\Condition.cs",
- "ToolTip": "E:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\WulaFallenEmpireTest\\Source\\WulaFallenEmpire\\EventSystem\\Condition.cs",
+ "ToolTip": "C:\\Steam\\steamapps\\common\\RimWorld\\Mods\\3516260226\\Source\\WulaFallenEmpire\\EventSystem\\Condition.cs",
"RelativeToolTip": "EventSystem\\Condition.cs",
"ViewState": "AgIAAAAAAAAAAAAAAAAAAAkAAAAAAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-27T10:50:26.799Z",
- "EditorCaption": ""
- },
- {
- "$type": "Bookmark",
- "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}"
+ "WhenOpened": "2025-07-27T10:50:26.799Z"
}
]
}
diff --git a/Source/WulaFallenEmpire/EventSystem/CompOpenCustomUI.cs b/Source/WulaFallenEmpire/EventSystem/CompOpenCustomUI.cs
new file mode 100644
index 00000000..af251dcf
--- /dev/null
+++ b/Source/WulaFallenEmpire/EventSystem/CompOpenCustomUI.cs
@@ -0,0 +1,60 @@
+using RimWorld;
+using Verse;
+using System.Collections.Generic;
+using Verse.AI;
+
+namespace WulaFallenEmpire
+{
+ public class CompProperties_OpenCustomUI : CompProperties
+ {
+ public string uiDefName;
+ public string label; // The text to display in the float menu
+ public string failReason; // Optional: Custom text to show if the pawn can't reach the building
+
+ public CompProperties_OpenCustomUI()
+ {
+ this.compClass = typeof(CompOpenCustomUI);
+ }
+ }
+
+ public class CompOpenCustomUI : ThingComp
+ {
+ public CompProperties_OpenCustomUI Props => (CompProperties_OpenCustomUI)this.props;
+
+ public override IEnumerable CompFloatMenuOptions(Pawn selPawn)
+ {
+ // Check if the pawn can interact with the building
+ if (!selPawn.CanReserveAndReach(this.parent, PathEndMode.InteractionCell, Danger.Deadly))
+ {
+ string reason = Props.failReason ?? "CannotUseNoPath".Translate();
+ yield return new FloatMenuOption(reason, null);
+ yield break;
+ }
+
+ // Check for power if the building has a power component
+ CompPowerTrader powerComp = this.parent.GetComp();
+ if (powerComp != null && !powerComp.PowerOn)
+ {
+ yield return new FloatMenuOption("CannotUseNoPower".Translate(), null);
+ yield break;
+ }
+
+ string label = Props.label ?? "Open Custom UI"; // Use default label if not provided
+
+ FloatMenuOption option = new FloatMenuOption(label, delegate()
+ {
+ CustomUIDef uiDef = DefDatabase.GetNamed(Props.uiDefName, false);
+ if (uiDef != null)
+ {
+ Find.WindowStack.Add(new Dialog_CustomDisplay(uiDef));
+ }
+ else
+ {
+ Log.Error($"[CompOpenCustomUI] Could not find CustomUIDef named '{Props.uiDefName}'.");
+ }
+ });
+
+ yield return option;
+ }
+ }
+}
diff --git a/Source/WulaFallenEmpire/EventSystem/CustomUIDef.cs b/Source/WulaFallenEmpire/EventSystem/CustomUIDef.cs
index c1f4534a..90652a44 100644
--- a/Source/WulaFallenEmpire/EventSystem/CustomUIDef.cs
+++ b/Source/WulaFallenEmpire/EventSystem/CustomUIDef.cs
@@ -1,17 +1,51 @@
using System.Collections.Generic;
+using UnityEngine;
using Verse;
namespace WulaFallenEmpire
{
+ public enum DescriptionSelectionMode
+ {
+ Random,
+ Sequential
+ }
+
public class CustomUIDef : Def
{
public string portraitPath;
public string characterName;
- public new string description;
+
+ // New system: list of descriptions
+ public List descriptions;
+ public DescriptionSelectionMode descriptionMode = DescriptionSelectionMode.Random;
+
+ // Backwards compatibility: old single description field
+ [System.Obsolete("Use 'descriptions' list instead. This field is for backwards compatibility only.")]
+ public new string description = null;
+
+ public Vector2 windowSize = Vector2.zero;
+
public List options;
- public string backgroundImagePath; // Override default background
+ public string backgroundImagePath;
public List onOpenEffects;
public List dismissEffects;
+
+ public override void PostLoad()
+ {
+ base.PostLoad();
+#pragma warning disable 0618
+ // If the old description field is used, move its value to the new list for processing.
+ if (!description.NullOrEmpty())
+ {
+ if (descriptions.NullOrEmpty())
+ {
+ descriptions = new List();
+ }
+ descriptions.Insert(0, description);
+ description = null; // Clear the old field to prevent confusion
+ }
+#pragma warning restore 0618
+ }
}
public class CustomUIOption
@@ -19,6 +53,6 @@ namespace WulaFallenEmpire
public string label;
public List effects;
public List conditions;
- public string disabledReason; // Custom text to show if conditions aren't met
+ public string disabledReason;
}
}
diff --git a/Source/WulaFallenEmpire/EventSystem/Dialog_CustomDisplay.cs b/Source/WulaFallenEmpire/EventSystem/Dialog_CustomDisplay.cs
index 93c8309a..0ccf67a2 100644
--- a/Source/WulaFallenEmpire/EventSystem/Dialog_CustomDisplay.cs
+++ b/Source/WulaFallenEmpire/EventSystem/Dialog_CustomDisplay.cs
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
+using System.Linq;
using UnityEngine;
using Verse;
@@ -10,6 +11,7 @@ namespace WulaFallenEmpire
private CustomUIDef def;
private Texture2D portrait;
private Texture2D background;
+ private string selectedDescription; // Store the chosen description for this window instance
private static EventUIConfigDef config;
public static EventUIConfigDef Config
@@ -24,14 +26,47 @@ namespace WulaFallenEmpire
}
}
- public override Vector2 InitialSize => new Vector2(750f, 500f);
+ public override Vector2 InitialSize
+ {
+ get
+ {
+ if (def.windowSize != Vector2.zero)
+ {
+ return def.windowSize;
+ }
+ return Config.defaultWindowSize; // Fallback to size from config
+ }
+ }
public Dialog_CustomDisplay(CustomUIDef def)
{
this.def = def;
this.forcePause = true;
this.absorbInputAroundWindow = true;
- this.doCloseX = true; // Add a close button to the window
+ this.doCloseX = true;
+
+ // Select the description text
+ if (!def.descriptions.NullOrEmpty())
+ {
+ if (def.descriptionMode == DescriptionSelectionMode.Random)
+ {
+ selectedDescription = def.descriptions.RandomElement();
+ }
+ else // Sequential
+ {
+ string indexVarName = $"_seq_desc_index_{def.defName}";
+ int currentIndex = EventContext.GetVariable(indexVarName, 0);
+
+ selectedDescription = def.descriptions[currentIndex];
+
+ int nextIndex = (currentIndex + 1) % def.descriptions.Count;
+ EventContext.SetVariable(indexVarName, nextIndex);
+ }
+ }
+ else
+ {
+ selectedDescription = "Error: No descriptions found in def.";
+ }
}
public override void PreOpen()
@@ -127,12 +162,11 @@ namespace WulaFallenEmpire
GUI.color = Color.white;
}
Rect textInnerRect = textRect.ContractedBy(10f * scale);
- Widgets.Label(textInnerRect, def.description);
+ Widgets.Label(textInnerRect, selectedDescription); // Use the selected description
// option (Buttons)
Rect optionRect = new Rect(nameRect.x, textRect.yMax + Config.optionsTextOffset * scale, scaledOptionsWidth, lihuiRect.height - nameRect.height - textRect.height - (Config.textNameOffset + Config.optionsTextOffset) * scale);
- // No need to draw a box for the options area, the buttons will be listed inside.
-
+
Listing_Standard listing = new Listing_Standard();
listing.Begin(optionRect.ContractedBy(10f * scale));
if (def.options != null)
@@ -151,7 +185,6 @@ namespace WulaFallenEmpire
}
else
{
- // Draw a disabled button and add a tooltip
Rect rect = listing.GetRect(30f);
Widgets.ButtonText(rect, option.label, false, true, false);
TooltipHandler.TipRegion(rect, GetDisabledReason(option, reason));
diff --git a/Source/WulaFallenEmpire/EventSystem/EventUIConfigDef.cs b/Source/WulaFallenEmpire/EventSystem/EventUIConfigDef.cs
index c14a18de..e968157c 100644
--- a/Source/WulaFallenEmpire/EventSystem/EventUIConfigDef.cs
+++ b/Source/WulaFallenEmpire/EventSystem/EventUIConfigDef.cs
@@ -9,6 +9,7 @@ namespace WulaFallenEmpire
public GameFont labelFont = GameFont.Small;
public bool drawBorders = true;
public string defaultBackgroundImagePath;
+ public Vector2 defaultWindowSize = new Vector2(750f, 500f);
// Virtual Layout Dimensions
public Vector2 lihuiSize = new Vector2(500f, 800f);
diff --git a/Source/WulaFallenEmpire/WulaFallenEmpire.csproj b/Source/WulaFallenEmpire/WulaFallenEmpire.csproj
index 351b307d..81d89f63 100644
--- a/Source/WulaFallenEmpire/WulaFallenEmpire.csproj
+++ b/Source/WulaFallenEmpire/WulaFallenEmpire.csproj
@@ -109,6 +109,7 @@
+
@@ -116,4 +117,4 @@
-
\ No newline at end of file
+
diff --git a/美术与文本源文件/Wula/Things/Wula_AI_Bomb_Mother/Bodies/Naked_Thin_east.sai2 b/美术与文本源文件/Wula/Things/Wula_AI_Bomb_Mother/Bodies/Naked_Thin_east.sai2
index d76a547d..3e6dab13 100644
Binary files a/美术与文本源文件/Wula/Things/Wula_AI_Bomb_Mother/Bodies/Naked_Thin_east.sai2 and b/美术与文本源文件/Wula/Things/Wula_AI_Bomb_Mother/Bodies/Naked_Thin_east.sai2 differ