mirror of
https://gitgud.io/Stardust3D/rjw-plasticsurgeries.git
synced 2024-08-14 23:57:25 +00:00
Compare commits
No commits in common. "master" and "5400.0.1.7" have entirely different histories.
master
...
5400.0.1.7
25 changed files with 70 additions and 44 deletions
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -22,10 +22,16 @@
|
|||
<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,5 +2,5 @@
|
|||
|
||||
<Manifest>
|
||||
<identifier>RJW PlasticSurgeries</identifier>
|
||||
<version>5400.0.1.8</version>
|
||||
<version>5400.0.1.7</version>
|
||||
</Manifest>
|
|
@ -7,6 +7,7 @@ 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)
|
||||
|
@ -34,11 +35,18 @@ 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();
|
||||
|
|
|
@ -22,10 +22,16 @@
|
|||
<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,5 +2,5 @@
|
|||
|
||||
<Manifest>
|
||||
<identifier>RJW PlasticSurgeries</identifier>
|
||||
<version>5400.0.1.8</version>
|
||||
<version>5400.0.1.7</version>
|
||||
</Manifest>
|
|
@ -8,15 +8,15 @@
|
|||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>RJW_PlasticSurgeries</RootNamespace>
|
||||
<AssemblyName>RJW_PlasticSurgeries</AssemblyName>
|
||||
<TargetFramework>net472</TargetFramework>
|
||||
<TargetFramework>net48</TargetFramework>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<TargetFrameworkProfile>
|
||||
</TargetFrameworkProfile>
|
||||
<LangVersion>11</LangVersion>
|
||||
<Copyright>©2024 Stardust3D</Copyright>
|
||||
<Company>Stardust3D</Company>
|
||||
<AssemblyVersion>5400.0.1.8</AssemblyVersion>
|
||||
<FileVersion>5400.0.1.8</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,11 +31,14 @@
|
|||
</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>
|
||||
<ItemGroup>
|
||||
<Reference Include="Dyspareunia">
|
||||
<HintPath>..\..\..\dyspareunia\1.3\Assemblies\Dyspareunia.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="LicentiaLabs">
|
||||
<HintPath>..\..\..\licentia-labs\Assemblies\LicentiaLabs.dll</HintPath>
|
||||
</Reference>
|
||||
|
|
|
@ -8,15 +8,15 @@
|
|||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>RJW_PlasticSurgeries</RootNamespace>
|
||||
<AssemblyName>RJW_PlasticSurgeries</AssemblyName>
|
||||
<TargetFramework>net472</TargetFramework>
|
||||
<TargetFramework>net48</TargetFramework>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<TargetFrameworkProfile>
|
||||
</TargetFrameworkProfile>
|
||||
<LangVersion>11</LangVersion>
|
||||
<Copyright>©2024 Stardust3D</Copyright>
|
||||
<Company>Stardust3D</Company>
|
||||
<AssemblyVersion>5400.0.1.8</AssemblyVersion>
|
||||
<FileVersion>5400.0.1.8</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,11 +31,14 @@
|
|||
</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>
|
||||
<ItemGroup>
|
||||
<Reference Include="Dyspareunia">
|
||||
<HintPath>..\..\..\dyspareunia\1.4\Assemblies\Dyspareunia.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="LicentiaLabs">
|
||||
<HintPath>..\..\..\licentia-labs\Assemblies\LicentiaLabs.dll</HintPath>
|
||||
</Reference>
|
||||
|
|
|
@ -8,15 +8,15 @@
|
|||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>RJW_PlasticSurgeries</RootNamespace>
|
||||
<AssemblyName>RJW_PlasticSurgeries</AssemblyName>
|
||||
<TargetFramework>net472</TargetFramework>
|
||||
<TargetFramework>net48</TargetFramework>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<TargetFrameworkProfile>
|
||||
</TargetFrameworkProfile>
|
||||
<LangVersion>11</LangVersion>
|
||||
<Copyright>©2024 Stardust3D</Copyright>
|
||||
<Company>Stardust3D</Company>
|
||||
<AssemblyVersion>5400.0.1.8</AssemblyVersion>
|
||||
<FileVersion>5400.0.1.8</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,11 +31,14 @@
|
|||
</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.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>
|
||||
|
@ -53,4 +56,5 @@
|
|||
<EmbeddedResource Remove="1.3\**" />
|
||||
<EmbeddedResource Remove="1.4\**" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
@ -1,12 +1,15 @@
|
|||
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)
|
||||
|
@ -34,11 +37,17 @@ 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();
|
||||
|
|
|
@ -1,9 +1,17 @@
|
|||
/*
|
||||
* 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.8"
|
||||
version = "5400.0.1.7"
|
||||
val friendlyName = "rjw-plasticsurgeries"
|
||||
|
||||
tasks.register<com.ullink.Msbuild>("buildC#_1.3") {
|
||||
|
@ -44,7 +52,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/net472")
|
||||
workingDir = project.projectDir.resolve("${rootProject.name}/bin/Release/1.3/net48")
|
||||
executable = "H:\\Windows Kits\\10\\bin\\10.0.22621.0\\x64\\signtool.exe"
|
||||
args = listOf(
|
||||
"sign",
|
||||
|
@ -62,7 +70,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/net472")
|
||||
workingDir = project.projectDir.resolve("${rootProject.name}/bin/Release/1.4/net48")
|
||||
executable = "H:\\Windows Kits\\10\\bin\\10.0.22621.0\\x64\\signtool.exe"
|
||||
args = listOf(
|
||||
"sign",
|
||||
|
@ -80,7 +88,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/net472")
|
||||
workingDir = project.projectDir.resolve("${rootProject.name}/bin/Release/1.5/net48")
|
||||
executable = "H:\\Windows Kits\\10\\bin\\10.0.22621.0\\x64\\signtool.exe"
|
||||
args = listOf(
|
||||
"sign",
|
||||
|
@ -107,8 +115,6 @@ 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")
|
||||
}
|
||||
|
@ -117,8 +123,6 @@ 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")
|
||||
}
|
||||
|
@ -127,8 +131,6 @@ 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")
|
||||
}
|
||||
|
@ -137,37 +139,22 @@ 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/net472/${rootProject.name}.dll"))
|
||||
from(project.projectDir.resolve("${rootProject.name}/bin/Release/1.3/net48/${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/net472/${rootProject.name}.dll"))
|
||||
from(project.projectDir.resolve("${rootProject.name}/bin/Release/1.4/net48/${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/net472/${rootProject.name}.dll"))
|
||||
from(project.projectDir.resolve("${rootProject.name}/bin/Release/1.5/net48/${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") {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
|
|
2
Source/gradlew
vendored
2
Source/gradlew
vendored
|
@ -55,7 +55,7 @@
|
|||
# Darwin, MinGW, and NonStop.
|
||||
#
|
||||
# (3) This script is generated from the Groovy template
|
||||
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||
# within the Gradle project.
|
||||
#
|
||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue