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..3351ee5 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..f52b555 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,10 +70,8 @@ - - diff --git a/CRIALactation/Defs/AbilityDefs/Abilities_Hucow.xml b/CRIALactation/Defs/AbilityDefs/Abilities_Hucow.xml index 41631d4..d9e8216 100644 --- a/CRIALactation/Defs/AbilityDefs/Abilities_Hucow.xml +++ b/CRIALactation/Defs/AbilityDefs/Abilities_Hucow.xml @@ -81,10 +81,10 @@
  • CompAbilityEffect_GiveHediff - InducingLactation + Hucow False
    • -
  • +
  • \ 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..366177c 100644 --- a/CRIALactation/Defs/PreceptDefs/Precepts_Lactating_Role.xml +++ b/CRIALactation/Defs/PreceptDefs/Precepts_Lactating_Role.xml @@ -37,7 +37,7 @@ UI/Issues/Lactating - + IdeoRole_HucowHandler HucowHandling @@ -147,7 +147,6 @@
  • ConvertToHucow
    • -
  • BeginInducingLactation
    • 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/Comps/CompAbilityEffects/CompAbilityEffect_BeginInducingLactation.cs b/CRIALactation/Source/Comps/CompAbilityEffects/CompAbilityEffect_BeginInducingLactation.cs index 17bded8..3c530e5 100644 --- a/CRIALactation/Source/Comps/CompAbilityEffects/CompAbilityEffect_BeginInducingLactation.cs +++ b/CRIALactation/Source/Comps/CompAbilityEffects/CompAbilityEffect_BeginInducingLactation.cs @@ -1,6 +1,5 @@ using RimWorld; using RimWorld.Planet; -using rjw; using System; using System.Collections.Generic; using System.Linq; @@ -17,10 +16,8 @@ namespace CRIALactation { 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 (!pawn.IsColonistPlayerControlled || !pawn.IsSlaveOfColony || !pawn.IsPrisonerOfColony) 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/CompLactation.cs index 56706c5..3345473 100644 --- a/CRIALactation/Source/Comps/CompLactation.cs +++ b/CRIALactation/Source/Comps/CompLactation.cs @@ -19,20 +19,6 @@ namespace CRIALactation 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 ""; - } - } } 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/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
    • -