diff --git a/1.5/Assemblies/0Harmony.dll b/1.5/Assemblies/0Harmony.dll new file mode 100644 index 0000000..7aac19c Binary files /dev/null and b/1.5/Assemblies/0Harmony.dll differ diff --git a/1.5/Assemblies/C0ffee's RJW Ideology Addons.dll b/1.5/Assemblies/C0ffee's RJW Ideology Addons.dll new file mode 100644 index 0000000..c94d103 Binary files /dev/null and b/1.5/Assemblies/C0ffee's RJW Ideology Addons.dll differ diff --git a/About/About.xml b/About/About.xml index 4f04051..f9eb8d1 100644 --- a/About/About.xml +++ b/About/About.xml @@ -7,6 +7,7 @@
  • 1.3
  • 1.4
    • +
  • 1.5
    •  c0ffee.rjw.IdeologyAddons diff --git a/C0ffee's RJW Ideology Addons.csproj b/C0ffee's RJW Ideology Addons.csproj index 888608e..9054e30 100644 --- a/C0ffee's RJW Ideology Addons.csproj +++ b/C0ffee's RJW Ideology Addons.csproj @@ -18,7 +18,7 @@ false none false - 1.4\Assemblies\ + 1.5\Assemblies\ DEBUG;TRACE prompt 4 @@ -27,7 +27,7 @@ pdbonly true - 1.4\Assemblies\ + 1.5\Assemblies\ TRACE prompt 4 @@ -46,7 +46,7 @@ False - ..\rjw\1.4\Assemblies\RJW.dll + ..\rjw\1.5\Assemblies\RJW.dll False diff --git a/CRIALactation/1.5/Assemblies/0Harmony.dll b/CRIALactation/1.5/Assemblies/0Harmony.dll new file mode 100644 index 0000000..7aac19c Binary files /dev/null and b/CRIALactation/1.5/Assemblies/0Harmony.dll differ diff --git a/CRIALactation/1.5/Assemblies/CRIALactation.dll b/CRIALactation/1.5/Assemblies/CRIALactation.dll new file mode 100644 index 0000000..7d97a30 Binary files /dev/null and b/CRIALactation/1.5/Assemblies/CRIALactation.dll differ diff --git a/CRIALactation/CRIALactation.csproj b/CRIALactation/CRIALactation.csproj index b29ee35..5d930b0 100644 --- a/CRIALactation/CRIALactation.csproj +++ b/CRIALactation/CRIALactation.csproj @@ -18,7 +18,7 @@ false none false - 1.4\Assemblies\ + 1.5\Assemblies\ DEBUG;TRACE prompt 4 @@ -26,14 +26,14 @@ pdbonly true - 1.4\Assemblies\ + 1.5\Assemblies\ TRACE prompt 4 - ..\..\..\..\..\workshop\content\294100\839005762\1.4\Assemblies\0Harmony.dll + $(STEAMC)\workshop\content\294100\839005762\1.4\Assemblies\0Harmony.dll False @@ -41,15 +41,15 @@ False - ..\..\..\..\..\workshop\content\294100\818773962\v1.4\Assemblies\HugsLib.dll + $(STEAMC)\workshop\content\294100\818773962\v1.4\Assemblies\HugsLib.dll False - ..\..\rjw-mc\1.4\Assemblies\Milk.dll + ..\..\rjw-mc\1.5\Assemblies\Milk.dll False - ..\..\rjw\1.4\Assemblies\RJW.dll + ..\..\rjw\1.5\Assemblies\RJW.dll False diff --git a/CRIALactation/Source/Precepts/PreceptComp_Lactation.cs b/CRIALactation/Source/Precepts/PreceptComp_Lactation.cs index def819c..abfe4d5 100644 --- a/CRIALactation/Source/Precepts/PreceptComp_Lactation.cs +++ b/CRIALactation/Source/Precepts/PreceptComp_Lactation.cs @@ -13,7 +13,7 @@ namespace CRIALactation public class PreceptComp_Lactation : PreceptComp { - public override void Notify_MemberGenerated(Pawn pawn, Precept precept, bool newborn) + public override void Notify_MemberGenerated(Pawn pawn, Precept precept, bool newborn, bool ignoreApparel = false) { if (newborn) return; @@ -30,7 +30,5 @@ namespace CRIALactation } } } - - } } diff --git a/CRIALactation/Source/WorkGivers/WorkGiver_MassageBreasts.cs b/CRIALactation/Source/WorkGivers/WorkGiver_MassageBreasts.cs index d7e2f89..106abc0 100644 --- a/CRIALactation/Source/WorkGivers/WorkGiver_MassageBreasts.cs +++ b/CRIALactation/Source/WorkGivers/WorkGiver_MassageBreasts.cs @@ -21,7 +21,7 @@ namespace CRIALactation public override bool ShouldSkip(Pawn pawn, bool forced = false) { - List list = pawn.Map.mapPawns.AllPawnsSpawned; + IReadOnlyList list = pawn.Map.mapPawns.AllPawnsSpawned; for(int i = 0; i < list.Count; i++) { if(LactationUtility.isMassageable(list[i])) diff --git a/CRIAOrgy/1.5/Assemblies/0Harmony.dll b/CRIAOrgy/1.5/Assemblies/0Harmony.dll new file mode 100644 index 0000000..7aac19c Binary files /dev/null and b/CRIAOrgy/1.5/Assemblies/0Harmony.dll differ diff --git a/CRIAOrgy/1.5/Assemblies/CRIAOrgy.dll b/CRIAOrgy/1.5/Assemblies/CRIAOrgy.dll new file mode 100644 index 0000000..a434f2f Binary files /dev/null and b/CRIAOrgy/1.5/Assemblies/CRIAOrgy.dll differ diff --git a/CRIAOrgy/CRIAOrgy.csproj b/CRIAOrgy/CRIAOrgy.csproj index 0589e04..bb2a020 100644 --- a/CRIAOrgy/CRIAOrgy.csproj +++ b/CRIAOrgy/CRIAOrgy.csproj @@ -18,7 +18,7 @@ false none false - 1.4\Assemblies\ + 1.5\Assemblies\ DEBUG;TRACE prompt 4 @@ -27,14 +27,14 @@ pdbonly true - 1.4\Assemblies\ + 1.5\Assemblies\ TRACE prompt 4 - ..\..\..\..\..\workshop\content\294100\839005762\1.4\Assemblies\0Harmony.dll + ..\..\..\..\..\workshop\content\294100\839005762\Current\Assemblies\0Harmony.dll False @@ -42,11 +42,11 @@ False - ..\..\rjw-mc\1.3\Assemblies\Milk.dll + ..\..\rjw-mc\1.5\Assemblies\Milk.dll False - ..\..\rjw\1.4\Assemblies\RJW.dll + ..\..\rjw\1.5\Assemblies\RJW.dll False diff --git a/CRIAOrgy/Source/RitualOutcomeEffectWorkers/RitualOutcomeEffectWorker_Orgy.cs b/CRIAOrgy/Source/RitualOutcomeEffectWorkers/RitualOutcomeEffectWorker_Orgy.cs index 044cfb8..2fcf913 100644 --- a/CRIAOrgy/Source/RitualOutcomeEffectWorkers/RitualOutcomeEffectWorker_Orgy.cs +++ b/CRIAOrgy/Source/RitualOutcomeEffectWorkers/RitualOutcomeEffectWorker_Orgy.cs @@ -31,7 +31,7 @@ namespace CRIAOrgy GlobalTextureAtlasManager.TryMarkPawnFrameSetDirty(participant); if (xxx.is_human(participant)) - participant.Drawer.renderer.graphics.ResolveAllGraphics(); + participant.Drawer.renderer.renderTree.SetDirty(); } base.Apply(progress, totalPresence, jobRitual); diff --git a/LoadFolders.xml b/LoadFolders.xml index f003119..1c882ab 100644 --- a/LoadFolders.xml +++ b/LoadFolders.xml @@ -18,4 +18,13 @@
  • CRIAOrgy
  • CRIAOrgy/1.4
    • + +
  • /
    • +
  • 1.5
    • +
  • CRIALactation
    • +
  • CRIALactation/1.5
    • + +
  • CRIAOrgy
    • +
  • CRIAOrgy/1.5
    • +