diff --git a/1.4/Assemblies/C0ffee's RJW Ideology Addons.dll b/1.4/Assemblies/C0ffee's RJW Ideology Addons.dll
deleted file mode 100644
index 4d92201..0000000
Binary files a/1.4/Assemblies/C0ffee's RJW Ideology Addons.dll and /dev/null differ
diff --git a/About/About.xml b/About/About.xml
index 4f04051..5194815 100644
--- a/About/About.xml
+++ b/About/About.xml
@@ -6,7 +6,6 @@
https://gitgud.io/c0ffeeeeeeee/rimworld-animations
1.3
- 1.4
c0ffee.rjw.IdeologyAddons
diff --git a/About/Manifest.xml b/About/Manifest.xml
index 11cc8f7..fbe5173 100644
--- a/About/Manifest.xml
+++ b/About/Manifest.xml
@@ -1,5 +1,5 @@
C0ffeeRIA
- 0.0.6
+ 0.0.5
diff --git a/C0ffee's RJW Ideology Addons.csproj b/C0ffee's RJW Ideology Addons.csproj
index 9adb9f6..ca47b96 100644
--- a/C0ffee's RJW Ideology Addons.csproj
+++ b/C0ffee's RJW Ideology Addons.csproj
@@ -9,16 +9,15 @@
Properties
C0ffee_s_RJW_Ideology_Addons
C0ffee%27s RJW Ideology Addons
- v4.8
+ v4.7.2
512
true
-
false
none
false
- 1.4\Assemblies\
+ 1.3\Assemblies\
DEBUG;TRACE
prompt
4
@@ -34,7 +33,7 @@
- ..\..\..\..\workshop\content\294100\839005762\1.4\Assemblies\0Harmony.dll
+ ..\..\..\..\workshop\content\294100\2009463077\Current\Assemblies\0Harmony.dll
False
@@ -46,7 +45,7 @@
False
- ..\rjw\1.4\Assemblies\RJW.dll
+ ..\rjw\1.3\Assemblies\RJW.dll
False
diff --git a/CRIALactation/1.3/Assemblies/CRIALactation.dll b/CRIALactation/1.3/Assemblies/CRIALactation.dll
index 4612335..51709c9 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
deleted file mode 100644
index df8d0f8..0000000
Binary files a/CRIALactation/1.4/Assemblies/CRIALactation.dll and /dev/null differ
diff --git a/CRIALactation/CRIALactation.csproj b/CRIALactation/CRIALactation.csproj
index 5c849ac..084d84b 100644
--- a/CRIALactation/CRIALactation.csproj
+++ b/CRIALactation/CRIALactation.csproj
@@ -9,16 +9,15 @@
Properties
CRIALactation
CRIALactation
- v4.8
+ v4.7.2
512
true
-
false
none
false
- 1.4\Assemblies\
+ 1.3\Assemblies\
DEBUG;TRACE
prompt
4
@@ -33,7 +32,7 @@
- ..\..\..\..\..\workshop\content\294100\839005762\1.4\Assemblies\0Harmony.dll
+ ..\..\..\..\..\workshop\content\294100\2009463077\Current\Assemblies\0Harmony.dll
False
@@ -41,7 +40,7 @@
False
- ..\..\..\..\..\workshop\content\294100\818773962\v1.4\Assemblies\HugsLib.dll
+ ..\..\..\..\..\workshop\content\294100\818773962\v1.3\Assemblies\HugsLib.dll
False
@@ -49,7 +48,7 @@
False
- ..\..\rjw\1.4\Assemblies\RJW.dll
+ ..\..\rjw\1.3\Assemblies\RJW.dll
False
@@ -71,21 +70,17 @@
-
-
-
+
-
+
-
-
diff --git a/CRIALactation/Defs/AbilityDefs/Abilities_Hucow.xml b/CRIALactation/Defs/AbilityDefs/Abilities_Hucow.xml
index 41631d4..285604d 100644
--- a/CRIALactation/Defs/AbilityDefs/Abilities_Hucow.xml
+++ b/CRIALactation/Defs/AbilityDefs/Abilities_Hucow.xml
@@ -43,48 +43,4 @@
-
-
- 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 65055c7..fa48966 100644
--- a/CRIALactation/Defs/HediffDefs/Hediffs_Hucow.xml
+++ b/CRIALactation/Defs/HediffDefs/Hediffs_Hucow.xml
@@ -21,26 +21,4 @@
-
-
- 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 41524c5..d115507 100644
--- a/CRIALactation/Defs/MemeDefs/Memes_Hucow.xml
+++ b/CRIALactation/Defs/MemeDefs/Memes_Hucow.xml
@@ -1,20 +1,18 @@
+
Hucow
hucow
Breast milk should be produced for and consumed by all.
UI/Memes/Hucow
- Sexuality
-
- Sexuality
-
+ Misc
3
50
@@ -22,6 +20,9 @@
Lactating_Essential
Lactating_MandatoryHucow
+
+ IdeoRole_HucowHandler
+
@@ -63,17 +64,21 @@
- Bovinism
- bovines
- Bovine
- Bovinist
+ Lactatism
+ lactation
+ lactatist
+ lactatist
Hucowism
hucows
- hucow
+ bovine
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 c69663b..cab6710 100644
--- a/CRIALactation/Defs/PreceptDefs/Precepts_Lactating_Role.xml
+++ b/CRIALactation/Defs/PreceptDefs/Precepts_Lactating_Role.xml
@@ -30,27 +30,20 @@
-->
-
-
- 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
@@ -58,9 +51,7 @@
-
- Animals
-
+
AnimalGatherSpeed
@@ -147,8 +138,8 @@
ConvertToHucow
- BeginInducingLactation
+ 2
diff --git a/CRIALactation/Patches/Patch_LactationInduction.xml b/CRIALactation/Patches/Patch_LactationInduction.xml
index 5bcee66..fb63d15 100644
--- a/CRIALactation/Patches/Patch_LactationInduction.xml
+++ b/CRIALactation/Patches/Patch_LactationInduction.xml
@@ -17,7 +17,9 @@
/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
deleted file mode 100644
index 7ba6f26..0000000
--- a/CRIALactation/Source/CompProperties/CompAbilityEffects/CompProperties_AbilityBeginInducingLactation.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_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
new file mode 100644
index 0000000..9c119b2
--- /dev/null
+++ b/CRIALactation/Source/CompProperties/CompProperties_InduceLactation.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_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
deleted file mode 100644
index 49f9aa5..0000000
--- a/CRIALactation/Source/CompProperties/CompProperties_Lactation.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_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
deleted file mode 100644
index 17bded8..0000000
--- a/CRIALactation/Source/Comps/CompAbilityEffects/CompAbilityEffect_BeginInducingLactation.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-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 65b38f7..9d6d4cc 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, this.parent) &&
- AbilityUtility.ValidateNoMentalState(pawn, throwMessages, this.parent) &&
- AbilityUtility.ValidateSameIdeo(this.parent.pawn, pawn, throwMessages, this.parent) &&
+ return pawn != null && AbilityUtility.ValidateMustBeHuman(pawn, throwMessages) &&
+ AbilityUtility.ValidateNoMentalState(pawn, throwMessages) &&
+ AbilityUtility.ValidateSameIdeo(this.parent.pawn, pawn, throwMessages) &&
LactationUtility.IsLactating(pawn) &&
!LactationUtility.IsHucow(pawn);
diff --git a/CRIALactation/Source/Comps/CompLactation.cs b/CRIALactation/Source/Comps/CompInduceLactation.cs
similarity index 82%
rename from CRIALactation/Source/Comps/CompLactation.cs
rename to CRIALactation/Source/Comps/CompInduceLactation.cs
index 56706c5..1fd6330 100644
--- a/CRIALactation/Source/Comps/CompLactation.cs
+++ b/CRIALactation/Source/Comps/CompInduceLactation.cs
@@ -10,34 +10,7 @@ using UnityEngine;
namespace CRIALactation
{
- 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
+ public class CompInduceLactation : ThingComp
{
private readonly int OneDayInTicks = 60000;
private int TicksSinceLastMassage = -60000;
@@ -151,6 +124,4 @@ 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 8180341..470dcc7 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 94dad92..a722532 100644
--- a/CRIALactation/Source/HediffDefOf/HediffDefOf_Milk.cs
+++ b/CRIALactation/Source/HediffDefOf/HediffDefOf_Milk.cs
@@ -19,9 +19,6 @@ 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
deleted file mode 100644
index dc3e8b4..0000000
--- a/CRIALactation/Source/Hediffs/HediffCompProperties_LactationInduction.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-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
deleted file mode 100644
index 462dd4b..0000000
--- a/CRIALactation/Source/Hediffs/HediffComp_LactationInduction.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-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 21c9a07..7910b6a 100644
--- a/CRIALactation/Source/JobDrivers/JobDriver_MassageBreasts.cs
+++ b/CRIALactation/Source/JobDrivers/JobDriver_MassageBreasts.cs
@@ -28,7 +28,6 @@ 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;
@@ -47,9 +46,14 @@ namespace CRIALactation
Pawn p = job.GetTarget(TargetIndex.A).Thing as Pawn;
if (massageProgress >= WorkTotal)
{
- p.health.hediffSet.GetFirstHediffOfDef(HediffDefOf_Milk.InducingLactation).TryGetComp().massage(pawn);
+ p.TryGetComp().MassageBreasts();
return JobCondition.Succeeded;
}
+
+ if (!(p.TryGetComp().isActive && p.TryGetComp().CanMassage))
+ {
+ return JobCondition.Incompletable;
+ }
return JobCondition.Ongoing;
@@ -70,5 +74,7 @@ namespace CRIALactation
yield break;
}
+
+ float massageProgress = 0f;
}
}
diff --git a/CRIALactation/Source/LactationUtility.cs b/CRIALactation/Source/LactationUtility.cs
index 0071f11..a32e055 100644
--- a/CRIALactation/Source/LactationUtility.cs
+++ b/CRIALactation/Source/LactationUtility.cs
@@ -55,10 +55,13 @@ namespace CRIALactation
public static bool isMassageable(Pawn p)
{
- Hediff lactationInductionHediff = p.health?.hediffSet?.GetFirstHediffOfDef(HediffDefOf_Milk.InducingLactation);
- if (lactationInductionHediff == null) return false;
+ CompInduceLactation c = p.TryGetComp();
+ if (c != null && c.isActive && c.CanMassage)
+ {
+ return true;
+ }
- return true;
+ return false;
}
diff --git a/CRIALactation/Source/Precepts/PreceptComp_Lactation.cs b/CRIALactation/Source/Precepts/PreceptComp_Lactation.cs
index def819c..57e788c 100644
--- a/CRIALactation/Source/Precepts/PreceptComp_Lactation.cs
+++ b/CRIALactation/Source/Precepts/PreceptComp_Lactation.cs
@@ -13,11 +13,9 @@ 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)
{
- 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 c068e83..9110034 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 6bd11c6..2d86b3e 100644
--- a/CRIALactation/Source/WorkGivers/WorkGiver_MassageBreasts.cs
+++ b/CRIALactation/Source/WorkGivers/WorkGiver_MassageBreasts.cs
@@ -36,15 +36,13 @@ namespace CRIALactation
public override bool HasJobOnThing(Pawn p, Thing t, bool forced = false)
{
Pawn pawn2 = t as Pawn;
- if(pawn2?.health?.hediffSet.GetFirstHediffOfDef(HediffDefOf_Milk.InducingLactation) == null)
+ if(pawn2?.TryGetComp() == null)
{
return false;
}
- Hediff lactationInductionHediff = pawn2?.health?.hediffSet?.GetFirstHediffOfDef(HediffDefOf_Milk.InducingLactation);
- if (lactationInductionHediff == null) return false;
+ CompInduceLactation c = pawn2.TryGetComp();
- 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);
+ 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);
}
diff --git a/CRIAOrgy/1.4/Assemblies/CRIAOrgy.dll b/CRIAOrgy/1.4/Assemblies/CRIAOrgy.dll
deleted file mode 100644
index f8c3265..0000000
Binary files a/CRIAOrgy/1.4/Assemblies/CRIAOrgy.dll and /dev/null differ
diff --git a/CRIAOrgy/1.3/Assemblies/CRIAOrgy.dll b/CRIAOrgy/Assemblies/CRIAOrgy.dll
similarity index 100%
rename from CRIAOrgy/1.3/Assemblies/CRIAOrgy.dll
rename to CRIAOrgy/Assemblies/CRIAOrgy.dll
diff --git a/CRIAOrgy/CRIAOrgy.csproj b/CRIAOrgy/CRIAOrgy.csproj
index 542136f..5d52a29 100644
--- a/CRIAOrgy/CRIAOrgy.csproj
+++ b/CRIAOrgy/CRIAOrgy.csproj
@@ -9,16 +9,15 @@
Properties
CRIAOrgy
CRIAOrgy
- v4.8
+ v4.7.2
512
true
-
false
none
false
- 1.4\Assemblies\
+ Assemblies\
DEBUG;TRACE
prompt
4
@@ -34,19 +33,19 @@
- ..\..\..\..\..\workshop\content\294100\839005762\1.4\Assemblies\0Harmony.dll
+ ..\..\..\..\..\workshop\content\294100\2009463077\Current\Assemblies\0Harmony.dll
False
..\..\..\RimWorldWin64_Data\Managed\Assembly-CSharp.dll
False
-
- ..\..\rjw-mc\1.3\Assemblies\Milk.dll
+
+ ..\..\..\..\..\workshop\content\294100\818773962\v1.3\Assemblies\HugsLib.dll
False
- ..\..\rjw\1.4\Assemblies\RJW.dll
+ ..\..\rjw\1.3\Assemblies\RJW.dll
False
@@ -74,6 +73,8 @@
-
+
+
+
\ No newline at end of file
diff --git a/LoadFolders.xml b/LoadFolders.xml
index f003119..7e5931b 100644
--- a/LoadFolders.xml
+++ b/LoadFolders.xml
@@ -9,13 +9,4 @@
CRIAOrgy
CRIAOrgy/1.3
-
- /
- 1.4
- CRIALactation
- CRIALactation/1.4
-
- CRIAOrgy
- CRIAOrgy/1.4
-