AblativeAbsolute/rjw-plasticsurgeries
1
0
Fork 0
mirror of https://gitgud.io/Stardust3D/rjw-plasticsurgeries.git synced 2024-08-14 23:57:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'release/5400.0.1.8'

Browse source
This commit is contained in:
Stardust3D 2024-06-02 17:04:20 +02:00
commit a60cb1c4cf
25 changed files with 44 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
1.3/Assemblies/RJW_PlasticSurgeries.dll
View file

Binary file not shown.

BIN
1.4/Assemblies/RJW_PlasticSurgeries.dll
View file

Binary file not shown.

BIN
1.5/Assemblies/RJW_PlasticSurgeries.dll
View file

Binary file not shown.

0
Source/RJW_PlasticSurgeries/1.3/Defs/Recipe_Surgery/Recipes_Surgery_Beautify.xml → 1.5/Defs/Recipe_Surgery/Recipes_Surgery_Beautify.xml
View file

0
Source/RJW_PlasticSurgeries/1.3/Defs/Recipe_Surgery/Recipes_Surgery_Mammoplasty.xml → 1.5/Defs/Recipe_Surgery/Recipes_Surgery_Mammoplasty.xml
View file

0
Source/RJW_PlasticSurgeries/1.3/Defs/Recipe_Surgery/Recipes_Surgery_Penoplasty.xml → 1.5/Defs/Recipe_Surgery/Recipes_Surgery_Penoplasty.xml
View file

0
Source/RJW_PlasticSurgeries/1.3/Defs/Recipe_Surgery/Recipes_Surgery_Sphinctoplasty.xml → 1.5/Defs/Recipe_Surgery/Recipes_Surgery_Sphinctoplasty.xml
View file

0
Source/RJW_PlasticSurgeries/1.3/Defs/Recipe_Surgery/Recipes_Surgery_Vaginoplasty.xml → 1.5/Defs/Recipe_Surgery/Recipes_Surgery_Vaginoplasty.xml
View file

6
About/About.xml
View file

@ -22,16 +22,10 @@
<steamWorkshopUrl>steam://url/CommunityFilePage/2009463077</steamWorkshopUrl>
<downloadUrl>https://github.com/pardeike/HarmonyRimWorld/releases/latest</downloadUrl>
</li>
<!--<li>
<packageId>NuttySquabble.Dyspareunia</packageId>
<displayName>Dyspareunia</displayName>
<downloadUrl>https://gitgud.io/NuttySquabble/Dyspareunia</downloadUrl>
</li>-->
</modDependencies>
<loadAfter>
<li>Ludeon.RimWorld</li>
<li>rim.job.world</li>
<li>NuttySquabble.Dyspareunia</li>
<li>LustLicentia.RJWLabs</li>
</loadAfter>
</ModMetaData>

2
About/Manifest.xml
View file

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

8
Source/RJW_PlasticSurgeries/1.5/Recipe_Plastic_Surgery.cs
View file

