Skip to content

Replace slow Traverse calls with private fields with native performance #4

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
Taranchuk wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Replace slow Traverse calls with private fields with native performance #4

Show file tree
Hide file tree
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
Binary file modified Assemblies/RimWar.dll
View file
Open in desktop
Binary file not shown.
Binary file added Source/RimWar/.vs/RimWar/v16/.suo
View file
Open in desktop
Binary file not shown.
37 changes: 16 additions & 21 deletions Source/RimWar/Harmony/HarmonyPatches.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,18 +172,17 @@ public RimWarMod(ModContentPack content) : base(content)
[HarmonyPatch(typeof(Faction), "RelationWith")]
public static class FactionRelationCheck_Patch
{
private static bool Prefix(Faction __instance, Faction other, ref FactionRelation __result, bool allowNull = false)
private static bool Prefix(Faction __instance, List<FactionRelation> ___relations, Faction other, ref FactionRelation __result, bool allowNull = false)
{
if(other == __instance)
{
return true;
}
List<FactionRelation> fr = Traverse.Create(root: __instance).Field(name: "relations").GetValue<List<FactionRelation>>();
for (int i = 0; i < fr.Count; i++)
for (int i = 0; i < ___relations.Count; i++)
{
if(fr[i].other == other)
if(___relations[i].other == other)
{
__result = fr[i];
__result = ___relations[i];
return false;
}
}
Expand Down Expand Up @@ -259,30 +258,27 @@ public static void OpenSettingsWindow(Page_CreateWorldParams __instance)
}
}

public static void Pather_StartPath_WarObjects(Caravan_PathFollower __instance, int destTile, CaravanArrivalAction arrivalAction, ref bool __result, bool repathImmediately = false, bool resetPauseStatus = true)
public static void Pather_StartPath_WarObjects(Caravan_PathFollower __instance, Caravan ___caravan, int destTile, CaravanArrivalAction arrivalAction, ref bool __result, bool repathImmediately = false, bool resetPauseStatus = true)
{
if(__result == true)
{
if (arrivalAction is RimWar.Planet.CaravanArrivalAction_AttackWarObject)
{
//Log.Message("assigning war object action: attack");
Caravan caravan = Traverse.Create(root: __instance).Field(name: "caravan").GetValue<Caravan>();
CaravanArrivalAction_AttackWarObject woAction = arrivalAction as CaravanArrivalAction_AttackWarObject;
woAction.wo.interactable = true;
RimWar.Planet.WorldUtility.Get_WCPT().AssignCaravanTargets(caravan, woAction.wo);
RimWar.Planet.WorldUtility.Get_WCPT().AssignCaravanTargets(___caravan, woAction.wo);
}
else if(arrivalAction is RimWar.Planet.CaravanArrivalAction_EngageWarObject)
{
//Log.Message("assigning war object action: engage");
Caravan caravan = Traverse.Create(root: __instance).Field(name: "caravan").GetValue<Caravan>();
CaravanArrivalAction_EngageWarObject woAction = arrivalAction as CaravanArrivalAction_EngageWarObject;
woAction.wo.interactable = true;
RimWar.Planet.WorldUtility.Get_WCPT().AssignCaravanTargets(caravan, woAction.wo);
RimWar.Planet.WorldUtility.Get_WCPT().AssignCaravanTargets(___caravan, woAction.wo);
}
else
{
Caravan caravan = Traverse.Create(root: __instance).Field(name: "caravan").GetValue<Caravan>();
WorldUtility.Get_WCPT().RemoveCaravanTarget(caravan);
WorldUtility.Get_WCPT().RemoveCaravanTarget(___caravan);
}
}
}
Expand Down Expand Up @@ -493,25 +489,24 @@ private static void Settlement_InspectString_WithPoints_Postfix(RimWorld.Planet.
[HarmonyPatch(typeof(WorldPathPool), "GetEmptyWorldPath", null)]
public class WorldPathPool_Prefix_Patch
{
public static bool Prefix(WorldPathPool __instance, ref WorldPath __result)
public static bool Prefix(WorldPathPool __instance, ref List<WorldPath> ___paths, ref WorldPath __result)
{
List<WorldPath> paths = Traverse.Create(root: __instance).Field(name: "paths").GetValue<List<WorldPath>>();
for (int i = 0; i < paths.Count; i++)
for (int i = 0; i < ___paths.Count; i++)
{
if (!paths[i].inUse)
if (!___paths[i].inUse)
{
paths[i].inUse = true;
__result = paths[i];
___paths[i].inUse = true;
__result = ___paths[i];
return false;
}
}
if (paths.Count > Find.WorldObjects.CaravansCount + 2 + (Find.WorldObjects.RoutePlannerWaypointsCount - 1))
if (___paths.Count > Find.WorldObjects.CaravansCount + 2 + (Find.WorldObjects.RoutePlannerWaypointsCount - 1))
{
//Log.ErrorOnce("WorldPathPool leak: more paths than caravans. Force-recovering.", 664788);
paths.Clear();
___paths.Clear();
}
WorldPath worldPath = new WorldPath();
paths.Add(worldPath);
___paths.Add(worldPath);
worldPath.inUse = true;
__result = worldPath;
return false;
Expand Down
Loading