AblativeAbsolute
/
rjw-genes
mirror of https://github.com/vegapnk/RJW-Genes.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

Really fixed merge conflicts,upsie

This commit is contained in:
Vegapnk 2023-01-15 21:14:26 +01:00
parent 0e20e00150
commit 0c3af21c3a
7 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/GeneDefOf.cs
View File

@ -76,9 +76,6 @@ namespace RJW_Genes
public static readonly GeneDef rjw_genes_youth_fountain; public static readonly GeneDef rjw_genes_youth_fountain;
public static readonly GeneDef rjw_genes_sex_age_drain; public static readonly GeneDef rjw_genes_sex_age_drain;
public static readonly GeneDef rjw_genes_aphrodisiac_pheromones; public static readonly GeneDef rjw_genes_aphrodisiac_pheromones;
public static readonly GeneDef rjw_genes_aphrodisiac_pheromones;
public static readonly GeneDef rjw_genes_youth_fountain;
public static readonly GeneDef rjw_genes_sex_age_drain;
// LifeForce // LifeForce
public static readonly GeneDef rjw_genes_lifeforce; public static readonly GeneDef rjw_genes_lifeforce;
@ -91,6 +88,5 @@ namespace RJW_Genes
public static readonly GeneDef rjw_genes_succubus_tail; public static readonly GeneDef rjw_genes_succubus_tail;
// Others & Non-Genes // Others & Non-Genes
public static readonly HediffDef rjw_genes_orgasm_rush_hediff;
} }
} }

3
Source/Genes/Damage/Gene_Unbreakable.cs
View File

@ -1,5 +1,4 @@
using LicentiaLabs; using rjw;
using rjw;
using Verse; using Verse;
namespace RJW_Genes namespace RJW_Genes

9
Source/Genes/GeneUtility.cs
View File

@ -174,13 +174,6 @@ namespace RJW_Genes
} }
return pawn.genes.HasGene(GeneDefOf.rjw_genes_unbreakable); return pawn.genes.HasGene(GeneDefOf.rjw_genes_unbreakable);
} }
<<<<<<< HEAD
public static bool HasGenitaliaResizingGenes(Pawn pawn)
{
return !GetGenitaliaResizingGenes(pawn).NullOrEmpty();
}
public static List<Gene_GenitaliaResizingGene> GetGenitaliaResizingGenes(Pawn pawn) public static List<Gene_GenitaliaResizingGene> GetGenitaliaResizingGenes(Pawn pawn)
{ {
@ -196,7 +189,5 @@ namespace RJW_Genes
return ResizingGenes; return ResizingGenes;
} }
=======
>>>>>>> 09157e923d5c4c4cf71d79cb0af665ffd6a7c536
} }
} }

2
Source/Genes/Life_Force/Gene_LifeForce.cs
View File

@ -24,7 +24,7 @@ namespace RJW_Genes
Pawn pawn = this.pawn; Pawn pawn = this.pawn;
return ((pawn != null) ? pawn.ageTracker : null) == null || return ((pawn != null) ? pawn.ageTracker : null) == null ||
((float)this.pawn.ageTracker.AgeBiologicalYears >= this.def.minAgeActive && this.pawn.ageTracker.AgeBiologicalYears >= (RJWSettings.AllowYouthSex ? 13f : 18f)); ((float)this.pawn.ageTracker.AgeBiologicalYears >= this.def.minAgeActive);
} }
} }

4
Source/Genes/Special/Patch_OrgasmRush.cs
View File