@ -7,7 +7,6 @@ namespace RJW_PlasticSurgeries
{
public abstract class Recipe_Plastic_Surgery : Recipe_Surgery
{
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)
@ -35,18 +34,11 @@ namespace RJW_PlasticSurgeries
protected abstract void SurgeryResult(Pawn pawn);
/// <Compatibility />
private static void DamageHediff(Hediff hed)
{
}
protected void SurgeryX(Pawn pawn, float severity, bool damagePart = false)
{
GetHediffs(pawn).ForEach(hed =>
{
hed.Severity = severity;
if (damagePart && HasDyspareunia) DamageHediff(hed);
if (damagePart && HasLicentia)
{
var (type, damage) = GetLicentiaDamage();

6
Source/RJW_PlasticSurgeries/About/About.xml
View file

@ -22,16 +22,10 @@
<steamWorkshopUrl>steam://url/CommunityFilePage/2009463077</steamWorkshopUrl>
<downloadUrl>https://github.com/pardeike/HarmonyRimWorld/releases/latest</downloadUrl>
</li>
<!--<li>
<packageId>NuttySquabble.Dyspareunia</packageId>
<displayName>Dyspareunia</displayName>
<downloadUrl>https://gitgud.io/NuttySquabble/Dyspareunia</downloadUrl>
</li>-->
</modDependencies>
<loadAfter>
<li>Ludeon.RimWorld</li>
<li>rim.job.world</li>
<li>NuttySquabble.Dyspareunia</li>
<li>LustLicentia.RJWLabs</li>
</loadAfter>
</ModMetaData>

2
Source/RJW_PlasticSurgeries/About/Manifest.xml
View file

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

0
Source/RJW_PlasticSurgeries/1.4/Defs/Recipe_Surgery/Recipes_Surgery_Beautify.xml → Source/RJW_PlasticSurgeries/Defs/Recipe_Surgery/Recipes_Surgery_Beautify.xml
View file

0
Source/RJW_PlasticSurgeries/1.4/Defs/Recipe_Surgery/Recipes_Surgery_Mammoplasty.xml → Source/RJW_PlasticSurgeries/Defs/Recipe_Surgery/Recipes_Surgery_Mammoplasty.xml
View file

0
Source/RJW_PlasticSurgeries/1.4/Defs/Recipe_Surgery/Recipes_Surgery_Penoplasty.xml → Source/RJW_PlasticSurgeries/Defs/Recipe_Surgery/Recipes_Surgery_Penoplasty.xml
View file

0
Source/RJW_PlasticSurgeries/1.4/Defs/Recipe_Surgery/Recipes_Surgery_Sphinctoplasty.xml → Source/RJW_PlasticSurgeries/Defs/Recipe_Surgery/Recipes_Surgery_Sphinctoplasty.xml
View file

0
Source/RJW_PlasticSurgeries/1.4/Defs/Recipe_Surgery/Recipes_Surgery_Vaginoplasty.xml → Source/RJW_PlasticSurgeries/Defs/Recipe_Surgery/Recipes_Surgery_Vaginoplasty.xml
View file

11
Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries_1.3.csproj
View file

@ -8,15 +8,15 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>RJW_PlasticSurgeries</RootNamespace>
<AssemblyName>RJW_PlasticSurgeries</AssemblyName>
<TargetFramework>net48</TargetFramework>
<TargetFramework>net472</TargetFramework>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
<LangVersion>11</LangVersion>
<Copyright>©2024 Stardust3D</Copyright>
<Company>Stardust3D</Company>
<AssemblyVersion>5400.0.1.7</AssemblyVersion>
<FileVersion>5400.0.1.7</FileVersion>
<AssemblyVersion>5400.0.1.8</AssemblyVersion>
<FileVersion>5400.0.1.8</FileVersion>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>RJW_PlasticSurgeries.snk</AssemblyOriginatorKeyFile>
<Description>Surgically alter pawn's genitals.</Description>
@ -31,14 +31,11 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Lib.Harmony" Version="2.3.3" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.2" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Krafs.Rimworld.Ref" Version="1.3.3389" />
<PackageReference Include="UnlimitedHugs.Rimworld.HugsLib" Version="11.0.3" />
</ItemGroup>
<ItemGroup>
<Reference Include="Dyspareunia">
<HintPath>..\..\..\dyspareunia\1.3\Assemblies\Dyspareunia.dll</HintPath>
</Reference>
<Reference Include="LicentiaLabs">
<HintPath>..\..\..\licentia-labs\Assemblies\LicentiaLabs.dll</HintPath>
</Reference>

11
Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries_1.4.csproj
View file

@ -8,15 +8,15 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>RJW_PlasticSurgeries</RootNamespace>
<AssemblyName>RJW_PlasticSurgeries</AssemblyName>
<TargetFramework>net48</TargetFramework>
<TargetFramework>net472</TargetFramework>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
<LangVersion>11</LangVersion>
<Copyright>©2024 Stardust3D</Copyright>
<Company>Stardust3D</Company>
<AssemblyVersion>5400.0.1.7</AssemblyVersion>
<FileVersion>5400.0.1.7</FileVersion>
<AssemblyVersion>5400.0.1.8</AssemblyVersion>
<FileVersion>5400.0.1.8</FileVersion>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>RJW_PlasticSurgeries.snk</AssemblyOriginatorKeyFile>
<Description>Surgically alter pawn's genitals.</Description>
@ -31,14 +31,11 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Lib.Harmony" Version="2.3.3" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.2" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Krafs.Rimworld.Ref" Version="1.4.3901" />
<PackageReference Include="UnlimitedHugs.Rimworld.HugsLib" Version="11.0.3" />
</ItemGroup>
<ItemGroup>
<Reference Include="Dyspareunia">
<HintPath>..\..\..\dyspareunia\1.4\Assemblies\Dyspareunia.dll</HintPath>
</Reference>
<Reference Include="LicentiaLabs">
<HintPath>..\..\..\licentia-labs\Assemblies\LicentiaLabs.dll</HintPath>
</Reference>

12
Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries_1.5.csproj
View file

@ -8,15 +8,15 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>RJW_PlasticSurgeries</RootNamespace>
<AssemblyName>RJW_PlasticSurgeries</AssemblyName>
<TargetFramework>net48</TargetFramework>
<TargetFramework>net472</TargetFramework>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
<LangVersion>11</LangVersion>
<Copyright>©2024 Stardust3D</Copyright>
<Company>Stardust3D</Company>
<AssemblyVersion>5400.0.1.7</AssemblyVersion>
<FileVersion>5400.0.1.7</FileVersion>
<AssemblyVersion>5400.0.1.8</AssemblyVersion>
<FileVersion>5400.0.1.8</FileVersion>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>RJW_PlasticSurgeries.snk</AssemblyOriginatorKeyFile>
<Description>Surgically alter pawn's genitals.</Description>
@ -31,14 +31,11 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Lib.Harmony" Version="2.3.3" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.2" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Krafs.Rimworld.Ref" Version="1.5.4104" />
<PackageReference Include="UnlimitedHugs.Rimworld.HugsLib" Version="11.0.3" />
</ItemGroup>
<ItemGroup>
<!--<Reference Include="Dyspareunia">
<HintPath>..\..\..\dyspareunia\1.5\Assemblies\Dyspareunia.dll</HintPath>
</Reference>-->
<Reference Include="LicentiaLabs">
<HintPath>..\..\..\licentia-labs\Assemblies\LicentiaLabs.dll</HintPath>
</Reference>
@ -56,5 +53,4 @@
<EmbeddedResource Remove="1.3\**" />
<EmbeddedResource Remove="1.4\**" />
</ItemGroup>
</Project>

9
Source/RJW_PlasticSurgeries/Recipe_Plastic_Surgery.cs
View file

@ -1,15 +1,12 @@
using System.Collections.Generic;
using Dyspareunia;
using RimWorld;
using rjw;
using Verse;
using DamageDefOf = Dyspareunia.DamageDefOf;
namespace RJW_PlasticSurgeries
{
public abstract class Recipe_Plastic_Surgery : Recipe_Surgery
{
protected readonly bool HasDyspareunia = ModLister.HasActiveModWithName("Dyspareunia");
protected readonly bool HasLicentia = ModLister.HasActiveModWithName("RimJobWorld - Licentia Labs");
public override IEnumerable<BodyPartRecord> GetPartsToApplyOn(Pawn pawn, RecipeDef recipe)
@ -37,17 +34,11 @@ namespace RJW_PlasticSurgeries
protected abstract void SurgeryResult(Pawn pawn);
private static void DamageHediff(Hediff hed)
{
PenetrationUtility.AddDamageHediff(DamageDefOf.SexStretch, 0.5f, hed, null);
}
protected void SurgeryX(Pawn pawn, float severity, bool damagePart = false)
{
GetHediffs(pawn).ForEach(hed =>
{
hed.Severity = severity;
if (damagePart && HasDyspareunia) DamageHediff(hed);
if (damagePart && HasLicentia)
{
var (type, damage) = GetLicentiaDamage();

43
Source/build.gradle.kts
View file

@ -1,17 +1,9 @@
/*
* This file was generated by the Gradle "init" task.
*
* This is a general purpose Gradle build.
* Learn more about Gradle by exploring our samples at https://docs.gradle.org/7.3/samples
* This project uses @Incubating APIs which are subject to change.
*/
plugins {
alias(libs.plugins.msbuild)
alias(libs.plugins.versions)
}
version = "5400.0.1.7"
version = "5400.0.1.8"
val friendlyName = "rjw-plasticsurgeries"
tasks.register<com.ullink.Msbuild>("buildC#_1.3") {
@ -52,7 +44,7 @@ tasks.register<com.ullink.Msbuild>("buildC#_1.5") {
tasks.register<Exec>("sign_1.3") {
dependsOn("buildC#_1.3")
workingDir = project.projectDir.resolve("${rootProject.name}/bin/Release/1.3/net48")
workingDir = project.projectDir.resolve("${rootProject.name}/bin/Release/1.3/net472")
executable = "H:\\Windows Kits\\10\\bin\\10.0.22621.0\\x64\\signtool.exe"
args = listOf(
"sign",
@ -70,7 +62,7 @@ tasks.register<Exec>("sign_1.3") {
tasks.register<Exec>("sign_1.4") {
dependsOn("buildC#_1.4")
workingDir = project.projectDir.resolve("${rootProject.name}/bin/Release/1.4/net48")
workingDir = project.projectDir.resolve("${rootProject.name}/bin/Release/1.4/net472")
executable = "H:\\Windows Kits\\10\\bin\\10.0.22621.0\\x64\\signtool.exe"
args = listOf(
"sign",
@ -88,7 +80,7 @@ tasks.register<Exec>("sign_1.4") {
tasks.register<Exec>("sign_1.5") {
dependsOn("buildC#_1.5")
workingDir = project.projectDir.resolve("${rootProject.name}/bin/Release/1.5/net48")
workingDir = project.projectDir.resolve("${rootProject.name}/bin/Release/1.5/net472")
executable = "H:\\Windows Kits\\10\\bin\\10.0.22621.0\\x64\\signtool.exe"
args = listOf(
"sign",
@ -115,6 +107,8 @@ tasks.register<Copy>("copy_about") {
tasks.register<Copy>("copy_1.3") {
dependsOn("copyDll_1.3")
dependsOn("copyDefs_1.3")
from(project.projectDir.resolve("${rootProject.name}/1.3")){
exclude("**/*.cs")
}
@ -123,6 +117,8 @@ tasks.register<Copy>("copy_1.3") {
tasks.register<Copy>("copy_1.4") {
dependsOn("copyDll_1.4")
dependsOn("copyDefs_1.4")
from(project.projectDir.resolve("${rootProject.name}/1.4")){
exclude("**/*.cs")
}
@ -131,6 +127,8 @@ tasks.register<Copy>("copy_1.4") {
tasks.register<Copy>("copy_1.5") {
dependsOn("copyDll_1.5")
dependsOn("copyDefs_1.5")
from(project.projectDir.resolve("${rootProject.name}/1.5")){
exclude("**/*.cs")
}
@ -139,22 +137,37 @@ tasks.register<Copy>("copy_1.5") {
tasks.register<Copy>("copyDll_1.3") {
dependsOn("sign_1.3")
from(project.projectDir.resolve("${rootProject.name}/bin/Release/1.3/net48/${rootProject.name}.dll"))
from(project.projectDir.resolve("${rootProject.name}/bin/Release/1.3/net472/${rootProject.name}.dll"))
into(project.projectDir.parentFile.resolve("1.3/Assemblies"))
}
tasks.register<Copy>("copyDll_1.4") {
dependsOn("sign_1.4")
from(project.projectDir.resolve("${rootProject.name}/bin/Release/1.4/net48/${rootProject.name}.dll"))
from(project.projectDir.resolve("${rootProject.name}/bin/Release/1.4/net472/${rootProject.name}.dll"))
into(project.projectDir.parentFile.resolve("1.4/Assemblies"))
}
tasks.register<Copy>("copyDll_1.5") {
dependsOn("sign_1.5")
from(project.projectDir.resolve("${rootProject.name}/bin/Release/1.5/net48/${rootProject.name}.dll"))
from(project.projectDir.resolve("${rootProject.name}/bin/Release/1.5/net472/${rootProject.name}.dll"))
into(project.projectDir.parentFile.resolve("1.5/Assemblies"))
}
tasks.register<Copy>("copyDefs_1.3") {
from(project.projectDir.resolve("${rootProject.name}/Defs"))
into(project.projectDir.parentFile.resolve("1.3/Defs"))
}
tasks.register<Copy>("copyDefs_1.4") {
from(project.projectDir.resolve("${rootProject.name}/Defs"))
into(project.projectDir.parentFile.resolve("1.4/Defs"))
}
tasks.register<Copy>("copyDefs_1.5") {
from(project.projectDir.resolve("${rootProject.name}/Defs"))
into(project.projectDir.parentFile.resolve("1.5/Defs"))
}
tasks.register<Zip>("buildZip") {
dependsOn("clean", ":copy")
into("$friendlyName/1.3") {

2
Source/gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME

2
Source/gradlew vendored
View file

@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.