Merge pull request #91 from Jaaldabaoth/dev

royalty dependency fix
This commit is contained in:
vegapnk 2024-06-06 08:22:34 +02:00 committed by GitHub
commit a5458f7569
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 105 additions and 119 deletions

Binary file not shown.

View file

@ -18,4 +18,54 @@
</li>
</comps> -->
</HediffDef>
<ThingDef ParentName="BodyPartNaturalBase">
<defName>Bioscaffold</defName>
<label>bioscaffold</label>
<description>A single-use nanite-constructed lattice of organic mesh material meant to be installed inside a woman's womb prior to pregnancy. It provides an enriching environment for an unborn baby to grow more quickly.</description>
<descriptionHyperlinks>
<RecipeDef>InstallBioscaffold</RecipeDef>
</descriptionHyperlinks>
<techLevel>Spacer</techLevel>
<tickerType>Rare</tickerType>
<drawGUIOverlay>true</drawGUIOverlay>
<stackLimit>25</stackLimit>
<healthAffectsPrice>false</healthAffectsPrice>
<statBases>
<MaxHitPoints>30</MaxHitPoints>
<MarketValue>350</MarketValue>
<Mass>0.15</Mass>
<Flammability>1.3</Flammability>
<DeteriorationRate>6</DeteriorationRate>
<WorkToMake>800</WorkToMake>
</statBases>
<comps>
<li Class="CompProperties_Rottable">
<daysToRotStart>5</daysToRotStart>
<rotDestroys>true</rotDestroys>
</li>
</comps>
<costList>
<Plasteel>5</Plasteel>
<BabyFood>10</BabyFood>
<MedicineUltratech>1</MedicineUltratech>
<ComponentSpacer>1</ComponentSpacer>
</costList>
<recipeMaker>
<workSpeedStat>DrugSynthesisSpeed</workSpeedStat>
<workSkill>Intellectual</workSkill>
<recipeUsers>
<li>DrugLab</li>
</recipeUsers>
<skillRequirements>
<Crafting>6</Crafting>
<Intellectual>4</Intellectual>
</skillRequirements>
<researchPrerequisite>FertilityProcedures</researchPrerequisite>
<bulkRecipeCount>4</bulkRecipeCount>
</recipeMaker>
<tradeTags>
<li>ExoticMisc</li>
</tradeTags>
</ThingDef>
</Defs>

View file

@ -6,9 +6,7 @@
<label>limbic stimulator</label>
<labelNoun>limbic stimulator</labelNoun>
<description>An installed limbic stimulator.</description>
<descriptionHyperlinks>
<ThingDef>Scrambler</ThingDef>
</descriptionHyperlinks>
<defaultLabelColor>(1.0, 0.6, 0.7)</defaultLabelColor>
<stages>
<li>
@ -20,4 +18,21 @@
</li>
</stages>
</HediffDef>
<ThingDef ParentName="BodyPartBionicBase">
<defName>LimbicStimulator</defName>
<label>limbic stimulator</label>
<description>A perpetual slow-release chemical stimulation implant that is embedded deep within the reward center of the brain, greatly increasing the need for lovin'. The need is said to become so strong that it can drive people to force themselves onto others, even if they wouldn't otherwise. Post-lovin' clarity will leave the implanted in a state of bliss, but they may also feel a sense of regret if they steal lovin' if they normally wouldn't - at least until they become used to doing it.</description>
<descriptionHyperlinks>
<RecipeDef>InstallLimbicStimulator</RecipeDef>
</descriptionHyperlinks>
<costList>
<Steel>30</Steel>
<ComponentIndustrial>4</ComponentIndustrial>
<ComponentSpacer>1</ComponentSpacer>
</costList>
<recipeMaker>
<researchPrerequisite>FertilityProcedures</researchPrerequisite>
</recipeMaker>
</ThingDef>
</Defs>

View file

