diff --git a/About/About.xml b/About/About.xml index 625745bc..f46b31e5 100644 --- a/About/About.xml +++ b/About/About.xml @@ -29,5 +29,6 @@ Load as far down as possible.
  • erdelf.humanoidalienraces
  • Krkr.rule56
  • ceteam.combatextended
    • +
  • taranchuk.performanceoptimizer
    • \ No newline at end of file diff --git a/About/ModIcon.png b/About/ModIcon.png new file mode 100644 index 00000000..5e6933b9 Binary files /dev/null and b/About/ModIcon.png differ diff --git a/Source/AMRetextureSupport/AMRetextureSupport.csproj b/Source/AMRetextureSupport/AMRetextureSupport.csproj index 518061c8..d384917f 100644 --- a/Source/AMRetextureSupport/AMRetextureSupport.csproj +++ b/Source/AMRetextureSupport/AMRetextureSupport.csproj @@ -9,14 +9,9 @@ false false AM.Retexture - v1.4;v1.5 disable true none - - - V14 - V15 @@ -24,21 +19,12 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + + - - - - - - - - - - diff --git a/Source/AMRetextureSupport/RetextureUtility.cs b/Source/AMRetextureSupport/RetextureUtility.cs index 7a3e42c2..5713de3f 100644 --- a/Source/AMRetextureSupport/RetextureUtility.cs +++ b/Source/AMRetextureSupport/RetextureUtility.cs @@ -5,9 +5,7 @@ using System.Linq; using UnityEngine; using Verse; -#if !V14 using LudeonTK; -#endif namespace AM.Retexture; diff --git a/Source/AlienRacesPatch/AlienRacesPatch.csproj b/Source/AlienRacesPatch/AlienRacesPatch.csproj index ba627592..1fcf78e4 100644 --- a/Source/AlienRacesPatch/AlienRacesPatch.csproj +++ b/Source/AlienRacesPatch/AlienRacesPatch.csproj @@ -1,6 +1,8 @@  - + + + net48 Library false @@ -8,55 +10,36 @@ preview false false - v1.4;v1.5 AM.AlienRacesPatch AM.AlienRacesPatch - - False - False - all - + - - - - refs/1.4/AlienRace14.dll + + False False - - - 1.4.3901 - + all + - - none - ..\..\Patch_AlienRaces\1.4\Assemblies\ - true - TRACE;V14 - - - - - - refs/1.4/AlienRace14.dll + + + refs\AlienRace.dll False False - - - 1.5.4033-beta - - + runtime + + - + none - ..\..\Patch_AlienRaces\1.5\Assemblies\ + ..\..\Patch_AlienRaces\$(RimworldVersion)\Assemblies\ true - TRACE;V15 + TRACE diff --git a/Source/AlienRacesPatch/refs/1.4/AlienRace14.dll b/Source/AlienRacesPatch/refs/AlienRace.dll similarity index 100% rename from Source/AlienRacesPatch/refs/1.4/AlienRace14.dll rename to Source/AlienRacesPatch/refs/AlienRace.dll diff --git a/Source/AnimationMod.sln b/Source/AnimationMod.sln index de8bcf9d..579d805a 100644 --- a/Source/AnimationMod.sln +++ b/Source/AnimationMod.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.0.31717.71 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AnimationMod", "ThingGenerator\AnimationMod.csproj", "{0CB2DDBC-ECE8-46B4-A8E9-9BF2239BE82B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AnimationMod", "AnimationMod\AnimationMod.csproj", "{0CB2DDBC-ECE8-46B4-A8E9-9BF2239BE82B}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LightsaberPatch", "LightsaberPatch\LightsaberPatch.csproj", "{D9B99467-57BB-4DE7-8147-F5D47554D1CB}" EndProject @@ -32,58 +32,58 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TacticowlPatch", "Tacticowl EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - v1.4|Any CPU = v1.4|Any CPU - v1.5|Any CPU = v1.5|Any CPU + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0CB2DDBC-ECE8-46B4-A8E9-9BF2239BE82B}.v1.4|Any CPU.ActiveCfg = v1.4|Any CPU - {0CB2DDBC-ECE8-46B4-A8E9-9BF2239BE82B}.v1.4|Any CPU.Build.0 = v1.4|Any CPU - {0CB2DDBC-ECE8-46B4-A8E9-9BF2239BE82B}.v1.5|Any CPU.ActiveCfg = v1.5|Any CPU - {0CB2DDBC-ECE8-46B4-A8E9-9BF2239BE82B}.v1.5|Any CPU.Build.0 = v1.5|Any CPU - {D9B99467-57BB-4DE7-8147-F5D47554D1CB}.v1.4|Any CPU.ActiveCfg = v1.4|Any CPU - {D9B99467-57BB-4DE7-8147-F5D47554D1CB}.v1.4|Any CPU.Build.0 = v1.4|Any CPU - {D9B99467-57BB-4DE7-8147-F5D47554D1CB}.v1.5|Any CPU.ActiveCfg = v1.5|Any CPU - {D9B99467-57BB-4DE7-8147-F5D47554D1CB}.v1.5|Any CPU.Build.0 = v1.5|Any CPU - {15189C13-7D5D-4F8D-AE17-1CA9F4A744EB}.v1.4|Any CPU.ActiveCfg = v1.4|Any CPU - {15189C13-7D5D-4F8D-AE17-1CA9F4A744EB}.v1.4|Any CPU.Build.0 = v1.4|Any CPU - {15189C13-7D5D-4F8D-AE17-1CA9F4A744EB}.v1.5|Any CPU.ActiveCfg = v1.5|Any CPU - {15189C13-7D5D-4F8D-AE17-1CA9F4A744EB}.v1.5|Any CPU.Build.0 = v1.5|Any CPU - {603ACB32-6730-4BAF-8E0A-A0E3399D634F}.v1.4|Any CPU.ActiveCfg = Release|Any CPU - {603ACB32-6730-4BAF-8E0A-A0E3399D634F}.v1.4|Any CPU.Build.0 = Release|Any CPU - {603ACB32-6730-4BAF-8E0A-A0E3399D634F}.v1.5|Any CPU.ActiveCfg = Debug|Any CPU - {603ACB32-6730-4BAF-8E0A-A0E3399D634F}.v1.5|Any CPU.Build.0 = Debug|Any CPU - {3802FB86-C860-4F98-A6F6-5E9AA47AF564}.v1.4|Any CPU.ActiveCfg = v1.4|Any CPU - {3802FB86-C860-4F98-A6F6-5E9AA47AF564}.v1.4|Any CPU.Build.0 = v1.4|Any CPU - {3802FB86-C860-4F98-A6F6-5E9AA47AF564}.v1.5|Any CPU.ActiveCfg = v1.5|Any CPU - {3802FB86-C860-4F98-A6F6-5E9AA47AF564}.v1.5|Any CPU.Build.0 = v1.5|Any CPU - {67701E3B-9094-4CA2-9DD8-42EBAFCB9F4A}.v1.4|Any CPU.ActiveCfg = Debug|Any CPU - {67701E3B-9094-4CA2-9DD8-42EBAFCB9F4A}.v1.4|Any CPU.Build.0 = Debug|Any CPU - {67701E3B-9094-4CA2-9DD8-42EBAFCB9F4A}.v1.5|Any CPU.ActiveCfg = Release|Any CPU - {67701E3B-9094-4CA2-9DD8-42EBAFCB9F4A}.v1.5|Any CPU.Build.0 = Release|Any CPU - {0B91E675-3505-4587-94BB-6FEFC5ADB24D}.v1.4|Any CPU.ActiveCfg = v1.4|Any CPU - {0B91E675-3505-4587-94BB-6FEFC5ADB24D}.v1.4|Any CPU.Build.0 = v1.4|Any CPU - {0B91E675-3505-4587-94BB-6FEFC5ADB24D}.v1.5|Any CPU.ActiveCfg = v1.5|Any CPU - {0B91E675-3505-4587-94BB-6FEFC5ADB24D}.v1.5|Any CPU.Build.0 = v1.5|Any CPU - {BBB0D084-8A32-458E-8A7F-48E7D90F0489}.v1.4|Any CPU.ActiveCfg = v1.4|Any CPU - {BBB0D084-8A32-458E-8A7F-48E7D90F0489}.v1.4|Any CPU.Build.0 = v1.4|Any CPU - {BBB0D084-8A32-458E-8A7F-48E7D90F0489}.v1.5|Any CPU.ActiveCfg = v1.5|Any CPU - {BBB0D084-8A32-458E-8A7F-48E7D90F0489}.v1.5|Any CPU.Build.0 = v1.5|Any CPU - {DB0FEE4E-5DF7-4DD3-B876-7FC20D310C8E}.v1.4|Any CPU.ActiveCfg = Debug|Any CPU - {DB0FEE4E-5DF7-4DD3-B876-7FC20D310C8E}.v1.4|Any CPU.Build.0 = Debug|Any CPU - {DB0FEE4E-5DF7-4DD3-B876-7FC20D310C8E}.v1.5|Any CPU.ActiveCfg = Release|Any CPU - {DB0FEE4E-5DF7-4DD3-B876-7FC20D310C8E}.v1.5|Any CPU.Build.0 = Release|Any CPU - {06C481CC-E8D0-46D6-B02B-127DD9E3A1AA}.v1.4|Any CPU.ActiveCfg = Debug|Any CPU - {06C481CC-E8D0-46D6-B02B-127DD9E3A1AA}.v1.4|Any CPU.Build.0 = Debug|Any CPU - {06C481CC-E8D0-46D6-B02B-127DD9E3A1AA}.v1.5|Any CPU.ActiveCfg = Release|Any CPU - {06C481CC-E8D0-46D6-B02B-127DD9E3A1AA}.v1.5|Any CPU.Build.0 = Release|Any CPU - {7B881968-1527-40FC-9FB3-85A5A01BEE88}.v1.4|Any CPU.ActiveCfg = v1.4|Any CPU - {7B881968-1527-40FC-9FB3-85A5A01BEE88}.v1.4|Any CPU.Build.0 = v1.4|Any CPU - {7B881968-1527-40FC-9FB3-85A5A01BEE88}.v1.5|Any CPU.ActiveCfg = v1.5|Any CPU - {7B881968-1527-40FC-9FB3-85A5A01BEE88}.v1.5|Any CPU.Build.0 = v1.5|Any CPU - {DEC2223C-6DD4-48EF-9438-8F4E97B6C542}.v1.4|Any CPU.ActiveCfg = v1.4|Any CPU - {DEC2223C-6DD4-48EF-9438-8F4E97B6C542}.v1.4|Any CPU.Build.0 = v1.4|Any CPU - {DEC2223C-6DD4-48EF-9438-8F4E97B6C542}.v1.5|Any CPU.ActiveCfg = v1.5|Any CPU - {DEC2223C-6DD4-48EF-9438-8F4E97B6C542}.v1.5|Any CPU.Build.0 = v1.5|Any CPU + {0CB2DDBC-ECE8-46B4-A8E9-9BF2239BE82B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0CB2DDBC-ECE8-46B4-A8E9-9BF2239BE82B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0CB2DDBC-ECE8-46B4-A8E9-9BF2239BE82B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0CB2DDBC-ECE8-46B4-A8E9-9BF2239BE82B}.Release|Any CPU.Build.0 = Release|Any CPU + {D9B99467-57BB-4DE7-8147-F5D47554D1CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D9B99467-57BB-4DE7-8147-F5D47554D1CB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D9B99467-57BB-4DE7-8147-F5D47554D1CB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D9B99467-57BB-4DE7-8147-F5D47554D1CB}.Release|Any CPU.Build.0 = Release|Any CPU + {15189C13-7D5D-4F8D-AE17-1CA9F4A744EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {15189C13-7D5D-4F8D-AE17-1CA9F4A744EB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {15189C13-7D5D-4F8D-AE17-1CA9F4A744EB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {15189C13-7D5D-4F8D-AE17-1CA9F4A744EB}.Release|Any CPU.Build.0 = Release|Any CPU + {603ACB32-6730-4BAF-8E0A-A0E3399D634F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {603ACB32-6730-4BAF-8E0A-A0E3399D634F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {603ACB32-6730-4BAF-8E0A-A0E3399D634F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {603ACB32-6730-4BAF-8E0A-A0E3399D634F}.Release|Any CPU.Build.0 = Release|Any CPU + {3802FB86-C860-4F98-A6F6-5E9AA47AF564}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3802FB86-C860-4F98-A6F6-5E9AA47AF564}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3802FB86-C860-4F98-A6F6-5E9AA47AF564}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3802FB86-C860-4F98-A6F6-5E9AA47AF564}.Release|Any CPU.Build.0 = Release|Any CPU + {67701E3B-9094-4CA2-9DD8-42EBAFCB9F4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {67701E3B-9094-4CA2-9DD8-42EBAFCB9F4A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {67701E3B-9094-4CA2-9DD8-42EBAFCB9F4A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {67701E3B-9094-4CA2-9DD8-42EBAFCB9F4A}.Release|Any CPU.Build.0 = Release|Any CPU + {0B91E675-3505-4587-94BB-6FEFC5ADB24D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0B91E675-3505-4587-94BB-6FEFC5ADB24D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0B91E675-3505-4587-94BB-6FEFC5ADB24D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0B91E675-3505-4587-94BB-6FEFC5ADB24D}.Release|Any CPU.Build.0 = Release|Any CPU + {BBB0D084-8A32-458E-8A7F-48E7D90F0489}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BBB0D084-8A32-458E-8A7F-48E7D90F0489}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BBB0D084-8A32-458E-8A7F-48E7D90F0489}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BBB0D084-8A32-458E-8A7F-48E7D90F0489}.Release|Any CPU.Build.0 = Release|Any CPU + {DB0FEE4E-5DF7-4DD3-B876-7FC20D310C8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DB0FEE4E-5DF7-4DD3-B876-7FC20D310C8E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DB0FEE4E-5DF7-4DD3-B876-7FC20D310C8E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DB0FEE4E-5DF7-4DD3-B876-7FC20D310C8E}.Release|Any CPU.Build.0 = Release|Any CPU + {06C481CC-E8D0-46D6-B02B-127DD9E3A1AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {06C481CC-E8D0-46D6-B02B-127DD9E3A1AA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {06C481CC-E8D0-46D6-B02B-127DD9E3A1AA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {06C481CC-E8D0-46D6-B02B-127DD9E3A1AA}.Release|Any CPU.Build.0 = Release|Any CPU + {7B881968-1527-40FC-9FB3-85A5A01BEE88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7B881968-1527-40FC-9FB3-85A5A01BEE88}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7B881968-1527-40FC-9FB3-85A5A01BEE88}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7B881968-1527-40FC-9FB3-85A5A01BEE88}.Release|Any CPU.Build.0 = Release|Any CPU + {DEC2223C-6DD4-48EF-9438-8F4E97B6C542}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DEC2223C-6DD4-48EF-9438-8F4E97B6C542}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DEC2223C-6DD4-48EF-9438-8F4E97B6C542}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DEC2223C-6DD4-48EF-9438-8F4E97B6C542}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Source/ThingGenerator/AMSettings/Presets/Default.cs b/Source/AnimationMod/AMSettings/Presets/Default.cs similarity index 100% rename from Source/ThingGenerator/AMSettings/Presets/Default.cs rename to Source/AnimationMod/AMSettings/Presets/Default.cs diff --git a/Source/ThingGenerator/AMSettings/Presets/NoLassos.cs b/Source/AnimationMod/AMSettings/Presets/NoLassos.cs similarity index 100% rename from Source/ThingGenerator/AMSettings/Presets/NoLassos.cs rename to Source/AnimationMod/AMSettings/Presets/NoLassos.cs diff --git a/Source/ThingGenerator/AMSettings/Presets/VanillaPlus.cs b/Source/AnimationMod/AMSettings/Presets/VanillaPlus.cs similarity index 100% rename from Source/ThingGenerator/AMSettings/Presets/VanillaPlus.cs rename to Source/AnimationMod/AMSettings/Presets/VanillaPlus.cs diff --git a/Source/ThingGenerator/AMSettings/Settings.cs b/Source/AnimationMod/AMSettings/Settings.cs similarity index 98% rename from Source/ThingGenerator/AMSettings/Settings.cs rename to Source/AnimationMod/AMSettings/Settings.cs index d7a10087..b70fe48f 100644 --- a/Source/ThingGenerator/AMSettings/Settings.cs +++ b/Source/AnimationMod/AMSettings/Settings.cs @@ -4,9 +4,7 @@ using System.Linq; using UnityEngine; using Verse; -#if !V14 using LudeonTK; -#endif namespace AM.AMSettings; @@ -429,11 +427,7 @@ float DrawAnim(AnimDef def) checkbox.x += 110; checkbox.width = 200; -#if V14 - def.SData.Probability = Widgets.HorizontalSlider_NewTemp(checkbox, def.SData.Probability, 0f, 10f, label: $"Relative Probability: {def.SData.Probability * 100f:F0}%", roundTo: 0.05f); -#else def.SData.Probability = Widgets.HorizontalSlider(checkbox, def.SData.Probability, 0f, 10f, label: $"Relative Probability: {def.SData.Probability * 100f:F0}%", roundTo: 0.05f); -#endif } return rect.height; diff --git a/Source/ThingGenerator/AMSettings/SimpleSettings.cs b/Source/AnimationMod/AMSettings/SimpleSettings.cs similarity index 99% rename from Source/ThingGenerator/AMSettings/SimpleSettings.cs rename to Source/AnimationMod/AMSettings/SimpleSettings.cs index 17505e22..fd30a1c8 100644 --- a/Source/ThingGenerator/AMSettings/SimpleSettings.cs +++ b/Source/AnimationMod/AMSettings/SimpleSettings.cs @@ -1,21 +1,18 @@ -using System; +using AM.UI; +using AM.Video; +using ColourPicker; +using LudeonTK; +using RimWorld; +using System; using System.Collections; using System.Collections.Generic; using System.IO; using System.Linq; using System.Reflection; -using System.Runtime.Remoting.Messaging; using System.Security; using System.Text; -using AM.UI; -using AM.Video; -using ColourPicker; -using RimWorld; using UnityEngine; using Verse; -#if !V14 -using LudeonTK; -#endif namespace AM.AMSettings; @@ -604,11 +601,8 @@ private static float DrawNumeric(SimpleSettingsBase settings, MemberWrapper memb float step = member.TryGetCustomAttribute()?.Step ?? -1; // Simple slider for now. -#if V14 - float changed = Widgets.HorizontalSlider_NewTemp(sliderArea, value, min.Value, max.Value, roundTo: step); -#else float changed = Widgets.HorizontalSlider(sliderArea, value, min.Value, max.Value, roundTo: step); -#endif + if (Math.Abs(changed - value) > 0.0001f) { Type type = member.MemberType; diff --git a/Source/ThingGenerator/AM_DefOf.cs b/Source/AnimationMod/AM_DefOf.cs similarity index 98% rename from Source/ThingGenerator/AM_DefOf.cs rename to Source/AnimationMod/AM_DefOf.cs index a1976bbd..b9c62db4 100644 --- a/Source/ThingGenerator/AM_DefOf.cs +++ b/Source/AnimationMod/AM_DefOf.cs @@ -47,7 +47,5 @@ static AM_DefOf() public static HediffDef AM_KnockedOut; -#if !V14 public static RenderSkipFlagDef Body; -#endif } \ No newline at end of file diff --git a/Source/ThingGenerator/AnimCellData.cs b/Source/AnimationMod/AnimCellData.cs similarity index 100% rename from Source/ThingGenerator/AnimCellData.cs rename to Source/AnimationMod/AnimCellData.cs diff --git a/Source/ThingGenerator/AnimDef.cs b/Source/AnimationMod/AnimDef.cs similarity index 99% rename from Source/ThingGenerator/AnimDef.cs rename to Source/AnimationMod/AnimDef.cs index ec06fe35..c7e2d127 100644 --- a/Source/ThingGenerator/AnimDef.cs +++ b/Source/AnimationMod/AnimDef.cs @@ -13,9 +13,7 @@ using RimWorld; using UnityEngine; using Verse; -#if !V14 using LudeonTK; -#endif namespace AM; diff --git a/Source/ThingGenerator/AnimRenderer.cs b/Source/AnimationMod/AnimRenderer.cs similarity index 99% rename from Source/ThingGenerator/AnimRenderer.cs rename to Source/AnimationMod/AnimRenderer.cs index fd16a573..7e171b43 100644 --- a/Source/ThingGenerator/AnimRenderer.cs +++ b/Source/AnimationMod/AnimRenderer.cs @@ -182,7 +182,9 @@ private static void DrawSingle(AnimRenderer renderer, float? dt, Action eventOutput, bool cullDraw, Action labelDraw = null) { + Core.Log("Start draw 2"); if (IsDestroyed) return; @@ -733,6 +736,8 @@ public void Draw(float? atTime, float dt, Action eventO if (item != null) item.MirrorHorizontal = MirrorHorizontal; + Core.Log("A"); + if (eventOutput != null) Seek(atTime, dt, e => eventOutput(this, e)); else @@ -752,11 +757,17 @@ public void Draw(float? atTime, float dt, Action eventO path.Draw(time); timer2.GetElapsedMilliseconds(out SweepMS); + Core.Log("B"); + + foreach (var snap in snapshots) { if (!ShouldDraw(snap)) continue; + Core.Log($"Start {snap.PartName}"); + + var tex = ResolveTexture(snap); if (tex == null) continue; @@ -792,6 +803,8 @@ public void Draw(float? atTime, float dt, Action eventO bool useMPB = forceMPB || ov.UseMPB; var color = snap.FinalColor; + Core.Log($" - {snap.PartName} draw..."); + int passes = 1; for (int i = 0; i < passes; i++) { @@ -833,11 +846,15 @@ public void Draw(float? atTime, float dt, Action eventO var finalMpb = useMPB ? pb : null; + Core.Log("Pre render..."); AnimationRendererWorker?.PreRenderPart(snap, ov, ref mesh, ref matrix, ref mat, ref finalMpb); + Core.Log("Post-Pre render..."); Graphics.DrawMesh(mesh, matrix, mat, 0, Camera, 0, finalMpb); } } + Core.Log("Done"); + DrawPawns(labelDraw); timer.GetElapsedMilliseconds(out DrawMS); @@ -915,11 +932,7 @@ protected void DrawPawns(Action labelDraw = null) Patch_PawnUtility_IsInvisible.IsRendering = true; PrePawnSpecialRender?.Invoke(pawn, this); -#if V14 - pawn.DrawAt(pawn.DrawPosHeld ?? pawn.DrawPos); -#else pawn.DrawNowAt(pawn.DrawPosHeld ?? pawn.DrawPos); -#endif PostPawnSpecialRender?.Invoke(pawn, this); Patch_PawnRenderer_RenderPawnInternal.DoNotModify = false; diff --git a/Source/ThingGenerator/AnimType.cs b/Source/AnimationMod/AnimType.cs similarity index 100% rename from Source/ThingGenerator/AnimType.cs rename to Source/AnimationMod/AnimType.cs diff --git a/Source/ThingGenerator/AnimationManager.cs b/Source/AnimationMod/AnimationManager.cs similarity index 99% rename from Source/ThingGenerator/AnimationManager.cs rename to Source/AnimationMod/AnimationManager.cs index bf000ff9..93e48338 100644 --- a/Source/ThingGenerator/AnimationManager.cs +++ b/Source/AnimationMod/AnimationManager.cs @@ -7,9 +7,7 @@ using AM.Processing; using UnityEngine; using Verse; -#if !V14 using LudeonTK; -#endif namespace AM { diff --git a/Source/ThingGenerator/AnimationMod.csproj b/Source/AnimationMod/AnimationMod.csproj similarity index 65% rename from Source/ThingGenerator/AnimationMod.csproj rename to Source/AnimationMod/AnimationMod.csproj index 9660fdeb..34dc7493 100644 --- a/Source/ThingGenerator/AnimationMod.csproj +++ b/Source/AnimationMod/AnimationMod.csproj @@ -1,6 +1,8 @@  + + net472 Library @@ -9,7 +11,6 @@ true false false - v1.4;v1.5 zAnimationMod AM disable @@ -22,7 +23,7 @@ <_Parameter1>$([System.DateTime]::UtcNow.ToString("yyyyMMddHHmmss")) - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -34,7 +35,8 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + + @@ -42,35 +44,16 @@ - - - - - - Deps/0ColourPicker14.dll - - - - - - ..\..\1.4\Assemblies\ - true - TRACE;V14 - - - - - + - Deps/0ColourPicker15.dll + refs\0ColourPicker.dll - - ..\..\1.5\Assemblies\ - true - TRACE;V15 + + ..\..\$(RimworldVersion)\Assemblies\ + TRACE diff --git a/Source/ThingGenerator/AnimationStartParameters.cs b/Source/AnimationMod/AnimationStartParameters.cs similarity index 100% rename from Source/ThingGenerator/AnimationStartParameters.cs rename to Source/AnimationMod/AnimationStartParameters.cs diff --git a/Source/ThingGenerator/AudioCredits.txt b/Source/AnimationMod/AudioCredits.txt similarity index 100% rename from Source/ThingGenerator/AudioCredits.txt rename to Source/AnimationMod/AudioCredits.txt diff --git a/Source/ThingGenerator/AudioUtility.cs b/Source/AnimationMod/AudioUtility.cs similarity index 100% rename from Source/ThingGenerator/AudioUtility.cs rename to Source/AnimationMod/AudioUtility.cs diff --git a/Source/ThingGenerator/AutoDuel/AutoFriendlyDuelMapComp.cs b/Source/AnimationMod/AutoDuel/AutoFriendlyDuelMapComp.cs similarity index 99% rename from Source/ThingGenerator/AutoDuel/AutoFriendlyDuelMapComp.cs rename to Source/AnimationMod/AutoDuel/AutoFriendlyDuelMapComp.cs index 45192028..e26f46e1 100644 --- a/Source/ThingGenerator/AutoDuel/AutoFriendlyDuelMapComp.cs +++ b/Source/AnimationMod/AutoDuel/AutoFriendlyDuelMapComp.cs @@ -7,9 +7,7 @@ using System.Linq; using System.Threading.Tasks; using Verse; -#if !V14 using LudeonTK; -#endif namespace AM.AutoDuel; diff --git a/Source/ThingGenerator/AutoDuel/JoyGiver_FriendlyDuel.cs b/Source/AnimationMod/AutoDuel/JoyGiver_FriendlyDuel.cs similarity index 100% rename from Source/ThingGenerator/AutoDuel/JoyGiver_FriendlyDuel.cs rename to Source/AnimationMod/AutoDuel/JoyGiver_FriendlyDuel.cs diff --git a/Source/ThingGenerator/AutoDuel/JoyGiver_SpectateFriendlyDuel.cs b/Source/AnimationMod/AutoDuel/JoyGiver_SpectateFriendlyDuel.cs similarity index 100% rename from Source/ThingGenerator/AutoDuel/JoyGiver_SpectateFriendlyDuel.cs rename to Source/AnimationMod/AutoDuel/JoyGiver_SpectateFriendlyDuel.cs diff --git a/Source/ThingGenerator/Bezier.cs b/Source/AnimationMod/Bezier.cs similarity index 100% rename from Source/ThingGenerator/Bezier.cs rename to Source/AnimationMod/Bezier.cs diff --git a/Source/ThingGenerator/Buildings/Building_DuelSpot.cs b/Source/AnimationMod/Buildings/Building_DuelSpot.cs similarity index 100% rename from Source/ThingGenerator/Buildings/Building_DuelSpot.cs rename to Source/AnimationMod/Buildings/Building_DuelSpot.cs diff --git a/Source/ThingGenerator/ColumnWorkers/PawnColumnWorker_Base.cs b/Source/AnimationMod/ColumnWorkers/PawnColumnWorker_Base.cs similarity index 100% rename from Source/ThingGenerator/ColumnWorkers/PawnColumnWorker_Base.cs rename to Source/AnimationMod/ColumnWorkers/PawnColumnWorker_Base.cs diff --git a/Source/ThingGenerator/ColumnWorkers/PawnColumnWorker_Execute.cs b/Source/AnimationMod/ColumnWorkers/PawnColumnWorker_Execute.cs similarity index 100% rename from Source/ThingGenerator/ColumnWorkers/PawnColumnWorker_Execute.cs rename to Source/AnimationMod/ColumnWorkers/PawnColumnWorker_Execute.cs diff --git a/Source/ThingGenerator/ColumnWorkers/PawnColumnWorker_Lasso.cs b/Source/AnimationMod/ColumnWorkers/PawnColumnWorker_Lasso.cs similarity index 100% rename from Source/ThingGenerator/ColumnWorkers/PawnColumnWorker_Lasso.cs rename to Source/AnimationMod/ColumnWorkers/PawnColumnWorker_Lasso.cs diff --git a/Source/ThingGenerator/Content.cs b/Source/AnimationMod/Content.cs similarity index 100% rename from Source/ThingGenerator/Content.cs rename to Source/AnimationMod/Content.cs diff --git a/Source/ThingGenerator/Controller/ActionController.cs b/Source/AnimationMod/Controller/ActionController.cs similarity index 100% rename from Source/ThingGenerator/Controller/ActionController.cs rename to Source/AnimationMod/Controller/ActionController.cs diff --git a/Source/ThingGenerator/Controller/Reports/DuelAttemptReport.cs b/Source/AnimationMod/Controller/Reports/DuelAttemptReport.cs similarity index 100% rename from Source/ThingGenerator/Controller/Reports/DuelAttemptReport.cs rename to Source/AnimationMod/Controller/Reports/DuelAttemptReport.cs diff --git a/Source/ThingGenerator/Controller/Reports/ExecutionAttemptReport.cs b/Source/AnimationMod/Controller/Reports/ExecutionAttemptReport.cs similarity index 100% rename from Source/ThingGenerator/Controller/Reports/ExecutionAttemptReport.cs rename to Source/AnimationMod/Controller/Reports/ExecutionAttemptReport.cs diff --git a/Source/ThingGenerator/Controller/Reports/GrappleAttemptReport.cs b/Source/AnimationMod/Controller/Reports/GrappleAttemptReport.cs similarity index 100% rename from Source/ThingGenerator/Controller/Reports/GrappleAttemptReport.cs rename to Source/AnimationMod/Controller/Reports/GrappleAttemptReport.cs diff --git a/Source/ThingGenerator/Controller/Requests/DuelAttemptRequest.cs b/Source/AnimationMod/Controller/Requests/DuelAttemptRequest.cs similarity index 100% rename from Source/ThingGenerator/Controller/Requests/DuelAttemptRequest.cs rename to Source/AnimationMod/Controller/Requests/DuelAttemptRequest.cs diff --git a/Source/ThingGenerator/Controller/Requests/ExecutionAttemptRequest.cs b/Source/AnimationMod/Controller/Requests/ExecutionAttemptRequest.cs similarity index 100% rename from Source/ThingGenerator/Controller/Requests/ExecutionAttemptRequest.cs rename to Source/AnimationMod/Controller/Requests/ExecutionAttemptRequest.cs diff --git a/Source/ThingGenerator/Controller/Requests/GrappleAttemptsRequest.cs b/Source/AnimationMod/Controller/Requests/GrappleAttemptsRequest.cs similarity index 100% rename from Source/ThingGenerator/Controller/Requests/GrappleAttemptsRequest.cs rename to Source/AnimationMod/Controller/Requests/GrappleAttemptsRequest.cs diff --git a/Source/ThingGenerator/Core.cs b/Source/AnimationMod/Core.cs similarity index 100% rename from Source/ThingGenerator/Core.cs rename to Source/AnimationMod/Core.cs diff --git a/Source/ThingGenerator/Data/AnimData.cs b/Source/AnimationMod/Data/AnimData.cs similarity index 100% rename from Source/ThingGenerator/Data/AnimData.cs rename to Source/AnimationMod/Data/AnimData.cs diff --git a/Source/ThingGenerator/Data/Model/AnimDataModel.cs b/Source/AnimationMod/Data/Model/AnimDataModel.cs similarity index 100% rename from Source/ThingGenerator/Data/Model/AnimDataModel.cs rename to Source/AnimationMod/Data/Model/AnimDataModel.cs diff --git a/Source/ThingGenerator/Data/Model/AnimPartModel.cs b/Source/AnimationMod/Data/Model/AnimPartModel.cs similarity index 100% rename from Source/ThingGenerator/Data/Model/AnimPartModel.cs rename to Source/AnimationMod/Data/Model/AnimPartModel.cs diff --git a/Source/ThingGenerator/Data/Model/CurveModel.cs b/Source/AnimationMod/Data/Model/CurveModel.cs similarity index 100% rename from Source/ThingGenerator/Data/Model/CurveModel.cs rename to Source/AnimationMod/Data/Model/CurveModel.cs diff --git a/Source/ThingGenerator/Data/Model/EventModel.cs b/Source/AnimationMod/Data/Model/EventModel.cs similarity index 100% rename from Source/ThingGenerator/Data/Model/EventModel.cs rename to Source/AnimationMod/Data/Model/EventModel.cs diff --git a/Source/ThingGenerator/Data/Model/SweepPoint.cs b/Source/AnimationMod/Data/Model/SweepPoint.cs similarity index 100% rename from Source/ThingGenerator/Data/Model/SweepPoint.cs rename to Source/AnimationMod/Data/Model/SweepPoint.cs diff --git a/Source/ThingGenerator/Events/AudioEvent.cs b/Source/AnimationMod/Events/AudioEvent.cs similarity index 100% rename from Source/ThingGenerator/Events/AudioEvent.cs rename to Source/AnimationMod/Events/AudioEvent.cs diff --git a/Source/ThingGenerator/Events/CamShakeEvent.cs b/Source/AnimationMod/Events/CamShakeEvent.cs similarity index 100% rename from Source/ThingGenerator/Events/CamShakeEvent.cs rename to Source/AnimationMod/Events/CamShakeEvent.cs diff --git a/Source/ThingGenerator/Events/ClashAudioEvent.cs b/Source/AnimationMod/Events/ClashAudioEvent.cs similarity index 100% rename from Source/ThingGenerator/Events/ClashAudioEvent.cs rename to Source/AnimationMod/Events/ClashAudioEvent.cs diff --git a/Source/ThingGenerator/Events/DamageEffectEvent.cs b/Source/AnimationMod/Events/DamageEffectEvent.cs similarity index 100% rename from Source/ThingGenerator/Events/DamageEffectEvent.cs rename to Source/AnimationMod/Events/DamageEffectEvent.cs diff --git a/Source/ThingGenerator/Events/DuelEvent.cs b/Source/AnimationMod/Events/DuelEvent.cs similarity index 100% rename from Source/ThingGenerator/Events/DuelEvent.cs rename to Source/AnimationMod/Events/DuelEvent.cs diff --git a/Source/ThingGenerator/Events/EventBase.cs b/Source/AnimationMod/Events/EventBase.cs similarity index 100% rename from Source/ThingGenerator/Events/EventBase.cs rename to Source/AnimationMod/Events/EventBase.cs diff --git a/Source/ThingGenerator/Events/EventHelper.cs b/Source/AnimationMod/Events/EventHelper.cs similarity index 100% rename from Source/ThingGenerator/Events/EventHelper.cs rename to Source/AnimationMod/Events/EventHelper.cs diff --git a/Source/ThingGenerator/Events/GoreSplashEvent.cs b/Source/AnimationMod/Events/GoreSplashEvent.cs similarity index 100% rename from Source/ThingGenerator/Events/GoreSplashEvent.cs rename to Source/AnimationMod/Events/GoreSplashEvent.cs diff --git a/Source/ThingGenerator/Events/KillPawnEvent.cs b/Source/AnimationMod/Events/KillPawnEvent.cs similarity index 100% rename from Source/ThingGenerator/Events/KillPawnEvent.cs rename to Source/AnimationMod/Events/KillPawnEvent.cs diff --git a/Source/ThingGenerator/Events/MoteEvent.cs b/Source/AnimationMod/Events/MoteEvent.cs similarity index 100% rename from Source/ThingGenerator/Events/MoteEvent.cs rename to Source/AnimationMod/Events/MoteEvent.cs diff --git a/Source/ThingGenerator/Events/PuntPawnEvent.cs b/Source/AnimationMod/Events/PuntPawnEvent.cs similarity index 100% rename from Source/ThingGenerator/Events/PuntPawnEvent.cs rename to Source/AnimationMod/Events/PuntPawnEvent.cs diff --git a/Source/ThingGenerator/Events/TextMoteEvent.cs b/Source/AnimationMod/Events/TextMoteEvent.cs similarity index 100% rename from Source/ThingGenerator/Events/TextMoteEvent.cs rename to Source/AnimationMod/Events/TextMoteEvent.cs diff --git a/Source/ThingGenerator/Events/Workers/AnimEventInput.cs b/Source/AnimationMod/Events/Workers/AnimEventInput.cs similarity index 100% rename from Source/ThingGenerator/Events/Workers/AnimEventInput.cs rename to Source/AnimationMod/Events/Workers/AnimEventInput.cs diff --git a/Source/ThingGenerator/Events/Workers/AudioWorker.cs b/Source/AnimationMod/Events/Workers/AudioWorker.cs similarity index 100% rename from Source/ThingGenerator/Events/Workers/AudioWorker.cs rename to Source/AnimationMod/Events/Workers/AudioWorker.cs diff --git a/Source/ThingGenerator/Events/Workers/ClashAudioWorker.cs b/Source/AnimationMod/Events/Workers/ClashAudioWorker.cs similarity index 100% rename from Source/ThingGenerator/Events/Workers/ClashAudioWorker.cs rename to Source/AnimationMod/Events/Workers/ClashAudioWorker.cs diff --git a/Source/ThingGenerator/Events/Workers/DamageEffectWorker.cs b/Source/AnimationMod/Events/Workers/DamageEffectWorker.cs similarity index 100% rename from Source/ThingGenerator/Events/Workers/DamageEffectWorker.cs rename to Source/AnimationMod/Events/Workers/DamageEffectWorker.cs diff --git a/Source/ThingGenerator/Events/Workers/DuelSectionWorker.cs b/Source/AnimationMod/Events/Workers/DuelSectionWorker.cs similarity index 100% rename from Source/ThingGenerator/Events/Workers/DuelSectionWorker.cs rename to Source/AnimationMod/Events/Workers/DuelSectionWorker.cs diff --git a/Source/ThingGenerator/Events/Workers/EventWorkerBase.cs b/Source/AnimationMod/Events/Workers/EventWorkerBase.cs similarity index 100% rename from Source/ThingGenerator/Events/Workers/EventWorkerBase.cs rename to Source/AnimationMod/Events/Workers/EventWorkerBase.cs diff --git a/Source/ThingGenerator/Events/Workers/GoreSplashWorker.cs b/Source/AnimationMod/Events/Workers/GoreSplashWorker.cs similarity index 100% rename from Source/ThingGenerator/Events/Workers/GoreSplashWorker.cs rename to Source/AnimationMod/Events/Workers/GoreSplashWorker.cs diff --git a/Source/ThingGenerator/Events/Workers/KillPawnWorker.cs b/Source/AnimationMod/Events/Workers/KillPawnWorker.cs similarity index 100% rename from Source/ThingGenerator/Events/Workers/KillPawnWorker.cs rename to Source/AnimationMod/Events/Workers/KillPawnWorker.cs diff --git a/Source/ThingGenerator/Events/Workers/MoteWorker.cs b/Source/AnimationMod/Events/Workers/MoteWorker.cs similarity index 100% rename from Source/ThingGenerator/Events/Workers/MoteWorker.cs rename to Source/AnimationMod/Events/Workers/MoteWorker.cs diff --git a/Source/ThingGenerator/Events/Workers/PuntPawnWorker.cs b/Source/AnimationMod/Events/Workers/PuntPawnWorker.cs similarity index 100% rename from Source/ThingGenerator/Events/Workers/PuntPawnWorker.cs rename to Source/AnimationMod/Events/Workers/PuntPawnWorker.cs diff --git a/Source/ThingGenerator/Events/Workers/TextMoteWorker.cs b/Source/AnimationMod/Events/Workers/TextMoteWorker.cs similarity index 100% rename from Source/ThingGenerator/Events/Workers/TextMoteWorker.cs rename to Source/AnimationMod/Events/Workers/TextMoteWorker.cs diff --git a/Source/ThingGenerator/ExecutionOutcome.cs b/Source/AnimationMod/ExecutionOutcome.cs similarity index 100% rename from Source/ThingGenerator/ExecutionOutcome.cs rename to Source/AnimationMod/ExecutionOutcome.cs diff --git a/Source/ThingGenerator/Extensions.cs b/Source/AnimationMod/Extensions.cs similarity index 99% rename from Source/ThingGenerator/Extensions.cs rename to Source/AnimationMod/Extensions.cs index 2ac9bab9..3eec57ca 100644 --- a/Source/ThingGenerator/Extensions.cs +++ b/Source/AnimationMod/Extensions.cs @@ -11,9 +11,7 @@ using UnityEngine; using Verse; using Verse.AI; -#if !V14 using LudeonTK; -#endif namespace AM; diff --git a/Source/ThingGenerator/GameComp.cs b/Source/AnimationMod/GameComp.cs similarity index 99% rename from Source/ThingGenerator/GameComp.cs rename to Source/AnimationMod/GameComp.cs index 383fbd32..89eb5135 100644 --- a/Source/ThingGenerator/GameComp.cs +++ b/Source/AnimationMod/GameComp.cs @@ -10,9 +10,7 @@ using UnityEngine; using Verse; using Object = UnityEngine.Object; -#if !V14 using LudeonTK; -#endif namespace AM; diff --git a/Source/ThingGenerator/Grappling/GrabUtility.cs b/Source/AnimationMod/Grappling/GrabUtility.cs similarity index 100% rename from Source/ThingGenerator/Grappling/GrabUtility.cs rename to Source/AnimationMod/Grappling/GrabUtility.cs diff --git a/Source/ThingGenerator/Grappling/GrappleFlyer.cs b/Source/AnimationMod/Grappling/GrappleFlyer.cs similarity index 93% rename from Source/ThingGenerator/Grappling/GrappleFlyer.cs rename to Source/AnimationMod/Grappling/GrappleFlyer.cs index a54c6701..de457165 100644 --- a/Source/ThingGenerator/Grappling/GrappleFlyer.cs +++ b/Source/AnimationMod/Grappling/GrappleFlyer.cs @@ -52,23 +52,7 @@ public static GrappleFlyer MakeGrappleFlyer(Pawn grappler, Pawn victim, in IntVe private Vector3 effectivePos; private float effectiveHeight; - private Material ShadowMaterial - { - get - { -#if V14 - if (this.cachedShadowMaterial == null && !this.def.pawnFlyer.shadow.NullOrEmpty()) - { - this.cachedShadowMaterial = - MaterialPool.MatFrom(this.def.pawnFlyer.shadow, ShaderDatabase.Transparent); - } - - return this.cachedShadowMaterial; -#else - return this.def.pawnFlyer.ShadowMaterial; -#endif - } - } + private Material ShadowMaterial => this.def.pawnFlyer.ShadowMaterial; static GrappleFlyer() { diff --git a/Source/ThingGenerator/Grappling/JobDriver_GrapplePawn.cs b/Source/AnimationMod/Grappling/JobDriver_GrapplePawn.cs similarity index 100% rename from Source/ThingGenerator/Grappling/JobDriver_GrapplePawn.cs rename to Source/AnimationMod/Grappling/JobDriver_GrapplePawn.cs diff --git a/Source/ThingGenerator/Grappling/KnockbackFlyer.cs b/Source/AnimationMod/Grappling/KnockbackFlyer.cs similarity index 96% rename from Source/ThingGenerator/Grappling/KnockbackFlyer.cs rename to Source/AnimationMod/Grappling/KnockbackFlyer.cs index 74a0fcda..d8a31841 100644 --- a/Source/ThingGenerator/Grappling/KnockbackFlyer.cs +++ b/Source/AnimationMod/Grappling/KnockbackFlyer.cs @@ -4,9 +4,7 @@ using UnityEngine; using Verse; using Verse.Sound; -#if !V14 using LudeonTK; -#endif namespace AM.Grappling; @@ -43,11 +41,7 @@ public static KnockbackFlyer MakeKnockbackFlyer(Pawn victim, IntVec3 targetPos) var start = victim.DrawPos; var end = targetPos.ToVector3ShiftedWithAltitude(start.y); -#if V14 - var soundDef = SoundDefOf.Pawn_Melee_Punch_HitBuilding; -#else var soundDef = SoundDefOf.Pawn_Melee_Punch_HitBuilding_Generic; -#endif KnockbackFlyer flyer = MakeFlyer(AM_DefOf.AM_KnockbackFlyer, victim, targetPos, EffecterDefOf.ConstructDirt, soundDef) as KnockbackFlyer; @@ -200,11 +194,7 @@ public override void Tick() private void LandingEffects() { -#if V13 - def.pawnFlyer.soundLanding.PlayOneShot(new TargetInfo(EndPos.ToIntVec3(), Map)); -#else soundLanding.PlayOneShot(new TargetInfo(EndPos.ToIntVec3(), Map)); -#endif for (int i = 0; i < 5; i++) { diff --git a/Source/ThingGenerator/Heads/HeadInstance.cs b/Source/AnimationMod/Heads/HeadInstance.cs similarity index 100% rename from Source/ThingGenerator/Heads/HeadInstance.cs rename to Source/AnimationMod/Heads/HeadInstance.cs diff --git a/Source/ThingGenerator/Health/HediffCompProperties_SingleTendRemove.cs b/Source/AnimationMod/Health/HediffCompProperties_SingleTendRemove.cs similarity index 100% rename from Source/ThingGenerator/Health/HediffCompProperties_SingleTendRemove.cs rename to Source/AnimationMod/Health/HediffCompProperties_SingleTendRemove.cs diff --git a/Source/ThingGenerator/Health/HediffComp_SingleTendRemove.cs b/Source/AnimationMod/Health/HediffComp_SingleTendRemove.cs similarity index 100% rename from Source/ThingGenerator/Health/HediffComp_SingleTendRemove.cs rename to Source/AnimationMod/Health/HediffComp_SingleTendRemove.cs diff --git a/Source/ThingGenerator/Idle/IdleClassifier.cs b/Source/AnimationMod/Idle/IdleClassifier.cs similarity index 99% rename from Source/ThingGenerator/Idle/IdleClassifier.cs rename to Source/AnimationMod/Idle/IdleClassifier.cs index 0a24c173..11f3eb92 100644 --- a/Source/ThingGenerator/Idle/IdleClassifier.cs +++ b/Source/AnimationMod/Idle/IdleClassifier.cs @@ -2,9 +2,7 @@ using AM.Tweaks; using UnityEngine; using Verse; -#if !V14 using LudeonTK; -#endif namespace AM.Idle; diff --git a/Source/ThingGenerator/Idle/IdleControllerComp.cs b/Source/AnimationMod/Idle/IdleControllerComp.cs similarity index 99% rename from Source/ThingGenerator/Idle/IdleControllerComp.cs rename to Source/AnimationMod/Idle/IdleControllerComp.cs index fb09924e..1384f58f 100644 --- a/Source/ThingGenerator/Idle/IdleControllerComp.cs +++ b/Source/AnimationMod/Idle/IdleControllerComp.cs @@ -9,9 +9,7 @@ using RimWorld; using UnityEngine; using Verse; -#if !V14 using LudeonTK; -#endif namespace AM.Idle; @@ -102,11 +100,8 @@ private bool ShouldBeActive(out Thing weapon) } // Vanilla checks. -#if V14 - bool vanillaShouldDraw = pawn.drawer.renderer.CarryWeaponOpenly(); -#else bool vanillaShouldDraw = PawnRenderUtility.CarryWeaponOpenly(pawn); -#endif + if (!vanillaShouldDraw) { // Sometimes the pawn will not be 'openly carrying' but will still be aiming their weapon, such as when casting psycasts. diff --git a/Source/ThingGenerator/Idle/IdleType.cs b/Source/AnimationMod/Idle/IdleType.cs similarity index 100% rename from Source/ThingGenerator/Idle/IdleType.cs rename to Source/AnimationMod/Idle/IdleType.cs diff --git a/Source/ThingGenerator/Idle/WeaponCat.cs b/Source/AnimationMod/Idle/WeaponCat.cs similarity index 100% rename from Source/ThingGenerator/Idle/WeaponCat.cs rename to Source/AnimationMod/Idle/WeaponCat.cs diff --git a/Source/ThingGenerator/Idle/WeaponSize.cs b/Source/AnimationMod/Idle/WeaponSize.cs similarity index 100% rename from Source/ThingGenerator/Idle/WeaponSize.cs rename to Source/AnimationMod/Idle/WeaponSize.cs diff --git a/Source/ThingGenerator/Jobs/IDuelEndNotificationReceiver.cs b/Source/AnimationMod/Jobs/IDuelEndNotificationReceiver.cs similarity index 100% rename from Source/ThingGenerator/Jobs/IDuelEndNotificationReceiver.cs rename to Source/AnimationMod/Jobs/IDuelEndNotificationReceiver.cs diff --git a/Source/ThingGenerator/Jobs/JobDriver_ChannelAnimation.cs b/Source/AnimationMod/Jobs/JobDriver_ChannelAnimation.cs similarity index 100% rename from Source/ThingGenerator/Jobs/JobDriver_ChannelAnimation.cs rename to Source/AnimationMod/Jobs/JobDriver_ChannelAnimation.cs diff --git a/Source/ThingGenerator/Jobs/JobDriver_DoAnimation.cs b/Source/AnimationMod/Jobs/JobDriver_DoAnimation.cs similarity index 100% rename from Source/ThingGenerator/Jobs/JobDriver_DoAnimation.cs rename to Source/AnimationMod/Jobs/JobDriver_DoAnimation.cs diff --git a/Source/ThingGenerator/Jobs/JobDriver_DoFriendlyDuel.cs b/Source/AnimationMod/Jobs/JobDriver_DoFriendlyDuel.cs similarity index 100% rename from Source/ThingGenerator/Jobs/JobDriver_DoFriendlyDuel.cs rename to Source/AnimationMod/Jobs/JobDriver_DoFriendlyDuel.cs diff --git a/Source/ThingGenerator/Jobs/JobDriver_GoToAnimationSpot.cs b/Source/AnimationMod/Jobs/JobDriver_GoToAnimationSpot.cs similarity index 100% rename from Source/ThingGenerator/Jobs/JobDriver_GoToAnimationSpot.cs rename to Source/AnimationMod/Jobs/JobDriver_GoToAnimationSpot.cs diff --git a/Source/ThingGenerator/Jobs/JobDriver_GoToExecutionSpot.cs b/Source/AnimationMod/Jobs/JobDriver_GoToExecutionSpot.cs similarity index 100% rename from Source/ThingGenerator/Jobs/JobDriver_GoToExecutionSpot.cs rename to Source/AnimationMod/Jobs/JobDriver_GoToExecutionSpot.cs diff --git a/Source/ThingGenerator/Jobs/JobDriver_SpectateDuel.cs b/Source/AnimationMod/Jobs/JobDriver_SpectateDuel.cs similarity index 100% rename from Source/ThingGenerator/Jobs/JobDriver_SpectateDuel.cs rename to Source/AnimationMod/Jobs/JobDriver_SpectateDuel.cs diff --git a/Source/ThingGenerator/Jobs/ToilUtils.cs b/Source/AnimationMod/Jobs/ToilUtils.cs similarity index 100% rename from Source/ThingGenerator/Jobs/ToilUtils.cs rename to Source/AnimationMod/Jobs/ToilUtils.cs diff --git a/Source/ThingGenerator/MeleeAnimationAdjustmentDef.cs b/Source/AnimationMod/MeleeAnimationAdjustmentDef.cs similarity index 100% rename from Source/ThingGenerator/MeleeAnimationAdjustmentDef.cs rename to Source/AnimationMod/MeleeAnimationAdjustmentDef.cs diff --git a/Source/ThingGenerator/Outcome/IOutcomeWorker.cs b/Source/AnimationMod/Outcome/IOutcomeWorker.cs similarity index 100% rename from Source/ThingGenerator/Outcome/IOutcomeWorker.cs rename to Source/AnimationMod/Outcome/IOutcomeWorker.cs diff --git a/Source/ThingGenerator/Outcome/OutcomeUtility.cs b/Source/AnimationMod/Outcome/OutcomeUtility.cs similarity index 99% rename from Source/ThingGenerator/Outcome/OutcomeUtility.cs rename to Source/AnimationMod/Outcome/OutcomeUtility.cs index 92944469..4c783181 100644 --- a/Source/ThingGenerator/Outcome/OutcomeUtility.cs +++ b/Source/AnimationMod/Outcome/OutcomeUtility.cs @@ -6,9 +6,7 @@ using RimWorld; using UnityEngine; using Verse; -#if !V14 using LudeonTK; -#endif namespace AM.Outcome; diff --git a/Source/ThingGenerator/Outcome/PossibleMeleeAttack.cs b/Source/AnimationMod/Outcome/PossibleMeleeAttack.cs similarity index 100% rename from Source/ThingGenerator/Outcome/PossibleMeleeAttack.cs rename to Source/AnimationMod/Outcome/PossibleMeleeAttack.cs diff --git a/Source/ThingGenerator/Outcome/VanillaOutcomeWorker.cs b/Source/AnimationMod/Outcome/VanillaOutcomeWorker.cs similarity index 100% rename from Source/ThingGenerator/Outcome/VanillaOutcomeWorker.cs rename to Source/AnimationMod/Outcome/VanillaOutcomeWorker.cs diff --git a/Source/ThingGenerator/PartRenderer.cs b/Source/AnimationMod/PartRenderer.cs similarity index 100% rename from Source/ThingGenerator/PartRenderer.cs rename to Source/AnimationMod/PartRenderer.cs diff --git a/Source/ThingGenerator/Patches/PatchMaster.cs b/Source/AnimationMod/Patches/PatchMaster.cs similarity index 100% rename from Source/ThingGenerator/Patches/PatchMaster.cs rename to Source/AnimationMod/Patches/PatchMaster.cs diff --git a/Source/ThingGenerator/Patches/Patch_Corpse_DrawAt.cs b/Source/AnimationMod/Patches/Patch_Corpse_DrawAt.cs similarity index 88% rename from Source/ThingGenerator/Patches/Patch_Corpse_DrawAt.cs rename to Source/AnimationMod/Patches/Patch_Corpse_DrawAt.cs index 9feff099..d0f52d5c 100644 --- a/Source/ThingGenerator/Patches/Patch_Corpse_DrawAt.cs +++ b/Source/AnimationMod/Patches/Patch_Corpse_DrawAt.cs @@ -3,18 +3,12 @@ using HarmonyLib; using UnityEngine; using Verse; -#if !V14 using LudeonTK; -#endif namespace AM.Patches; -#if V14 -[HarmonyPatch(typeof(Corpse), nameof(Corpse.DrawAt))] -#else [HarmonyPatch(typeof(ThingWithComps), nameof(ThingWithComps.DrawAt))] // Corpse DrawAt was removed in 1.5 -#endif public static class Patch_Corpse_DrawAt { public static readonly Dictionary Interpolators = new Dictionary(); @@ -25,13 +19,6 @@ public static void Tick() Interpolators.RemoveAll(p => !p.Key.Spawned); } -#if V14 - [HarmonyPriority(Priority.First)] - private static void Prefix(Corpse __instance, ref Vector3 drawLoc) - { - DoOffsetLogic(__instance, ref drawLoc); - } -#else [HarmonyPriority(Priority.First)] private static void Prefix(ThingWithComps __instance, ref Vector3 drawLoc) { @@ -40,7 +27,6 @@ private static void Prefix(ThingWithComps __instance, ref Vector3 drawLoc) DoOffsetLogic(corpse, ref drawLoc); } -#endif private static void DoOffsetLogic(Corpse __instance, ref Vector3 drawLoc) { diff --git a/Source/ThingGenerator/Patches/Patch_FloatMenuMakerMap_AddDraftedOrders.cs b/Source/AnimationMod/Patches/Patch_FloatMenuMakerMap_AddDraftedOrders.cs similarity index 100% rename from Source/ThingGenerator/Patches/Patch_FloatMenuMakerMap_AddDraftedOrders.cs rename to Source/AnimationMod/Patches/Patch_FloatMenuMakerMap_AddDraftedOrders.cs diff --git a/Source/ThingGenerator/Patches/Patch_GlobalTextureAtlasManager_TryGetPawnFrameSet.cs b/Source/AnimationMod/Patches/Patch_GlobalTextureAtlasManager_TryGetPawnFrameSet.cs similarity index 100% rename from Source/ThingGenerator/Patches/Patch_GlobalTextureAtlasManager_TryGetPawnFrameSet.cs rename to Source/AnimationMod/Patches/Patch_GlobalTextureAtlasManager_TryGetPawnFrameSet.cs diff --git a/Source/ThingGenerator/Patches/Patch_PawnGenerator_GeneratePawn.cs b/Source/AnimationMod/Patches/Patch_PawnGenerator_GeneratePawn.cs similarity index 100% rename from Source/ThingGenerator/Patches/Patch_PawnGenerator_GeneratePawn.cs rename to Source/AnimationMod/Patches/Patch_PawnGenerator_GeneratePawn.cs diff --git a/Source/ThingGenerator/Patches/Patch_PawnRenderer_DrawEquipmentAiming.cs b/Source/AnimationMod/Patches/Patch_PawnRenderer_DrawEquipmentAiming.cs similarity index 76% rename from Source/ThingGenerator/Patches/Patch_PawnRenderer_DrawEquipmentAiming.cs rename to Source/AnimationMod/Patches/Patch_PawnRenderer_DrawEquipmentAiming.cs index 0502ade5..f9031aaf 100644 --- a/Source/ThingGenerator/Patches/Patch_PawnRenderer_DrawEquipmentAiming.cs +++ b/Source/AnimationMod/Patches/Patch_PawnRenderer_DrawEquipmentAiming.cs @@ -8,31 +8,15 @@ namespace AM.Patches; /// /// Used to override drawing melee weapons. /// - -#if V14 -[HarmonyPatch(typeof(PawnRenderer), nameof(PawnRenderer.DrawEquipment))] -#else [HarmonyPatch(typeof(PawnRenderUtility), nameof(PawnRenderUtility.DrawEquipmentAndApparelExtras))] -#endif - public static class Patch_PawnRenderer_DrawEquipment { -#if V14 - [HarmonyPriority(Priority.First)] - [HarmonyBefore("com.yayo.yayoAni")] - private static bool Prefix(PawnRenderer __instance) - { - var pawn = __instance.pawn; - return WorkerMethod(pawn); - } -#else [HarmonyPriority(Priority.First)] [HarmonyBefore("com.yayo.yayoAni")] private static bool Prefix(Pawn pawn) { return WorkerMethod(pawn); } -#endif public static bool WorkerMethod(Pawn pawn) { diff --git a/Source/ThingGenerator/Patches/Patch_PawnRenderer_DrawInvisibleShadow.cs b/Source/AnimationMod/Patches/Patch_PawnRenderer_DrawInvisibleShadow.cs similarity index 82% rename from Source/ThingGenerator/Patches/Patch_PawnRenderer_DrawInvisibleShadow.cs rename to Source/AnimationMod/Patches/Patch_PawnRenderer_DrawInvisibleShadow.cs index 6b7f15c9..01c801f9 100644 --- a/Source/ThingGenerator/Patches/Patch_PawnRenderer_DrawInvisibleShadow.cs +++ b/Source/AnimationMod/Patches/Patch_PawnRenderer_DrawInvisibleShadow.cs @@ -7,11 +7,7 @@ namespace AM.Patches; /// /// Suppresses shadow draw which was added in 1.4 in the . /// -#if V14 -[HarmonyPatch(typeof(PawnRenderer), nameof(PawnRenderer.DrawInvisibleShadow))] -#else [HarmonyPatch(typeof(PawnRenderer), nameof(PawnRenderer.RenderShadowOnlyAt))] -#endif [UsedImplicitly] public class Patch_PawnRenderer_DrawInvisibleShadow { diff --git a/Source/ThingGenerator/Patches/Patch_PawnRenderer_LayingFacing.cs b/Source/AnimationMod/Patches/Patch_PawnRenderer_LayingFacing.cs similarity index 100% rename from Source/ThingGenerator/Patches/Patch_PawnRenderer_LayingFacing.cs rename to Source/AnimationMod/Patches/Patch_PawnRenderer_LayingFacing.cs diff --git a/Source/ThingGenerator/Patches/Patch_PawnRenderer_RenderPawnAt.cs b/Source/AnimationMod/Patches/Patch_PawnRenderer_RenderPawnAt.cs similarity index 100% rename from Source/ThingGenerator/Patches/Patch_PawnRenderer_RenderPawnAt.cs rename to Source/AnimationMod/Patches/Patch_PawnRenderer_RenderPawnAt.cs diff --git a/Source/ThingGenerator/Patches/Patch_PawnRenderer_RenderPawnInternal.cs b/Source/AnimationMod/Patches/Patch_PawnRenderer_RenderPawnInternal.cs similarity index 93% rename from Source/ThingGenerator/Patches/Patch_PawnRenderer_RenderPawnInternal.cs rename to Source/AnimationMod/Patches/Patch_PawnRenderer_RenderPawnInternal.cs index 56f95c62..df7d3e62 100644 --- a/Source/ThingGenerator/Patches/Patch_PawnRenderer_RenderPawnInternal.cs +++ b/Source/AnimationMod/Patches/Patch_PawnRenderer_RenderPawnInternal.cs @@ -32,12 +32,6 @@ public enum DrawMode [HarmonyPriority(Priority.Last)] // As late as possible. We want to be the last to modify results. [HarmonyAfter("com.yayo.yayoAni")] // Go away. [HarmonyBefore("rimworld.Nals.FacialAnimation")] // Must go before facial animation otherwise the face gets fucky. -#if V14 - private static bool Prefix(Pawn ___pawn, ref Rot4 bodyFacing, ref float angle, ref PawnRenderFlags flags, ref bool renderBody) - { - return ModifyRenderData(___pawn, ref bodyFacing, ref angle, ref flags, ref renderBody); - } -#else private static bool Prefix(Pawn ___pawn, ref PawnDrawParms parms) { float angle = parms.matrix.rotation.eulerAngles.y; @@ -63,7 +57,6 @@ private static bool Prefix(Pawn ___pawn, ref PawnDrawParms parms) return result; } -#endif public static bool ModifyRenderData(Pawn ___pawn, ref Rot4 bodyFacing, ref float angle, ref PawnRenderFlags flags, ref bool renderBody) { diff --git a/Source/ThingGenerator/Patches/Patch_PawnUtility_GetPosture.cs b/Source/AnimationMod/Patches/Patch_PawnUtility_GetPosture.cs similarity index 100% rename from Source/ThingGenerator/Patches/Patch_PawnUtility_GetPosture.cs rename to Source/AnimationMod/Patches/Patch_PawnUtility_GetPosture.cs diff --git a/Source/ThingGenerator/Patches/Patch_PawnUtility_IsInvisible.cs b/Source/AnimationMod/Patches/Patch_PawnUtility_IsInvisible.cs similarity index 68% rename from Source/ThingGenerator/Patches/Patch_PawnUtility_IsInvisible.cs rename to Source/AnimationMod/Patches/Patch_PawnUtility_IsInvisible.cs index fdcdd76c..b646d8f8 100644 --- a/Source/ThingGenerator/Patches/Patch_PawnUtility_IsInvisible.cs +++ b/Source/AnimationMod/Patches/Patch_PawnUtility_IsInvisible.cs @@ -16,28 +16,6 @@ namespace AM.Patches; /// However, making pawns invincible during animations would be very overpowered and broken, so making them untargettable instead is a nice /// compromise. /// -#if V14 -[HarmonyPatch(typeof(PawnUtility), nameof(PawnUtility.IsInvisible))] -public static class Patch_PawnUtility_IsInvisible -{ - public static bool IsRendering; - - [HarmonyPriority(Priority.First)] - public static bool Prefix(Pawn pawn, ref bool __result) - { - if (!Core.Settings.AllowInvisiblePawns) - return true; - - var anim = PatchMaster.GetAnimator(pawn); - if (anim != null && !IsRendering) - { - __result = true; - return false; - } - return true; - } -} -#else [HarmonyPatch(typeof(InvisibilityUtility), nameof(InvisibilityUtility.IsPsychologicallyInvisible))] public static class Patch_PawnUtility_IsInvisible { @@ -58,4 +36,3 @@ public static bool Prefix(Pawn pawn, ref bool __result) return true; } } -#endif \ No newline at end of file diff --git a/Source/ThingGenerator/Patches/Patch_Pawn_DrawGUIOverlay.cs b/Source/AnimationMod/Patches/Patch_Pawn_DrawGUIOverlay.cs similarity index 100% rename from Source/ThingGenerator/Patches/Patch_Pawn_DrawGUIOverlay.cs rename to Source/AnimationMod/Patches/Patch_Pawn_DrawGUIOverlay.cs diff --git a/Source/ThingGenerator/Patches/Patch_Pawn_DrawTracker_Notify_MeleeAttackOn.cs b/Source/AnimationMod/Patches/Patch_Pawn_DrawTracker_Notify_MeleeAttackOn.cs similarity index 100% rename from Source/ThingGenerator/Patches/Patch_Pawn_DrawTracker_Notify_MeleeAttackOn.cs rename to Source/AnimationMod/Patches/Patch_Pawn_DrawTracker_Notify_MeleeAttackOn.cs diff --git a/Source/ThingGenerator/Patches/Patch_VBE_Utils_DrawBG.cs b/Source/AnimationMod/Patches/Patch_VBE_Utils_DrawBG.cs similarity index 100% rename from Source/ThingGenerator/Patches/Patch_VBE_Utils_DrawBG.cs rename to Source/AnimationMod/Patches/Patch_VBE_Utils_DrawBG.cs diff --git a/Source/ThingGenerator/Patches/Patch_Verb_MeleeAttack_ApplyMeleeDamageToTarget.cs b/Source/AnimationMod/Patches/Patch_Verb_MeleeAttack_ApplyMeleeDamageToTarget.cs similarity index 100% rename from Source/ThingGenerator/Patches/Patch_Verb_MeleeAttack_ApplyMeleeDamageToTarget.cs rename to Source/AnimationMod/Patches/Patch_Verb_MeleeAttack_ApplyMeleeDamageToTarget.cs diff --git a/Source/ThingGenerator/Patches/Patch_Verb_MeleeAttack_TryCastShot.cs b/Source/AnimationMod/Patches/Patch_Verb_MeleeAttack_TryCastShot.cs similarity index 100% rename from Source/ThingGenerator/Patches/Patch_Verb_MeleeAttack_TryCastShot.cs rename to Source/AnimationMod/Patches/Patch_Verb_MeleeAttack_TryCastShot.cs diff --git a/Source/ThingGenerator/PawnData/AutoOption.cs b/Source/AnimationMod/PawnData/AutoOption.cs similarity index 100% rename from Source/ThingGenerator/PawnData/AutoOption.cs rename to Source/AnimationMod/PawnData/AutoOption.cs diff --git a/Source/ThingGenerator/PawnData/PawnMeleeData.cs b/Source/AnimationMod/PawnData/PawnMeleeData.cs similarity index 100% rename from Source/ThingGenerator/PawnData/PawnMeleeData.cs rename to Source/AnimationMod/PawnData/PawnMeleeData.cs diff --git a/Source/ThingGenerator/Preview/PreviewRenderer.cs b/Source/AnimationMod/Preview/PreviewRenderer.cs similarity index 100% rename from Source/ThingGenerator/Preview/PreviewRenderer.cs rename to Source/AnimationMod/Preview/PreviewRenderer.cs diff --git a/Source/ThingGenerator/Processing/MapPawnProcessor.cs b/Source/AnimationMod/Processing/MapPawnProcessor.cs similarity index 99% rename from Source/ThingGenerator/Processing/MapPawnProcessor.cs rename to Source/AnimationMod/Processing/MapPawnProcessor.cs index a2a2241c..20afe6c2 100644 --- a/Source/ThingGenerator/Processing/MapPawnProcessor.cs +++ b/Source/AnimationMod/Processing/MapPawnProcessor.cs @@ -16,9 +16,7 @@ using UnityEngine; using Verse; using Verse.AI; -#if !V14 using LudeonTK; -#endif namespace AM.Processing; diff --git a/Source/ThingGenerator/Processing/RefTimer.cs b/Source/AnimationMod/Processing/RefTimer.cs similarity index 100% rename from Source/ThingGenerator/Processing/RefTimer.cs rename to Source/AnimationMod/Processing/RefTimer.cs diff --git a/Source/ThingGenerator/PromotionWorkers/MustHaveHeadPromotionWorker.cs b/Source/AnimationMod/PromotionWorkers/MustHaveHeadPromotionWorker.cs similarity index 100% rename from Source/ThingGenerator/PromotionWorkers/MustHaveHeadPromotionWorker.cs rename to Source/AnimationMod/PromotionWorkers/MustHaveHeadPromotionWorker.cs diff --git a/Source/ThingGenerator/RendererWorkers/AnimationRendererWorker.cs b/Source/AnimationMod/RendererWorkers/AnimationRendererWorker.cs similarity index 100% rename from Source/ThingGenerator/RendererWorkers/AnimationRendererWorker.cs rename to Source/AnimationMod/RendererWorkers/AnimationRendererWorker.cs diff --git a/Source/ThingGenerator/RendererWorkers/GilgameshRendererWorker.cs b/Source/AnimationMod/RendererWorkers/GilgameshRendererWorker.cs similarity index 100% rename from Source/ThingGenerator/RendererWorkers/GilgameshRendererWorker.cs rename to Source/AnimationMod/RendererWorkers/GilgameshRendererWorker.cs diff --git a/Source/ThingGenerator/Reqs/AndReq.cs b/Source/AnimationMod/Reqs/AndReq.cs similarity index 100% rename from Source/ThingGenerator/Reqs/AndReq.cs rename to Source/AnimationMod/Reqs/AndReq.cs diff --git a/Source/ThingGenerator/Reqs/AnyCategory.cs b/Source/AnimationMod/Reqs/AnyCategory.cs similarity index 100% rename from Source/ThingGenerator/Reqs/AnyCategory.cs rename to Source/AnimationMod/Reqs/AnyCategory.cs diff --git a/Source/ThingGenerator/Reqs/AnySize.cs b/Source/AnimationMod/Reqs/AnySize.cs similarity index 100% rename from Source/ThingGenerator/Reqs/AnySize.cs rename to Source/AnimationMod/Reqs/AnySize.cs diff --git a/Source/ThingGenerator/Reqs/AnyType.cs b/Source/AnimationMod/Reqs/AnyType.cs similarity index 100% rename from Source/ThingGenerator/Reqs/AnyType.cs rename to Source/AnimationMod/Reqs/AnyType.cs diff --git a/Source/ThingGenerator/Reqs/False.cs b/Source/AnimationMod/Reqs/False.cs similarity index 100% rename from Source/ThingGenerator/Reqs/False.cs rename to Source/AnimationMod/Reqs/False.cs diff --git a/Source/ThingGenerator/Reqs/OnlyType.cs b/Source/AnimationMod/Reqs/OnlyType.cs similarity index 100% rename from Source/ThingGenerator/Reqs/OnlyType.cs rename to Source/AnimationMod/Reqs/OnlyType.cs diff --git a/Source/ThingGenerator/Reqs/OrReq.cs b/Source/AnimationMod/Reqs/OrReq.cs similarity index 100% rename from Source/ThingGenerator/Reqs/OrReq.cs rename to Source/AnimationMod/Reqs/OrReq.cs diff --git a/Source/ThingGenerator/Reqs/Req.cs b/Source/AnimationMod/Reqs/Req.cs similarity index 100% rename from Source/ThingGenerator/Reqs/Req.cs rename to Source/AnimationMod/Reqs/Req.cs diff --git a/Source/ThingGenerator/Reqs/ReqInput.cs b/Source/AnimationMod/Reqs/ReqInput.cs similarity index 100% rename from Source/ThingGenerator/Reqs/ReqInput.cs rename to Source/AnimationMod/Reqs/ReqInput.cs diff --git a/Source/ThingGenerator/Reqs/SpecificWeapon.cs b/Source/AnimationMod/Reqs/SpecificWeapon.cs similarity index 100% rename from Source/ThingGenerator/Reqs/SpecificWeapon.cs rename to Source/AnimationMod/Reqs/SpecificWeapon.cs diff --git a/Source/ThingGenerator/Reqs/True.cs b/Source/AnimationMod/Reqs/True.cs similarity index 100% rename from Source/ThingGenerator/Reqs/True.cs rename to Source/AnimationMod/Reqs/True.cs diff --git a/Source/ThingGenerator/SpaceChecker.cs b/Source/AnimationMod/SpaceChecker.cs similarity index 100% rename from Source/ThingGenerator/SpaceChecker.cs rename to Source/AnimationMod/SpaceChecker.cs diff --git a/Source/ThingGenerator/Stats/StatWorker_DuelAbility.cs b/Source/AnimationMod/Stats/StatWorker_DuelAbility.cs similarity index 100% rename from Source/ThingGenerator/Stats/StatWorker_DuelAbility.cs rename to Source/AnimationMod/Stats/StatWorker_DuelAbility.cs diff --git a/Source/ThingGenerator/Stats/StatWorker_ExecCooldown.cs b/Source/AnimationMod/Stats/StatWorker_ExecCooldown.cs similarity index 100% rename from Source/ThingGenerator/Stats/StatWorker_ExecCooldown.cs rename to Source/AnimationMod/Stats/StatWorker_ExecCooldown.cs diff --git a/Source/ThingGenerator/Stats/StatWorker_Lethality.cs b/Source/AnimationMod/Stats/StatWorker_Lethality.cs similarity index 100% rename from Source/ThingGenerator/Stats/StatWorker_Lethality.cs rename to Source/AnimationMod/Stats/StatWorker_Lethality.cs diff --git a/Source/ThingGenerator/Sweep/BasicSweepProvider.cs b/Source/AnimationMod/Sweep/BasicSweepProvider.cs similarity index 100% rename from Source/ThingGenerator/Sweep/BasicSweepProvider.cs rename to Source/AnimationMod/Sweep/BasicSweepProvider.cs diff --git a/Source/ThingGenerator/Sweep/ISweepProvider.cs b/Source/AnimationMod/Sweep/ISweepProvider.cs similarity index 100% rename from Source/ThingGenerator/Sweep/ISweepProvider.cs rename to Source/AnimationMod/Sweep/ISweepProvider.cs diff --git a/Source/ThingGenerator/Sweep/PartWithSweep.cs b/Source/AnimationMod/Sweep/PartWithSweep.cs similarity index 100% rename from Source/ThingGenerator/Sweep/PartWithSweep.cs rename to Source/AnimationMod/Sweep/PartWithSweep.cs diff --git a/Source/ThingGenerator/Sweep/SweepMesh.cs b/Source/AnimationMod/Sweep/SweepMesh.cs similarity index 100% rename from Source/ThingGenerator/Sweep/SweepMesh.cs rename to Source/AnimationMod/Sweep/SweepMesh.cs diff --git a/Source/ThingGenerator/Tweaks/ColorConverter.cs b/Source/AnimationMod/Tweaks/ColorConverter.cs similarity index 100% rename from Source/ThingGenerator/Tweaks/ColorConverter.cs rename to Source/AnimationMod/Tweaks/ColorConverter.cs diff --git a/Source/ThingGenerator/Tweaks/HandsMode.cs b/Source/AnimationMod/Tweaks/HandsMode.cs similarity index 100% rename from Source/ThingGenerator/Tweaks/HandsMode.cs rename to Source/AnimationMod/Tweaks/HandsMode.cs diff --git a/Source/ThingGenerator/Tweaks/ItemTweakData.cs b/Source/AnimationMod/Tweaks/ItemTweakData.cs similarity index 100% rename from Source/ThingGenerator/Tweaks/ItemTweakData.cs rename to Source/AnimationMod/Tweaks/ItemTweakData.cs diff --git a/Source/ThingGenerator/Tweaks/MeleeWeaponType.cs b/Source/AnimationMod/Tweaks/MeleeWeaponType.cs similarity index 100% rename from Source/ThingGenerator/Tweaks/MeleeWeaponType.cs rename to Source/AnimationMod/Tweaks/MeleeWeaponType.cs diff --git a/Source/ThingGenerator/Tweaks/TweakDataManager.cs b/Source/AnimationMod/Tweaks/TweakDataManager.cs similarity index 98% rename from Source/ThingGenerator/Tweaks/TweakDataManager.cs rename to Source/AnimationMod/Tweaks/TweakDataManager.cs index 2bf93e97..aa903c98 100644 --- a/Source/ThingGenerator/Tweaks/TweakDataManager.cs +++ b/Source/AnimationMod/Tweaks/TweakDataManager.cs @@ -5,9 +5,7 @@ using AM.Retexture; using UnityEngine; using Verse; -#if !V14 using LudeonTK; -#endif namespace AM.Tweaks; @@ -93,9 +91,9 @@ public static ItemTweakData TryGetTweak(ThingDef def, ModContentPack textureSupp return null; if (textureSupplier == null) - return defToTweak.TryGetValue(def, out var found) ? found : null; + return defToTweak.GetValueOrDefault(def); - return defWithModToTweak.TryGetValue((def, textureSupplier), out var found2) ? found2 : null; + return defWithModToTweak.GetValueOrDefault((def, textureSupplier)); } public static ItemTweakData CreateNew(ThingDef def, ModContentPack textureSupplier) diff --git a/Source/ThingGenerator/UI/BGRenderer.cs b/Source/AnimationMod/UI/BGRenderer.cs similarity index 99% rename from Source/ThingGenerator/UI/BGRenderer.cs rename to Source/AnimationMod/UI/BGRenderer.cs index ae00d5f1..8be78ca4 100644 --- a/Source/ThingGenerator/UI/BGRenderer.cs +++ b/Source/AnimationMod/UI/BGRenderer.cs @@ -1,9 +1,7 @@ using System; using UnityEngine; using Verse; -#if !V14 using LudeonTK; -#endif namespace AM.UI; diff --git a/Source/ThingGenerator/UI/Dialog_AnimationDebugger.cs b/Source/AnimationMod/UI/Dialog_AnimationDebugger.cs similarity index 99% rename from Source/ThingGenerator/UI/Dialog_AnimationDebugger.cs rename to Source/AnimationMod/UI/Dialog_AnimationDebugger.cs index 44ae7439..cfe153dd 100644 --- a/Source/ThingGenerator/UI/Dialog_AnimationDebugger.cs +++ b/Source/AnimationMod/UI/Dialog_AnimationDebugger.cs @@ -8,9 +8,7 @@ using UnityEngine; using Verse; using Verse.Sound; -#if !V14 using LudeonTK; -#endif namespace AM.UI; @@ -184,11 +182,9 @@ private void DrawAllAnimators(Listing_Standard ui) bar.y += 18; Widgets.DrawBoxSolid(bar, Color.white * 0.45f); -#if V14 - float newLerp = Widgets.HorizontalSlider_NewTemp(bar.ExpandedBy(0, -2), lerp, 0, 1); -#else + float newLerp = Widgets.HorizontalSlider(bar.ExpandedBy(0, -2), lerp, 0, 1); -#endif + if (Math.Abs(newLerp - lerp) > 0.005f) renderer.Seek(newLerp * renderer.Data.Duration, 0, null); diff --git a/Source/ThingGenerator/UI/Dialog_TweakEditor.cs b/Source/AnimationMod/UI/Dialog_TweakEditor.cs similarity index 96% rename from Source/ThingGenerator/UI/Dialog_TweakEditor.cs rename to Source/AnimationMod/UI/Dialog_TweakEditor.cs index fd1e812e..e507a95c 100644 --- a/Source/ThingGenerator/UI/Dialog_TweakEditor.cs +++ b/Source/AnimationMod/UI/Dialog_TweakEditor.cs @@ -10,9 +10,7 @@ using RimWorld; using UnityEngine; using Verse; -#if !V14 using LudeonTK; -#endif namespace AM.UI; @@ -389,13 +387,10 @@ string MakeLabel((ModContentPack mcp, ThingDef def) pair) ui.TextFieldNumericLabeled("Scale Y: ", ref tweak.ScaleY, ref GetBuffer(tweak.ScaleY)); ui.Gap(); -#if V14 - tweak.OffX = Widgets.HorizontalSlider_NewTemp(ui.GetRect(28), tweak.OffX, -2, 2, label: $"Offset X [G]: {tweak.OffX:F3}"); - tweak.OffY = Widgets.HorizontalSlider_NewTemp(ui.GetRect(28), tweak.OffY, -2, 2, label: $"Offset Y [Shift+G]: {tweak.OffY:F3}"); -#else + tweak.OffX = Widgets.HorizontalSlider(ui.GetRect(28), tweak.OffX, -2, 2, label: $"Offset X [G]: {tweak.OffX:F3}"); tweak.OffY = Widgets.HorizontalSlider(ui.GetRect(28), tweak.OffY, -2, 2, label: $"Offset Y [Shift+G]: {tweak.OffY:F3}"); -#endif + ui.Gap(); ref string tweakRotBuf = ref GetBuffer(tweak.Rotation); ui.TextFieldNumericLabeled("Rotation [R]: ", ref tweak.Rotation, ref tweakRotBuf, -360, 360); @@ -456,13 +451,9 @@ string MakeTagLabel(MeleeWeaponType tag) var startSlider = ui.GetRect(20); var endSlider = ui.GetRect(20); -#if V14 - tweak.BladeStart = Widgets.HorizontalSlider_NewTemp(startSlider, tweak.BladeStart, -2, 2, label: "Blade Start [Q]"); - tweak.BladeEnd = Widgets.HorizontalSlider_NewTemp(endSlider, tweak.BladeEnd, -2, 2, label: "Blade End [E]"); -#else + tweak.BladeStart = Widgets.HorizontalSlider(startSlider, tweak.BladeStart, -2, 2, label: "Blade Start [Q]"); tweak.BladeEnd = Widgets.HorizontalSlider(endSlider, tweak.BladeEnd, -2, 2, label: "Blade End [E]"); -#endif ui.GapLine(); @@ -568,11 +559,7 @@ string MakeTagLabel(MeleeWeaponType tag) const float MIN = 0.1f; const float MAX = 5f; -#if V14 - camera.orthographicSize = Mathf.Lerp(MIN, MAX, 1f - Widgets.HorizontalSlider_NewTemp(ui.GetRect(30), 1f - Mathf.InverseLerp(MIN, MAX, camera.orthographicSize), 0f, 1f, label: "Camera zoom")); -#else camera.orthographicSize = Mathf.Lerp(MIN, MAX, 1f - Widgets.HorizontalSlider(ui.GetRect(30), 1f - Mathf.InverseLerp(MIN, MAX, camera.orthographicSize), 0f, 1f, label: "Camera zoom")); -#endif } ui.End(); diff --git a/Source/ThingGenerator/UI/DraftedFloatMenuOptionsUI.cs b/Source/AnimationMod/UI/DraftedFloatMenuOptionsUI.cs similarity index 100% rename from Source/ThingGenerator/UI/DraftedFloatMenuOptionsUI.cs rename to Source/AnimationMod/UI/DraftedFloatMenuOptionsUI.cs diff --git a/Source/ThingGenerator/UniqueSkillDef.cs b/Source/AnimationMod/UniqueSkillDef.cs similarity index 100% rename from Source/ThingGenerator/UniqueSkillDef.cs rename to Source/AnimationMod/UniqueSkillDef.cs diff --git a/Source/ThingGenerator/UniqueSkills/ChanneledUniqueSkillInstance.cs b/Source/AnimationMod/UniqueSkills/ChanneledUniqueSkillInstance.cs similarity index 100% rename from Source/ThingGenerator/UniqueSkills/ChanneledUniqueSkillInstance.cs rename to Source/AnimationMod/UniqueSkills/ChanneledUniqueSkillInstance.cs diff --git a/Source/ThingGenerator/UniqueSkills/ExecutionUniqueSkillInstance.cs b/Source/AnimationMod/UniqueSkills/ExecutionUniqueSkillInstance.cs similarity index 100% rename from Source/ThingGenerator/UniqueSkills/ExecutionUniqueSkillInstance.cs rename to Source/AnimationMod/UniqueSkills/ExecutionUniqueSkillInstance.cs diff --git a/Source/ThingGenerator/UniqueSkills/Instances/ExecutionSkills.cs b/Source/AnimationMod/UniqueSkills/Instances/ExecutionSkills.cs similarity index 100% rename from Source/ThingGenerator/UniqueSkills/Instances/ExecutionSkills.cs rename to Source/AnimationMod/UniqueSkills/Instances/ExecutionSkills.cs diff --git a/Source/ThingGenerator/UniqueSkills/Instances/GilgameshSkill.cs b/Source/AnimationMod/UniqueSkills/Instances/GilgameshSkill.cs similarity index 100% rename from Source/ThingGenerator/UniqueSkills/Instances/GilgameshSkill.cs rename to Source/AnimationMod/UniqueSkills/Instances/GilgameshSkill.cs diff --git a/Source/ThingGenerator/UniqueSkills/SkillType.cs b/Source/AnimationMod/UniqueSkills/SkillType.cs similarity index 100% rename from Source/ThingGenerator/UniqueSkills/SkillType.cs rename to Source/AnimationMod/UniqueSkills/SkillType.cs diff --git a/Source/ThingGenerator/UniqueSkills/UniqueSkillInstance.cs b/Source/AnimationMod/UniqueSkills/UniqueSkillInstance.cs similarity index 100% rename from Source/ThingGenerator/UniqueSkills/UniqueSkillInstance.cs rename to Source/AnimationMod/UniqueSkills/UniqueSkillInstance.cs diff --git a/Source/ThingGenerator/Video/BundleManager.cs b/Source/AnimationMod/Video/BundleManager.cs similarity index 100% rename from Source/ThingGenerator/Video/BundleManager.cs rename to Source/AnimationMod/Video/BundleManager.cs diff --git a/Source/ThingGenerator/Video/VideoPlayerUtil.cs b/Source/AnimationMod/Video/VideoPlayerUtil.cs similarity index 100% rename from Source/ThingGenerator/Video/VideoPlayerUtil.cs rename to Source/AnimationMod/Video/VideoPlayerUtil.cs diff --git a/Source/ThingGenerator/Deps/0ColourPicker15.dll b/Source/AnimationMod/refs/0ColourPicker.dll similarity index 100% rename from Source/ThingGenerator/Deps/0ColourPicker15.dll rename to Source/AnimationMod/refs/0ColourPicker.dll diff --git a/Source/CAI5000Patch/CAI5000Patch.csproj b/Source/CAI5000Patch/CAI5000Patch.csproj index 8ac2c192..f81dd55e 100644 --- a/Source/CAI5000Patch/CAI5000Patch.csproj +++ b/Source/CAI5000Patch/CAI5000Patch.csproj @@ -1,5 +1,7 @@  + + net472 Library @@ -8,7 +10,6 @@ true false false - v1.4;v1.5 AM.CAI5000Patch AM.CAI5000Patch disable @@ -17,7 +18,7 @@ - + False False all @@ -29,52 +30,24 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive + + - - - - 1.4.3901 - + - CombatAI_14.dll + refs\CombatAI.dll False False runtime - - - - - none - ..\..\Patch_CAI5000\1.4\Assemblies\ - true - TRACE;V14 - - - - - - - 1.5.4033-beta - - - CombatAI_14.dll - False - False - runtime - - - - - - + none - ..\..\Patch_CAI5000\1.5\Assemblies\ + ..\..\Patch_CAI5000\$(RimworldVersion)\Assemblies\ true - TRACE;V15 + TRACE diff --git a/Source/CAI5000Patch/CombatAI_14.dll b/Source/CAI5000Patch/CombatAI_14.dll deleted file mode 100644 index 890f7aca..00000000 Binary files a/Source/CAI5000Patch/CombatAI_14.dll and /dev/null differ diff --git a/Source/CAI5000Patch/refs/CombatAI.dll b/Source/CAI5000Patch/refs/CombatAI.dll new file mode 100644 index 00000000..d1da7409 Binary files /dev/null and b/Source/CAI5000Patch/refs/CombatAI.dll differ diff --git a/Source/CombatExtendedPatch/CombatExtendedPatch.csproj b/Source/CombatExtendedPatch/CombatExtendedPatch.csproj index 63a2bf56..3494c348 100644 --- a/Source/CombatExtendedPatch/CombatExtendedPatch.csproj +++ b/Source/CombatExtendedPatch/CombatExtendedPatch.csproj @@ -1,5 +1,7 @@ + + net472 Library @@ -8,7 +10,6 @@ true false false - v1.4;v1.5 AM.CombatExtendedPatch zz.AM.CombatExtendedPatch disable @@ -24,55 +25,29 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + False False all + + - - - - 1.4.3901 - - - CombatExtended_14.dll - False - False - runtime - - - - - - - none - ..\..\Patch_CombatExtended\1.4\Assemblies\ - true - TRACE;V14 - - - - - - - 1.5.4033-beta - + - CombatExtended_14.dll + refs\CombatExtended.dll False False runtime - - + none - ..\..\Patch_CombatExtended\1.5\Assemblies\ + ..\..\Patch_CombatExtended\$(RimworldVersion)\Assemblies\ true - TRACE;V15 + TRACE diff --git a/Source/CombatExtendedPatch/CombatExtended_14.dll b/Source/CombatExtendedPatch/refs/CombatExtended.dll similarity index 100% rename from Source/CombatExtendedPatch/CombatExtended_14.dll rename to Source/CombatExtendedPatch/refs/CombatExtended.dll diff --git a/Source/CompatibilityReportGenerator/CompatibilityReportGenerator.csproj b/Source/CompatibilityReportGenerator/CompatibilityReportGenerator.csproj index 6d74064f..f4b08022 100644 --- a/Source/CompatibilityReportGenerator/CompatibilityReportGenerator.csproj +++ b/Source/CompatibilityReportGenerator/CompatibilityReportGenerator.csproj @@ -7,7 +7,7 @@ disable false false - 11 + latest @@ -15,7 +15,7 @@ - + diff --git a/Source/Content/PDN/ModIcon.pdn b/Source/Content/PDN/ModIcon.pdn new file mode 100644 index 00000000..5bcb4aa9 Binary files /dev/null and b/Source/Content/PDN/ModIcon.pdn differ diff --git a/Source/GlobalCommon.targets b/Source/GlobalCommon.targets new file mode 100644 index 00000000..a05392b8 --- /dev/null +++ b/Source/GlobalCommon.targets @@ -0,0 +1,8 @@ + + + + + 1.5 + + + diff --git a/Source/LightsaberPatch/LightsaberPatch.csproj b/Source/LightsaberPatch/LightsaberPatch.csproj index 562a09b8..eeef3846 100644 --- a/Source/LightsaberPatch/LightsaberPatch.csproj +++ b/Source/LightsaberPatch/LightsaberPatch.csproj @@ -1,5 +1,7 @@  + + net480 Library @@ -8,7 +10,6 @@ preview false false - v1.4;v1.5 AM.LightsaberPatch AM.LightsaberPatch @@ -17,71 +18,40 @@ runtime - + False False all + - - - - 1.4.3901 - - - refs/1.4/SWSaber.dll - False - False - - - refs/1.4/CompActivatableEffect.dll - False - False - - - refs/1.4/CompSlotLoadable.dll - False - False - - - - - - none - ..\..\Patch_Lightsabers\1.4\Assemblies\ - true - TRACE;V14 - - - - - - 1.5.4033-beta - - - refs/1.4/SWSaber.dll + + + refs\CompActivatableEffect.dll False False + runtime - - refs/1.4/CompActivatableEffect.dll + + refs\CompSlotLoadable.dll False False + runtime - - refs/1.4/CompSlotLoadable.dll + + refs\SWSaber.dll False False + runtime - - - + + none - ..\..\Patch_Lightsabers\1.5\Assemblies\ + ..\..\Patch_Lightsabers\$(RimworldVersion)\Assemblies\ true - TRACE;V15 + TRACE diff --git a/Source/LightsaberPatch/refs/1.4/CompActivatableEffect.dll b/Source/LightsaberPatch/refs/1.4/CompActivatableEffect.dll deleted file mode 100644 index 21622c5e..00000000 Binary files a/Source/LightsaberPatch/refs/1.4/CompActivatableEffect.dll and /dev/null differ diff --git a/Source/LightsaberPatch/refs/1.4/CompSlotLoadable.dll b/Source/LightsaberPatch/refs/1.4/CompSlotLoadable.dll deleted file mode 100644 index 2fabd236..00000000 Binary files a/Source/LightsaberPatch/refs/1.4/CompSlotLoadable.dll and /dev/null differ diff --git a/Source/LightsaberPatch/refs/1.4/SWSaber.dll b/Source/LightsaberPatch/refs/1.4/SWSaber.dll deleted file mode 100644 index 25e32a1f..00000000 Binary files a/Source/LightsaberPatch/refs/1.4/SWSaber.dll and /dev/null differ diff --git a/Source/LightsaberPatch/refs/CompActivatableEffect.dll b/Source/LightsaberPatch/refs/CompActivatableEffect.dll new file mode 100644 index 00000000..a29adf4f Binary files /dev/null and b/Source/LightsaberPatch/refs/CompActivatableEffect.dll differ diff --git a/Source/LightsaberPatch/refs/CompSlotLoadable.dll b/Source/LightsaberPatch/refs/CompSlotLoadable.dll new file mode 100644 index 00000000..a75d9fdb Binary files /dev/null and b/Source/LightsaberPatch/refs/CompSlotLoadable.dll differ diff --git a/Source/LightsaberPatch/refs/SWSaber.dll b/Source/LightsaberPatch/refs/SWSaber.dll new file mode 100644 index 00000000..a83542e5 Binary files /dev/null and b/Source/LightsaberPatch/refs/SWSaber.dll differ diff --git a/Source/ModRequestAPI.Models/ModRequestAPI.Models.csproj b/Source/ModRequestAPI.Models/ModRequestAPI.Models.csproj index 859f87bf..205abcba 100644 --- a/Source/ModRequestAPI.Models/ModRequestAPI.Models.csproj +++ b/Source/ModRequestAPI.Models/ModRequestAPI.Models.csproj @@ -2,6 +2,7 @@ net472 + none diff --git a/Source/ModRequestAPI/ModRequestAPI.csproj b/Source/ModRequestAPI/ModRequestAPI.csproj index bc2ce84c..60f3d390 100644 --- a/Source/ModRequestAPI/ModRequestAPI.csproj +++ b/Source/ModRequestAPI/ModRequestAPI.csproj @@ -1,13 +1,13 @@  - net472 - Library - disable - disable - false - 11 - none + net472 + Library + disable + disable + false + latest + none diff --git a/Source/PerformanceOptimizerPatch/PerformanceOptimizerPatch.csproj b/Source/PerformanceOptimizerPatch/PerformanceOptimizerPatch.csproj index 5d8b16a8..67ae2da0 100644 --- a/Source/PerformanceOptimizerPatch/PerformanceOptimizerPatch.csproj +++ b/Source/PerformanceOptimizerPatch/PerformanceOptimizerPatch.csproj @@ -1,4 +1,6 @@ - + + + net472 @@ -8,7 +10,6 @@ true false false - v1.4;v1.5 AM.PerformanceOptimizerPatch zz.AM.PerformanceOptimizerPatch disable @@ -24,55 +25,29 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + False False all + - - - - - 1.4.3901 - - - refs/1.4/PerformanceOptimizer.dll - False - False - runtime - - - - - - none - ..\..\Patch_PerformanceOptimizer\1.4\Assemblies\ - true - TRACE;V14 - - - - - - 1.5.4033-beta - - - refs/1.4/PerformanceOptimizer.dll + + + refs\PerformanceOptimizer.dll False False runtime - - - - - + + + + none - ..\..\Patch_PerformanceOptimizer\1.5\Assemblies\ + ..\..\Patch_PerformanceOptimizer\$(RimworldVersion)\Assemblies\ true - TRACE;V15 + TRACE diff --git a/Source/PerformanceOptimizerPatch/refs/1.4/PerformanceOptimizer.dll b/Source/PerformanceOptimizerPatch/refs/PerformanceOptimizer.dll similarity index 100% rename from Source/PerformanceOptimizerPatch/refs/1.4/PerformanceOptimizer.dll rename to Source/PerformanceOptimizerPatch/refs/PerformanceOptimizer.dll diff --git a/Source/TacticowlPatch/TacticowlPatch.csproj b/Source/TacticowlPatch/TacticowlPatch.csproj index ae662622..1200f0bd 100644 --- a/Source/TacticowlPatch/TacticowlPatch.csproj +++ b/Source/TacticowlPatch/TacticowlPatch.csproj @@ -1,14 +1,15 @@  + + net472 Library - preview + latest false true false false - v1.4;v1.5 AM.TacticowlPatch AM.TacticowlPatch disable @@ -17,53 +18,28 @@ - + False False all + - - - - 1.4.3901 - - - Tacticowl14.dll - False - False - runtime - - - - - - none - ..\..\Patch_Tacticowl\1.4\Assemblies\ - true - TRACE;V14 - - - - - - 1.5.4033-beta - + - Tacticowl14.dll + refs\Tacticowl.dll False False runtime - - + none - ..\..\Patch_Tacticowl\1.5\Assemblies\ + ..\..\Patch_Tacticowl\$(RimworldVersion)\Assemblies\ true - TRACE;V15 + TRACE diff --git a/Source/TacticowlPatch/Tacticowl14.dll b/Source/TacticowlPatch/refs/Tacticowl.dll similarity index 100% rename from Source/TacticowlPatch/Tacticowl14.dll rename to Source/TacticowlPatch/refs/Tacticowl.dll diff --git a/Source/ThingGenerator/Deps/0ColourPicker14.dll b/Source/ThingGenerator/Deps/0ColourPicker14.dll deleted file mode 100644 index 2e294d35..00000000 Binary files a/Source/ThingGenerator/Deps/0ColourPicker14.dll and /dev/null differ