This commit is contained in:
Stardust3D 2022-01-15 03:57:37 +01:00
parent 8bf3570f8c
commit 1a268705dd
13 changed files with 408 additions and 489 deletions

View file

@ -2,5 +2,5 @@
<Manifest> <Manifest>
<identifier>RJW PlasticSurgeries</identifier> <identifier>RJW PlasticSurgeries</identifier>
<version>4943.0.1.2</version> <version>4943.0.1.3</version>
</Manifest> </Manifest>

Binary file not shown.

View file

@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("4943.0.1.2")] [assembly: AssemblyVersion("4943.0.1.3")]
[assembly: AssemblyFileVersion("4943.0.1.2")] [assembly: AssemblyFileVersion("4943.0.1.3")]

View file

@ -47,6 +47,7 @@ namespace RJW_PlasticSurgeries
.ForEach(t => pawn.story.traits.RemoveTrait(t)); .ForEach(t => pawn.story.traits.RemoveTrait(t));
pawn.story.traits.RemoveTrait(pawn.story.traits.allTraits.Find(t => t.def == Beauty)); pawn.story.traits.RemoveTrait(pawn.story.traits.allTraits.Find(t => t.def == Beauty));
} }
pawn.story.traits.GainTrait(new Trait(Beauty, severity)); pawn.story.traits.GainTrait(new Trait(Beauty, severity));
} }
} }

View file

@ -1,7 +1,7 @@
using RimWorld; using System.Collections.Generic;
using rjw;
using System.Collections.Generic;
using System.Linq; using System.Linq;
using RimWorld;
using rjw;
using Verse; using Verse;
namespace RJW_PlasticSurgeries namespace RJW_PlasticSurgeries
@ -77,145 +77,91 @@ namespace RJW_PlasticSurgeries
public class Recipe_Surgery_Mammoplasty_A : Recipe_Surgery_Mammoplasty public class Recipe_Surgery_Mammoplasty_A : Recipe_Surgery_Mammoplasty
{ {
public override void SurgeryResult(Pawn pawn) public override void SurgeryResult(Pawn pawn) => SurgeryCupX(pawn, 1);
{
this.SurgeryCupX(pawn, 1);
}
} }
public class Recipe_Surgery_Mammoplasty_B : Recipe_Surgery_Mammoplasty public class Recipe_Surgery_Mammoplasty_B : Recipe_Surgery_Mammoplasty
{ {
public override void SurgeryResult(Pawn pawn) public override void SurgeryResult(Pawn pawn) => SurgeryCupX(pawn, 2);
{
this.SurgeryCupX(pawn, 2);
}
} }
public class Recipe_Surgery_Mammoplasty_C : Recipe_Surgery_Mammoplasty public class Recipe_Surgery_Mammoplasty_C : Recipe_Surgery_Mammoplasty
{ {
public override void SurgeryResult(Pawn pawn) public override void SurgeryResult(Pawn pawn) => SurgeryCupX(pawn, 3);
{
this.SurgeryCupX(pawn, 3);
}
} }
public class Recipe_Surgery_Mammoplasty_D : Recipe_Surgery_Mammoplasty public class Recipe_Surgery_Mammoplasty_D : Recipe_Surgery_Mammoplasty
{ {
public override void SurgeryResult(Pawn pawn) public override void SurgeryResult(Pawn pawn) => SurgeryCupX(pawn, 4);
{
this.SurgeryCupX(pawn, 4);
}
} }
public class Recipe_Surgery_Mammoplasty_E : Recipe_Surgery_Mammoplasty public class Recipe_Surgery_Mammoplasty_E : Recipe_Surgery_Mammoplasty
{ {
public override void SurgeryResult(Pawn pawn) public override void SurgeryResult(Pawn pawn) => SurgeryCupX(pawn, 6);
{
this.SurgeryCupX(pawn, 6);
}
} }
public class Recipe_Surgery_Mammoplasty_F : Recipe_Surgery_Mammoplasty public class Recipe_Surgery_Mammoplasty_F : Recipe_Surgery_Mammoplasty
{ {
public override void SurgeryResult(Pawn pawn) public override void SurgeryResult(Pawn pawn) => SurgeryCupX(pawn, 7);
{
this.SurgeryCupX(pawn, 7);
}
} }
public class Recipe_Surgery_Mammoplasty_G : Recipe_Surgery_Mammoplasty public class Recipe_Surgery_Mammoplasty_G : Recipe_Surgery_Mammoplasty
{ {
public override void SurgeryResult(Pawn pawn) public override void SurgeryResult(Pawn pawn) => SurgeryCupX(pawn, 9);
{
this.SurgeryCupX(pawn, 9);
}
} }
public class Recipe_Surgery_Mammoplasty_H : Recipe_Surgery_Mammoplasty public class Recipe_Surgery_Mammoplasty_H : Recipe_Surgery_Mammoplasty
{ {
public override void SurgeryResult(Pawn pawn) public override void SurgeryResult(Pawn pawn) => SurgeryCupX(pawn, 11);
{
this.SurgeryCupX(pawn, 11);
}
} }
public class Recipe_Surgery_Mammoplasty_J : Recipe_Surgery_Mammoplasty public class Recipe_Surgery_Mammoplasty_J : Recipe_Surgery_Mammoplasty
{ {
public override void SurgeryResult(Pawn pawn) public override void SurgeryResult(Pawn pawn) => SurgeryCupX(pawn, 13);
{
this.SurgeryCupX(pawn, 13);
}
} }
public class Recipe_Surgery_Mammoplasty_K : Recipe_Surgery_Mammoplasty public class Recipe_Surgery_Mammoplasty_K : Recipe_Surgery_Mammoplasty
{ {
public override void SurgeryResult(Pawn pawn) public override void SurgeryResult(Pawn pawn) => SurgeryCupX(pawn, 15);
{
this.SurgeryCupX(pawn, 15);
}
} }
public class Recipe_Surgery_Mammoplasty_L : Recipe_Surgery_Mammoplasty public class Recipe_Surgery_Mammoplasty_L : Recipe_Surgery_Mammoplasty
{ {
public override void SurgeryResult(Pawn pawn) public override void SurgeryResult(Pawn pawn) => SurgeryCupX(pawn, 17);
{
this.SurgeryCupX(pawn, 17);
}
} }
public class Recipe_Surgery_Mammoplasty_M : Recipe_Surgery_Mammoplasty public class Recipe_Surgery_Mammoplasty_M : Recipe_Surgery_Mammoplasty
{ {
public override void SurgeryResult(Pawn pawn) public override void SurgeryResult(Pawn pawn) => SurgeryCupX(pawn, 19);
{
this.SurgeryCupX(pawn, 19);
}
} }
public class Recipe_Surgery_Mammoplasty_N : Recipe_Surgery_Mammoplasty public class Recipe_Surgery_Mammoplasty_N : Recipe_Surgery_Mammoplasty
{ {
public override void SurgeryResult(Pawn pawn) public override void SurgeryResult(Pawn pawn) => SurgeryCupX(pawn, 21);
{
this.SurgeryCupX(pawn, 21);
}
} }
public class Recipe_Surgery_Mammoplasty_O : Recipe_Surgery_Mammoplasty public class Recipe_Surgery_Mammoplasty_O : Recipe_Surgery_Mammoplasty
{ {
public override void SurgeryResult(Pawn pawn) public override void SurgeryResult(Pawn pawn) => SurgeryCupX(pawn, 23);
{
this.SurgeryCupX(pawn, 23);
}
} }
public class Recipe_Surgery_Mammoplasty_P : Recipe_Surgery_Mammoplasty public class Recipe_Surgery_Mammoplasty_P : Recipe_Surgery_Mammoplasty
{ {
public override void SurgeryResult(Pawn pawn) public override void SurgeryResult(Pawn pawn) => SurgeryCupX(pawn, 25);
{
this.SurgeryCupX(pawn, 25);
}
} }
public class Recipe_Surgery_Mammoplasty_Q : Recipe_Surgery_Mammoplasty public class Recipe_Surgery_Mammoplasty_Q : Recipe_Surgery_Mammoplasty
{ {
public override void SurgeryResult(Pawn pawn) public override void SurgeryResult(Pawn pawn) => SurgeryCupX(pawn, 27);
{
this.SurgeryCupX(pawn, 27);
}
} }
public class Recipe_Surgery_Mammoplasty_R : Recipe_Surgery_Mammoplasty public class Recipe_Surgery_Mammoplasty_R : Recipe_Surgery_Mammoplasty
{ {
public override void SurgeryResult(Pawn pawn) public override void SurgeryResult(Pawn pawn) => SurgeryCupX(pawn, 29);
{
this.SurgeryCupX(pawn, 29);
}
} }
public class Recipe_Surgery_Mammoplasty_Unknown : Recipe_Surgery_Mammoplasty public class Recipe_Surgery_Mammoplasty_Unknown : Recipe_Surgery_Mammoplasty
{ {
public override void SurgeryResult(Pawn pawn) public override void SurgeryResult(Pawn pawn) => SurgeryCupX(pawn, 31);
{
this.SurgeryCupX(pawn, 31);
}
} }
} }