@ -116,4 +116,21 @@
</li>
</comps>
</HediffDef>
<ThingDef ParentName="BodyPartBionicBase">
<defName>OvaryAgitator</defName>
<label>ovary agitator</label>
<description>A crude slaver implant used to increase the number of eggs released during ovulation, increasing the likelihood of having multiple children per pregnancy. Their use is largely limited to rimworlds lacking in cloning infrastructure as most civilized and unified worlds have outlawed them.\n\nWhile it provides an initial boost in fertility, the implant will slowly deplete the victims's ovaries over several years until they're infertile. Allies of implanted victims will be angered.</description>
<descriptionHyperlinks>
<RecipeDef>InstallOvaryAgitator</RecipeDef>
</descriptionHyperlinks>
<costList>
<Plasteel>10</Plasteel>
<MedicineIndustrial>1</MedicineIndustrial>
<ComponentIndustrial>6</ComponentIndustrial>
</costList>
<recipeMaker>
<researchPrerequisite>FertilityProcedures</researchPrerequisite>
</recipeMaker>
</ThingDef>
</Defs>

View file

@ -29,4 +29,21 @@
</li>
</stages>
</HediffDef>
<ThingDef ParentName="BodyPartBionicBase">
<defName>Scrambler</defName>
<label>scrambler</label>
<description>A slaver implant, similar to the mindscrew, that can inject disorienting mind imagery directly into the visual cortex of the brain through a complex network of nanoelectrodes. Victims of scrambler implantation tend to socially withdraw to minimize additional stimulation. As a consequence of their confusion, they also become physically meek, making them easy to impose upon. Allies of implanted victims will be angered.</description>
<statBases>
<WorkToMake>50</WorkToMake>
</statBases>
<costList>
<ComponentIndustrial>8</ComponentIndustrial>
<ComponentSpacer>1</ComponentSpacer>
</costList>
<recipeMaker>
<researchPrerequisite>FertilityProcedures</researchPrerequisite>
</recipeMaker>
</ThingDef>
</Defs>

View file

@ -1,53 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<Defs>
<ThingDef ParentName="BodyPartNaturalBase">
<defName>Bioscaffold</defName>
<label>bioscaffold</label>
<description>A single-use nanite-constructed lattice of organic mesh material meant to be installed inside a woman's womb prior to pregnancy. It provides an enriching environment for an unborn baby to grow more quickly.</description>
<descriptionHyperlinks>
<RecipeDef>InstallBioscaffold</RecipeDef>
</descriptionHyperlinks>
<techLevel>Spacer</techLevel>
<tickerType>Rare</tickerType>
<drawGUIOverlay>true</drawGUIOverlay>
<stackLimit>25</stackLimit>
<healthAffectsPrice>false</healthAffectsPrice>
<statBases>
<MaxHitPoints>30</MaxHitPoints>
<MarketValue>350</MarketValue>
<Mass>0.15</Mass>
<Flammability>1.3</Flammability>
<DeteriorationRate>6</DeteriorationRate>
<WorkToMake>800</WorkToMake>
</statBases>
<comps>
<li Class="CompProperties_Rottable">
<daysToRotStart>5</daysToRotStart>
<rotDestroys>true</rotDestroys>
</li>
</comps>
<costList>
<Plasteel>5</Plasteel>
<BabyFood>10</BabyFood>
<MedicineUltratech>1</MedicineUltratech>
<ComponentSpacer>1</ComponentSpacer>
</costList>
<recipeMaker>
<workSpeedStat>DrugSynthesisSpeed</workSpeedStat>
<workSkill>Intellectual</workSkill>
<recipeUsers>
<li>DrugLab</li>
</recipeUsers>
<skillRequirements>
<Crafting>6</Crafting>
<Intellectual>4</Intellectual>
</skillRequirements>
<researchPrerequisite>FertilityProcedures</researchPrerequisite>
<bulkRecipeCount>4</bulkRecipeCount>
</recipeMaker>
<tradeTags>
<li>ExoticMisc</li>
</tradeTags>
</ThingDef>
</Defs>

