Skip to content

Fix/shuttle quest colonist register #882

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

Merged
notfood merged 1 commit into from
Apr 15, 2026
Merged

Fix/shuttle quest colonist register #882

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 21 additions & 1 deletion Source/Client/Factions/MultifactionPatches.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -761,7 +761,7 @@ static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> inst
yield return ci;
}
}
static bool IsFreeColonistAnyPlayerFaction(Pawn pawn)
public static bool IsFreeColonistAnyPlayerFaction(Pawn pawn)
{
if (Multiplayer.Client == null || !Multiplayer.GameComp.multifaction)
return pawn.IsFreeColonist;
Expand Down Expand Up @@ -818,3 +818,23 @@ static void Finalizer(Gravship gravship, Map map,bool __state)
map.PopFaction();
}
}

[HarmonyPatch(typeof(QuestPart_LendColonistsToFaction), "Enable")]
static class QuestPart_LendColonistsToFaction_Enable_Patch
{
static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> insts)
{
var isFreeColonist = AccessTools.PropertyGetter(typeof(Pawn), nameof(Pawn.IsFreeColonist));
var replacement = AccessTools.Method(typeof(CompShuttle_ContainedColonistCount_Patch),
nameof(CompShuttle_ContainedColonistCount_Patch.IsFreeColonistAnyPlayerFaction));
foreach (var ci in insts)
{
if (ci.Calls(isFreeColonist))
{
ci.opcode = OpCodes.Call;
ci.operand = replacement;
}
yield return ci;
}
}
}
Loading