diff --git a/Assemblies/RimWar.dll b/Assemblies/RimWar.dll index 6243fd5..726dec6 100644 Binary files a/Assemblies/RimWar.dll and b/Assemblies/RimWar.dll differ diff --git a/Source/RimWar/.vs/RimWar/v16/.suo b/Source/RimWar/.vs/RimWar/v16/.suo new file mode 100644 index 0000000..75ec3c0 Binary files /dev/null and b/Source/RimWar/.vs/RimWar/v16/.suo differ diff --git a/Source/RimWar/Harmony/HarmonyPatches.cs b/Source/RimWar/Harmony/HarmonyPatches.cs index acaa342..58beb9c 100644 --- a/Source/RimWar/Harmony/HarmonyPatches.cs +++ b/Source/RimWar/Harmony/HarmonyPatches.cs @@ -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 ___relations, Faction other, ref FactionRelation __result, bool allowNull = false) { if(other == __instance) { return true; } - List fr = Traverse.Create(root: __instance).Field(name: "relations").GetValue>(); - 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; } } @@ -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(); 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(); 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(); - WorldUtility.Get_WCPT().RemoveCaravanTarget(caravan); + WorldUtility.Get_WCPT().RemoveCaravanTarget(___caravan); } } } @@ -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 ___paths, ref WorldPath __result) { - List paths = Traverse.Create(root: __instance).Field(name: "paths").GetValue>(); - 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; diff --git a/Source/RimWar/RimWar.csproj b/Source/RimWar/RimWar.csproj index 2c37eda..78fdc16 100644 --- a/Source/RimWar/RimWar.csproj +++ b/Source/RimWar/RimWar.csproj @@ -33,25 +33,20 @@ false - - False - ..\..\..\..\..\..\workshop\content\294100\2009463077\Current\Assemblies\0Harmony.dll + + ..\..\..\..\GAMES\Rimworld\Mods\Harmony\Current\Assemblies\0Harmony.dll False - ..\..\..\..\RimWorldWin64_Data\Managed\Assembly-CSharp.dll - False - - - ..\..\..\..\..\..\workshop\content\294100\2009463077\Current\Assemblies\HarmonyMod.dll + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\Assembly-CSharp.dll False - ..\..\..\..\..\..\workshop\content\294100\818773962\v1.2\Assemblies\HugsLib.dll + ..\..\..\..\GAMES\Rimworld\Mods\HugsLib\v1.2\Assemblies\HugsLib.dll False - ..\..\..\..\..\..\workshop\content\294100\1775170117\1.2\Assemblies\RimCities.dll + ..\..\..\..\GAMES\Rimworld\Mods\RimCities - Citadel Update\1.2\Assemblies\RimCities.dll False @@ -61,47 +56,251 @@ - ..\..\..\..\RimWorldWin64_Data\Managed\Unity.TextMeshPro.dll + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\Unity.TextMeshPro.dll False - ..\..\..\..\RimWorldWin64_Data\Managed\UnityEngine.dll + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.dll + False + + + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.AccessibilityModule.dll + False + + + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.AIModule.dll + False + + + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.AndroidJNIModule.dll + False + + + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.AnimationModule.dll + False + + + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.ARModule.dll + False + + + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.AssetBundleModule.dll + False + + + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.AudioModule.dll + False + + + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.ClothModule.dll + False + + + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.ClusterInputModule.dll + False + + + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.ClusterRendererModule.dll False - ..\..\..\..\RimWorldWin64_Data\Managed\UnityEngine.CoreModule.dll + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.CoreModule.dll + False + + + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.CrashReportingModule.dll + False + + + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.DirectorModule.dll + False + + + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.DSPGraphModule.dll + False + + + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.FileSystemHttpModule.dll + False + + + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.GameCenterModule.dll + False + + + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.GridModule.dll + False + + + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.HotReloadModule.dll + False + + + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.ImageConversionModule.dll False - ..\..\..\..\RimWorldWin64_Data\Managed\UnityEngine.IMGUIModule.dll + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.IMGUIModule.dll False - ..\..\..\..\RimWorldWin64_Data\Managed\UnityEngine.InputLegacyModule.dll + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.InputLegacyModule.dll False - ..\..\..\..\RimWorldWin64_Data\Managed\UnityEngine.InputModule.dll + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.InputModule.dll + False + + + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.JSONSerializeModule.dll + False + + + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.LocalizationModule.dll + False + + + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.ParticleSystemModule.dll + False + + + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.PerformanceReportingModule.dll + False + + + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.Physics2DModule.dll + False + + + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.PhysicsModule.dll + False + + + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.ProfilerModule.dll + False + + + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.ScreenCaptureModule.dll + False + + + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.SharedInternalsModule.dll + False + + + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.SpriteMaskModule.dll + False + + + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.SpriteShapeModule.dll + False + + + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.StreamingModule.dll + False + + + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.SubstanceModule.dll + False + + + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.TerrainModule.dll + False + + + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.TerrainPhysicsModule.dll False - ..\..\..\..\RimWorldWin64_Data\Managed\UnityEngine.TextCoreModule.dll + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.TextCoreModule.dll False - ..\..\..\..\RimWorldWin64_Data\Managed\UnityEngine.TextRenderingModule.dll + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.TextRenderingModule.dll + False + + + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.TilemapModule.dll + False + + + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.TLSModule.dll False - ..\..\..\..\RimWorldWin64_Data\Managed\UnityEngine.UI.dll + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.UI.dll False - ..\..\..\..\RimWorldWin64_Data\Managed\UnityEngine.UIElementsModule.dll + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.UIElementsModule.dll False - ..\..\..\..\RimWorldWin64_Data\Managed\UnityEngine.UIModule.dll + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.UIModule.dll + False + + + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.UmbraModule.dll + False + + + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.UNETModule.dll + False + + + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.UnityAnalyticsModule.dll + False + + + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.UnityConnectModule.dll + False + + + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.UnityTestProtocolModule.dll + False + + + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.UnityWebRequestAssetBundleModule.dll + False + + + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.UnityWebRequestAudioModule.dll + False + + + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.UnityWebRequestModule.dll + False + + + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.UnityWebRequestTextureModule.dll + False + + + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.UnityWebRequestWWWModule.dll + False + + + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.VehiclesModule.dll + False + + + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.VFXModule.dll + False + + + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.VideoModule.dll + False + + + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.VRModule.dll + False + + + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.WindModule.dll + False + + + ..\..\..\..\GAMES\Rimworld\RimWorldWin64_Data\Managed\UnityEngine.XRModule.dll False diff --git a/Source/RimWar/obj/Debug/.NETFramework,Version=v4.7.2.AssemblyAttributes.cs b/Source/RimWar/obj/Debug/.NETFramework,Version=v4.7.2.AssemblyAttributes.cs new file mode 100644 index 0000000..3871b18 --- /dev/null +++ b/Source/RimWar/obj/Debug/.NETFramework,Version=v4.7.2.AssemblyAttributes.cs @@ -0,0 +1,4 @@ +// +using System; +using System.Reflection; +[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.7.2", FrameworkDisplayName = ".NET Framework 4.7.2")] diff --git a/Source/RimWar/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Source/RimWar/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 6277b75..a54f37a 100644 Binary files a/Source/RimWar/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/Source/RimWar/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/Source/RimWar/obj/Debug/RimWar.csproj.CoreCompileInputs.cache b/Source/RimWar/obj/Debug/RimWar.csproj.CoreCompileInputs.cache index d1469ac..824a5c8 100644 --- a/Source/RimWar/obj/Debug/RimWar.csproj.CoreCompileInputs.cache +++ b/Source/RimWar/obj/Debug/RimWar.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -c813d171eca689fee049d1edae50e91f602c542f +2e93dda31b9f0b56f67e62c9db373f1b265ae9de diff --git a/Source/RimWar/obj/Debug/RimWar.csproj.FileListAbsolute.txt b/Source/RimWar/obj/Debug/RimWar.csproj.FileListAbsolute.txt index b9ac7b0..f4da145 100644 --- a/Source/RimWar/obj/Debug/RimWar.csproj.FileListAbsolute.txt +++ b/Source/RimWar/obj/Debug/RimWar.csproj.FileListAbsolute.txt @@ -7,3 +7,7 @@ C:\Program Files (x86)\Steam\steamapps\common\RimWorld\Mods\RimWar\Source\RimWar C:\Program Files (x86)\Steam\steamapps\common\RimWorld\Mods\RimWar\Source\RimWar\obj\Debug\RimWar.csprojAssemblyReference.cache E:\Programs\Steam\steamapps\common\RimWorld\Mods\RimWar\Source\RimWar\obj\Debug\RimWar.csproj.CoreCompileInputs.cache E:\Programs\Steam\steamapps\common\RimWorld\Mods\RimWar\Source\RimWar\obj\Debug\RimWar.csprojAssemblyReference.cache +C:\Files\RimWar\Assemblies\RimWar.dll +C:\Files\RimWar\Source\RimWar\obj\Debug\RimWar.csprojAssemblyReference.cache +C:\Files\RimWar\Source\RimWar\obj\Debug\RimWar.csproj.CoreCompileInputs.cache +C:\Files\RimWar\Source\RimWar\obj\Debug\RimWar.dll diff --git a/Source/RimWar/obj/Debug/RimWar.csprojAssemblyReference.cache b/Source/RimWar/obj/Debug/RimWar.csprojAssemblyReference.cache index ad531a6..3acc835 100644 Binary files a/Source/RimWar/obj/Debug/RimWar.csprojAssemblyReference.cache and b/Source/RimWar/obj/Debug/RimWar.csprojAssemblyReference.cache differ diff --git a/Source/RimWar/obj/Debug/RimWar.dll b/Source/RimWar/obj/Debug/RimWar.dll index 6243fd5..726dec6 100644 Binary files a/Source/RimWar/obj/Debug/RimWar.dll and b/Source/RimWar/obj/Debug/RimWar.dll differ