fix(cheatenabler): restore mecha and fleet invincibility

Patch the native mecha damage and shield consumers so an inlined Player.invincible getter cannot bypass protection. Replace the fleet damage matcher with target-type prefixes to cover both space paths.

Synchronize the English and Chinese documentation without changing version 2.4.8.
This commit is contained in:
soarqin committed 2026-11-04 20:46:44 +08:00
1 parent 2eae91fa18
commit 64a23e9772
3 files changed
+35 -20

No files matched your search

+2
View File
@@ -4,6 +4,7 @@
## Changlog
* 2.4.8
* `Mecha and Drones/Fleets invincible`: Fix mecha HP and energy shield protection failing when enabled after taking damage, and restore protection for space fleets.
* `Finish build immediately`: Fix possible errors when starting a new game. Construction begins after the opening cutscene ends or is skipped.
* `Belt signal item generation`:
* Improve raw-material, intermediate, by-product and proliferator statistics using current recipes, with production and consumption counted separately. Incomplete recipe data only pauses the affected upstream statistics; item generation continues.
@@ -207,6 +208,7 @@
## 更新日志
* 2.4.8
* `机甲和战斗无人机无敌`:修复受伤后启用时机甲耐久度和能量护盾保护可能失效的问题,并恢复太空编队的无敌保护。
* `建造秒完成`:修复开始新游戏时可能报错的问题。建造会在开场动画播放结束或跳过后开始。
* `传送带信号物品生成`:
* 按当前配方完善原料、中间产物、副产物和增产剂的统计,分别记录生产和消耗。配方数据不完整时,仅暂停受影响物品的上游统计,物品仍会正常生成。
+30 -19
View File
@@ -1,10 +1,11 @@
using System.Collections.Generic;
using System.Reflection;
using System.Linq;
using System.Reflection.Emit;
using BepInEx.Configuration;
using HarmonyLib;
using UXAssist.Common;
using UXAssist.Common.ModFeatures;
using UXAssist.Common.Patching;
namespace CheatEnabler.Patches;
@@ -48,27 +49,37 @@ public static class CombatPatch
);
return matcher.InstructionEnumeration();
}
// Harmony transpiler: SkillSystem_DamageObject_Transpiler
// Target: SkillSystem.DamageGroundObjectByLocalCaster, SkillSystem.DamageGroundObjectByRemoteCaster, SkillSystem.DamageObject
// Fallback: None — patch will fail loudly if the target method body changes.
// Harmony transpiler: Mecha_Invincible_Transpiler
// Target: Mecha.TakeDamage, Mecha.EnergyShieldResist (both overloads)
// Fallback: Return original instructions if the invincibility check is not found.
[HarmonyTranspiler]
[HarmonyPatch(typeof(Mecha), nameof(Mecha.TakeDamage))]
[HarmonyPatch(typeof(Mecha), nameof(Mecha.EnergyShieldResist), [typeof(int)], [ArgumentType.Ref])]
[HarmonyPatch(typeof(Mecha), nameof(Mecha.EnergyShieldResist), [typeof(int), typeof(int)], [ArgumentType.Ref, ArgumentType.Out])]
private static IEnumerable<CodeInstruction> Mecha_Invincible_Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
{
// Repatch the consumers too: an already inlined getter bypasses its own Harmony patch.
var original = instructions.ToList();
var matcher = new CodeMatcher(original, generator);
matcher.MatchForward(false, new CodeMatch(ci => ci.Calls(AccessTools.PropertyGetter(typeof(Player), nameof(Player.invincible)))));
if (matcher.IsInvalid) return matcher.Finish(original, CheatEnabler.Logger, nameof(Mecha_Invincible_Transpiler));
matcher.Set(OpCodes.Pop, null).Advance(1).Insert(new CodeInstruction(OpCodes.Ldc_I4_1));
return matcher.InstructionEnumeration();
}
[HarmonyPrefix]
[HarmonyPatch(typeof(SkillSystem), nameof(SkillSystem.DamageGroundObjectByLocalCaster))]
[HarmonyPatch(typeof(SkillSystem), nameof(SkillSystem.DamageGroundObjectByRemoteCaster))]
[HarmonyPatch(typeof(SkillSystem), nameof(SkillSystem.DamageObject))]
private static IEnumerable<CodeInstruction> SkillSystem_DamageObject_Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator, MethodBase __originalMethod)
private static void SkillSystem_DamageGroundObject_Prefix(ref int damage, ref SkillTargetLocal target)
{
var matcher = new CodeMatcher(instructions, generator);
matcher.MatchForward(false,
new CodeMatch(ci => ci.IsLdarg()),
new CodeMatch(OpCodes.Ldfld, AccessTools.Field(typeof(SkillTargetLocal), nameof(SkillTargetLocal.type))),
new CodeMatch(OpCodes.Ldc_I4_6),
new CodeMatch(ci => ci.opcode == OpCodes.Bne_Un || ci.opcode == OpCodes.Bne_Un_S)
);
matcher.Repeat(m => m.Advance(4).InsertAndAdvance(
new CodeInstruction(OpCodes.Ldc_I4_0),
new CodeInstruction(OpCodes.Starg_S, __originalMethod.Name == "DamageObject" ? 1 : 2)
));
return matcher.InstructionEnumeration();
if (target.type == ETargetType.Craft) damage = 0;
}
[HarmonyPrefix]
[HarmonyPatch(typeof(SkillSystem), nameof(SkillSystem.DamageObject))]
private static void SkillSystem_DamageObject_Prefix(ref int damage, ref SkillTarget target)
{
if (target.type == ETargetType.Craft) damage = 0;
}
}
@@ -95,4 +106,4 @@ public static class CombatPatch
return matcher.InstructionEnumeration();
}
}
}
}
+3 -1
View File
@@ -75,7 +75,8 @@
* Keep the highest-production shells and remove the others
* Duplicate the highest-production shells with a configurable shell count
* Mecha/Combat:
* Mecha and Drones/Fleets invicible
* Mecha and Drones/Fleets invincible
* Protects mecha HP and energy shields, ground combat drones, and space fleets, including when enabled during combat.
* Buildings invicible
* Enable warp without space warpers
* Teleport to outer space
@@ -180,6 +181,7 @@ The item icon selects the output; no hotkey is needed.
* 从发电量最高的壳复制戴森壳,可设置壳面数量
* 机甲/战斗:
* 机甲和战斗无人机无敌
* 保护机甲耐久度和能量护盾、地面战斗无人机和太空编队,战斗中开启同样生效。
* 建筑无敌
* 无需空间翘曲器即可曲速飞行
* 传送到外太空