diff --git a/Common/Defs/AbilityDefs/Ability_NakedProwess.xml b/Common/Defs/AbilityDefs/Ability_NakedProwess.xml index 71ad638..82d5bd8 100644 --- a/Common/Defs/AbilityDefs/Ability_NakedProwess.xml +++ b/Common/Defs/AbilityDefs/Ability_NakedProwess.xml @@ -4,7 +4,7 @@ rjw_genes_naked_prowess Enhance the strength and resilience of your naked body with fertilin. - Things/Mote/Heart + Genes/Icons/rjw_naked_prowess Things/Mote/Heart CastAbilityOnThing False diff --git a/Common/Defs/AbilityDefs/Ability_Seduce.xml b/Common/Defs/AbilityDefs/Ability_Seduce.xml index fb87fea..3310595 100644 --- a/Common/Defs/AbilityDefs/Ability_Seduce.xml +++ b/Common/Defs/AbilityDefs/Ability_Seduce.xml @@ -4,7 +4,7 @@ rjw_genes_seduce Seduce the target to approach the caster. - Things/Mote/Heart + Genes/Icons/seduce True true true diff --git a/Common/Defs/GeneDefs/GeneDefs_LifeForce.xml b/Common/Defs/GeneDefs/GeneDefs_LifeForce.xml index fe67321..cc70eae 100644 --- a/Common/Defs/GeneDefs/GeneDefs_LifeForce.xml +++ b/Common/Defs/GeneDefs/GeneDefs_LifeForce.xml @@ -15,7 +15,7 @@ true true A reserve of biological strength which can be gained and spent in a variety of ways. \n\nFertilin can be increased by absorbing cum, typically through oral sex or stored cum. \n\nIf fertilin reaches zero, {PAWN_nameDef} will become very unhappy and may try to obtain some forcefully. - UI/Icons/Genes/Gene_Hemogenic + Genes/Icons/FertilinAlt 0 rjw_genes_fertilin -2 @@ -39,7 +39,7 @@ Carriers lose an additional 15 fertilin per day from biological entropy. fertilin RJW_Genes.Gene_LifeForceDrain - UI/Icons/Genes/Gene_HemogenDrain + Genes/Icons/FertilinDrainAlt rjw_genes_lifeforce 0.15 rjw_genes_fertilin @@ -53,7 +53,7 @@ pussyhealer Carriers of this gene are able use vaginal sex to tend to other's wounds. - Things/Mote/Heart + Genes/Icons/Healpussy rjw_genes_lifeforce 9 rjw_genes_fertilin @@ -79,7 +79,7 @@ cockeater Carriers of this gene are able eat cocks to restore their fertilin supply. Cocks are consumed during that process. - Things/Mote/Heart + Genes/Icons/cockeater rjw_genes_lifeforce 11 rjw_genes_fertilin @@ -130,7 +130,7 @@ seduction Carriers of this gene are able to seduce a pawn into having sex with them. - Things/Mote/Heart + Genes/Icons/seduce rjw_genes_lifeforce 13 rjw_genes_fertilin @@ -155,7 +155,7 @@ rjw_genes_naked_prowess Carriers of this gene are able to temporarily increase their strength and resilience, while they are naked. - Things/Mote/Heart + Genes/Icons/rjw_naked_prowess rjw_genes_lifeforce 13 rjw_genes_fertilin @@ -173,7 +173,7 @@ rjw_genes_cum_eater Carriers of this gene are able to absorb fertilin through eating cum. This includes oral sex, eating cum for food or sucking out cumflated pawns. - Things/Mote/Heart + Genes/Icons/cumeater rjw_genes_lifeforce 1 rjw_genes_fertilin @@ -181,27 +181,16 @@ - rjw_genes_vaginal_absorber - - Carriers of this gene are able to absorb the fertilin inside sperm through their vagina. - Things/Mote/Heart + rjw_genes_fertilin_absorber + + Carriers of this gene are able to absorb the fertilin inside sperm through their vagina and anus. + Genes/Icons/Vaginal_cum_absorption rjw_genes_lifeforce 2 rjw_genes_fertilin 1 - - rjw_genes_anal_absorber - - Carriers of this gene are able to absorb the fertilin inside sperm through their anus. - Things/Mote/Heart - rjw_genes_lifeforce - 3 - rjw_genes_fertilin - 1 - - rjw_genes_drainer diff --git a/Common/Defs/GeneDefs/Xenotype_Lifeforce.xml b/Common/Defs/GeneDefs/Xenotype_Lifeforce.xml index 9942abf..79af864 100644 --- a/Common/Defs/GeneDefs/Xenotype_Lifeforce.xml +++ b/Common/Defs/GeneDefs/Xenotype_Lifeforce.xml @@ -31,8 +31,7 @@
  • rjw_genes_demonic_genitalia
  • rjw_genes_cum_eater
    • -
  • rjw_genes_vaginal_absorber
    • -
  • rjw_genes_anal_absorber
    • +
  • rjw_genes_fertilin_absorber
  • rjw_genes_paralysingkiss
  • rjw_genes_seduce
    • @@ -89,7 +88,7 @@
  • UVSensitivity_Intense
  • AptitudeStrong_Intellectual
  • Ears_Pointed
    • -
  • Headbone_MiniHorns
    • +
  • Headbone_CenterHorn
  • Skin_InkBlack
    • diff --git a/Common/Textures/Genes/Icons/FertilinAlt.png b/Common/Textures/Genes/Icons/FertilinAlt.png new file mode 100644 index 0000000..f89bc2d Binary files /dev/null and b/Common/Textures/Genes/Icons/FertilinAlt.png differ diff --git a/Common/Textures/Genes/Icons/FertilinDrainAlt.png b/Common/Textures/Genes/Icons/FertilinDrainAlt.png new file mode 100644 index 0000000..adb198b Binary files /dev/null and b/Common/Textures/Genes/Icons/FertilinDrainAlt.png differ diff --git a/Common/Textures/Genes/Icons/Healpussy.png b/Common/Textures/Genes/Icons/Healpussy.png new file mode 100644 index 0000000..46a11a3 Binary files /dev/null and b/Common/Textures/Genes/Icons/Healpussy.png differ diff --git a/Common/Textures/Genes/Icons/Vaginal_cum_absorption.png b/Common/Textures/Genes/Icons/Vaginal_cum_absorption.png new file mode 100644 index 0000000..4148bde Binary files /dev/null and b/Common/Textures/Genes/Icons/Vaginal_cum_absorption.png differ diff --git a/Common/Textures/Genes/Icons/cockeater.png b/Common/Textures/Genes/Icons/cockeater.png new file mode 100644 index 0000000..deab6ef Binary files /dev/null and b/Common/Textures/Genes/Icons/cockeater.png differ diff --git a/Common/Textures/Genes/Icons/cumeater.png b/Common/Textures/Genes/Icons/cumeater.png new file mode 100644 index 0000000..3150a18 Binary files /dev/null and b/Common/Textures/Genes/Icons/cumeater.png differ diff --git a/Common/Textures/Genes/Icons/rjw_naked_prowess.png b/Common/Textures/Genes/Icons/rjw_naked_prowess.png new file mode 100644 index 0000000..468fc60 Binary files /dev/null and b/Common/Textures/Genes/Icons/rjw_naked_prowess.png differ diff --git a/Common/Textures/Genes/Icons/seduce.png b/Common/Textures/Genes/Icons/seduce.png new file mode 100644 index 0000000..635132c Binary files /dev/null and b/Common/Textures/Genes/Icons/seduce.png differ diff --git a/Source/GeneDefOf.cs b/Source/GeneDefOf.cs index f8a84f1..e4af81f 100644 --- a/Source/GeneDefOf.cs +++ b/Source/GeneDefOf.cs @@ -82,8 +82,7 @@ namespace RJW_Genes public static readonly GeneDef rjw_genes_pussyhealing; public static readonly GeneDef rjw_genes_lifeforce_drain; public static readonly GeneDef rjw_genes_cum_eater; - public static readonly GeneDef rjw_genes_vaginal_absorber; - public static readonly GeneDef rjw_genes_anal_absorber; + public static readonly GeneDef rjw_genes_fertilin_absorber; public static readonly GeneDef rjw_genes_drainer; public static readonly GeneDef rjw_genes_seduce; public static readonly GeneDef rjw_genes_paralysingkiss; diff --git a/Source/Genes/Life_Force/HediffComp_SeverityFromFertilin.cs b/Source/Genes/Life_Force/HediffComp_SeverityFromFertilin.cs index d209423..4b8b3a7 100644 --- a/Source/Genes/Life_Force/HediffComp_SeverityFromFertilin.cs +++ b/Source/Genes/Life_Force/HediffComp_SeverityFromFertilin.cs @@ -47,7 +47,7 @@ namespace RJW_Genes if (cachedLifeForceGene.Resource.Value <= cachedLifeForceGene.Resource.MinLevelForAlert && this.Pawn.IsHashIntervalTick(2500) && Rand.Chance(0.03f)) //~50% chance each day for mental break { if (this.Pawn.genes.HasGene(GeneDefOf.rjw_genes_cum_eater) - || this.Pawn.genes.HasGene(GeneDefOf.rjw_genes_vaginal_absorber) || this.Pawn.genes.HasGene(GeneDefOf.rjw_genes_anal_absorber) || this.Pawn.genes.HasGene(GeneDefOf.rjw_genes_drainer)) + || this.Pawn.genes.HasGene(GeneDefOf.rjw_genes_fertilin_absorber) || this.Pawn.genes.HasGene(GeneDefOf.rjw_genes_drainer)) { //TODO: use mentalstatedef instead of mentalbreakdef MentalBreakDef randomrape = GeneDefOf.rjw_genes_lifeforce_randomrape; diff --git a/Source/Genes/Life_Force/Patches/Patch_SatisfyPersonal_LifeForceGain.cs b/Source/Genes/Life_Force/Patches/Patch_SatisfyPersonal_LifeForceGain.cs index 74cb0bb..6ea0a62 100644 --- a/Source/Genes/Life_Force/Patches/Patch_SatisfyPersonal_LifeForceGain.cs +++ b/Source/Genes/Life_Force/Patches/Patch_SatisfyPersonal_LifeForceGain.cs @@ -180,24 +180,17 @@ namespace RJW_Genes { absorb_factor += 1f; } - else if (props.sexType == xxx.rjwSextype.Vaginal && GeneUtility.HasGeneNullCheck(PawnWithLifeForce, GeneDefOf.rjw_genes_vaginal_absorber)) + else if (props.sexType == xxx.rjwSextype.Vaginal && GeneUtility.HasGeneNullCheck(PawnWithLifeForce, GeneDefOf.rjw_genes_fertilin_absorber)) { absorb_factor += 1f; } - else if (props.sexType == xxx.rjwSextype.Anal && GeneUtility.HasGeneNullCheck(PawnWithLifeForce, GeneDefOf.rjw_genes_anal_absorber)) + else if (props.sexType == xxx.rjwSextype.Anal && GeneUtility.HasGeneNullCheck(PawnWithLifeForce, GeneDefOf.rjw_genes_fertilin_absorber)) { absorb_factor += 1f; } - else if (props.sexType == xxx.rjwSextype.DoublePenetration) + else if (props.sexType == xxx.rjwSextype.DoublePenetration && GeneUtility.HasGeneNullCheck(PawnWithLifeForce, GeneDefOf.rjw_genes_fertilin_absorber)) { - if (GeneUtility.HasGeneNullCheck(PawnWithLifeForce, GeneDefOf.rjw_genes_vaginal_absorber)) - { - absorb_factor += 0.5f; - } - if (GeneUtility.HasGeneNullCheck(PawnWithLifeForce, GeneDefOf.rjw_genes_anal_absorber)) - { - absorb_factor += 0.5f; - } + absorb_factor += 1f; } else if (props.sexType == xxx.rjwSextype.Scissoring || props.sexType == xxx.rjwSextype.Cunnilingus) { diff --git a/Source/Genes/Life_Force/Patches/Patch_Vanilla_Inheritance_Fertilin.cs b/Source/Genes/Life_Force/Patches/Patch_Vanilla_Inheritance_Fertilin.cs index 6bb3c92..b4b327c 100644 --- a/Source/Genes/Life_Force/Patches/Patch_Vanilla_Inheritance_Fertilin.cs +++ b/Source/Genes/Life_Force/Patches/Patch_Vanilla_Inheritance_Fertilin.cs @@ -58,8 +58,7 @@ namespace RJW_Genes private static List FertilinSourceGenes = new List() { GeneDefOf.rjw_genes_drainer, GeneDefOf.rjw_genes_cum_eater, - GeneDefOf.rjw_genes_vaginal_absorber, - GeneDefOf.rjw_genes_anal_absorber, + GeneDefOf.rjw_genes_fertilin_absorber, GeneDefOf.rjw_genes_cockeater }; diff --git a/Source/Interactions/SuccubusTailjob/GenesPartKindUsageRule.cs b/Source/Interactions/SuccubusTailjob/GenesPartKindUsageRule.cs index 1825550..8e993aa 100644 --- a/Source/Interactions/SuccubusTailjob/GenesPartKindUsageRule.cs +++ b/Source/Interactions/SuccubusTailjob/GenesPartKindUsageRule.cs @@ -35,12 +35,9 @@ namespace RJW_Genes.Interactions yield return new Weighted(weight, LewdablePartKind.Beak); } - if (pawn.genes.HasGene(GeneDefOf.rjw_genes_vaginal_absorber)) + if (pawn.genes.HasGene(GeneDefOf.rjw_genes_fertilin_absorber)) { yield return new Weighted(weight, LewdablePartKind.Vagina); - } - if (pawn.genes.HasGene(GeneDefOf.rjw_genes_anal_absorber)) - { yield return new Weighted(weight, LewdablePartKind.Anus); } } @@ -64,12 +61,10 @@ namespace RJW_Genes.Interactions } yield return new Weighted(weight, LewdablePartKind.Mouth); yield return new Weighted(weight, LewdablePartKind.Beak); - if (pawn.genes.HasGene(GeneDefOf.rjw_genes_vaginal_absorber)) + + if (pawn.genes.HasGene(GeneDefOf.rjw_genes_fertilin_absorber)) { yield return new Weighted(weight, LewdablePartKind.Vagina); - } - if (pawn.genes.HasGene(GeneDefOf.rjw_genes_anal_absorber)) - { yield return new Weighted(weight, LewdablePartKind.Anus); } }