bugfix and sanguo patch

This commit is contained in:
Jaaldabaoth 2024-05-31 00:34:37 +02:00
parent 38f9e43e42
commit 13eaa8b994
9 changed files with 138 additions and 5 deletions

Binary file not shown.

View file

@ -89,6 +89,10 @@
<vagina>DemonVagina</vagina> <vagina>DemonVagina</vagina>
<anus>DemonAnus</anus> <anus>DemonAnus</anus>
</li> </li>
<li Class="RJW_Genes.QirkExtension">
<Satisfiedquirk>DemonLoverQuirk</Satisfiedquirk>
</li>
</modExtensions> </modExtensions>
<displayOrderInCategory>805</displayOrderInCategory> <displayOrderInCategory>805</displayOrderInCategory>
</GeneDef> </GeneDef>
@ -104,6 +108,9 @@
<vagina>DragonVagina</vagina> <vagina>DragonVagina</vagina>
<anus>GenericAnus</anus> <anus>GenericAnus</anus>
</li> </li>
<li Class="RJW_Genes.QirkExtension">
<Satisfiedquirk>ScaleLoverQuirk</Satisfiedquirk>
</li>
</modExtensions> </modExtensions>
<displayOrderInCategory>806</displayOrderInCategory> <displayOrderInCategory>806</displayOrderInCategory>
</GeneDef> </GeneDef>
@ -119,6 +126,9 @@
<vagina>SlimeVagina</vagina> <vagina>SlimeVagina</vagina>
<anus>SlimeAnus</anus> <anus>SlimeAnus</anus>
</li> </li>
<li Class="RJW_Genes.QirkExtension">
<Satisfiedquirk>SlimeLoverQuirk</Satisfiedquirk>
</li>
</modExtensions> </modExtensions>
<displayOrderInCategory>807</displayOrderInCategory> <displayOrderInCategory>807</displayOrderInCategory>
</GeneDef> </GeneDef>
@ -134,6 +144,9 @@
<vagina>DemonVagina</vagina> <vagina>DemonVagina</vagina>
<anus>DemonAnus</anus> <anus>DemonAnus</anus>
</li> </li>
<li Class="RJW_Genes.QirkExtension">
<Satisfiedquirk>DemonLoverQuirk</Satisfiedquirk>
</li>
</modExtensions> </modExtensions>
<displayOrderInCategory>807</displayOrderInCategory> <displayOrderInCategory>807</displayOrderInCategory>
</GeneDef> </GeneDef>
@ -147,6 +160,9 @@
<li Class="RJW_Genes.GenitaliaTypeExtension"> <li Class="RJW_Genes.GenitaliaTypeExtension">
<penis>CrocodilianPenis</penis> <penis>CrocodilianPenis</penis>
</li> </li>
<li Class="RJW_Genes.QirkExtension">
<Satisfiedquirk>ScaleLoverQuirk</Satisfiedquirk>
</li>
</modExtensions> </modExtensions>
<displayOrderInCategory>807</displayOrderInCategory> <displayOrderInCategory>807</displayOrderInCategory>
</GeneDef> </GeneDef>
@ -160,6 +176,7 @@
<li Class="RJW_Genes.GenitaliaTypeExtension"> <li Class="RJW_Genes.GenitaliaTypeExtension">
<penis>RaccoonPenis</penis> <penis>RaccoonPenis</penis>
</li> </li>
</modExtensions> </modExtensions>
<displayOrderInCategory>807</displayOrderInCategory> <displayOrderInCategory>807</displayOrderInCategory>
</GeneDef> </GeneDef>
@ -173,6 +190,9 @@
<li Class="RJW_Genes.GenitaliaTypeExtension"> <li Class="RJW_Genes.GenitaliaTypeExtension">
<penis>HemiPenis</penis> <penis>HemiPenis</penis>
</li> </li>
<li Class="RJW_Genes.QirkExtension">
<Satisfiedquirk>ScaleLoverQuirk</Satisfiedquirk>
</li>
</modExtensions> </modExtensions>
<displayOrderInCategory>807</displayOrderInCategory> <displayOrderInCategory>807</displayOrderInCategory>
</GeneDef> </GeneDef>
@ -191,6 +211,9 @@
<penis>GhostPenis</penis> <penis>GhostPenis</penis>
<vagina>GhostVagina</vagina> <vagina>GhostVagina</vagina>
</li> </li>
<li Class="RJW_Genes.QirkExtension">
<Satisfiedquirk>TeratophileQuirk</Satisfiedquirk>
</li>
</modExtensions> </modExtensions>
<displayOrderInCategory>807</displayOrderInCategory> <displayOrderInCategory>807</displayOrderInCategory>
</GeneDef> </GeneDef>
@ -204,6 +227,9 @@
<li Class="RJW_Genes.GenitaliaTypeExtension"> <li Class="RJW_Genes.GenitaliaTypeExtension">
<penis>GolemPenis</penis> <penis>GolemPenis</penis>
</li> </li>
<li Class="RJW_Genes.QirkExtension">
<Satisfiedquirk>TeratophileQuirk</Satisfiedquirk>
</li>
</modExtensions> </modExtensions>
<displayOrderInCategory>807</displayOrderInCategory> <displayOrderInCategory>807</displayOrderInCategory>
</GeneDef> </GeneDef>
@ -230,6 +256,9 @@
<li Class="RJW_Genes.GenitaliaTypeExtension"> <li Class="RJW_Genes.GenitaliaTypeExtension">
<penis>NecroPenis</penis> <penis>NecroPenis</penis>
</li> </li>
<li Class="RJW_Genes.QirkExtension">
<Satisfiedquirk>TeratophileQuirk</Satisfiedquirk>
</li>
</modExtensions> </modExtensions>
<displayOrderInCategory>807</displayOrderInCategory> <displayOrderInCategory>807</displayOrderInCategory>
</GeneDef> </GeneDef>
@ -282,6 +311,9 @@
<li Class="RJW_Genes.GenitaliaTypeExtension"> <li Class="RJW_Genes.GenitaliaTypeExtension">
<penis>TentaclePenis</penis> <penis>TentaclePenis</penis>
</li> </li>
<li Class="RJW_Genes.QirkExtension">
<Satisfiedquirk>TeratophileQuirk</Satisfiedquirk>
</li>
</modExtensions> </modExtensions>
<displayOrderInCategory>807</displayOrderInCategory> <displayOrderInCategory>807</displayOrderInCategory>
</GeneDef> </GeneDef>
@ -302,6 +334,9 @@
<vagina>OvipositorF</vagina> <vagina>OvipositorF</vagina>
<anus>InsectAnus</anus> <anus>InsectAnus</anus>
</li> </li>
<li Class="RJW_Genes.QirkExtension">
<Satisfiedquirk>ChitinLoverQuirk</Satisfiedquirk>
</li>
</modExtensions> </modExtensions>
<displayOrderInCategory>808</displayOrderInCategory> <displayOrderInCategory>808</displayOrderInCategory>

