diff --git a/1.3/Assemblies/RJW_PlasticSurgeries.dll b/1.3/Assemblies/RJW_PlasticSurgeries.dll index 0186651..eb5a690 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 2954131..e68f2a2 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 new file mode 100644 index 0000000..c0dc90e Binary files /dev/null and b/1.5/Assemblies/RJW_PlasticSurgeries.dll differ diff --git a/Source/RJW_PlasticSurgeries/1.5/Recipe_Plastic_Surgery.cs b/Source/RJW_PlasticSurgeries/1.5/Recipe_Plastic_Surgery.cs new file mode 100644 index 0000000..af5d873 --- /dev/null +++ b/Source/RJW_PlasticSurgeries/1.5/Recipe_Plastic_Surgery.cs @@ -0,0 +1,61 @@ +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 new file mode 100644 index 0000000..bdf4023 --- /dev/null +++ b/Source/RJW_PlasticSurgeries/1.5/Recipe_Surgery_Beautify.cs @@ -0,0 +1,61 @@ +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 new file mode 100644 index 0000000..918c7ca --- /dev/null +++ b/Source/RJW_PlasticSurgeries/1.5/VanillaTraitDefOf.cs @@ -0,0 +1,26 @@ +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 0aa915d..0c63548 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.4\ + bin\Release\1.5\ @@ -32,23 +32,25 @@ - + - + ..\..\..\licentia-labs\Assemblies\LicentiaLabs.dll - ..\..\..\rjw-base\1.5\Assemblies\RJW.dll + ..\..\..\rjw-beta\1.5\Assemblies\RJW.dll + + diff --git a/Source/build.gradle.kts b/Source/build.gradle.kts index 46daea1..3ad417d 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_about") + dependsOn("copy_1.3", "copy_1.4", "copy_1.5", "copy_about") } tasks.register("copy_about") { @@ -115,19 +115,25 @@ tasks.register("copy_about") { tasks.register("copy_1.3") { dependsOn("copyDll_1.3") - from(project.projectDir.resolve("${rootProject.name}/1.3")) + from(project.projectDir.resolve("${rootProject.name}/1.3")){ + exclude("**/*.cs") + } into(project.projectDir.parentFile.resolve("1.3")) } tasks.register("copy_1.4") { dependsOn("copyDll_1.4") - from(project.projectDir.resolve("${rootProject.name}/1.4")) + from(project.projectDir.resolve("${rootProject.name}/1.4")){ + exclude("**/*.cs") + } into(project.projectDir.parentFile.resolve("1.4")) } tasks.register("copy_1.5") { dependsOn("copyDll_1.5") - from(project.projectDir.resolve("${rootProject.name}/1.5")) + from(project.projectDir.resolve("${rootProject.name}/1.5")){ + exclude("**/*.cs") + } into(project.projectDir.parentFile.resolve("1.5")) } diff --git a/Source/global.json b/Source/global.json index 1bcf6c0..2ddda36 100644 --- a/Source/global.json +++ b/Source/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "6.0.0", + "version": "8.0.0", "rollForward": "latestMinor", "allowPrerelease": false }