diff --git a/1.6/1.6/Assemblies/WulaFallenEmpire.dll b/1.6/1.6/Assemblies/WulaFallenEmpire.dll index 86af74e6..f8148c23 100644 Binary files a/1.6/1.6/Assemblies/WulaFallenEmpire.dll and b/1.6/1.6/Assemblies/WulaFallenEmpire.dll differ diff --git a/1.6/1.6/Defs/ThingDefs_Buildings/Building_WULA_ArmedShuttleWithPocket.xml b/1.6/1.6/Defs/ThingDefs_Buildings/Building_WULA_ArmedShuttleWithPocket.xml index 4b77b3b7..21bb662d 100644 --- a/1.6/1.6/Defs/ThingDefs_Buildings/Building_WULA_ArmedShuttleWithPocket.xml +++ b/1.6/1.6/Defs/ThingDefs_Buildings/Building_WULA_ArmedShuttleWithPocket.xml @@ -1,8 +1,9 @@ + WULA_ArmedShuttleWithPocket - + An advanced chemfuel-powered shuttle with integrated pocket space technology. Equipped with a defensive turret and internal storage dimension that doesn't require hacking to access. Perfect for long-distance exploration and mobile operations. WulaFallenEmpire.Building_ArmedShuttleWithPocket true @@ -26,30 +27,28 @@ - 800 - 0.4 - 60000 - 200 - 0.75 + 6000 + 0.5 + 40000 + 150 + 0.65 Normal Odyssey - 10 + 8 - 400 - 300 - 12 - 4 + 300 + 200 + 8 + 2 1 - 1 true - 80 - 90 - 6 - 6 - 1 + 60 + 60 + 5 + 4 true true @@ -69,30 +68,18 @@ true
  • ShuttleEngine
    • -
  • VanometricPowerCore
    •  - Gun_ChargeBlasterAdvancedTurret - 4.5 - 1.0~1.5 - 1.9 - (0, 0.08) + Gun_ChargeBlasterHeavyTurret + 5.5 + 1.75 + (0, 0.05) - - -
  • - WULA_PocketSpace_Small - WULA_PocketMapExit - (13, 13) - true -
    • -
  • ITab_ContentsTransporter
  • ITab_Shells
    •
  • Shuttles
    • -
  • VoidStructure
    •
  • @@ -134,19 +121,27 @@ true
  • - CompPowerTrader - 200 - false + CompPowerPlant + -400 + true
  • ShuttleIdle_Ambience
    • + +
  • + WULA_PocketSpace_Small + WULA_PocketMapExit + (13, 13) + true +
    • +
  • PlaceWorker_NotUnderRoof
  • PlaceWorker_TurretTop
    •  - 2602 + 2601     @@ -305,13 +300,15 @@ An exit portal that allows return from the pocket space to the main map. WulaFallenEmpire.Building_PocketMapExit - (1,1) + (3,3) MapMeshAndRealTime - Graphic_Single - Things/Building/Misc/CaveExit/CaveExit - (1,1) + Wula/Building/WULA_War_Machine_Recharger + Graphic_Multi + (3,3) + (0,0,0) + Standable 0 @@ -323,6 +320,11 @@
  • UndercaveMapExitLightshafts
    • +
  • + CompPowerPlant + -400 + true +
    • \ No newline at end of file diff --git a/1.6/1.6/Languages/ChineseSimplified/Keyed/Misc_Gameplay.xml b/1.6/1.6/Languages/ChineseSimplified (简体中文)/Keyed/Misc_Gameplay.xml similarity index 100% rename from 1.6/1.6/Languages/ChineseSimplified/Keyed/Misc_Gameplay.xml rename to 1.6/1.6/Languages/ChineseSimplified (简体中文)/Keyed/Misc_Gameplay.xml diff --git a/1.6/1.6/Languages/ChineseSimplified/Keyed/WULA_PocketShuttle.xml b/1.6/1.6/Languages/ChineseSimplified (简体中文)/Keyed/WULA_PocketShuttle.xml similarity index 79% rename from 1.6/1.6/Languages/ChineseSimplified/Keyed/WULA_PocketShuttle.xml rename to 1.6/1.6/Languages/ChineseSimplified (简体中文)/Keyed/WULA_PocketShuttle.xml index 0dfffac4..e6943045 100644 --- a/1.6/1.6/Languages/ChineseSimplified/Keyed/WULA_PocketShuttle.xml +++ b/1.6/1.6/Languages/ChineseSimplified (简体中文)/Keyed/WULA_PocketShuttle.xml @@ -36,18 +36,6 @@ 通过传送门返回 - 返回主地图 - 没有目标地图 - 查看主地图 - 切换到主地图并查看穿梭机。 - 装载穿梭机 - 打开穿梭机装载界面，选择要装载的人员和物品。 - 取消装载 - 取消当前的装载操作。 - 穿梭机状态 - 查看穿梭机的详细状态信息。 - 穿梭机信息 - 无法打开装载对话框。 全员返回 将所有殖民者从口袋空间传送回主地图。 {0} 已成功返回主地图。 diff --git a/1.6/1.6/Languages/English/Keyed/WULA_PocketShuttle.xml b/1.6/1.6/Languages/English/Keyed/WULA_PocketShuttle.xml index 22372968..85ed3874 100644 --- a/1.6/1.6/Languages/English/Keyed/WULA_PocketShuttle.xml +++ b/1.6/1.6/Languages/English/Keyed/WULA_PocketShuttle.xml @@ -36,18 +36,6 @@ Return through portal - Return to main map - No target map - View main map - Switch to main map and view the shuttle. - Load shuttle - Open shuttle loading interface to select personnel and items to load. - Cancel loading - Cancel the current loading operation. - Shuttle status - View detailed shuttle status information. - Shuttle Information - Cannot open loading dialog. Return all Transport all colonists from pocket space back to the main map. {0} successfully returned to main map. diff --git a/Source/WulaFallenEmpire/WULA_Shuttle/Building_PocketMapExit.cs b/Source/WulaFallenEmpire/WULA_Shuttle/Building_PocketMapExit.cs index d7113ba0..e458f819 100644 --- a/Source/WulaFallenEmpire/WULA_Shuttle/Building_PocketMapExit.cs +++ b/Source/WulaFallenEmpire/WULA_Shuttle/Building_PocketMapExit.cs @@ -2,7 +2,6 @@ using RimWorld; using Verse; using System.Collections.Generic; using System.Linq; -using System.Text; using UnityEngine; namespace WulaFallenEmpire @@ -111,104 +110,6 @@ namespace WulaFallenEmpire /// 重写进入按钮图标，使用原版的ViewCave图标 /// protected override Texture2D EnterTex => ContentFinder.Get("UI/Commands/ViewCave"); - - /// - /// 重写GetGizmos方法，添加穿梭机装载相关按钮 - /// - public override IEnumerable GetGizmos() - { - // 获取基类的按钮（退出空间和查看地图按钮） - foreach (Gizmo gizmo in base.GetGizmos()) - { - yield return gizmo; - } - - // 如果有父穿梭机，添加穿梭机相关的装载按钮 - if (parentShuttle != null) - { - // 查看主地图按钮 - yield return new Command_Action - { - defaultLabel = "WULA.PocketSpace.ViewMainMap".Translate(), - defaultDesc = "WULA.PocketSpace.ViewMainMapDesc".Translate(), - icon = ContentFinder.Get("UI/Commands/ViewWorld"), - action = delegate - { - if (targetMap != null) - { - Current.Game.CurrentMap = targetMap; - if (parentShuttle != null && parentShuttle.Spawned) - { - Find.CameraDriver.JumpToCurrentMapLoc(parentShuttle.Position); - Find.Selector.Select(parentShuttle); - } - else - { - Find.CameraDriver.JumpToCurrentMapLoc(targetPos); - } - } - } - }; - - // 穿梭机装载管理按钮 - if (parentShuttle.Spawned) - { - // 获取穿梭机的CompTransporter组件 - CompTransporter transporter = parentShuttle.GetComp(); - if (transporter != null) - { - // 添加装载按钮（模仿原版CompTransporter的功能） - yield return new Command_Action - { - defaultLabel = "WULA.PocketSpace.LoadShuttle".Translate(), - defaultDesc = "WULA.PocketSpace.LoadShuttleDesc".Translate(), - icon = ContentFinder.Get("UI/Commands/LoadTransporter"), - action = delegate - { - OpenShuttleLoadingDialog(transporter); - } - }; - - // 如果正在装载，添加取消装载按钮 - if (transporter.LoadingInProgress) - { - yield return new Command_Action - { - defaultLabel = "WULA.PocketSpace.CancelLoading".Translate(), - defaultDesc = "WULA.PocketSpace.CancelLoadingDesc".Translate(), - icon = ContentFinder.Get("UI/Designators/Cancel"), - action = delegate - { - transporter.CancelLoad(); - } - }; - } - } - - // 添加穿梭机发射按钮（如果正在装载且可以发射） - CompLaunchable launchable = parentShuttle.GetComp(); - if (launchable != null && transporter != null && !transporter.LoadingInProgress) - { - foreach (Gizmo gizmo in launchable.CompGetGizmosExtra()) - { - yield return gizmo; - } - } - } - - // 穿梭机状态信息按钮 - yield return new Command_Action - { - defaultLabel = "WULA.PocketSpace.ShuttleStatus".Translate(), - defaultDesc = "WULA.PocketSpace.ShuttleStatusDesc".Translate(), - icon = ContentFinder.Get("UI/Commands/InfoCard"), - action = delegate - { - ShowShuttleStatusInfo(); - } - }; - } - } @@ -242,78 +143,5 @@ namespace WulaFallenEmpire Log.Error($"[WULA] Error exiting pocket space: {ex}"); } } - - /// - /// 打开穿梭机装载对话框 - /// - private void OpenShuttleLoadingDialog(CompTransporter transporter) - { - if (transporter == null) return; - - try - { - // 使用原版的Dialog_LoadTransporters打开装载对话框 - Find.WindowStack.Add(new Dialog_LoadTransporters(parentShuttle.Map, new List { transporter })); - } - catch (System.Exception ex) - { - Log.Error($"[WULA] Error opening shuttle loading dialog: {ex}"); - Messages.Message("WULA.PocketSpace.LoadingDialogError".Translate(), MessageTypeDefOf.RejectInput); - } - } - - /// - /// 显示穿梭机状态信息 - /// - private void ShowShuttleStatusInfo() - { - if (parentShuttle == null) return; - - StringBuilder statusText = new StringBuilder(); - - // 基本信息 - statusText.AppendLine("WULA.PocketSpace.ShuttleInfo".Translate()); - statusText.AppendLine($"• 状态: {(parentShuttle.Spawned ? "已部署" : "飞行中")}"); - - if (parentShuttle.Spawned) - { - statusText.AppendLine($"• 位置: {targetMap?.Parent?.Label ?? "未知"} ({targetPos.x}, {targetPos.z})"); - - // 燃料信息 - CompRefuelable fuel = parentShuttle.GetComp(); - if (fuel != null) - { - statusText.AppendLine($"• 燃料: {fuel.Fuel:F0}/{fuel.Props.fuelCapacity:F0}"); - } - - // 装载信息 - CompTransporter transporter = parentShuttle.GetComp(); - if (transporter != null) - { - statusText.AppendLine($"• 载重: {transporter.MassUsage:F1}/{transporter.Props.massCapacity:F1}"); - if (transporter.LoadingInProgress) - { - statusText.AppendLine("• 装载状态: 正在装载..."); - } - } - - // 口袋空间信息 - if (parentShuttle.pocketMapGenerated) - { - statusText.AppendLine($"• 内部空间: 已初始化"); - if (parentShuttle.innerContainer.Count > 0) - { - statusText.AppendLine($"• 内部储存: {parentShuttle.innerContainer.Count} 件物品"); - } - } - } - else - { - statusText.AppendLine("• 穿梭机正在飞行中，无法获取详细信息"); - } - - // 显示信息对话框 - Find.WindowStack.Add(new Dialog_MessageBox(statusText.ToString(), "WULA.PocketSpace.ShuttleStatus".Translate())); - } } } \ No newline at end of file