Merge branch 'release/5603.0.1.8'

5600.0.1.8 5600.0.1.8

About/Manifest.xml

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

Source/RJW_PlasticSurgeries.sln

@@ -15,12 +15,12 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{EB363145-6DB4-42CB-B2CB-82DA7AE02A97}.Debug|Any CPU.ActiveCfg = Release|Any CPU
+		{EB363145-6DB4-42CB-B2CB-82DA7AE02A97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EB363145-6DB4-42CB-B2CB-82DA7AE02A97}.Debug|Any CPU.Build.0 = Release|Any CPU
+		{EB363145-6DB4-42CB-B2CB-82DA7AE02A97}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EB363145-6DB4-42CB-B2CB-82DA7AE02A97}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EB363145-6DB4-42CB-B2CB-82DA7AE02A97}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F17C6B3F-BA9D-4133-A201-1265A64BCB72}.Debug|Any CPU.ActiveCfg = Release|Any CPU
+		{F17C6B3F-BA9D-4133-A201-1265A64BCB72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F17C6B3F-BA9D-4133-A201-1265A64BCB72}.Debug|Any CPU.Build.0 = Release|Any CPU
+		{F17C6B3F-BA9D-4133-A201-1265A64BCB72}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F17C6B3F-BA9D-4133-A201-1265A64BCB72}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F17C6B3F-BA9D-4133-A201-1265A64BCB72}.Release|Any CPU.Build.0 = Release|Any CPU
 		{02AA6D85-913F-44B8-9C32-6E8024261824}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

Source/RJW_PlasticSurgeries/1.5/Recipe_Surgery_Mammoplasty.cs

