diff --git a/1.3/Assemblies/RJW_PlasticSurgeries.dll b/1.3/Assemblies/RJW_PlasticSurgeries.dll index eb5a690..0186651 100644 Binary files a/1.3/Assemblies/RJW_PlasticSurgeries.dll and b/1.3/Assemblies/RJW_PlasticSurgeries.dll differ diff --git a/1.4/Assemblies/RJW_PlasticSurgeries.dll b/1.4/Assemblies/RJW_PlasticSurgeries.dll index e68f2a2..2954131 100644 Binary files a/1.4/Assemblies/RJW_PlasticSurgeries.dll and b/1.4/Assemblies/RJW_PlasticSurgeries.dll differ diff --git a/1.5/Assemblies/RJW_PlasticSurgeries.dll b/1.5/Assemblies/RJW_PlasticSurgeries.dll deleted file mode 100644 index c0dc90e..0000000 Binary files a/1.5/Assemblies/RJW_PlasticSurgeries.dll and /dev/null differ diff --git a/Source/RJW_PlasticSurgeries/1.5/Recipe_Plastic_Surgery.cs b/Source/RJW_PlasticSurgeries/1.5/Recipe_Plastic_Surgery.cs deleted file mode 100644 index af5d873..0000000 --- a/Source/RJW_PlasticSurgeries/1.5/Recipe_Plastic_Surgery.cs +++ /dev/null @@ -1,61 +0,0 @@ -using System.Collections.Generic; -using RimWorld; -using rjw; -using Verse; - -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 GetPartsToApplyOn(Pawn pawn, RecipeDef recipe) - { - var part = GetPartCandidate(pawn); - if (part != null) - { - var hediffs = Genital_Helper.get_PartsHediffList(pawn, part); - if (HasPart(pawn, hediffs)) yield return part; - } - } - - protected abstract BodyPartRecord GetPartCandidate(Pawn pawn); - protected abstract bool HasPart(Pawn pawn, List hediffs); - - public override void ApplyOnPawn(Pawn pawn, BodyPartRecord part, Pawn billDoer, List ingredients, - Bill bill) - { - if (billDoer != null) - { - TaleRecorder.RecordTale(TaleDefOf.DidSurgery, billDoer, pawn); - SurgeryResult(pawn); - } - } - - protected abstract void SurgeryResult(Pawn pawn); - - - /// - 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(); - LicentiaLabs.DamageHelper.ApplyDamage(pawn, hed.Part, type, damage); - } - }); - } - - protected abstract List GetHediffs(Pawn pawn); - protected abstract (HediffDef, float) GetLicentiaDamage(); - } -} \ No newline at end of file diff --git a/Source/RJW_PlasticSurgeries/1.5/Recipe_Surgery_Beautify.cs b/Source/RJW_PlasticSurgeries/1.5/Recipe_Surgery_Beautify.cs deleted file mode 100644 index bdf4023..0000000 --- a/Source/RJW_PlasticSurgeries/1.5/Recipe_Surgery_Beautify.cs +++ /dev/null @@ -1,61 +0,0 @@ -using System.Collections.Generic; -using RimWorld; -using Verse; -using static rjw.VanillaTraitDefOf; - -namespace RJW_PlasticSurgeries -{ - /// - public abstract class Recipe_Surgery_Beautify : Recipe_Surgery - { - /// - public override IEnumerable GetPartsToApplyOn(Pawn pawn, RecipeDef recipe) - { - if (!pawn.story.traits.HasTrait(Beauty) || - pawn.story.traits.HasTrait(Beauty) && pawn.story.traits.GetTrait(Beauty).Degree < 2) - yield return pawn.RaceProps.body.corePart; - } - - /// - public override void ApplyOnPawn(Pawn pawn, BodyPartRecord part, Pawn billDoer, List ingredients, - Bill bill) - { - if (billDoer != null) - { - TaleRecorder.RecordTale(TaleDefOf.DidSurgery, billDoer, pawn); - SurgeryResult(pawn); - } - } - - /// - /// - /// - /// - public abstract void SurgeryResult(Pawn pawn); - - /// - /// Setts the severity of the Beautiful trait for the selected pawn. - /// If the trait doesn't exist in the pawns traits, it will be added. - /// - /// the pawn to modify - /// the new severity of the pawn's Beautiful trait - protected void SurgeryX(Pawn pawn, int severity) - { - if (pawn.story.traits.HasTrait(Beauty)) - { - pawn.story.traits.allTraits.FindAll(t => Beauty.ConflictsWith(t)) - .ForEach(t => pawn.story.traits.RemoveTrait(t)); - pawn.story.traits.RemoveTrait(pawn.story.traits.allTraits.Find(t => t.def == Beauty)); - } - - pawn.story.traits.GainTrait(new Trait(Beauty, severity)); - } - } - - /// - public class Recipe_Surgery_Beautify_Beautiful : Recipe_Surgery_Beautify - { - /// - public override void SurgeryResult(Pawn pawn) => SurgeryX(pawn, 2); - } -} \ No newline at end of file diff --git a/Source/RJW_PlasticSurgeries/1.5/VanillaTraitDefOf.cs b/Source/RJW_PlasticSurgeries/1.5/VanillaTraitDefOf.cs deleted file mode 100644 index 918c7ca..0000000 --- a/Source/RJW_PlasticSurgeries/1.5/VanillaTraitDefOf.cs +++ /dev/null @@ -1,26 +0,0 @@ -using Verse; -using RimWorld; - -namespace rjw -{ - [DefOf] - public static class VanillaTraitDefOf - { - public static TraitDef Tough; - - public static TraitDef Nerves; - - public static TraitDef Beauty; - - public static TraitDef TooSmart; - - public static TraitDef NaturalMood; - - public static TraitDef Cannibal; - - static VanillaTraitDefOf() - { - DefOfHelper.EnsureInitializedInCtor(typeof(VanillaTraitDefOf)); - } - } -} \ No newline at end of file diff --git a/Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries_1.5.csproj b/Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries_1.5.csproj index 0c63548..0aa915d 100644 --- a/Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries_1.5.csproj +++ b/Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries_1.5.csproj @@ -22,7 +22,7 @@ Surgically alter pawn's genitals. - bin\Release\1.5\ + bin\Release\1.4\ @@ -32,25 +32,23 @@ - + - + ..\..\..\licentia-labs\Assemblies\LicentiaLabs.dll - ..\..\..\rjw-beta\1.5\Assemblies\RJW.dll + ..\..\..\rjw-base\1.5\Assemblies\RJW.dll - - diff --git a/Source/build.gradle.kts b/Source/build.gradle.kts index 3ad417d..46daea1 100644 --- a/Source/build.gradle.kts +++ b/Source/build.gradle.kts @@ -105,7 +105,7 @@ tasks.register("sign_1.5") { } tasks.register("copy") { - dependsOn("copy_1.3", "copy_1.4", "copy_1.5", "copy_about") + dependsOn("copy_1.3", "copy_1.4", "copy_about") } tasks.register("copy_about") { @@ -115,25 +115,19 @@ tasks.register("copy_about") { tasks.register("copy_1.3") { dependsOn("copyDll_1.3") - from(project.projectDir.resolve("${rootProject.name}/1.3")){ - exclude("**/*.cs") - } + from(project.projectDir.resolve("${rootProject.name}/1.3")) into(project.projectDir.parentFile.resolve("1.3")) } tasks.register("copy_1.4") { dependsOn("copyDll_1.4") - from(project.projectDir.resolve("${rootProject.name}/1.4")){ - exclude("**/*.cs") - } + from(project.projectDir.resolve("${rootProject.name}/1.4")) into(project.projectDir.parentFile.resolve("1.4")) } tasks.register("copy_1.5") { dependsOn("copyDll_1.5") - from(project.projectDir.resolve("${rootProject.name}/1.5")){ - exclude("**/*.cs") - } + from(project.projectDir.resolve("${rootProject.name}/1.5")) into(project.projectDir.parentFile.resolve("1.5")) } diff --git a/Source/global.json b/Source/global.json index 2ddda36..1bcf6c0 100644 --- a/Source/global.json +++ b/Source/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.0", + "version": "6.0.0", "rollForward": "latestMinor", "allowPrerelease": false }