View file

@ -181,6 +181,13 @@
<marketValueFactor>1.10</marketValueFactor> <marketValueFactor>1.10</marketValueFactor>
<biostatMet>-2</biostatMet> <biostatMet>-2</biostatMet>
<biostatCpx>1</biostatCpx> <biostatCpx>1</biostatCpx>
<modExtensions>
<li Class="RJW_Genes.QirkExtension">
<Satisfiedquirk>ImpregnationFetishQuirk</Satisfiedquirk>
</li>
</modExtensions>
</GeneDef> </GeneDef>
</Defs> </Defs>

View file

@ -125,6 +125,11 @@
</descriptionHyperlinks> </descriptionHyperlinks>
<biostatCpx>1</biostatCpx> <biostatCpx>1</biostatCpx>
<biostatMet>-1</biostatMet> <biostatMet>-1</biostatMet>
<modExtensions>
<li Class="RJW_Genes.QirkExtension">
<Satisfiedquirk>BreederQuirk</Satisfiedquirk>
</li>
</modExtensions>
</GeneDef> </GeneDef>
</Defs> </Defs>

View file

@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8" ?>
<Patch>
<Operation Class="PatchOperationAdd">
<xpath>/Defs/GeneDef[defName="Furskin"]</xpath>
<value>
<modExtensions>
<li Class="RJW_Genes.QirkExtension">
<Satisfiedquirk>FurLoverQuirk</Satisfiedquirk>
</li>
</modExtensions>
</value>
</Operation>
<Operation Class="PatchOperationAdd">
<xpath>/Defs/GeneDef[defName="Head_Gaunt"]</xpath>
<value>
<modExtensions>
<li Class="RJW_Genes.QirkExtension">
<Satisfiedquirk>TeratophileQuirk</Satisfiedquirk>
</li>
</modExtensions>
</value>
</Operation>
</Patch>

View file

