AblativeAbsolute/coffees-rjw-ideology-addons
1
0
Fork 0
mirror of https://gitgud.io/c0ffeeeeeeee/coffees-rjw-ideology-addons.git synced 2024-08-14 23:57:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: AblativeAbsolute:5b4b203d13d61361de60ab52c256e21aacea0771
Branches Tags
AblativeAbsolute:master
AblativeAbsolute:Onslort1.4
AblativeAbsolute:wip
AblativeAbsolute:preg
AblativeAbsolute:quests
AblativeAbsolute:Orassans
AblativeAbsolute:Thoughts
AblativeAbsolute:Hucow
...
compare: AblativeAbsolute:711a61a31ac69ef8fd56c1e29f9cddb6b8f8b1f8
Branches Tags
AblativeAbsolute:master
AblativeAbsolute:Onslort1.4
AblativeAbsolute:wip
AblativeAbsolute:preg
AblativeAbsolute:quests
AblativeAbsolute:Orassans
AblativeAbsolute:Thoughts
AblativeAbsolute:Hucow

3 commits
5b4b203d13 ... 711a61a31a

Author SHA1 Message Date
c0ffee
711a61a31a 1.4 versioning 2022-10-25 13:47:06 -07:00
c0ffee
6cdd801207 1.4 updates 2022-10-25 13:46:15 -07:00
c0ffee
cd8fe17713 1.4 updates 2022-10-25 13:45:00 -07:00
18 changed files with 83 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
1.4/Assemblies/C0ffee's RJW Ideology Addons.dll Normal file
View file

Binary file not shown.

1
About/About.xml
View file

@ -6,6 +6,7 @@
<url>https://gitgud.io/c0ffeeeeeeee/rimworld-animations</url> <url>https://gitgud.io/c0ffeeeeeeee/rimworld-animations</url>
<supportedVersions> <supportedVersions>
<li>1.3</li> <li>1.3</li>
<li>1.4</li>
</supportedVersions> </supportedVersions>
<packageId>c0ffee.rjw.IdeologyAddons</packageId> <packageId>c0ffee.rjw.IdeologyAddons</packageId>
<modDependencies> <modDependencies>

2
About/Manifest.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<Manifest> <Manifest>
<identifier>C0ffeeRIA</identifier> <identifier>C0ffeeRIA</identifier>
<version>0.0.5</version> <version>0.0.6</version>
</Manifest> </Manifest>

9
C0ffee's RJW Ideology Addons.csproj
View file

@ -9,15 +9,16 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>C0ffee_s_RJW_Ideology_Addons</RootNamespace> <RootNamespace>C0ffee_s_RJW_Ideology_Addons</RootNamespace>
<AssemblyName>C0ffee%27s RJW Ideology Addons</AssemblyName> <AssemblyName>C0ffee%27s RJW Ideology Addons</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic> <Deterministic>true</Deterministic>
<TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>false</DebugSymbols> <DebugSymbols>false</DebugSymbols>
<DebugType>none</DebugType> <DebugType>none</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>
<OutputPath>1.3\Assemblies\</OutputPath> <OutputPath>1.4\Assemblies\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
@ -33,7 +34,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="0Harmony"> <Reference Include="0Harmony">
<HintPath>..\..\..\..\workshop\content\294100\2009463077\Current\Assemblies\0Harmony.dll</HintPath> <HintPath>..\..\..\..\workshop\content\294100\839005762\1.4\Assemblies\0Harmony.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="Assembly-CSharp"> <Reference Include="Assembly-CSharp">
@ -45,7 +46,7 @@
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="RJW"> <Reference Include="RJW">
<HintPath>..\rjw\1.3\Assemblies\RJW.dll</HintPath> <HintPath>..\rjw\1.4\Assemblies\RJW.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />

BIN
CRIALactation/1.3/Assemblies/CRIALactation.dll
View file

Binary file not shown.

BIN
CRIALactation/1.4/Assemblies/CRIALactation.dll Normal file
View file

Binary file not shown.

13
CRIALactation/CRIALactation.csproj
View file