View file

@ -1,20 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<Defs>
<ThingDef ParentName="BodyPartProstheticImperialBase">
<defName>LimbicStimulator</defName>
<label>limbic stimulator</label>
<description>A perpetual slow-release chemical stimulation implant that is embedded deep within the reward center of the brain, greatly increasing the need for lovin'. The need is said to become so strong that it can drive people to force themselves onto others, even if they wouldn't otherwise. Post-lovin' clarity will leave the implanted in a state of bliss, but they may also feel a sense of regret if they steal lovin' if they normally wouldn't - at least until they become used to doing it.</description>
<descriptionHyperlinks>
<RecipeDef>InstallLimbicStimulator</RecipeDef>
</descriptionHyperlinks>
<costList>
<Steel>30</Steel>
<ComponentIndustrial>4</ComponentIndustrial>
<ComponentSpacer>1</ComponentSpacer>
</costList>
<recipeMaker>
<researchPrerequisite>BrainWiring</researchPrerequisite>
</recipeMaker>
</ThingDef>
</Defs>

View file

@ -1,20 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<Defs>
<ThingDef ParentName="BodyPartBionicBase">
<defName>OvaryAgitator</defName>
<label>ovary agitator</label>
<description>A crude slaver implant used to increase the number of eggs released during ovulation, increasing the likelihood of having multiple children per pregnancy. Their use is largely limited to rimworlds lacking in cloning infrastructure as most civilized and unified worlds have outlawed them.\n\nWhile it provides an initial boost in fertility, the implant will slowly deplete the victims's ovaries over several years until they're infertile. Allies of implanted victims will be angered.</description>
<descriptionHyperlinks>
<RecipeDef>InstallOvaryAgitator</RecipeDef>
</descriptionHyperlinks>
<costList>
<Plasteel>10</Plasteel>
<MedicineIndustrial>1</MedicineIndustrial>
<ComponentIndustrial>6</ComponentIndustrial>
</costList>
<recipeMaker>
<researchPrerequisite>FertilityProcedures</researchPrerequisite>
</recipeMaker>
</ThingDef>
</Defs>

View file

@ -1,21 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<Defs>
<ThingDef ParentName="BodyPartProstheticImperialBase">
<defName>Scrambler</defName>
<label>scrambler</label>
<description>A slaver implant, made from a modified mindscrew, that can inject disorienting mind imagery directly into the visual cortex of the brain through a complex network of nanoelectrodes. Victims of scrambler implantation tend to socially withdraw to minimize additional stimulation. As a consequence of their confusion, they also become physically meek, making them easy to impose upon. Allies of implanted victims will be angered.</description>
<descriptionHyperlinks><RecipeDef>InstallScrambler</RecipeDef></descriptionHyperlinks>
<statBases>
<WorkToMake>50</WorkToMake>
</statBases>
<costList>
<Mindscrew>1</Mindscrew>
<ComponentIndustrial>1</ComponentIndustrial>
<ComponentSpacer>1</ComponentSpacer>
</costList>
<recipeMaker>
<researchPrerequisite>BrainWiring</researchPrerequisite>
</recipeMaker>
</ThingDef>
</Defs>

View file

@ -71,8 +71,9 @@ namespace RJWLoveFeeding
public static bool RJWTryTakeBlood(Pawn pawn, Pawn bloodBag)
{
if (bloodBag == null || pawn == null) return false;
Pawn_GeneTracker genes = bloodBag.genes;
if (genes!=null)
if ((genes.GetFirstGeneOfType<Gene_Hemogen>() != null))
{
return false;

View file

@ -219,7 +219,7 @@
<Private>False</Private>
</Reference>
<Reference Include="RJWSexperience">
<HintPath>..\..\rjw-sexperience\1.5\Assemblies\RJWSexperience.dll</HintPath>
<HintPath>..\..\rjw-sexperience-master\1.5\Assemblies\RJWSexperience.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System" />