@@ -0,0 +1,198 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using rjw;
+using Verse;
+
+namespace RJW_PlasticSurgeries
+{
+    public abstract class Recipe_Surgery_Mammoplasty : Recipe_Plastic_Surgery
+    {
+        protected override BodyPartRecord GetPartCandidate(Pawn pawn)
+        {
+            return Genital_Helper.get_genitalsBPR(pawn);
+        }
+
+        protected override bool HasPart(Pawn pawn, List<Hediff> hediffs)
+        {
+            return Genital_Helper.has_breasts(pawn, hediffs) &&
+                   pawn.GetBreastList().Any(hed => hed.Severity >= 0.02f);
+        }
+
+        protected override List<Hediff> GetHediffs(Pawn pawn)
+        {
+            throw new NotSupportedException();
+        }
+
+        protected void SurgeryCupX(Pawn pawn, int stage)
+        {
+            pawn.GetBreastList().ForEach(hed =>
+            {
+                float severity;
+                if (TryGetSeverityFromSize(hed, stage, out severity)) hed.Severity = severity;
+            });
+        }
+
+        private static bool TryGetSeverityFromSize(Hediff hediff, float cupSize, out float severity)
+        {
+            var list = (hediff.def as HediffDef_SexPart)?.sizeProfile.cupSizes;
+
+            if (list == null)
+            {
+                severity = 0f;
+                return false;
+            }
+
+            var curve = new SimpleCurve(hediff.def.stages.Zip(list,
+                (stage, s) => new CurvePoint(s, stage.minSeverity)));
+            severity = curve.Evaluate(cupSize);
+            return true;
+        }
+
+        protected override (HediffDef, float) GetLicentiaDamage() => throw new NotSupportedException();
+    }
+
+    public class Recipe_Surgery_Mammoplasty_A : Recipe_Surgery_Mammoplasty
+    {
+        protected override void SurgeryResult(Pawn pawn)
+        {
+            SurgeryCupX(pawn, 1);
+        }
+    }
+
+    public class Recipe_Surgery_Mammoplasty_B : Recipe_Surgery_Mammoplasty
+    {
+        protected override void SurgeryResult(Pawn pawn)
+        {
+            SurgeryCupX(pawn, 2);
+        }
+    }
+
+    public class Recipe_Surgery_Mammoplasty_C : Recipe_Surgery_Mammoplasty
+    {
+        protected override void SurgeryResult(Pawn pawn)
+        {
+            SurgeryCupX(pawn, 3);
+        }
+    }
+
+    public class Recipe_Surgery_Mammoplasty_D : Recipe_Surgery_Mammoplasty
+    {
+        protected override void SurgeryResult(Pawn pawn)
+        {
+            SurgeryCupX(pawn, 4);
+        }
+    }
+
+    public class Recipe_Surgery_Mammoplasty_E : Recipe_Surgery_Mammoplasty
+    {
+        protected override void SurgeryResult(Pawn pawn)
+        {
+            SurgeryCupX(pawn, 6);
+        }
+    }
+
+    public class Recipe_Surgery_Mammoplasty_F : Recipe_Surgery_Mammoplasty
+    {
+        protected override void SurgeryResult(Pawn pawn)
+        {
+            SurgeryCupX(pawn, 7);
+        }
+    }
+
+    public class Recipe_Surgery_Mammoplasty_G : Recipe_Surgery_Mammoplasty
+    {
+        protected override void SurgeryResult(Pawn pawn)
+        {
+            SurgeryCupX(pawn, 9);
+        }
+    }
+
+    public class Recipe_Surgery_Mammoplasty_H : Recipe_Surgery_Mammoplasty
+    {
+        protected override void SurgeryResult(Pawn pawn)
+        {
+            SurgeryCupX(pawn, 11);
+        }
+    }
+
+    public class Recipe_Surgery_Mammoplasty_J : Recipe_Surgery_Mammoplasty
+    {
+        protected override void SurgeryResult(Pawn pawn)
+        {
+            SurgeryCupX(pawn, 13);
+        }
+    }
+
+    public class Recipe_Surgery_Mammoplasty_K : Recipe_Surgery_Mammoplasty
+    {
+        protected override void SurgeryResult(Pawn pawn)
+        {
+            SurgeryCupX(pawn, 15);
+        }
+    }
+
+    public class Recipe_Surgery_Mammoplasty_L : Recipe_Surgery_Mammoplasty
+    {
+        protected override void SurgeryResult(Pawn pawn)
+        {
+            SurgeryCupX(pawn, 17);
+        }
+    }
+
+    public class Recipe_Surgery_Mammoplasty_M : Recipe_Surgery_Mammoplasty
+    {
+        protected override void SurgeryResult(Pawn pawn)
+        {
+            SurgeryCupX(pawn, 19);
+        }
+    }
+
+    public class Recipe_Surgery_Mammoplasty_N : Recipe_Surgery_Mammoplasty
+    {
+        protected override void SurgeryResult(Pawn pawn)
+        {
+            SurgeryCupX(pawn, 21);
+        }
+    }
+
+    public class Recipe_Surgery_Mammoplasty_O : Recipe_Surgery_Mammoplasty
+    {
+        protected override void SurgeryResult(Pawn pawn)
+        {
+            SurgeryCupX(pawn, 23);
+        }
+    }
+
+    public class Recipe_Surgery_Mammoplasty_P : Recipe_Surgery_Mammoplasty
+    {
+        protected override void SurgeryResult(Pawn pawn)
+        {
+            SurgeryCupX(pawn, 25);
+        }
+    }
+
+    public class Recipe_Surgery_Mammoplasty_Q : Recipe_Surgery_Mammoplasty
+    {
+        protected override void SurgeryResult(Pawn pawn)
+        {
+            SurgeryCupX(pawn, 27);
+        }
+    }
+
+    public class Recipe_Surgery_Mammoplasty_R : Recipe_Surgery_Mammoplasty
+    {
+        protected override void SurgeryResult(Pawn pawn)
+        {
+            SurgeryCupX(pawn, 29);
+        }
+    }
+
+    public class Recipe_Surgery_Mammoplasty_Unknown : Recipe_Surgery_Mammoplasty
+    {
+        protected override void SurgeryResult(Pawn pawn)
+        {
+            SurgeryCupX(pawn, 31);
+        }
+    }
+}

Source/RJW_PlasticSurgeries/About/Manifest.xml

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

Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries_1.3.csproj

@@ -15,8 +15,8 @@
         <LangVersion>11</LangVersion>
         <Copyright>©2024 Stardust3D</Copyright>
         <Company>Stardust3D</Company>
-        <AssemblyVersion>5400.0.1.8</AssemblyVersion>
+        <AssemblyVersion>5603.0.1.8</AssemblyVersion>
-        <FileVersion>5400.0.1.8</FileVersion>
+        <FileVersion>5603.0.1.8</FileVersion>
         <SignAssembly>true</SignAssembly>
         <AssemblyOriginatorKeyFile>RJW_PlasticSurgeries.snk</AssemblyOriginatorKeyFile>
         <Description>Surgically alter pawn's genitals.</Description>

Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries_1.4.csproj

@@ -15,8 +15,8 @@
         <LangVersion>11</LangVersion>
         <Copyright>©2024 Stardust3D</Copyright>
         <Company>Stardust3D</Company>