@ -46,10 +46,10 @@ namespace RJW_Genes
/// <returns></returns> /// <returns></returns>
public static Hediff GetOrgasmRushHediff(Pawn orgasmed) public static Hediff GetOrgasmRushHediff(Pawn orgasmed)
{ {
Hediff orgasmRushHediff = orgasmed.health.hediffSet.GetFirstHediffOfDef(GeneDefOf.rjw_genes_orgasm_rush_hediff); Hediff orgasmRushHediff = orgasmed.health.hediffSet.GetFirstHediffOfDef(HediffDefOf.rjw_genes_orgasm_rush_hediff);
if (orgasmRushHediff == null) if (orgasmRushHediff == null)
{ {
orgasmRushHediff = HediffMaker.MakeHediff(GeneDefOf.rjw_genes_orgasm_rush_hediff, orgasmed); orgasmRushHediff = HediffMaker.MakeHediff(HediffDefOf.rjw_genes_orgasm_rush_hediff, orgasmed);
orgasmRushHediff.Severity = 0; orgasmRushHediff.Severity = 0;
orgasmed.health.AddHediff(orgasmRushHediff); orgasmed.health.AddHediff(orgasmRushHediff);
} }

1
Source/HediffDefOf.cs
View File

@ -14,5 +14,6 @@ namespace RJW_Genes
public static readonly HediffDef Aphrodisiac_Pheromone; public static readonly HediffDef Aphrodisiac_Pheromone;
public static readonly HediffDef Fertilin_Lost; public static readonly HediffDef Fertilin_Lost;
public static readonly HediffDef Succubus_Drained; public static readonly HediffDef Succubus_Drained;
public static readonly HediffDef rjw_genes_orgasm_rush_hediff;
} }
} }

3
Source/Rjw-Genes.csproj
View File

@ -133,9 +133,7 @@
<Compile Include="Genes\Life_Force\ThinkNode_ConditionalLowLifeForce.cs" /> <Compile Include="Genes\Life_Force\ThinkNode_ConditionalLowLifeForce.cs" />
<Compile Include="Genes\Life_Force\ThinkNode_ConditionalCritcalLifeForce.cs" /> <Compile Include="Genes\Life_Force\ThinkNode_ConditionalCritcalLifeForce.cs" />
<Compile Include="Genes\Life_Force\JobGiver_GetLifeForce.cs" /> <Compile Include="Genes\Life_Force\JobGiver_GetLifeForce.cs" />
<Compile Include="Genes\Damage\Gene_Unbreakable.cs" />
<Compile Include="Genes\Special\Patch_AgeDrain.cs" /> <Compile Include="Genes\Special\Patch_AgeDrain.cs" />
<Compile Include="Genes\Special\Patch_Youth_Fountain.cs" />
<Compile Include="Interactions\CompAbility_SexInteractionRequirements.cs" /> <Compile Include="Interactions\CompAbility_SexInteractionRequirements.cs" />
<Compile Include="Genes\Life_Force\Abilities\CompAbilityEffect_PussyHeal.cs" /> <Compile Include="Genes\Life_Force\Abilities\CompAbilityEffect_PussyHeal.cs" />
<Compile Include="Genes\Life_Force\Abilities\CompProperties_AbilityLifeForceCost.cs" /> <Compile Include="Genes\Life_Force\Abilities\CompProperties_AbilityLifeForceCost.cs" />
@ -152,7 +150,6 @@
<Compile Include="Genes\RJW_Gene.cs" /> <Compile Include="Genes\RJW_Gene.cs" />
<Compile Include="Genes\Genitalia\GenitaliaUtility.cs" /> <Compile Include="Genes\Genitalia\GenitaliaUtility.cs" />
<Compile Include="Genes\Special\Gene_Aphrodisiac_Pheromones_.cs" /> <Compile Include="Genes\Special\Gene_Aphrodisiac_Pheromones_.cs" />
<Compile Include="Genes\Special\Patch_AgeDrain.cs" />
<Compile Include="Genes\Life_Force\Patch_LifeForce.cs" /> <Compile Include="Genes\Life_Force\Patch_LifeForce.cs" />
<Compile Include="Genes\Special\Patch_OrgasmRush.cs" /> <Compile Include="Genes\Special\Patch_OrgasmRush.cs" />
<Compile Include="Genes\Special\Patch_Youth_Fountain.cs" /> <Compile Include="Genes\Special\Patch_Youth_Fountain.cs" />