diff --git a/1.6/1.6/Assemblies/WulaFallenEmpire.dll b/1.6/1.6/Assemblies/WulaFallenEmpire.dll index 9f243bd7..ade5b720 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/HediffDefs/WULA_Misc_Hediffs.xml b/1.6/1.6/Defs/HediffDefs/WULA_Misc_Hediffs.xml index 9c9f0419..8a81f2fc 100644 --- a/1.6/1.6/Defs/HediffDefs/WULA_Misc_Hediffs.xml +++ b/1.6/1.6/Defs/HediffDefs/WULA_Misc_Hediffs.xml @@ -47,9 +47,7 @@ -
  • - 0.0025 -
  • +
  • diff --git a/1.6/1.6/Defs/NeedDefs/WULA_Needs.xml b/1.6/1.6/Defs/NeedDefs/WULA_Needs.xml index dbff8bbd..5248f756 100644 --- a/1.6/1.6/Defs/NeedDefs/WULA_Needs.xml +++ b/1.6/1.6/Defs/NeedDefs/WULA_Needs.xml @@ -40,9 +40,10 @@ 0.5 0.2 0.05 - 0.05 - 0.1 - 5 + 0.01 + 0.05 + 50 + 0.001 WULA_Maintenance_MinorBreakdown WULA_Maintenance_MajorBreakdown WULA_Maintenance_CriticalFailuren diff --git a/1.6/1.6/Defs/ResearchProjectDefs/WULA_ResearchProjects_Remake.xml b/1.6/1.6/Defs/ResearchProjectDefs/WULA_ResearchProjects_Remake.xml index 1384a86f..b485472f 100644 --- a/1.6/1.6/Defs/ResearchProjectDefs/WULA_ResearchProjects_Remake.xml +++ b/1.6/1.6/Defs/ResearchProjectDefs/WULA_ResearchProjects_Remake.xml @@ -24,7 +24,7 @@ Graphic_Single - Things/Item/Special/TechprintUltratech + Wula/Item/WULA_Techprint false @@ -86,7 +86,7 @@ Graphic_Single - Things/Item/Special/TechprintUltratech + Wula/Item/WULA_Techprint false @@ -148,7 +148,7 @@ Graphic_Single - Things/Item/Special/TechprintUltratech + Wula/Item/WULA_Techprint false diff --git a/1.6/1.6/Defs/StatDefs/WULA_Stats.xml b/1.6/1.6/Defs/StatDefs/WULA_Stats.xml index d97f515e..c7d3a15a 100644 --- a/1.6/1.6/Defs/StatDefs/WULA_Stats.xml +++ b/1.6/1.6/Defs/StatDefs/WULA_Stats.xml @@ -92,7 +92,7 @@ 乌拉帝国合成人因为伤害导致维护度损失的程度。数值越高,受到伤害时损失越多维护度。 WULA_Synth - 0.01 + 0.0025 PercentZero true true diff --git a/1.6/1.6/Defs/ThingDefs_Buildings/WULA_Drop_Buildings.xml b/1.6/1.6/Defs/ThingDefs_Buildings/WULA_Drop_Buildings.xml index c4ef4a50..029fe8ef 100644 --- a/1.6/1.6/Defs/ThingDefs_Buildings/WULA_Drop_Buildings.xml +++ b/1.6/1.6/Defs/ThingDefs_Buildings/WULA_Drop_Buildings.xml @@ -829,9 +829,6 @@
  • PlaceWorker_NotUnderRoof
  • - -
  • TransportPod
  • -
    6 0.65 diff --git a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Manpack_Weapon.xml b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Manpack_Weapon.xml index ad48e01a..3e3d8ae4 100644 --- a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Manpack_Weapon.xml +++ b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Manpack_Weapon.xml @@ -110,7 +110,7 @@ Graphic_Single CutoutComplex - +
  • Wula_Melee_Weapon_T1
  • -65 @@ -254,7 +254,7 @@ 450 UnfinishedWeapon - +
  • Wula_Melee_Weapon_T2
  • @@ -297,7 +297,7 @@ 1.5 -65 - +
  • Wula_Melee_Weapon_T3
  • 0.8 @@ -422,7 +422,7 @@ - +
  • Wula_Constructor_Cat_Weapon
  • @@ -511,7 +511,7 @@ 40 2 - +
  • Wula_Ranged_Weapon_T1
  • Wula_Assault_Cat_Weapon
  • @@ -595,7 +595,7 @@ 乌拉帝国配发的近距离霰弹枪,以威力巨大的梭镖破甲弹为核心,专注于在短距离上的快速反应战斗和持续性压制能力 Ultra - +
  • Wula_Ranged_Weapon_T2
  • @@ -720,7 +720,7 @@ 9 - +
  • Wula_Ranged_Weapon_T2
  • @@ -762,7 +762,7 @@ 一般由乌拉帝国跳帮组或骑士军团携带的自动炮,在拥有长射程的同时火力也非常凶猛,会造成区域性的爆炸效果以控制集群敌军。它同时下挂了一具长射程的EMP榴弹发射器,可以用于控制机械族的集群冲击。 Ultra - +
  • Wula_Ranged_Weapon_T3
  • @@ -964,7 +964,7 @@ 6 2 - +
  • Wula_Ranged_Weapon_T1
  • @@ -1056,7 +1056,7 @@ 1.07 - +
  • Wula_Ranged_Weapon_T2
  • @@ -1149,7 +1149,7 @@ 1.07 - +
  • Wula_Weapon_Init
  • @@ -1238,7 +1238,7 @@ 乌拉帝国的通用机枪,负责在班组中提供如暴雨倾泻的高速连射光束流,产生的高温熔烧穿透效果极好,可以贯穿融化一条线上所有敌人。由于其光束武器的性质,在开始连射前有一段很长时间的预热,非常需要保护。 Ultra - +
  • Wula_Ranged_Weapon_T3
  • @@ -1342,7 +1342,7 @@ 由乌拉帝国跳帮组或骑士军团携带的手持光束炮,需要很长的时间进行瞄准,但是可以射出在远距离上击穿单体强大光束流。 Ultra - +
  • Wula_Ranged_Weapon_Wall_Destoryer
  • @@ -1598,7 +1598,7 @@ WULA_MW_Lance 乌拉帝国骑士所喜爱的远近合一的重型近战武器,采用高强度纳米碳纤维复合材料内芯,外层覆盖着带有散热格栅和能量导流槽的记忆合金装甲板,既可以在近战中刺穿对手,也可以从远距离上发射光束融化敌军装甲。 - + 50 @@ -1898,7 +1898,7 @@ 150 8 - +
  • Wula_Ranged_Weapon_T2
  • @@ -2014,7 +2014,7 @@ Graphic_Single 1.45
    - +
  • Wula_Ranged_Weapon_T3
  • 0.8 diff --git a/Content/Textures/Wula/Item/WULA_Techprint.png b/Content/Textures/Wula/Item/WULA_Techprint.png new file mode 100644 index 00000000..a458507c Binary files /dev/null and b/Content/Textures/Wula/Item/WULA_Techprint.png differ diff --git a/Source/WulaFallenEmpire/Pawn/WULA_AutonomousMech/CompAutonomousMech.cs b/Source/WulaFallenEmpire/Pawn/WULA_AutonomousMech/CompAutonomousMech.cs index 3c68123b..80fcdee1 100644 --- a/Source/WulaFallenEmpire/Pawn/WULA_AutonomousMech/CompAutonomousMech.cs +++ b/Source/WulaFallenEmpire/Pawn/WULA_AutonomousMech/CompAutonomousMech.cs @@ -38,7 +38,7 @@ namespace WulaFallenEmpire public bool requirePowerForAutonomy = true; public bool suppressUncontrolledWarning = true; - // 新增:能量管理设置 + // 保留能量管理设置供 ThinkNode 使用 public float lowEnergyThreshold = 0.3f; // 低能量阈值 public float criticalEnergyThreshold = 0.1f; // 临界能量阈值 public float rechargeCompleteThreshold = 0.9f; // 充电完成阈值 @@ -58,7 +58,6 @@ namespace WulaFallenEmpire public Pawn MechPawn => parent as Pawn; private DroneWorkModeDef currentWorkMode; - private bool wasLowEnergy = false; // 记录上次是否处于低能量状态 public bool CanBeAutonomous { @@ -104,6 +103,7 @@ namespace WulaFallenEmpire return CanBeAutonomous; } } + public bool IsInCombatMode { get @@ -190,56 +190,12 @@ namespace WulaFallenEmpire // 每60 tick检查一次能量状态 if (MechPawn != null && MechPawn.IsColonyMech && Find.TickManager.TicksGame % 60 == 0) { - CheckEnergyStatus(); + // 删除了自动切换模式的 CheckEnergyStatus 调用 EnsureWorkSettings(); } } - // 新增:能量状态检查 - private void CheckEnergyStatus() - { - if (!CanWorkAutonomously) - return; - bool isLowEnergyNow = IsLowEnergy; - - // 如果能量状态发生变化 - if (isLowEnergyNow != wasLowEnergy) - { - if (isLowEnergyNow) - { - // 进入低能量状态 - if (currentWorkMode == WulaDefOf.Work) - { - // 自动切换到充电模式 - SetWorkMode(WulaDefOf.Recharge); - Messages.Message("WULA_LowEnergySwitchToRecharge".Translate(MechPawn.LabelCap), - MechPawn, MessageTypeDefOf.CautionInput); - } - } - else - { - // 恢复能量状态 - if (currentWorkMode == WulaDefOf.Recharge && IsFullyCharged) - { - // 充满电后自动切换回工作模式 - SetWorkMode(WulaDefOf.Work); - Messages.Message("WULA_FullyChargedSwitchToWork".Translate(MechPawn.LabelCap), - MechPawn, MessageTypeDefOf.PositiveEvent); - } - } - - wasLowEnergy = isLowEnergyNow; - } - - // 临界能量警告 - if (IsCriticalEnergy && currentWorkMode != WulaDefOf.Recharge && currentWorkMode != WulaDefOf.Shutdown) - { - Messages.Message("WULA_CriticalEnergyLevels".Translate(MechPawn.LabelCap), - MechPawn, MessageTypeDefOf.ThreatBig); - // 强制切换到充电模式 - SetWorkMode(WulaDefOf.Recharge); - } - } + // 删除了整个 CheckEnergyStatus 方法,因为充电逻辑在 ThinkNode 中处理 public override IEnumerable CompGetGizmosExtra() { @@ -292,7 +248,7 @@ namespace WulaFallenEmpire { base.PostExposeData(); Scribe_Defs.Look(ref currentWorkMode, "currentWorkMode"); - Scribe_Values.Look(ref wasLowEnergy, "wasLowEnergy", false); + // 删除了 wasLowEnergy 的序列化 } } -} \ No newline at end of file +} diff --git a/美术与文本源文件/Wula/Item/WULA_Syhth_Trainer.sai2 b/美术与文本源文件/Wula/Item/WULA_Syhth_Trainer.sai2 deleted file mode 100644 index 024aaa63..00000000 Binary files a/美术与文本源文件/Wula/Item/WULA_Syhth_Trainer.sai2 and /dev/null differ diff --git a/美术与文本源文件/Wula/Item/WULA_Techprint.sai2 b/美术与文本源文件/Wula/Item/WULA_Techprint.sai2 new file mode 100644 index 00000000..243f4c88 Binary files /dev/null and b/美术与文本源文件/Wula/Item/WULA_Techprint.sai2 differ