Skip to content

fix for v1.5 UnnaturalCorpse event #445

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CodeOptimist wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

fix for v1.5 UnnaturalCorpse event #445

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1cfbc5c
fix for v1.5 UnnaturalCorpse event
CodeOptimist Apr 18, 2024
b617f9c
handle `Find.CurrentMap`
CodeOptimist May 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions Source/Client/Patches/Determinism.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,40 @@ static void Postfix(ref FloodUnfogResult __result)
}
}

[HarmonyPatch]
static class UnnaturalCorpsePatch
{
static IEnumerable<MethodBase> TargetMethods()
{
// both of these actually combine "is valid" semantics with "is unseen"
yield return AccessTools.DeclaredMethod(typeof(AnomalyUtility), nameof(AnomalyUtility.IsValidUnseenCell));
yield return AccessTools.DeclaredMethod(typeof(UnnaturalCorpse), nameof(UnnaturalCorpse.IsOutsideView));
}

// primarily for `IsValidUnseenCell()` but works fine for `IsOutsideView()` as well (maybe others)
static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> insts, ILGenerator gen)
{
var cm = new CodeMatcher(insts, gen);

cm.MatchStartForward(Code.Call[AccessTools.DeclaredPropertyGetter(typeof(Find), nameof(Find.CurrentMap))]);
cm.SearchForward(inst => inst.Branches(out _));
// consider it always on current map, so we can proceed (with finding a nice walkable cell etc.)
// keeping `Beq` and `Bne` avoids needing `Code.Pop, Code.Pop`
if (cm.Opcode == OpCodes.Beq_S)
cm.Advance(1).Insert(Code.Br_S[cm.InstructionAt(-1).operand]); // force jump as if equal
else if (cm.Opcode == OpCodes.Bne_Un_S)
cm.CreateLabelWithOffsets(1, out var label).Operand = label; // not-equal jump goes nowhere
else
cm.ThrowIfFalse("Couldn't find equality branch opcode following `Find.CurrentMap`", _ => false);

cm.MatchStartForward(Code.Call[AccessTools.DeclaredMethod(typeof(CellRect), nameof(CellRect.Contains))]);
// consider it always outside view (not contained in `CurrentViewRect`) so we can proceed
cm.Advance(1).Insert(Code.Ldc_I4_0, Code.And);

return cm.Instructions();
}
}

[HarmonyPatch(typeof(Pawn), nameof(Pawn.ProcessPostTickVisuals))]
static class DrawTrackerTickPatch
{
Expand Down