diff --git a/1.4/Assemblies/C0ffee's RJW Ideology Addons.dll b/1.4/Assemblies/C0ffee's RJW Ideology Addons.dll
new file mode 100644
index 0000000..4d92201
Binary files /dev/null and b/1.4/Assemblies/C0ffee's RJW Ideology Addons.dll differ
diff --git a/About/About.xml b/About/About.xml
index 5194815..4f04051 100644
--- a/About/About.xml
+++ b/About/About.xml
@@ -6,6 +6,7 @@
https://gitgud.io/c0ffeeeeeeee/rimworld-animations
1.3
+ 1.4
c0ffee.rjw.IdeologyAddons
diff --git a/About/Manifest.xml b/About/Manifest.xml
index fbe5173..11cc8f7 100644
--- a/About/Manifest.xml
+++ b/About/Manifest.xml
@@ -1,5 +1,5 @@
C0ffeeRIA
- 0.0.5
+ 0.0.6
diff --git a/C0ffee's RJW Ideology Addons.csproj b/C0ffee's RJW Ideology Addons.csproj
index ca47b96..9adb9f6 100644
--- a/C0ffee's RJW Ideology Addons.csproj
+++ b/C0ffee's RJW Ideology Addons.csproj
@@ -9,15 +9,16 @@
Properties
C0ffee_s_RJW_Ideology_Addons
C0ffee%27s RJW Ideology Addons
- v4.7.2
+ v4.8
512
true
+
false
none
false
- 1.3\Assemblies\
+ 1.4\Assemblies\
DEBUG;TRACE
prompt
4
@@ -33,7 +34,7 @@
- ..\..\..\..\workshop\content\294100\2009463077\Current\Assemblies\0Harmony.dll
+ ..\..\..\..\workshop\content\294100\839005762\1.4\Assemblies\0Harmony.dll
False
@@ -45,7 +46,7 @@
False
- ..\rjw\1.3\Assemblies\RJW.dll
+ ..\rjw\1.4\Assemblies\RJW.dll
False
diff --git a/CRIALactation/1.3/Assemblies/CRIALactation.dll b/CRIALactation/1.3/Assemblies/CRIALactation.dll
index 51709c9..4612335 100644
Binary files a/CRIALactation/1.3/Assemblies/CRIALactation.dll and b/CRIALactation/1.3/Assemblies/CRIALactation.dll differ
diff --git a/CRIALactation/1.4/Assemblies/CRIALactation.dll b/CRIALactation/1.4/Assemblies/CRIALactation.dll
new file mode 100644
index 0000000..df8d0f8
Binary files /dev/null and b/CRIALactation/1.4/Assemblies/CRIALactation.dll differ
diff --git a/CRIALactation/CRIALactation.csproj b/CRIALactation/CRIALactation.csproj
index 084d84b..5c849ac 100644
--- a/CRIALactation/CRIALactation.csproj
+++ b/CRIALactation/CRIALactation.csproj
@@ -9,15 +9,16 @@
Properties
CRIALactation
CRIALactation
- v4.7.2
+ v4.8
512
true
+
false
none
false
- 1.3\Assemblies\
+ 1.4\Assemblies\
DEBUG;TRACE
prompt
4
@@ -32,7 +33,7 @@
- ..\..\..\..\..\workshop\content\294100\2009463077\Current\Assemblies\0Harmony.dll
+ ..\..\..\..\..\workshop\content\294100\839005762\1.4\Assemblies\0Harmony.dll
False
@@ -40,7 +41,7 @@
False
- ..\..\..\..\..\workshop\content\294100\818773962\v1.3\Assemblies\HugsLib.dll
+ ..\..\..\..\..\workshop\content\294100\818773962\v1.4\Assemblies\HugsLib.dll
False
@@ -48,7 +49,7 @@
False
- ..\..\rjw\1.3\Assemblies\RJW.dll
+ ..\..\rjw\1.4\Assemblies\RJW.dll
False
@@ -70,17 +71,21 @@
+
-
+
+
-
+
+
+
diff --git a/CRIALactation/Defs/AbilityDefs/Abilities_Hucow.xml b/CRIALactation/Defs/AbilityDefs/Abilities_Hucow.xml
index 285604d..41631d4 100644
--- a/CRIALactation/Defs/AbilityDefs/Abilities_Hucow.xml
+++ b/CRIALactation/Defs/AbilityDefs/Abilities_Hucow.xml
@@ -43,4 +43,48 @@
+
+
+ BeginInducingLactation
+ begin inducing lactation
+ Stimulate someone's milk ducts to begin the process of lactation without childbirth.
+ CastAbilityOnThingMelee
+ UI/Abilities/WorkDrive
+ UI/Issues/Lactating
+ True
+ False
+ True
+ False
+
+ True
+ 3000
+
+ Misc12
+ 4
+ WorkDrive_Warmup
+
+ 3000
+
+
+ Verb_CastAbilityTouch
+ False
+ -1
+ 3.0
+
+ false
+ false
+ false
+ false
+ true
+
+
+
+
+ CompAbilityEffect_GiveHediff
+ InducingLactation
+ False
+
+
+
+
\ No newline at end of file
diff --git a/CRIALactation/Defs/HediffDefs/Hediffs_Hucow.xml b/CRIALactation/Defs/HediffDefs/Hediffs_Hucow.xml
index fa48966..65055c7 100644
--- a/CRIALactation/Defs/HediffDefs/Hediffs_Hucow.xml
+++ b/CRIALactation/Defs/HediffDefs/Hediffs_Hucow.xml
@@ -21,4 +21,26 @@
+
+
+ InducingLactation
+ inducing lactation
+ This person's breasts are being encouraged to lactate. This is a long, arduous process of breast and nipple stimulation. It causes feelings of soreness and swelling that ends once milk begins expressing.
+ HediffWithComps
+
+
+
+
+ false
+
+
+
+ 2.75
+ 0.5
+ 0.4
+ 0.65
+
+
+
+
diff --git a/CRIALactation/Defs/MemeDefs/Memes_Hucow.xml b/CRIALactation/Defs/MemeDefs/Memes_Hucow.xml
index d115507..41524c5 100644
--- a/CRIALactation/Defs/MemeDefs/Memes_Hucow.xml
+++ b/CRIALactation/Defs/MemeDefs/Memes_Hucow.xml
@@ -1,18 +1,20 @@
-
+
Hucow
hucow
Breast milk should be produced for and consumed by all.
UI/Memes/Hucow
- Misc
+ Sexuality
+
+ Sexuality
+
3
50
@@ -20,9 +22,6 @@
Lactating_Essential
Lactating_MandatoryHucow
-
- IdeoRole_HucowHandler
-
@@ -64,21 +63,17 @@
- Lactatism
- lactation
- lactatist
- lactatist
+ Bovinism
+ bovines
+ Bovine
+ Bovinist
Hucowism
hucows
- bovine
+ hucow
Hucowist
- 1
-
- CelebratedDate
-
\ No newline at end of file
diff --git a/CRIALactation/Defs/PreceptDefs/Precepts_Lactating_Role.xml b/CRIALactation/Defs/PreceptDefs/Precepts_Lactating_Role.xml
index cab6710..c69663b 100644
--- a/CRIALactation/Defs/PreceptDefs/Precepts_Lactating_Role.xml
+++ b/CRIALactation/Defs/PreceptDefs/Precepts_Lactating_Role.xml
@@ -30,20 +30,27 @@
-->
-
+
+
+ HucowHandling
+ hucow handling
+ UI/Issues/Lactating
+
+
+
IdeoRole_HucowHandler
+ HucowHandling
+
hucow handler
A special ideoligious status which can convert lactating pawns to hucows, increasing their lactation yield at the cost of their work and movement speed. \n\nThey also receive an increase in the speed at which they harvest milk, and the speed at which they induce lactation in other pawns.
UI/Roles/SpecialistMelee
NamerRoleMoralist
+ 100
HucowHandler
-
- RoleRequirementLabelSameIdeo
-
6
@@ -51,7 +58,9 @@
-
+
+ Animals
+
AnimalGatherSpeed
@@ -138,8 +147,8 @@
ConvertToHucow
+ BeginInducingLactation
- 2
diff --git a/CRIALactation/Patches/Patch_LactationInduction.xml b/CRIALactation/Patches/Patch_LactationInduction.xml
index fb63d15..5bcee66 100644
--- a/CRIALactation/Patches/Patch_LactationInduction.xml
+++ b/CRIALactation/Patches/Patch_LactationInduction.xml
@@ -17,9 +17,7 @@
/Defs/ThingDef[@Name="BasePawn"]/comps
-
- 15
- 2.5
+
diff --git a/CRIALactation/Source/CompProperties/CompAbilityEffects/CompProperties_AbilityBeginInducingLactation.cs b/CRIALactation/Source/CompProperties/CompAbilityEffects/CompProperties_AbilityBeginInducingLactation.cs
new file mode 100644
index 0000000..7ba6f26
--- /dev/null
+++ b/CRIALactation/Source/CompProperties/CompAbilityEffects/CompProperties_AbilityBeginInducingLactation.cs
@@ -0,0 +1,23 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+using RimWorld;
+using rjw;
+using Milk;
+using UnityEngine;
+
+
+namespace CRIALactation
+{
+ public class CompProperties_AbilityBeginInducingLactation : CompProperties_AbilityEffect
+ {
+
+ public CompProperties_AbilityBeginInducingLactation()
+ {
+ this.compClass = typeof(CompAbilityEffect_BeginInducingLactation);
+ }
+
+ }
+}
diff --git a/CRIALactation/Source/CompProperties/CompProperties_InduceLactation.cs b/CRIALactation/Source/CompProperties/CompProperties_InduceLactation.cs
deleted file mode 100644
index 9c119b2..0000000
--- a/CRIALactation/Source/CompProperties/CompProperties_InduceLactation.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Verse;
-using RimWorld;
-using rjw;
-using Milk;
-using UnityEngine;
-
-namespace CRIALactation
-{
- public class CompProperties_InduceLactation : CompProperties
- {
- public CompProperties_InduceLactation()
- {
- this.compClass = typeof(CompInduceLactation);
- }
-
- public float DaysToLactating = 15;
- public float TimesMassagedADay = 2.5f;
- }
-}
diff --git a/CRIALactation/Source/CompProperties/CompProperties_Lactation.cs b/CRIALactation/Source/CompProperties/CompProperties_Lactation.cs
new file mode 100644
index 0000000..49f9aa5
--- /dev/null
+++ b/CRIALactation/Source/CompProperties/CompProperties_Lactation.cs
@@ -0,0 +1,23 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+using RimWorld;
+using rjw;
+using Milk;
+using UnityEngine;
+
+namespace CRIALactation
+{
+ public class CompProperties_Lactation : CompProperties
+ {
+ public CompProperties_Lactation()
+ {
+ this.compClass = typeof(CompLactation);
+ }
+
+ //public float DaysToLactating = 15;
+ //public float TimesMassagedADay = 2.5f;
+ }
+}
diff --git a/CRIALactation/Source/Comps/CompAbilityEffects/CompAbilityEffect_BeginInducingLactation.cs b/CRIALactation/Source/Comps/CompAbilityEffects/CompAbilityEffect_BeginInducingLactation.cs
new file mode 100644
index 0000000..17bded8
--- /dev/null
+++ b/CRIALactation/Source/Comps/CompAbilityEffects/CompAbilityEffect_BeginInducingLactation.cs
@@ -0,0 +1,31 @@
+using RimWorld;
+using RimWorld.Planet;
+using rjw;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+
+namespace CRIALactation
+{
+ public class CompAbilityEffect_BeginInducingLactation : CompAbilityEffect
+ {
+
+ public override bool Valid(LocalTargetInfo target, bool throwMessages = false)
+ {
+ Pawn pawn = target.Pawn;
+
+
+ if (pawn == null) return false;
+ if (!(pawn.IsColonistPlayerControlled || pawn.IsSlaveOfColony || pawn.IsPrisonerOfColony)) return false;
+ if (!Genital_Helper.has_breasts(pawn) || Genital_Helper.has_male_breasts(pawn)) return false;
+ if (LactationUtility.IsLactating(pawn)) return false;
+
+ return true;
+
+ }
+
+ }
+}
diff --git a/CRIALactation/Source/Comps/CompAbilityEffects/CompAbilityEffect_ConvertHucow.cs b/CRIALactation/Source/Comps/CompAbilityEffects/CompAbilityEffect_ConvertHucow.cs
index 9d6d4cc..65b38f7 100644
--- a/CRIALactation/Source/Comps/CompAbilityEffects/CompAbilityEffect_ConvertHucow.cs
+++ b/CRIALactation/Source/Comps/CompAbilityEffects/CompAbilityEffect_ConvertHucow.cs
@@ -16,9 +16,9 @@ namespace CRIALactation
public override bool Valid(LocalTargetInfo target, bool throwMessages = false)
{
Pawn pawn = target.Pawn;
- return pawn != null && AbilityUtility.ValidateMustBeHuman(pawn, throwMessages) &&
- AbilityUtility.ValidateNoMentalState(pawn, throwMessages) &&
- AbilityUtility.ValidateSameIdeo(this.parent.pawn, pawn, throwMessages) &&
+ return pawn != null && AbilityUtility.ValidateMustBeHuman(pawn, throwMessages, this.parent) &&
+ AbilityUtility.ValidateNoMentalState(pawn, throwMessages, this.parent) &&
+ AbilityUtility.ValidateSameIdeo(this.parent.pawn, pawn, throwMessages, this.parent) &&
LactationUtility.IsLactating(pawn) &&
!LactationUtility.IsHucow(pawn);
diff --git a/CRIALactation/Source/Comps/CompInduceLactation.cs b/CRIALactation/Source/Comps/CompLactation.cs
similarity index 82%
rename from CRIALactation/Source/Comps/CompInduceLactation.cs
rename to CRIALactation/Source/Comps/CompLactation.cs
index 1fd6330..56706c5 100644
--- a/CRIALactation/Source/Comps/CompInduceLactation.cs
+++ b/CRIALactation/Source/Comps/CompLactation.cs
@@ -10,7 +10,34 @@ using UnityEngine;
namespace CRIALactation
{
- public class CompInduceLactation : ThingComp
+ public class CompLactation : ThingComp
+ {
+ public int lastHumanLactationIngestedTick = 0;
+ public override void PostExposeData()
+ {
+ base.PostExposeData();
+ Scribe_Values.Look(ref this.lastHumanLactationIngestedTick, "lastHumanLactationIngestedTick", 0);
+
+ }
+
+ public override string CompInspectStringExtra()
+ {
+ if((parent as Pawn).health?.hediffSet?.GetFirstHediffOfDef(HediffDefOf_Milk.InducingLactation) != null
+ && (parent as Pawn).health.hediffSet.GetFirstHediffOfDef(HediffDefOf_Milk.InducingLactation).TryGetComp().canMassage())
+ {
+ return "Ready to stimulate breasts for lactation.";
+ }
+
+ else
+ {
+ return "";
+ }
+ }
+ }
+
+
+ /*
+ public class CompLactation : ThingComp
{
private readonly int OneDayInTicks = 60000;
private int TicksSinceLastMassage = -60000;
@@ -124,4 +151,6 @@ namespace CRIALactation
return result;
}
}
-}
+
+ */
+}
\ No newline at end of file
diff --git a/CRIALactation/Source/HarmonyPatches/HarmonyPatch_Thing.cs b/CRIALactation/Source/HarmonyPatches/HarmonyPatch_Thing.cs
index 470dcc7..8180341 100644
--- a/CRIALactation/Source/HarmonyPatches/HarmonyPatch_Thing.cs
+++ b/CRIALactation/Source/HarmonyPatches/HarmonyPatch_Thing.cs
@@ -17,8 +17,8 @@ namespace CRIALactation
if(__instance?.def == ThingDefOf_Milk.HumanMilk || __instance?.def == ThingDefOf_Milk.HumanoidMilk)
{
- if (ingester.TryGetComp() == null) return;
- ingester.TryGetComp().lastHumanLactationIngestedTick = Find.TickManager.TicksGame;
+ if (ingester.TryGetComp() == null) return;
+ ingester.TryGetComp().lastHumanLactationIngestedTick = Find.TickManager.TicksGame;
}
}
diff --git a/CRIALactation/Source/HediffDefOf/HediffDefOf_Milk.cs b/CRIALactation/Source/HediffDefOf/HediffDefOf_Milk.cs
index a722532..94dad92 100644
--- a/CRIALactation/Source/HediffDefOf/HediffDefOf_Milk.cs
+++ b/CRIALactation/Source/HediffDefOf/HediffDefOf_Milk.cs
@@ -19,6 +19,9 @@ namespace CRIALactation
public static HediffDef Lactating_Permanent;
public static HediffDef Heavy_Lactating_Permanent;
public static HediffDef Lactating_Natural;
+
+
+ public static HediffDef InducingLactation;
public static HediffDef Hucow;
diff --git a/CRIALactation/Source/Hediffs/HediffCompProperties_LactationInduction.cs b/CRIALactation/Source/Hediffs/HediffCompProperties_LactationInduction.cs
new file mode 100644
index 0000000..dc3e8b4
--- /dev/null
+++ b/CRIALactation/Source/Hediffs/HediffCompProperties_LactationInduction.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+
+namespace CRIALactation
+{
+ public class HediffCompProperties_LactationInduction : HediffCompProperties
+ {
+ public HediffCompProperties_LactationInduction()
+ {
+ this.compClass = typeof(HediffComp_LactationInduction);
+ }
+ }
+}
diff --git a/CRIALactation/Source/Hediffs/HediffComp_LactationInduction.cs b/CRIALactation/Source/Hediffs/HediffComp_LactationInduction.cs
new file mode 100644
index 0000000..462dd4b
--- /dev/null
+++ b/CRIALactation/Source/Hediffs/HediffComp_LactationInduction.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+
+namespace CRIALactation
+{
+ public class HediffComp_LactationInduction : HediffComp
+ {
+ private readonly int OneDayInTicks = 60000;
+ private float TimesMassagedADay = 2.5f;
+ private int tickLastMassaged = 0, DaysToLactating = 15;
+
+
+
+ public void massage(Pawn massager)
+ {
+
+ this.parent.Severity += (float)1 / (DaysToLactating * (TimesMassagedADay + Rand.Value));
+ }
+
+ public bool canMassage()
+ {
+ return tickLastMassaged + OneDayInTicks / TimesMassagedADay < GenTicks.TicksGame;
+ }
+
+
+
+ public override void CompExposeData()
+ {
+ Scribe_Values.Look(ref this.tickLastMassaged, "lastLactationInductionMassagedTick", 0);
+ base.CompExposeData();
+
+ }
+ }
+}
diff --git a/CRIALactation/Source/JobDrivers/JobDriver_MassageBreasts.cs b/CRIALactation/Source/JobDrivers/JobDriver_MassageBreasts.cs
index 7910b6a..21c9a07 100644
--- a/CRIALactation/Source/JobDrivers/JobDriver_MassageBreasts.cs
+++ b/CRIALactation/Source/JobDrivers/JobDriver_MassageBreasts.cs
@@ -28,6 +28,7 @@ namespace CRIALactation
Toil massage = new Toil();
massage.FailOnDespawnedOrNull(TargetIndex.A);
massage.FailOnAggroMentalStateAndHostile(TargetIndex.A);
+ float massageProgress = 0;
massage.initAction = delegate
{
Pawn p = job.GetTarget(TargetIndex.A).Thing as Pawn;
@@ -46,14 +47,9 @@ namespace CRIALactation
Pawn p = job.GetTarget(TargetIndex.A).Thing as Pawn;
if (massageProgress >= WorkTotal)
{
- p.TryGetComp().MassageBreasts();
+ p.health.hediffSet.GetFirstHediffOfDef(HediffDefOf_Milk.InducingLactation).TryGetComp().massage(pawn);
return JobCondition.Succeeded;
}
-
- if (!(p.TryGetComp().isActive && p.TryGetComp().CanMassage))
- {
- return JobCondition.Incompletable;
- }
return JobCondition.Ongoing;
@@ -74,7 +70,5 @@ namespace CRIALactation
yield break;
}
-
- float massageProgress = 0f;
}
}
diff --git a/CRIALactation/Source/LactationUtility.cs b/CRIALactation/Source/LactationUtility.cs
index a32e055..0071f11 100644
--- a/CRIALactation/Source/LactationUtility.cs
+++ b/CRIALactation/Source/LactationUtility.cs
@@ -55,13 +55,10 @@ namespace CRIALactation
public static bool isMassageable(Pawn p)
{
- CompInduceLactation c = p.TryGetComp();
- if (c != null && c.isActive && c.CanMassage)
- {
- return true;
- }
+ Hediff lactationInductionHediff = p.health?.hediffSet?.GetFirstHediffOfDef(HediffDefOf_Milk.InducingLactation);
+ if (lactationInductionHediff == null) return false;
- return false;
+ return true;
}
diff --git a/CRIALactation/Source/Precepts/PreceptComp_Lactation.cs b/CRIALactation/Source/Precepts/PreceptComp_Lactation.cs
index 57e788c..def819c 100644
--- a/CRIALactation/Source/Precepts/PreceptComp_Lactation.cs
+++ b/CRIALactation/Source/Precepts/PreceptComp_Lactation.cs
@@ -13,9 +13,11 @@ namespace CRIALactation
public class PreceptComp_Lactation : PreceptComp
{
- public override void Notify_MemberGenerated(Pawn pawn, Precept precept)
+ public override void Notify_MemberGenerated(Pawn pawn, Precept precept, bool newborn)
{
+ if (newborn) return;
+
if((precept.def == PreceptDefOf_Lactation.Lactating_Essential
|| precept.def == PreceptDefOf_Lactation.Lactating_MandatoryHucow)
&& LactationUtility.HasMilkableBreasts(pawn))
diff --git a/CRIALactation/Source/Thoughts/ThoughtWorker_Precept_NoRecentHumanMilk.cs b/CRIALactation/Source/Thoughts/ThoughtWorker_Precept_NoRecentHumanMilk.cs
index 9110034..c068e83 100644
--- a/CRIALactation/Source/Thoughts/ThoughtWorker_Precept_NoRecentHumanMilk.cs
+++ b/CRIALactation/Source/Thoughts/ThoughtWorker_Precept_NoRecentHumanMilk.cs
@@ -18,7 +18,7 @@ namespace CRIALactation
protected override ThoughtState ShouldHaveThought(Pawn p)
{
- int num = Mathf.Max(0, p.TryGetComp().lastHumanLactationIngestedTick);
+ int num = Mathf.Max(0, p.TryGetComp().lastHumanLactationIngestedTick);
return Find.TickManager.TicksGame - num > 480000 && !LactationUtility.IsHucow(p);
}
diff --git a/CRIALactation/Source/WorkGivers/WorkGiver_MassageBreasts.cs b/CRIALactation/Source/WorkGivers/WorkGiver_MassageBreasts.cs
index 2d86b3e..6bd11c6 100644
--- a/CRIALactation/Source/WorkGivers/WorkGiver_MassageBreasts.cs
+++ b/CRIALactation/Source/WorkGivers/WorkGiver_MassageBreasts.cs
@@ -36,13 +36,15 @@ namespace CRIALactation
public override bool HasJobOnThing(Pawn p, Thing t, bool forced = false)
{
Pawn pawn2 = t as Pawn;
- if(pawn2?.TryGetComp() == null)
+ if(pawn2?.health?.hediffSet.GetFirstHediffOfDef(HediffDefOf_Milk.InducingLactation) == null)
{
return false;
}
- CompInduceLactation c = pawn2.TryGetComp();
+ Hediff lactationInductionHediff = pawn2?.health?.hediffSet?.GetFirstHediffOfDef(HediffDefOf_Milk.InducingLactation);
+ if (lactationInductionHediff == null) return false;
- return p != pawn2 && c.isActive && c.CanMassage && !pawn2.Downed && !pawn2.Drafted && !pawn2.InAggroMentalState && !pawn2.IsFormingCaravan() && pawn2.CanCasuallyInteractNow(false, true, false) && p.CanReserve(pawn2, 1, -1, null, forced);
+ HediffComp_LactationInduction lactInductComp = lactationInductionHediff.TryGetComp();
+ return p != pawn2 && lactInductComp.canMassage() && !pawn2.Downed && !pawn2.Drafted && !pawn2.InAggroMentalState && !pawn2.IsFormingCaravan() && pawn2.CanCasuallyInteractNow(false, true, false) && p.CanReserve(pawn2, 1, -1, null, forced);
}
diff --git a/CRIAOrgy/Assemblies/CRIAOrgy.dll b/CRIAOrgy/1.3/Assemblies/CRIAOrgy.dll
similarity index 100%
rename from CRIAOrgy/Assemblies/CRIAOrgy.dll
rename to CRIAOrgy/1.3/Assemblies/CRIAOrgy.dll
diff --git a/CRIAOrgy/1.4/Assemblies/CRIAOrgy.dll b/CRIAOrgy/1.4/Assemblies/CRIAOrgy.dll
new file mode 100644
index 0000000..f8c3265
Binary files /dev/null and b/CRIAOrgy/1.4/Assemblies/CRIAOrgy.dll differ
diff --git a/CRIAOrgy/CRIAOrgy.csproj b/CRIAOrgy/CRIAOrgy.csproj
index 5d52a29..542136f 100644
--- a/CRIAOrgy/CRIAOrgy.csproj
+++ b/CRIAOrgy/CRIAOrgy.csproj
@@ -9,15 +9,16 @@
Properties
CRIAOrgy
CRIAOrgy
- v4.7.2
+ v4.8
512
true
+
false
none
false
- Assemblies\
+ 1.4\Assemblies\
DEBUG;TRACE
prompt
4
@@ -33,19 +34,19 @@
- ..\..\..\..\..\workshop\content\294100\2009463077\Current\Assemblies\0Harmony.dll
+ ..\..\..\..\..\workshop\content\294100\839005762\1.4\Assemblies\0Harmony.dll
False
..\..\..\RimWorldWin64_Data\Managed\Assembly-CSharp.dll
False
-
- ..\..\..\..\..\workshop\content\294100\818773962\v1.3\Assemblies\HugsLib.dll
+
+ ..\..\rjw-mc\1.3\Assemblies\Milk.dll
False
- ..\..\rjw\1.3\Assemblies\RJW.dll
+ ..\..\rjw\1.4\Assemblies\RJW.dll
False
@@ -73,8 +74,6 @@
-
-
-
+
\ No newline at end of file
diff --git a/LoadFolders.xml b/LoadFolders.xml
index 7e5931b..f003119 100644
--- a/LoadFolders.xml
+++ b/LoadFolders.xml
@@ -9,4 +9,13 @@
CRIAOrgy
CRIAOrgy/1.3
+
+ /
+ 1.4
+ CRIALactation
+ CRIALactation/1.4
+
+ CRIAOrgy
+ CRIAOrgy/1.4
+