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

Merge branch '1.5-update' into 'master'

Browse source 
1.5 Update

See merge request c0ffeeeeeeee/coffees-rjw-ideology-addons!3
This commit is contained in:
a flock of birds 2024-06-21 00:02:08 +00:00
commit 03ead36d1e
11 changed files with 28 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

Binary file not shown.

3
About/About.xml
View file

@ -3,10 +3,11 @@
<ModMetaData>
<name>C0ffeeRIA</name>
<author>C0ffee</author>
<url>https://gitgud.io/c0ffeeeeeeee/rimworld-animations</url>
<url>https://gitgud.io/c0ffeeeeeeee/coffees-rjw-ideology-addons</url>
<supportedVersions>
<li>1.3</li>
<li>1.4</li>
<li>1.5</li>
</supportedVersions>
<packageId>c0ffee.rjw.IdeologyAddons</packageId>
<modDependencies>

6
C0ffee's RJW Ideology Addons.csproj
View file

@ -18,7 +18,7 @@
<DebugSymbols>false</DebugSymbols>
<DebugType>none</DebugType>
<Optimize>false</Optimize>
<OutputPath>1.4\Assemblies\</OutputPath>
<OutputPath>1.5\Assemblies\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@ -27,7 +27,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>1.4\Assemblies\</OutputPath>
<OutputPath>1.5\Assemblies\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@ -46,7 +46,7 @@
<Private>False</Private>
</Reference>
<Reference Include="RJW">
<HintPath>..\rjw\1.4\Assemblies\RJW.dll</HintPath>
<HintPath>..\rjw\1.5\Assemblies\RJW.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System" />

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

Binary file not shown.

12
CRIALactation/CRIALactation.csproj
View file

@ -18,7 +18,7 @@
<DebugSymbols>false</DebugSymbols>
<DebugType>none</DebugType>
<Optimize>false</Optimize>
<OutputPath>1.4\Assemblies\</OutputPath>
<OutputPath>1.5\Assemblies\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@ -26,14 +26,14 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>1.4\Assemblies\</OutputPath>
<OutputPath>1.5\Assemblies\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="0Harmony">
<HintPath>..\..\..\..\..\workshop\content\294100\839005762\1.4\Assemblies\0Harmony.dll</HintPath>
<HintPath>$(STEAMC)\workshop\content\294100\839005762\1.4\Assemblies\0Harmony.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Assembly-CSharp">
@ -41,15 +41,15 @@
<Private>False</Private>
</Reference>
<Reference Include="HugsLib">
<HintPath>..\..\..\..\..\workshop\content\294100\818773962\v1.4\Assemblies\HugsLib.dll</HintPath>
<HintPath>$(STEAMC)\workshop\content\294100\818773962\v1.4\Assemblies\HugsLib.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Milk">
<HintPath>..\..\rjw-mc\1.4\Assemblies\Milk.dll</HintPath>
<HintPath>..\..\rjw-mc\1.5\Assemblies\Milk.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="RJW">
<HintPath>..\..\rjw\1.4\Assemblies\RJW.dll</HintPath>
<HintPath>..\..\rjw\1.5\Assemblies\RJW.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System" />

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

@ -13,7 +13,7 @@ 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, bool newborn, bool ignoreApparel = false)
{
if (newborn) return;
@ -30,7 +30,5 @@ namespace CRIALactation
}
}
}
}
}

2
CRIALactation/Source/WorkGivers/WorkGiver_MassageBreasts.cs
View file

@ -21,7 +21,7 @@ namespace CRIALactation
public override bool ShouldSkip(Pawn pawn, bool forced = false)
{
List<Pawn> list = pawn.Map.mapPawns.AllPawnsSpawned;
IReadOnlyList<Pawn> list = pawn.Map.mapPawns.AllPawnsSpawned;
for(int i = 0; i < list.Count; i++)
{
if(LactationUtility.isMassageable(list[i]))

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

Binary file not shown.

10
CRIAOrgy/CRIAOrgy.csproj
View file

@ -18,7 +18,7 @@
<DebugSymbols>false</DebugSymbols>
<DebugType>none</DebugType>
<Optimize>false</Optimize>
<OutputPath>1.4\Assemblies\</OutputPath>
<OutputPath>1.5\Assemblies\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@ -27,14 +27,14 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>1.4\Assemblies\</OutputPath>
<OutputPath>1.5\Assemblies\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="0Harmony">
<HintPath>..\..\..\..\..\workshop\content\294100\839005762\1.4\Assemblies\0Harmony.dll</HintPath>
<HintPath>..\..\..\..\..\workshop\content\294100\839005762\Current\Assemblies\0Harmony.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Assembly-CSharp">
@ -42,11 +42,11 @@
<Private>False</Private>
</Reference>
<Reference Include="Milk">
<HintPath>..\..\rjw-mc\1.3\Assemblies\Milk.dll</HintPath>
<HintPath>..\..\rjw-mc\1.5\Assemblies\Milk.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="RJW">
<HintPath>..\..\rjw\1.4\Assemblies\RJW.dll</HintPath>
<HintPath>..\..\rjw\1.5\Assemblies\RJW.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System" />

2
CRIAOrgy/Source/RitualOutcomeEffectWorkers/RitualOutcomeEffectWorker_Orgy.cs
View file

@ -31,7 +31,7 @@ namespace CRIAOrgy
GlobalTextureAtlasManager.TryMarkPawnFrameSetDirty(participant);
if (xxx.is_human(participant))
participant.Drawer.renderer.graphics.ResolveAllGraphics();
participant.Drawer.renderer.renderTree.SetDirty();
}
base.Apply(progress, totalPresence, jobRitual);

9
LoadFolders.xml
View file

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