View file

@ -1,9 +1,10 @@
using System; using System;
using RimWorld;
using rjw;
using System.Collections.Generic; using System.Collections.Generic;
using Dyspareunia; using Dyspareunia;
using RimWorld;
using rjw;
using Verse; using Verse;
using DamageDefOf = Dyspareunia.DamageDefOf;
namespace RJW_PlasticSurgeries namespace RJW_PlasticSurgeries
{ {
@ -39,7 +40,7 @@ namespace RJW_PlasticSurgeries
hed.Severity = severity; hed.Severity = severity;
try try
{ {
PenetrationUtility.AddDamageHediff(Dyspareunia.DamageDefOf.SexStretch, 0.5f, hed, null); PenetrationUtility.AddDamageHediff(DamageDefOf.SexStretch, 0.5f, hed, null);
} }
catch (Exception e) catch (Exception e)
{ {
@ -51,41 +52,26 @@ namespace RJW_PlasticSurgeries
public class Recipe_Surgery_Sphinctoplasty_Micro : Recipe_Surgery_Sphinctoplasty public class Recipe_Surgery_Sphinctoplasty_Micro : Recipe_Surgery_Sphinctoplasty
{ {
public override void SurgeryResult(Pawn pawn) public override void SurgeryResult(Pawn pawn) => SurgeryX(pawn, 0.1f);
{
this.SurgeryX(pawn, 0.1f);
}
} }
public class Recipe_Surgery_Sphinctoplasty_Tight : Recipe_Surgery_Sphinctoplasty public class Recipe_Surgery_Sphinctoplasty_Tight : Recipe_Surgery_Sphinctoplasty
{ {
public override void SurgeryResult(Pawn pawn) public override void SurgeryResult(Pawn pawn) => SurgeryX(pawn, 0.3f);
{
this.SurgeryX(pawn, 0.3f);
}
} }
public class Recipe_Surgery_Sphinctoplasty_Average : Recipe_Surgery_Sphinctoplasty public class Recipe_Surgery_Sphinctoplasty_Average : Recipe_Surgery_Sphinctoplasty
{ {
public override void SurgeryResult(Pawn pawn) public override void SurgeryResult(Pawn pawn) => SurgeryX(pawn, 0.5f);
{
this.SurgeryX(pawn, 0.5f);
}
} }
public class Recipe_Surgery_Sphinctoplasty_Accomodating : Recipe_Surgery_Sphinctoplasty public class Recipe_Surgery_Sphinctoplasty_Accomodating : Recipe_Surgery_Sphinctoplasty
{ {
public override void SurgeryResult(Pawn pawn) public override void SurgeryResult(Pawn pawn) => SurgeryX(pawn, 0.7f);
{
this.SurgeryX(pawn, 0.7f);
}
} }
public class Recipe_Surgery_Sphinctoplasty_Cavernous : Recipe_Surgery_Sphinctoplasty public class Recipe_Surgery_Sphinctoplasty_Cavernous : Recipe_Surgery_Sphinctoplasty
{ {
public override void SurgeryResult(Pawn pawn) public override void SurgeryResult(Pawn pawn) => SurgeryX(pawn, 0.9f);
{
this.SurgeryX(pawn, 0.9f);
}
} }
} }

View file

@ -1,9 +1,10 @@
using System; using System;
using RimWorld;
using rjw;
using System.Collections.Generic; using System.Collections.Generic;
using Dyspareunia; using Dyspareunia;
using RimWorld;
using rjw;
using Verse; using Verse;
using DamageDefOf = Dyspareunia.DamageDefOf;
namespace RJW_PlasticSurgeries namespace RJW_PlasticSurgeries
{ {
@ -39,7 +40,7 @@ namespace RJW_PlasticSurgeries
hed.Severity = severity; hed.Severity = severity;
try try
{ {
PenetrationUtility.AddDamageHediff(Dyspareunia.DamageDefOf.SexStretch, 0.5f, hed, null); PenetrationUtility.AddDamageHediff(DamageDefOf.SexStretch, 0.5f, hed, null);
} }
catch (Exception e) catch (Exception e)
{ {
@ -51,41 +52,26 @@ namespace RJW_PlasticSurgeries
public class Recipe_Surgery_Vaginoplasty_Micro : Recipe_Surgery_Vaginoplasty public class Recipe_Surgery_Vaginoplasty_Micro : Recipe_Surgery_Vaginoplasty
{ {
public override void SurgeryResult(Pawn pawn) public override void SurgeryResult(Pawn pawn) => SurgeryX(pawn, 0.1f);
{
this.SurgeryX(pawn, 0.1f);
}
} }
public class Recipe_Surgery_Vaginoplasty_Tight : Recipe_Surgery_Vaginoplasty public class Recipe_Surgery_Vaginoplasty_Tight : Recipe_Surgery_Vaginoplasty
{ {
public override void SurgeryResult(Pawn pawn) public override void SurgeryResult(Pawn pawn) => SurgeryX(pawn, 0.3f);
{
this.SurgeryX(pawn, 0.3f);
}
} }
public class Recipe_Surgery_Vaginoplasty_Average : Recipe_Surgery_Vaginoplasty public class Recipe_Surgery_Vaginoplasty_Average : Recipe_Surgery_Vaginoplasty
{ {
public override void SurgeryResult(Pawn pawn) public override void SurgeryResult(Pawn pawn) => SurgeryX(pawn, 0.5f);
{
this.SurgeryX(pawn, 0.5f);
}
} }
public class Recipe_Surgery_Vaginoplasty_Accomodating : Recipe_Surgery_Vaginoplasty public class Recipe_Surgery_Vaginoplasty_Accomodating : Recipe_Surgery_Vaginoplasty
{ {
public override void SurgeryResult(Pawn pawn) public override void SurgeryResult(Pawn pawn) => SurgeryX(pawn, 0.7f);
{
this.SurgeryX(pawn, 0.7f);
}
} }
public class Recipe_Surgery_Vaginoplasty_Cavernous : Recipe_Surgery_Vaginoplasty public class Recipe_Surgery_Vaginoplasty_Cavernous : Recipe_Surgery_Vaginoplasty
{ {
public override void SurgeryResult(Pawn pawn) public override void SurgeryResult(Pawn pawn) => SurgeryX(pawn, 0.9f);
{
this.SurgeryX(pawn, 0.9f);
}
} }
} }