@ -9,15 +9,16 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>CRIALactation</RootNamespace> <RootNamespace>CRIALactation</RootNamespace>
<AssemblyName>CRIALactation</AssemblyName> <AssemblyName>CRIALactation</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic> <Deterministic>true</Deterministic>
<TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>false</DebugSymbols> <DebugSymbols>false</DebugSymbols>
<DebugType>none</DebugType> <DebugType>none</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>
<OutputPath>1.3\Assemblies\</OutputPath> <OutputPath>1.4\Assemblies\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
@ -32,7 +33,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="0Harmony"> <Reference Include="0Harmony">
<HintPath>..\..\..\..\..\workshop\content\294100\2009463077\Current\Assemblies\0Harmony.dll</HintPath> <HintPath>..\..\..\..\..\workshop\content\294100\839005762\1.4\Assemblies\0Harmony.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="Assembly-CSharp"> <Reference Include="Assembly-CSharp">
@ -40,7 +41,7 @@
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="HugsLib"> <Reference Include="HugsLib">
<HintPath>..\..\..\..\..\workshop\content\294100\818773962\v1.3\Assemblies\HugsLib.dll</HintPath> <HintPath>..\..\..\..\..\workshop\content\294100\818773962\v1.4\Assemblies\HugsLib.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="Milk"> <Reference Include="Milk">
@ -48,7 +49,7 @@
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="RJW"> <Reference Include="RJW">
<HintPath>..\..\rjw\1.3\Assemblies\RJW.dll</HintPath> <HintPath>..\..\rjw\1.4\Assemblies\RJW.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
@ -70,8 +71,10 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Source\CompProperties\CompAbilityEffects\CompProperties_AbilityBeginInducingLactation.cs" />
<Compile Include="Source\CompProperties\CompAbilityEffects\CompProperties_AbilityConvertHucow.cs" /> <Compile Include="Source\CompProperties\CompAbilityEffects\CompProperties_AbilityConvertHucow.cs" />
<Compile Include="Source\CompProperties\CompProperties_Lactation.cs" /> <Compile Include="Source\CompProperties\CompProperties_Lactation.cs" />
<Compile Include="Source\Comps\CompAbilityEffects\CompAbilityEffect_BeginInducingLactation.cs" />
<Compile Include="Source\Comps\CompAbilityEffects\CompAbilityEffect_ConvertHucow.cs" /> <Compile Include="Source\Comps\CompAbilityEffects\CompAbilityEffect_ConvertHucow.cs" />
<Compile Include="Source\Comps\CompLactation.cs" /> <Compile Include="Source\Comps\CompLactation.cs" />
<Compile Include="Source\HarmonyPatches\HarmonyPatch_FoodUtility.cs" /> <Compile Include="Source\HarmonyPatches\HarmonyPatch_FoodUtility.cs" />

4
CRIALactation/Defs/AbilityDefs/Abilities_Hucow.xml
View file

@ -81,10 +81,10 @@
<comps> <comps>
<li Class="CompProperties_AbilityGiveHediff"> <li Class="CompProperties_AbilityGiveHediff">
<compClass>CompAbilityEffect_GiveHediff</compClass> <compClass>CompAbilityEffect_GiveHediff</compClass>
<hediffDef>Hucow</hediffDef> <hediffDef>InducingLactation</hediffDef>
<applicableToMechs>False</applicableToMechs> <applicableToMechs>False</applicableToMechs>
</li> </li>
<li Class="CRIALactation.CompProperties_AbilityConvertHucow" /> <li Class="CRIALactation.CompProperties_AbilityBeginInducingLactation" />
</comps> </comps>
</AbilityDef> </AbilityDef>
</Defs> </Defs>

3
CRIALactation/Defs/PreceptDefs/Precepts_Lactating_Role.xml
View file

@ -37,7 +37,7 @@
<iconPath>UI/Issues/Lactating</iconPath> <iconPath>UI/Issues/Lactating</iconPath>
</IssueDef> </IssueDef>
<PreceptDef ParentName="PreceptRoleSingleBase"> <PreceptDef ParentName="PreceptRoleMultiBase">
<defName>IdeoRole_HucowHandler</defName> <defName>IdeoRole_HucowHandler</defName>
<issue>HucowHandling</issue> <issue>HucowHandling</issue>
<!--this is needed to override old issue in issuedef to have hucow handler role--> <!--this is needed to override old issue in issuedef to have hucow handler role-->
@ -147,6 +147,7 @@
</requiredMemes> </requiredMemes>
<grantedAbilities> <grantedAbilities>
<li>ConvertToHucow</li> <li>ConvertToHucow</li>
<li>BeginInducingLactation</li>
</grantedAbilities> </grantedAbilities>
</PreceptDef> </PreceptDef>

23
CRIALactation/Source/CompProperties/CompAbilityEffects/CompProperties_AbilityBeginInducingLactation.cs Normal file
View file

@ -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);
}
}
}

5
CRIALactation/Source/Comps/CompAbilityEffects/CompAbilityEffect_BeginInducingLactation.cs
View file

