diff --git a/Common/Assemblies/Rjw-Genes.dll b/Common/Assemblies/Rjw-Genes.dll index 6c73855..1a16956 100644 Binary files a/Common/Assemblies/Rjw-Genes.dll and b/Common/Assemblies/Rjw-Genes.dll differ diff --git a/Common/Defs/AbilityDefs/Ability_ParalysingKiss.xml b/Common/Defs/AbilityDefs/Ability_ParalysingKiss.xml index eb2a13d..09245a0 100644 --- a/Common/Defs/AbilityDefs/Ability_ParalysingKiss.xml +++ b/Common/Defs/AbilityDefs/Ability_ParalysingKiss.xml @@ -34,7 +34,7 @@ -15
  • - Heart . + Heart
  • 0.05 diff --git a/Common/Defs/Genes/GeneDefs_LifeForce.xml b/Common/Defs/Genes/GeneDefs_LifeForce.xml index 76a1463..76b6ef6 100644 --- a/Common/Defs/Genes/GeneDefs_LifeForce.xml +++ b/Common/Defs/Genes/GeneDefs_LifeForce.xml @@ -143,7 +143,7 @@ rjw_genes_vaginal_absorber - Carriers of this gene are able to absorb ferilin through their vagina. + Carriers of this gene are able to absorb fertilin through their vagina. Things/Mote/Heart rjw_genes_lifeforce 2 @@ -154,7 +154,7 @@ rjw_genes_anal_absorber - Carriers of this gene are able to absorb ferilin through their anus. + Carriers of this gene are able to absorb fertilin through their anus. Things/Mote/Heart rjw_genes_lifeforce 3 @@ -165,7 +165,7 @@ rjw_genes_drainer - Carriers of this gene are able to absorb a great amount of ferilin by draining the vitality of the partner. + Carriers of this gene are able to absorb a great amount of fertilin by draining the vitality of the partner. Things/Mote/Heart rjw_genes_lifeforce 4 diff --git a/Common/Defs/Genes/GeneDefs_SexSpecial.xml b/Common/Defs/Genes/GeneDefs_SexSpecial.xml index 6f90175..74881d7 100644 --- a/Common/Defs/Genes/GeneDefs_SexSpecial.xml +++ b/Common/Defs/Genes/GeneDefs_SexSpecial.xml @@ -15,8 +15,8 @@ rjw_genes_special RJW_Genes.Gene_Aphrodisiac_Pheromones - Carriers of this gene create an aphrodisiac pheremones which induce an increased sexdrive to others nearby, increasing in strength as the sexdrive of the carrier increases.\nCarriers are unaffected by others with this gene. - UI/Memes/FleshPurity + Carriers of this gene create an aphrodisiac pheremones which induce an increased sexdrive to others nearby, increasing in strength as the sexdrive of the carrier increases.\n\nCarriers are unaffected by others with this gene. + Things/Mote/Heart 2 1 1 diff --git a/Common/Defs/HediffDefs/Hediffs_Genes.xml b/Common/Defs/HediffDefs/Hediffs_Genes.xml index d03f411..b0a9cc9 100644 --- a/Common/Defs/HediffDefs/Hediffs_Genes.xml +++ b/Common/Defs/HediffDefs/Hediffs_Genes.xml @@ -9,7 +9,7 @@ 1.0
  • - -4.0 + -24.0
    • @@ -86,24 +86,4 @@ - - - rjw_genes_sexually_exhausted - HediffWithComps - - Has been exhaused due to sexual activities and needs a little break before being able to stand up again.\n\nWill remove submitting hediff. - (1,1,1) - -
  • - true -
    • -     - -
  • - 300~900 - true -
    • -
  • - - \ No newline at end of file diff --git a/Common/Defs/ThoughtDefs/Thoughts_LifeForce.xml b/Common/Defs/ThoughtDefs/Thoughts_LifeForce.xml index 559ae40..16b32a1 100644 --- a/Common/Defs/ThoughtDefs/Thoughts_LifeForce.xml +++ b/Common/Defs/ThoughtDefs/Thoughts_LifeForce.xml @@ -15,4 +15,19 @@
    • + + + rjw_genes_seduced + Thought_Memory + 10.0 + 100 + 0.4 + +
  • + + I was seduced into having sex. I regrett what happened. + -10 +
    • +     +     diff --git a/Source/Animal_Inheritance/PatchVanillaPregnancyUtility.cs b/Source/Animal_Inheritance/PatchVanillaPregnancyUtility.cs index baa72f5..6aa5e1d 100644 --- a/Source/Animal_Inheritance/PatchVanillaPregnancyUtility.cs +++ b/Source/Animal_Inheritance/PatchVanillaPregnancyUtility.cs @@ -33,7 +33,7 @@ namespace RJW_BGS { __result.AddGene(gene); } - } + } } } } diff --git a/Source/Genes/Life_Force/HediffCompProperties_RemoveSubmit.cs b/Source/Genes/Life_Force/HediffCompProperties_RemoveSubmit.cs deleted file mode 100644 index fd68856..0000000 --- a/Source/Genes/Life_Force/HediffCompProperties_RemoveSubmit.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Verse; -using RimWorld; -namespace RJW_Genes -{ - public class HediffCompProperties_RemoveSubmit :HediffCompProperties - { - - public HediffCompProperties_RemoveSubmit() - { - this.compClass = typeof(HediffComp_RemoveSubmit); - } - } -} diff --git a/Source/Genes/Life_Force/HediffComp_RemoveSubmit.cs b/Source/Genes/Life_Force/HediffComp_RemoveSubmit.cs deleted file mode 100644 index 01891cc..0000000 --- a/Source/Genes/Life_Force/HediffComp_RemoveSubmit.cs +++ /dev/null @@ -1,42 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Verse; -using RimWorld; -using rjw; -namespace RJW_Genes -{ - public class HediffComp_RemoveSubmit : HediffComp - { - public HediffCompProperties_RemoveSubmit Props - { - get - { - return (HediffCompProperties_RemoveSubmit)this.props; - } - } - - public override void CompPostPostRemoved() - { - base.CompPostPostRemoved(); - HediffWithComps submitting = this.Pawn.health.hediffSet.GetFirstHediffOfDef(xxx.submitting) as HediffWithComps; - submitting.CurStage.becomeVisible = false; - if (submitting != null) - { - foreach (HediffComp comp in submitting.comps) - { - HediffComp_Disappears hediffComp = comp as HediffComp_Disappears; - if (hediffComp != null) - { - hediffComp.ticksToDisappear = 1; - //pawn.health.RemoveHediff(submitting); - //removing the hediff directly gives an error, ArgementOutOrRange, making the remaining time 1 ticks should have the same effect without the error - } - } - } - - } - } -} diff --git a/Source/Genes/Life_Force/JobDriver_Seduced.cs b/Source/Genes/Life_Force/JobDriver_Seduced.cs index 8960887..2d38d75 100644 --- a/Source/Genes/Life_Force/JobDriver_Seduced.cs +++ b/Source/Genes/Life_Force/JobDriver_Seduced.cs @@ -38,6 +38,7 @@ namespace RJW_Genes if(partner != null) { partner.drafter.Drafted = false; + this.pawn.needs.mood.thoughts.memories.TryGainMemory(ThoughtDefOf.rjw_genes_seduced, partner, null); Job newJob = JobMaker.MakeJob(JobDefOf.sex_on_spot, pawn); partner.jobs.StartJob(newJob, JobCondition.InterruptForced, null, false, true, null, null, false, false, null, false, true); } diff --git a/Source/HediffDefOf.cs b/Source/HediffDefOf.cs index 66796f8..b0425ec 100644 --- a/Source/HediffDefOf.cs +++ b/Source/HediffDefOf.cs @@ -14,6 +14,5 @@ namespace RJW_Genes public static readonly HediffDef Aphrodisiac_Pheromone; public static readonly HediffDef Fertilin_Lost; public static readonly HediffDef Succubus_Drained; - public static readonly HediffDef rjw_genes_sexually_exhausted; } } diff --git a/Source/Rjw-Genes.csproj b/Source/Rjw-Genes.csproj index 487ae64..4241be9 100644 --- a/Source/Rjw-Genes.csproj +++ b/Source/Rjw-Genes.csproj @@ -120,8 +120,6 @@ - - diff --git a/Source/ThoughtDefOf.cs b/Source/ThoughtDefOf.cs index ccb7df3..9eeef8b 100644 --- a/Source/ThoughtDefOf.cs +++ b/Source/ThoughtDefOf.cs @@ -11,5 +11,6 @@ namespace RJW_Genes public static class ThoughtDefOf { public static readonly ThoughtDef rjw_genes_cock_eaten; + public static readonly ThoughtDef rjw_genes_seduced; } }