Moved Xenotypes to more common location, reverted change to eating cum item, changed patch order of pythonkin patches

This commit is contained in:
Vegapnk 2023-02-05 11:55:37 +01:00
parent a1c31f74f6
commit 9effc7ffa3
4 changed files with 50 additions and 49 deletions

View file

@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<Patch> <Patch>
<Operation Class="PatchOperationFindMod"> <Operation Class="PatchOperationSequence">
<operations>
<li Class="PatchOperationFindMod">
<mods> <mods>
<li>Vanilla Races Expanded - Phytokin</li> <li>Vanilla Races Expanded - Phytokin</li>
</mods> </mods>
@ -13,11 +15,8 @@
<li>rjw_genes_bisexual</li> <li>rjw_genes_bisexual</li>
</value> </value>
</match> </match>
</Operation> </li>
</Patch> <li Class="PatchOperationFindMod">
<Patch>
<Operation Class="PatchOperationFindMod">
<mods> <mods>
<li>Vanilla Races Expanded - Phytokin</li> <li>Vanilla Races Expanded - Phytokin</li>
</mods> </mods>
@ -30,11 +29,9 @@
<li>rjw_genes_bisexual</li> <li>rjw_genes_bisexual</li>
</value> </value>
</match> </match>
</Operation> </li>
</Patch>
<Patch> <li Class="PatchOperationFindMod">
<Operation Class="PatchOperationFindMod">
<mods> <mods>
<li>Vanilla Races Expanded - Phytokin</li> <li>Vanilla Races Expanded - Phytokin</li>
</mods> </mods>
@ -47,5 +44,7 @@
<li>rjw_genes_bisexual</li> <li>rjw_genes_bisexual</li>
</value> </value>
</match> </match>
</li>
</operations>
</Operation> </Operation>
</Patch> </Patch>

View file

@ -8,15 +8,17 @@ namespace RJW_Genes
/// </summary> /// </summary>
public class IngestionOutcomeDoer_LifeForceOffset : IngestionOutcomeDoer public class IngestionOutcomeDoer_LifeForceOffset : IngestionOutcomeDoer
{ {
public const float FERTILIN_PER_UNIT = 1f; public const float DEFAULT_FERTILIN_PER_UNIT = 1f;
public float FertilinPerUnit = 1f;
protected override void DoIngestionOutcomeSpecial(Pawn pawn, Thing ingested) protected override void DoIngestionOutcomeSpecial(Pawn pawn, Thing ingested)
{ {
if (GeneUtility.HasLifeForce(pawn) && GeneUtility.IsCumEater(pawn)) if (GeneUtility.HasLifeForce(pawn) && GeneUtility.IsCumEater(pawn))
{ {
float num = ingested.stackCount * FERTILIN_PER_UNIT / 100; float num = ingested.stackCount * this.FertilinPerUnit / 100;
GeneUtility.OffsetLifeForce(GeneUtility.GetLifeForceGene(pawn), num); GeneUtility.OffsetLifeForce(GeneUtility.GetLifeForceGene(pawn), num);
} }
} }
} }
} }

View file

@ -39,7 +39,7 @@ namespace RJW_Genes
{ {
return null; return null;
} }
int num = Mathf.RoundToInt(((gene_lifeforce.targetValue - gene_lifeforce.Value) * 100 + 10) / IngestionOutcomeDoer_LifeForceOffset.FERTILIN_PER_UNIT); int num = Mathf.RoundToInt(((gene_lifeforce.targetValue - gene_lifeforce.Value) * 100 + 10) / IngestionOutcomeDoer_LifeForceOffset.DEFAULT_FERTILIN_PER_UNIT);
if (gatheredCum != null && num > 0) if (gatheredCum != null && num > 0)
{ {
Job job = JobMaker.MakeJob(RimWorld.JobDefOf.Ingest, gatheredCum); Job job = JobMaker.MakeJob(RimWorld.JobDefOf.Ingest, gatheredCum);