@ -5,6 +5,6 @@
<li>Common</li> <li>Common</li>
<!-- Mods --> <!-- Mods -->
<li IfModNotActive="asmr.rjw.racesupport">Mods/NotRaceSupport</li> <li IfModNotActive="asmr.rjw.racesupport">Mods/NotRaceSupport</li>
<li IfModActive="vanillaracesexpanded.sanguophage">Mods/Sanguophage</li>
</v1.5> </v1.5>
</loadFolders> </loadFolders>

View file

@ -0,0 +1,52 @@
<?xml version="1.0" encoding="utf-8" ?>
<Patch>
<Operation Class="PatchOperationAdd">
<xpath>/Defs/GeneDef[defName="VRE_SanguineHair"]</xpath>
<value>
<modExtensions>
<li Class="RJW_Genes.QirkExtension">
<Satisfiedquirk>DemonLoverQuirk</Satisfiedquirk>
</li>
</modExtensions>
</value>
</Operation>
<Operation Class="PatchOperationAdd">
<xpath>/Defs/GeneDef[defName="VRE_BatEars"]</xpath>
<value>
<modExtensions>
<li Class="RJW_Genes.QirkExtension">
<Satisfiedquirk>TeratophileQuirk</Satisfiedquirk>
</li>
</modExtensions>
</value>
</Operation>
<Operation Class="PatchOperationAdd">
<xpath>/Defs/GeneDef[defName="VRE_UpperBatEars"]</xpath>
<value>
<modExtensions>
<li Class="RJW_Genes.QirkExtension">
<Satisfiedquirk>TeratophileQuirk</Satisfiedquirk>
</li>
</modExtensions>
</value>
</Operation>
<Operation Class="PatchOperationAdd">
<xpath>/Defs/GeneDef[defName="VRE_Talons"]/modExtensions</xpath>
<value>
<li Class="RJW_Genes.QirkExtension">
<Satisfiedquirk>DemonLoverQuirk</Satisfiedquirk>
</li>
</value>
</Operation>
<Operation Class="PatchOperationAdd">
<xpath>/Defs/GeneDef[defName="VRE_BatNose"]</xpath>
<value>
<modExtensions>
<li Class="RJW_Genes.QirkExtension">
<Satisfiedquirk>TeratophileQuirk</Satisfiedquirk>
</li>
</modExtensions>
</value>
</Operation>
</Patch>

View file

@ -32,6 +32,11 @@ namespace RJW_Genes
Pawn giver = props.pawn; // orgasmer Pawn giver = props.pawn; // orgasmer
Pawn receiver = props.partner; Pawn receiver = props.partner;
if (receiver.genes == null)
{
return;
}
Hediff vasectomy; Hediff vasectomy;
receiver.health.hediffSet.TryGetHediff(vasectomydef, out vasectomy); receiver.health.hediffSet.TryGetHediff(vasectomydef, out vasectomy);
@ -40,10 +45,7 @@ namespace RJW_Genes
List<Hediff> pawnparts = giver.GetGenitalsList(); List<Hediff> pawnparts = giver.GetGenitalsList();
List<Hediff> partnerparts = receiver.GetGenitalsList(); List<Hediff> partnerparts = receiver.GetGenitalsList();
var interaction = rjw.Modules.Interactions.Helpers.InteractionHelper.GetWithExtension(props.dictionaryKey); var interaction = rjw.Modules.Interactions.Helpers.InteractionHelper.GetWithExtension(props.dictionaryKey);
if (receiver.genes == null)
{
return;
}
if (!(props.sexType == xxx.rjwSextype.Anal && receiver.genes.HasActiveGene(GeneDefOf.rjw_genes_fertile_anus))) if (!(props.sexType == xxx.rjwSextype.Anal && receiver.genes.HasActiveGene(GeneDefOf.rjw_genes_fertile_anus)))
return; return;

View file

@ -13,6 +13,13 @@ namespace RJW_Genes
{ {
Pawn pawn = props.pawn; Pawn pawn = props.pawn;
Pawn partner = props.partner; Pawn partner = props.partner;
if(pawn!=null && partner != null)
{
if(!pawn.IsHuman()||!partner.IsHuman())
{
return;
}
}
int count = 0; int count = 0;
List<string> listquirk = new List<string>(); List<string> listquirk = new List<string>();
string s; string s;
@ -40,6 +47,7 @@ namespace RJW_Genes
if (q.LocaliztionKey==s2) if (q.LocaliztionKey==s2)
{ {
count++; count++;
Quirk.AddThought(pawn);
} }
} }
} }