diff --git a/C0ffee's RJW Ideology Addons.csproj b/C0ffee's RJW Ideology Addons.csproj index 3dfff1b..a8da6ed 100644 --- a/C0ffee's RJW Ideology Addons.csproj +++ b/C0ffee's RJW Ideology Addons.csproj @@ -66,12 +66,12 @@ - - + + - - - + + + diff --git a/C0ffee's RJW Ideology Addons.sln b/C0ffee's RJW Ideology Addons.sln index ab67cc7..854a7a7 100644 --- a/C0ffee's RJW Ideology Addons.sln +++ b/C0ffee's RJW Ideology Addons.sln @@ -7,6 +7,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "C0ffee's RJW Ideology Addon EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CRIALactation", "CRIALactation\CRIALactation.csproj", "{01BE0D84-9292-4F89-90FC-647B66771C61}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CRIAOrgy", "CRIAOrgy\CRIAOrgy.csproj", "{212ED289-C5A3-4807-B482-A53F36B31F23}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -21,6 +23,10 @@ Global {01BE0D84-9292-4F89-90FC-647B66771C61}.Debug|Any CPU.Build.0 = Debug|Any CPU {01BE0D84-9292-4F89-90FC-647B66771C61}.Release|Any CPU.ActiveCfg = Release|Any CPU {01BE0D84-9292-4F89-90FC-647B66771C61}.Release|Any CPU.Build.0 = Release|Any CPU + {212ED289-C5A3-4807-B482-A53F36B31F23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {212ED289-C5A3-4807-B482-A53F36B31F23}.Debug|Any CPU.Build.0 = Debug|Any CPU + {212ED289-C5A3-4807-B482-A53F36B31F23}.Release|Any CPU.ActiveCfg = Release|Any CPU + {212ED289-C5A3-4807-B482-A53F36B31F23}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/CRIALactation/Source/Thoughts/ThoughtWorker_Precept_Lactating_Essential_Social.cs b/CRIALactation/Source/Thoughts/ThoughtWorker_Precept_Lactating_Essential_Social.cs index b389919..f3dfe5d 100644 --- a/CRIALactation/Source/Thoughts/ThoughtWorker_Precept_Lactating_Essential_Social.cs +++ b/CRIALactation/Source/Thoughts/ThoughtWorker_Precept_Lactating_Essential_Social.cs @@ -15,7 +15,7 @@ namespace CRIALactation protected override ThoughtState ShouldHaveThought(Pawn p, Pawn otherPawn) { - if(LactationUtility.HasMilkableBreasts(otherPawn) && !LactationUtility.IsLactating(otherPawn)) + if(LactationUtility.HasMilkableBreasts(p) && !LactationUtility.IsLactating(p)) { return ThoughtState.ActiveAtStage(0); diff --git a/CRIAOrgy/CRIAOrgy.csproj b/CRIAOrgy/CRIAOrgy.csproj new file mode 100644 index 0000000..c8090be --- /dev/null +++ b/CRIAOrgy/CRIAOrgy.csproj @@ -0,0 +1,51 @@ + + + + + Debug + AnyCPU + {212ED289-C5A3-4807-B482-A53F36B31F23} + Library + Properties + CRIAOrgy + CRIAOrgy + v4.7.2 + 512 + true + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/CRIAOrgy/Defs/PreceptDefs/Precepts_PublicSex.xml b/CRIAOrgy/Defs/PreceptDefs/Precepts_PublicSex.xml new file mode 100644 index 0000000..0f42661 --- /dev/null +++ b/CRIAOrgy/Defs/PreceptDefs/Precepts_PublicSex.xml @@ -0,0 +1,104 @@ + + + + OrgyCeremony + + Precept_Ritual + UI/Icons/Rituals/TreeCelebration + FertilityRitual + false + true + + + + FertilityRitual + fertility ritual + An orgy ritual. + FertilityRitual + AltarOrRitualSpot + AnyIdeoBuildingOrRitualSpot + FertilityRitualOutcome + ritual orgy. + true + + + + FertilityRitual + 5000 + + Participants + participate + +
  • + Orgy + +
  • + 1 +
    • + + +     +     + + + + FertilityRitualOutcome + orgy ritual outcome + RitualOutcomeEffectWorker_FromQuality + +
  • + + + +
  • (1, 0.0)
    • +
  • (5, 0.6)
    • +
  • (10, 0.8)
    • + + + +
  • + + Impressiveness + + +
  • 0, 0
    • +
  • 50, 0.1
    • +
  • 120, 0.2
    • + + + +     + +
  • + 0.05 + + TerribleOrgy + The {0} was terrible! Participants endured hours of jaw-clenching small talk while waiting for it to end. + -2 +
    • +
  • + 0.15 + + BoringOrgy + The {0} was boring. Everyone felt too awkward to open up and laugh. + -1 +
    • +
  • + 0.6 + + FunOrgy + The {0} was good. Everyone appreciated the chance to relax and have fun together. + There's a 5% chance that a random participant gains an inspiration. + 1 +
    • +
  • + 0.2 + + UnforgettableOrgy + The {0} was unforgettable! Everyone learned about each other and felt like a family. + There's a 10% chance a random participant gains an inspiration. + 2 +
    • +     +     +     diff --git a/CRIAOrgy/Defs/ThoughtDefs/Thoughts_Ritual_Orgy.xml b/CRIAOrgy/Defs/ThoughtDefs/Thoughts_Ritual_Orgy.xml new file mode 100644 index 0000000..15620e1 --- /dev/null +++ b/CRIAOrgy/Defs/ThoughtDefs/Thoughts_Ritual_Orgy.xml @@ -0,0 +1,58 @@ + + + + TerribleOrgy + Thought_AttendedRitual + 6 + 3 + +
  • + + That festival was horrible. I'm still cringing from the awkwardness flashbacks. + -3 +
    • +     +     + + + BoringOrgy + Thought_AttendedRitual + 6 + 3 + +
  • + + That festival was awkward. I wish I could have left. + -1 +
    • +     +     + + + FunOrgy + Thought_AttendedRitual + 6 + 3 + +
  • + + I had fun! We got to hang out and relax. + 5 +
    • +     +     + + + UnforgettableOrgy + Thought_AttendedRitual + 6 + 3 + +
  • + + That festival was something I'll never forget. + 8 +
    • +     +     +     diff --git a/CRIAOrgy/Properties/AssemblyInfo.cs b/CRIAOrgy/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..791a83e --- /dev/null +++ b/CRIAOrgy/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("CRIAOrgy")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("CRIAOrgy")] +[assembly: AssemblyCopyright("Copyright © 2021")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("212ed289-c5a3-4807-b482-a53f36b31f23")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/LoadFolders.xml b/LoadFolders.xml index 8132fec..7e5931b 100644 --- a/LoadFolders.xml +++ b/LoadFolders.xml @@ -5,5 +5,8 @@
  • 1.3
  • CRIALactation
  • CRIALactation/1.3
    • + +
  • CRIAOrgy
    • +
  • CRIAOrgy/1.3
    • diff --git a/Source/CRIAUtility.cs b/Source/Base/CRIAUtility.cs similarity index 100% rename from Source/CRIAUtility.cs rename to Source/Base/CRIAUtility.cs diff --git a/Source/Patches/Harmony_PatchAll.cs b/Source/Base/Patches/Harmony_PatchAll.cs similarity index 100% rename from Source/Patches/Harmony_PatchAll.cs rename to Source/Base/Patches/Harmony_PatchAll.cs diff --git a/Source/Patches/RJW/LovinEventDefs/HarmonyPatch_JobDriver_SexBaseInitiator.cs b/Source/Base/Patches/RJW/LovinEventDefs/HarmonyPatch_JobDriver_SexBaseInitiator.cs similarity index 100% rename from Source/Patches/RJW/LovinEventDefs/HarmonyPatch_JobDriver_SexBaseInitiator.cs rename to Source/Base/Patches/RJW/LovinEventDefs/HarmonyPatch_JobDriver_SexBaseInitiator.cs diff --git a/Source/Patches/RJW/LovinPrecepts/HarmonyPatch_CasualSex_Helper.cs b/Source/Base/Patches/RJW/LovinPrecepts/HarmonyPatch_CasualSex_Helper.cs similarity index 100% rename from Source/Patches/RJW/LovinPrecepts/HarmonyPatch_CasualSex_Helper.cs rename to Source/Base/Patches/RJW/LovinPrecepts/HarmonyPatch_CasualSex_Helper.cs diff --git a/Source/Patches/RJW/LovinPrecepts/HarmonyPatch_RMB_Menu.cs b/Source/Base/Patches/RJW/LovinPrecepts/HarmonyPatch_RMB_Menu.cs similarity index 100% rename from Source/Patches/RJW/LovinPrecepts/HarmonyPatch_RMB_Menu.cs rename to Source/Base/Patches/RJW/LovinPrecepts/HarmonyPatch_RMB_Menu.cs