-        <AssemblyVersion>5400.0.1.8</AssemblyVersion>
+        <AssemblyVersion>5603.0.1.8</AssemblyVersion>
-        <FileVersion>5400.0.1.8</FileVersion>
+        <FileVersion>5603.0.1.8</FileVersion>
         <SignAssembly>true</SignAssembly>
         <AssemblyOriginatorKeyFile>RJW_PlasticSurgeries.snk</AssemblyOriginatorKeyFile>
         <Description>Surgically alter pawn's genitals.</Description>

Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries_1.5.csproj

@@ -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>
+        <AssemblyVersion>5603.0.1.8</AssemblyVersion>
-        <FileVersion>5400.0.1.8</FileVersion>
+        <FileVersion>5603.0.1.8</FileVersion>
         <SignAssembly>true</SignAssembly>
         <AssemblyOriginatorKeyFile>RJW_PlasticSurgeries.snk</AssemblyOriginatorKeyFile>
         <Description>Surgically alter pawn's genitals.</Description>
@@ -32,7 +32,7 @@
     <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.4104" />
+        <PackageReference Include="Krafs.Rimworld.Ref" Version="1.5.4297" />
         <PackageReference Include="UnlimitedHugs.Rimworld.HugsLib" Version="11.0.3" />
     </ItemGroup>
     <ItemGroup>
@@ -48,6 +48,7 @@
         <Compile Remove="1.4\**" />
         <Compile Remove="Recipe_Plastic_Surgery.cs" />
         <Compile Remove="Recipe_Surgery_Beautify.cs" />
+        <Compile Remove="Recipe_Surgery_Mammoplasty.cs" />
     </ItemGroup>
     <ItemGroup>
         <EmbeddedResource Remove="1.3\**" />

Source/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
     alias(libs.plugins.versions)
 }
 
-version = "5400.0.1.8"
+version = "5603.0.1.8"
 val friendlyName = "rjw-plasticsurgeries"
 
 tasks.register<com.ullink.Msbuild>("buildC#_1.3") {
@@ -12,7 +12,7 @@ tasks.register<com.ullink.Msbuild>("buildC#_1.3") {
     // or a project file (.csproj or .vbproj)
     projectFile = file("${rootProject.name}/${rootProject.name}_1.3.csproj")
 
-    targets = listOf("Clean", "Rebuild")
+    targets = listOf("Restore", "Clean", "Rebuild")
     configuration = "Release"
 
     // destinationDir = "build/msbuild/bin"
@@ -24,7 +24,7 @@ tasks.register<com.ullink.Msbuild>("buildC#_1.4") {
     // or a project file (.csproj or .vbproj)
     projectFile = file("${rootProject.name}/${rootProject.name}_1.4.csproj")
 
-    targets = listOf("Clean", "Rebuild")
+    targets = listOf("Restore", "Clean", "Rebuild")
     configuration = "Release"
 
     // destinationDir = "build/msbuild/bin"
@@ -36,7 +36,7 @@ tasks.register<com.ullink.Msbuild>("buildC#_1.5") {
     // or a project file (.csproj or .vbproj)
     projectFile = file("${rootProject.name}/${rootProject.name}_1.5.csproj")
 
-    targets = listOf("Clean", "Rebuild")
+    targets = listOf("Restore", "Clean", "Rebuild")
     configuration = "Release"
 
     // destinationDir = "build/msbuild/bin"
@@ -45,7 +45,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")
-    executable = "H:\\Windows Kits\\10\\bin\\10.0.22621.0\\x64\\signtool.exe"
+    executable = "H:\\Windows Kits\\10\\bin\\10.0.26100.0\\x64\\signtool.exe"
     args = listOf(
         "sign",
         "/seal",
@@ -63,7 +63,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")
-    executable = "H:\\Windows Kits\\10\\bin\\10.0.22621.0\\x64\\signtool.exe"
+    executable = "H:\\Windows Kits\\10\\bin\\10.0.26100.0\\x64\\signtool.exe"
     args = listOf(
         "sign",
         "/seal",
@@ -80,8 +80,8 @@ 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"
+    executable = "H:\\Windows Kits\\10\\bin\\10.0.26100.0\\x64\\signtool.exe"
     args = listOf(
         "sign",
         "/seal",
@@ -149,7 +149,7 @@ tasks.register<Copy>("copyDll_1.4") {
 
 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"))
 }
 

Source/global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.0",
+    "version": "9.0.0",
     "rollForward": "latestMinor",
     "allowPrerelease": false
   }

Source/gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 versions = "0.51.0"
-msbuild = "4.6"
+msbuild = "4.7"
 
 [libraries]
 

Source/gradle/wrapper/gradle-wrapper.properties

@@ -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.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

Source/gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

Source/gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################