diff --git a/Common/Assemblies/Rjw-Genes.dll b/Common/Assemblies/Rjw-Genes.dll index 2f5d259..214b962 100644 Binary files a/Common/Assemblies/Rjw-Genes.dll and b/Common/Assemblies/Rjw-Genes.dll differ diff --git a/Common/Defs/HediffDefs/Bioscaffold.xml b/Common/Defs/HediffDefs/Bioscaffold.xml index 0b94e23..c6bed88 100644 --- a/Common/Defs/HediffDefs/Bioscaffold.xml +++ b/Common/Defs/HediffDefs/Bioscaffold.xml @@ -18,4 +18,54 @@ --> + + + Bioscaffold + + 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. + + InstallBioscaffold + + Spacer + Rare + true + 25 + false + + 30 + 350 + 0.15 + 1.3 + 6 + 800 + + +
  • + 5 + true +
    • +     + + 5 + 10 + 1 + 1 + + + DrugSynthesisSpeed + Intellectual + +
  • DrugLab
    • +     + + 6 + 4 + + FertilityProcedures + 4 +     + +
  • ExoticMisc
    • +     +     \ No newline at end of file diff --git a/Common/Defs/HediffDefs/LimbicStimulator.xml b/Common/Defs/HediffDefs/LimbicStimulator.xml index e3073fd..8a7f8a6 100644 --- a/Common/Defs/HediffDefs/LimbicStimulator.xml +++ b/Common/Defs/HediffDefs/LimbicStimulator.xml @@ -6,9 +6,7 @@ limbic stimulator An installed limbic stimulator. - - Scrambler - + (1.0, 0.6, 0.7)
  • @@ -20,4 +18,21 @@
    • + + + LimbicStimulator + + 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. + + InstallLimbicStimulator + + + 30 + 4 + 1 + + + FertilityProcedures + + \ No newline at end of file diff --git a/Common/Defs/HediffDefs/OvaryAgitator.xml b/Common/Defs/HediffDefs/OvaryAgitator.xml index 916b122..45d69c9 100644 --- a/Common/Defs/HediffDefs/OvaryAgitator.xml +++ b/Common/Defs/HediffDefs/OvaryAgitator.xml @@ -116,4 +116,21 @@ + + + OvaryAgitator + + 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. + + InstallOvaryAgitator + + + 10 + 1 + 6 + + + FertilityProcedures + + \ No newline at end of file diff --git a/Common/Defs/HediffDefs/Scrambler.xml b/Common/Defs/HediffDefs/Scrambler.xml index 5db5c4a..a84299d 100644 --- a/Common/Defs/HediffDefs/Scrambler.xml +++ b/Common/Defs/HediffDefs/Scrambler.xml @@ -29,4 +29,21 @@ + + + Scrambler + + 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. + + + 50 + + + 8 + 1 + + + FertilityProcedures + + \ No newline at end of file diff --git a/Common/Defs/ThingDefs/Bioscaffold.xml b/Common/Defs/ThingDefs/Bioscaffold.xml deleted file mode 100644 index 4d585ba..0000000 --- a/Common/Defs/ThingDefs/Bioscaffold.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - Bioscaffold - - 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. - - InstallBioscaffold - - Spacer - Rare - true - 25 - false - - 30 - 350 - 0.15 - 1.3 - 6 - 800 - - -
  • - 5 - true -
    • -     - - 5 - 10 - 1 - 1 - - - DrugSynthesisSpeed - Intellectual - -
  • DrugLab
    • -     - - 6 - 4 - - FertilityProcedures - 4 -     - -
  • ExoticMisc
    • -     -     -     \ No newline at end of file diff --git a/Common/Defs/ThingDefs/LimbicStimulator.xml b/Common/Defs/ThingDefs/LimbicStimulator.xml deleted file mode 100644 index a4e6aab..0000000 --- a/Common/Defs/ThingDefs/LimbicStimulator.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - LimbicStimulator - - 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. - - InstallLimbicStimulator - - - 30 - 4 - 1 - - - BrainWiring - - - \ No newline at end of file diff --git a/Common/Defs/ThingDefs/OvaryAgitator.xml b/Common/Defs/ThingDefs/OvaryAgitator.xml deleted file mode 100644 index 256f69c..0000000 --- a/Common/Defs/ThingDefs/OvaryAgitator.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - OvaryAgitator - - 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. - - InstallOvaryAgitator - - - 10 - 1 - 6 - - - FertilityProcedures - - - \ No newline at end of file diff --git a/Common/Defs/ThingDefs/Scrambler.xml b/Common/Defs/ThingDefs/Scrambler.xml deleted file mode 100644 index 0b13726..0000000 --- a/Common/Defs/ThingDefs/Scrambler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - Scrambler - - 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. - InstallScrambler - - 50 - - - 1 - 1 - 1 - - - BrainWiring - - - \ No newline at end of file diff --git a/Source/Genes/Patches/LustFeeding.cs b/Source/Genes/Patches/LustFeeding.cs index e227d2a..bba72a6 100644 --- a/Source/Genes/Patches/LustFeeding.cs +++ b/Source/Genes/Patches/LustFeeding.cs @@ -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() != null)) { return false; diff --git a/Source/Rjw-Genes.csproj b/Source/Rjw-Genes.csproj index 7b8559b..5c02391 100644 --- a/Source/Rjw-Genes.csproj +++ b/Source/Rjw-Genes.csproj @@ -219,7 +219,7 @@ False - ..\..\rjw-sexperience\1.5\Assemblies\RJWSexperience.dll + ..\..\rjw-sexperience-master\1.5\Assemblies\RJWSexperience.dll False