@ -1,5 +1,6 @@
using RimWorld; using RimWorld;
using RimWorld.Planet; using RimWorld.Planet;
using rjw;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@ -16,8 +17,10 @@ namespace CRIALactation
{ {
Pawn pawn = target.Pawn; Pawn pawn = target.Pawn;
if (pawn == null) return false; if (pawn == null) return false;
if (!pawn.IsColonistPlayerControlled || !pawn.IsSlaveOfColony || !pawn.IsPrisonerOfColony) 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; if (LactationUtility.IsLactating(pawn)) return false;
return true; return true;

6
CRIALactation/Source/Comps/CompAbilityEffects/CompAbilityEffect_ConvertHucow.cs
View file

@ -16,9 +16,9 @@ namespace CRIALactation
public override bool Valid(LocalTargetInfo target, bool throwMessages = false) public override bool Valid(LocalTargetInfo target, bool throwMessages = false)
{ {
Pawn pawn = target.Pawn; Pawn pawn = target.Pawn;
return pawn != null && AbilityUtility.ValidateMustBeHuman(pawn, throwMessages) && return pawn != null && AbilityUtility.ValidateMustBeHuman(pawn, throwMessages, this.parent) &&
AbilityUtility.ValidateNoMentalState(pawn, throwMessages) && AbilityUtility.ValidateNoMentalState(pawn, throwMessages, this.parent) &&
AbilityUtility.ValidateSameIdeo(this.parent.pawn, pawn, throwMessages) && AbilityUtility.ValidateSameIdeo(this.parent.pawn, pawn, throwMessages, this.parent) &&
LactationUtility.IsLactating(pawn) && LactationUtility.IsLactating(pawn) &&
!LactationUtility.IsHucow(pawn); !LactationUtility.IsHucow(pawn);

14
CRIALactation/Source/Comps/CompLactation.cs
View file

@ -19,6 +19,20 @@ namespace CRIALactation
Scribe_Values.Look<int>(ref this.lastHumanLactationIngestedTick, "lastHumanLactationIngestedTick", 0); Scribe_Values.Look<int>(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<HediffComp_LactationInduction>().canMassage())
{
return "Ready to stimulate breasts for lactation.";
}
else
{
return "";
}
}
} }

4
CRIALactation/Source/Precepts/PreceptComp_Lactation.cs
View file

@ -13,9 +13,11 @@ namespace CRIALactation
public class PreceptComp_Lactation : PreceptComp 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 if((precept.def == PreceptDefOf_Lactation.Lactating_Essential
|| precept.def == PreceptDefOf_Lactation.Lactating_MandatoryHucow) || precept.def == PreceptDefOf_Lactation.Lactating_MandatoryHucow)
&& LactationUtility.HasMilkableBreasts(pawn)) && LactationUtility.HasMilkableBreasts(pawn))

0
CRIAOrgy/Assemblies/CRIAOrgy.dll → CRIAOrgy/1.3/Assemblies/CRIAOrgy.dll
View file

BIN
CRIAOrgy/1.4/Assemblies/CRIAOrgy.dll Normal file
View file

Binary file not shown.

17
CRIAOrgy/CRIAOrgy.csproj
View file

@ -9,15 +9,16 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>CRIAOrgy</RootNamespace> <RootNamespace>CRIAOrgy</RootNamespace>
<AssemblyName>CRIAOrgy</AssemblyName> <AssemblyName>CRIAOrgy</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic> <Deterministic>true</Deterministic>
<TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>false</DebugSymbols> <DebugSymbols>false</DebugSymbols>
<DebugType>none</DebugType> <DebugType>none</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>
<OutputPath>Assemblies\</OutputPath> <OutputPath>1.4\Assemblies\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
@ -33,19 +34,19 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="0Harmony"> <Reference Include="0Harmony">
<HintPath>..\..\..\..\..\workshop\content\294100\2009463077\Current\Assemblies\0Harmony.dll</HintPath> <HintPath>..\..\..\..\..\workshop\content\294100\839005762\1.4\Assemblies\0Harmony.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="Assembly-CSharp"> <Reference Include="Assembly-CSharp">
<HintPath>..\..\..\RimWorldWin64_Data\Managed\Assembly-CSharp.dll</HintPath> <HintPath>..\..\..\RimWorldWin64_Data\Managed\Assembly-CSharp.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="HugsLib"> <Reference Include="Milk">
<HintPath>..\..\..\..\..\workshop\content\294100\818773962\v1.3\Assemblies\HugsLib.dll</HintPath> <HintPath>..\..\rjw-mc\1.3\Assemblies\Milk.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="RJW"> <Reference Include="RJW">
<HintPath>..\..\rjw\1.3\Assemblies\RJW.dll</HintPath> <HintPath>..\..\rjw\1.4\Assemblies\RJW.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
@ -73,8 +74,6 @@
<Content Include="Defs\PreceptDefs\Precepts_PublicSex.xml" /> <Content Include="Defs\PreceptDefs\Precepts_PublicSex.xml" />
<Content Include="Defs\ThoughtDefs\Thoughts_Ritual_Orgy.xml" /> <Content Include="Defs\ThoughtDefs\Thoughts_Ritual_Orgy.xml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup />
<Folder Include="Assemblies\" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project> </Project>

9
LoadFolders.xml
View file

@ -9,4 +9,13 @@
<li IfModActive="c0ffee.rjw.events">CRIAOrgy</li> <li IfModActive="c0ffee.rjw.events">CRIAOrgy</li>
<li IfModActive="c0ffee.rjw.events">CRIAOrgy/1.3</li> <li IfModActive="c0ffee.rjw.events">CRIAOrgy/1.3</li>
</v1.3> </v1.3>
<v1.4>
<li>/</li>
<li>1.4</li>
<li IfModActive="rjw.milk.humanoid">CRIALactation</li>
<li IfModActive="rjw.milk.humanoid">CRIALactation/1.4</li>
<li IfModActive="c0ffee.rjw.events">CRIAOrgy</li>
<li IfModActive="c0ffee.rjw.events">CRIAOrgy/1.4</li>
</v1.4>
</loadFolders> </loadFolders>