Merge branch 'feature/5400.0.1.7' into develop

This commit is contained in:
Stardust3D 2024-05-27 20:54:59 +02:00
commit 973bbb5cd5
14 changed files with 51 additions and 25 deletions

View file

@ -6,6 +6,7 @@
<supportedVersions>
<li>1.3</li>
<li>1.4</li>
<li>1.5</li>
</supportedVersions>
<packageId>Stardust3D.RJW.PlasticSurgeries</packageId>
<description>Surgically alter pawn's genitals.</description>

View file

@ -2,5 +2,5 @@
<Manifest>
<identifier>RJW PlasticSurgeries</identifier>
<version>5390.0.1.6</version>
<version>5400.0.1.7</version>
</Manifest>

View file

@ -7,7 +7,7 @@ namespace RJW_PlasticSurgeries
{
public abstract class Recipe_Plastic_Surgery : Recipe_Surgery
{
protected readonly bool HasDyspareunia = ModLister.HasActiveModWithName("Dyspareunia");
protected readonly bool HasDyspareunia = false; // ModLister.HasActiveModWithName("Dyspareunia");
protected readonly bool HasLicentia = ModLister.HasActiveModWithName("RimJobWorld - Licentia Labs");
public override IEnumerable<BodyPartRecord> GetPartsToApplyOn(Pawn pawn, RecipeDef recipe)

View file

@ -6,6 +6,7 @@
<supportedVersions>
<li>1.3</li>
<li>1.4</li>
<li>1.5</li>
</supportedVersions>
<packageId>Stardust3D.RJW.PlasticSurgeries</packageId>
<description>Surgically alter pawn's genitals.</description>

View file

@ -2,5 +2,5 @@
<Manifest>
<identifier>RJW PlasticSurgeries</identifier>
<version>5390.0.1.6</version>
<version>5400.0.1.7</version>
</Manifest>

View file

@ -15,8 +15,8 @@
<LangVersion>11</LangVersion>
<Copyright>©2024 Stardust3D</Copyright>
<Company>Stardust3D</Company>
<AssemblyVersion>5390.0.1.6</AssemblyVersion>
<FileVersion>5390.0.1.6</FileVersion>
<AssemblyVersion>5400.0.1.7</AssemblyVersion>
<FileVersion>5400.0.1.7</FileVersion>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>RJW_PlasticSurgeries.snk</AssemblyOriginatorKeyFile>
<Description>Surgically alter pawn's genitals.</Description>
@ -31,7 +31,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Lib.Harmony" Version="2.3.3" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.2" />
<PackageReference Include="Krafs.Rimworld.Ref" Version="1.3.3389" />
<PackageReference Include="UnlimitedHugs.Rimworld.HugsLib" Version="11.0.3" />
</ItemGroup>

View file

@ -15,8 +15,8 @@
<LangVersion>11</LangVersion>
<Copyright>©2024 Stardust3D</Copyright>
<Company>Stardust3D</Company>
<AssemblyVersion>5390.0.1.6</AssemblyVersion>
<FileVersion>5390.0.1.6</FileVersion>
<AssemblyVersion>5400.0.1.7</AssemblyVersion>
<FileVersion>5400.0.1.7</FileVersion>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>RJW_PlasticSurgeries.snk</AssemblyOriginatorKeyFile>
<Description>Surgically alter pawn's genitals.</Description>
@ -31,7 +31,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Lib.Harmony" Version="2.3.3" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.2" />
<PackageReference Include="Krafs.Rimworld.Ref" Version="1.4.3901" />
<PackageReference Include="UnlimitedHugs.Rimworld.HugsLib" Version="11.0.3" />
</ItemGroup>

View file

@ -15,8 +15,8 @@
<LangVersion>11</LangVersion>
<Copyright>©2024 Stardust3D</Copyright>
<Company>Stardust3D</Company>
<AssemblyVersion>5390.0.1.6</AssemblyVersion>
<FileVersion>5390.0.1.6</FileVersion>
<AssemblyVersion>5400.0.1.7</AssemblyVersion>
<FileVersion>5400.0.1.7</FileVersion>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>RJW_PlasticSurgeries.snk</AssemblyOriginatorKeyFile>
<Description>Surgically alter pawn's genitals.</Description>
@ -31,8 +31,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Lib.Harmony" Version="2.3.3" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Krafs.Rimworld.Ref" Version="1.5.4085" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.2" />
<PackageReference Include="Krafs.Rimworld.Ref" Version="1.5.4104" />
<PackageReference Include="UnlimitedHugs.Rimworld.HugsLib" Version="11.0.3" />
</ItemGroup>
<ItemGroup>
@ -43,7 +43,7 @@
<HintPath>..\..\..\licentia-labs\Assemblies\LicentiaLabs.dll</HintPath>
</Reference>
<Reference Include="RJW">
<HintPath>..\..\..\rjw-beta\1.5\Assemblies\RJW.dll</HintPath>
<HintPath>..\..\..\rjw-base\1.5\Assemblies\RJW.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>

View file

@ -1,4 +1,5 @@
using System.Collections.Generic;
using System;
using System.Collections.Generic;
using LicentiaLabs;
using rjw;
using Verse;
@ -23,8 +24,15 @@ namespace RJW_PlasticSurgeries
return pawn.GetGenitalsList().FindAll(Genital_Helper.is_penis);
}
protected override (HediffDef, float) GetLicentiaDamage() =>
(Licentia.HediffDefs.StretchTear, 0.2f);
protected override (HediffDef, float) GetLicentiaDamage()
{
if (HasLicentia)
{
return (Licentia.HediffDefs.StretchTear, 0.2f);
}
throw new NotSupportedException();
}
}
public class Recipe_Surgery_Penoplasty_Micro : Recipe_Surgery_Penoplasty

View file

@ -1,4 +1,5 @@
using System.Collections.Generic;
using System;
using System.Collections.Generic;
using LicentiaLabs;
using rjw;
using Verse;
@ -21,9 +22,16 @@ namespace RJW_PlasticSurgeries
{
return pawn.GetAnusList();
}
protected override (HediffDef, float) GetLicentiaDamage() =>
(Licentia.HediffDefs.StretchTear, 0.2f);
protected override (HediffDef, float) GetLicentiaDamage()
{
if (HasLicentia)
{
return (Licentia.HediffDefs.StretchTear, 0.2f);
}
throw new NotSupportedException();
}
}
public class Recipe_Surgery_Sphinctoplasty_Micro : Recipe_Surgery_Sphinctoplasty

View file

@ -1,4 +1,5 @@
using System.Collections.Generic;
using System;
using System.Collections.Generic;
using LicentiaLabs;
using rjw;
using Verse;
@ -21,9 +22,16 @@ namespace RJW_PlasticSurgeries
{
return pawn.GetGenitalsList().FindAll(Genital_Helper.is_vagina);
}
protected override (HediffDef, float) GetLicentiaDamage() =>
(Licentia.HediffDefs.StretchTear, 0.2f);
protected override (HediffDef, float) GetLicentiaDamage()
{
if (HasLicentia)
{
return (Licentia.HediffDefs.StretchTear, 0.2f);
}
throw new NotSupportedException();
}
}
public class Recipe_Surgery_Vaginoplasty_Micro : Recipe_Surgery_Vaginoplasty