From e8903c6accfb340413f7a4d9ee46057e920bd25e Mon Sep 17 00:00:00 2001 From: Jaaldabaoth Date: Tue, 4 Jun 2024 22:38:58 +0200 Subject: [PATCH 1/3] lovefeeding bugfix --- Common/Assemblies/Rjw-Genes.dll | Bin 147456 -> 147456 bytes Source/Genes/Patches/LustFeeding.cs | 2 +- Source/Rjw-Genes.csproj | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Common/Assemblies/Rjw-Genes.dll b/Common/Assemblies/Rjw-Genes.dll index 2f5d25919b07483eea2737f046caf8e96b45aea5..91d46ff3c0e17159059639777cedfc323e9754c8 100644 GIT binary patch delta 10870 zcmaKy3sjX=+QtcVlR)sz=r!d?PV+Jr)BfGd%&?ZeOC2PX{5jl{xjiGbr z_@NudNK$d#5NBv}4N8+#jVTk?hj+s+P3eMeL8Rqj?SW4^DA&6Ou659+@IZ9Gt-bu_ z@F1+0RE@`{G@+N#S}=MIVrR82t>+Wr!RVt12WFi_Fve+mqTfl}isV6-w4!eKN%S_- zgurtZAt=>>KNao_55d5}DlV#MXLuO)YYHlQI=n9ehA8drl9$56jhqfdOHED9fvrQp z^dA3`V6r-_%~~uP%wp(pwz|+(@voni7>)#~HQ@cA;XcFRGlHEBsGl}m z{BKN@ii=tBVfaWSYD$d$EIbOik{T#I=!@`CSRu($gBpV}iS4wZgW9~uV6UV`Y#;HT z@UeJj6qjg3R_eQcW6`4NaG)Q?A@B~?HsbL?OxGk`^0$>97xaT9wfE!THJY8(79NN% z3?GMq5-(BL#Xk!2ywxV+PNm5-6ERhiN;45NRT`OPA__dROf<4YV}o|CDC%mD#^tfH zJglijJ?(cH*2&14z@jQK8HI{4wz!XdGMY8b5)^|86QvU)iU-)I;uTG?f~F&ClG0u& ziVciMg{B5UvpVZp;$f12BU(GuFDwvoKCB7CSrSx)a2tT5&I4LPEs`v zPoH8>MBv@*Y(%+ukR@ZZCcgBNktWHFpL$q~UruGK+WTZ&ljOoeVl6b*GmTS|N;5(e zU$V)VFUbu@+Ani@K1-5uOgd#fO9Tc_QziIzO2$4(F6=5~N}SG`3-8NS#K$RmR#MCi zMeEbqc_N<4jSJ}u?4s?Niu{9@1&ExpnAA;~g6^}KT-cK22P*|W2@0=>0jJ=Grq>s> zd8ZhYnU6>3u(KNO;^?sX2%W1aarskS7aH4?h67Sl!%xFmO+2+UT-U@?OS3R&9;Z>m zPs2n>?SYFlsX&(|8Hhg^aVL$qRwK@q$Q2r);ygDy4OXBO`NUgnPcv4Lj#)a8%cmnv z6K_*GR!efBU>K9<`InA5o%7?Oe0#c)GXwAIEPPpJ;3rEXm&m}-q|Qz=kSNKG31WXU z(4y%N=|cs1t|9}sC#yJ>G+vX+xl9wUJ_B1MxzRt9DKtf%e{SSv{xWG{if7UWO)6>l ze9uOwNpfRp3MYL>(@#B^k`}PD3g-fw1bMcdiC-^}=bzf`OuQ(qjo=cQ_)rt~orxQg z_>N`Tu#l6w@zI>2g3P2JNUc5RH=0z=z*LS?S3)KV1&Q^$u~-Z^6KAF9#>o{-X3`#M zDv$@9iSe3L(ritt(e;wrbN)w?y0|mZb&+QlCljB4D$N8fsx%dn+!!tP>F3R~7-@dc zq_Q{{s}d?ph9ozF#NqVwEGML9wGZku9jMaS(mm5mljO!KvA;i0vrjwKWSTXpEMmjO zU;DU+NOB`ZW;vk9!j6<*?jdDzU^T9VH;ICGX?jCY7S?GBynBT`8|$)^bK9cb{<+4j zmWPCF*3>bUhdq+ia`SLXlf|9pp;@8}tzv)kup@^98!_NcCeJG&uj6!hM4S$Jcu6~X z^?CTSCYAGoBo_|eEGM6Td3YvQ)DutSGMV(Wq-rENSK9N?qN%daT6;d6dF-slDnUze zLero6G+`Nh@|D(2&~n6UI+XaJeFctbniRF!elMCe&F^D1p%ASa>tdQvgs(Im8{dRt z{Gcf=t_dZuEm0-xJ)2O9TQv=jXhIqKYx>QsCalCrO_<(B1~rn@t+oa)Dza7f8Y;AdnreF8 zD(F=m$D0)!dS`}Jr6k3b8n`oIg(JF4DRa!R@ zYi^<)y@_^KYE|N(+iqWLOmZEf?@`nJKzm)o+(zwGa`MrzltDUUGWofO(W8DwgE3yAx z)mnMxs;*mbTGP1|tGZUR-Z)`#ZDzzI}$4yzy$0 zDMdBXTHI&QV>)m_naxp)rwpympfd(}eiX08WtGK-!9!7t@vBrb7QfBaB1z&#++N6H zt`-YZ9Ral{)5Mx@?|p4T*1yi(WVxTZbDAykVdO~s>+ z3#~;`qb37wKyTQ_VR&iRQb`9cuw0SwZ}QvD($w^AhCrp zn&SGjS>6ZmrbLzIWqhhgTu>2?m+_^fMq9ktwU-h6fJ|e1FKn>Tq9rxr(WnIhFXK^3 z8}Z{vKODrCb?j6*4`PR;24s#J?l_1)duUc2E^4vMg7JJ3FlK0Nr29o6mcGbui}J@ ztt#oOxFM+;&qtiM9YfiJtf>;mu}+e59!HLwwQ97aEpfbt=naY}Y>DG_e5q;Y;6le6 zMx&>2>YCB`W+Xq$szMvi zFUAXA1qYamJ;8O8`Y(vcB+>8q)i~IyRw=gy0`lMX1Hq6%ayA>aaxHL)aN$>BV z$Aa3hSvv=JeLCn8c1dc$8&i(sbN!{S{#NjFEZ@o{s^M3B!ST8AS>Ov?*v1;4ahDxm z;A=_h-24JDPq3y=%6}PW;}xu~W=*wr#rT%FgVgzV1zV(*znq8-yMoB=99Sj3x7qFg zwb9Hsn6`s8c7Emf24i+A=POaW{r?xGlB%(3*td?WIIZdJ(!sWCSpTGQzTvpx_!ieR zS(9RYo&Ui*yOcP7T7dIA%zjGIj@U5g56ID!pFGg{BbMw@T4?MD=YO$9)5AqEJ&B^8 zW=$=^i!y4M8Zi8hiB4}?^FK^#7QWwCaBFjz-Y7w?UI_DlNHv3(wo9qmtZTl5HmzwVkHkt{c9=~Tz#f4BmN!56Aafvg80uQj( z2>!4WN?l)OQd?n#Qm{l77)m7_;_}|1WJzko#CuB+q6)+M)!6z`!yzVhUDzq=6{Yo^Tw`-slw8MniRR|r?~I^4P45l5-`U?- z;Q*?TTDAB>u3N|ens%7u#BG!Gu=6$=Sg)ug@d@W3TCb^lQjK#6#UD|cb5@OW7+sW9 zg-eNr;UmcM+|d!V>8P>>M(%fxFv^dl&_A-K<}{M?jJmefn*EJoU{+ja+vK?32 zYVimjP2wj3@u$W;j#g_e{*L#ZB@kY`|&hd2Y1Y4^RkbKEG!6<(xZF-$Gv7_Q^ z^*asiF4})mYht(WqUZ)DwcC@8-JVQGq^1@zna($KoPW!EPo^(*An*1Rx~hqHdkXy^ zNv$G=0#0!Wl_th$CWiV*&5eK4Rc8#1_i)~AIPa#|Q}XgIz?-Z%g51bOXj=a@b zK8~6twfeW+(={SamKXI^`A(6`$I*FZrTz(l!aD5j&hl|IT9O)moH3_3nj$qf#`#`# z#?cH9=M2L+gHohsxpCC{s9{qb-fY^XoR<77l3-X9XrH!L3u^)$@JKqxaL(x{KR`I=&@m6^T*En+PV1cM z!a0}DYNy4&hR-vs^9<`eI`5G*(QqcxWu5d>udB{P`r5;pWH^&L8eJ!xNpz##X^Ha5 zhBdikz;6g^GTEAV@6~Rn7|xUqXN*`=3I%&O=Nr!XcC6wdvG=JRtG`9;eOgB|9|>ASg*xX#v53V+mUK_DkWQPl_3z%| z2NwFfBz1G8>+@dS+Zlv+)P2A=R|YLrAY3`EJgnz%!i%GwBsc>S2;eXO-q(y6ldKOrw0K#^p1qMQ3>>VS;e> zeOKk=@|hM5kf_RMQj8Y4d={ zma(DPbkUMxEAa}msjgY}=D+uzsg7)8O`RIADVt6xCw($IHX@t6Kag?q@tjTFB&mYg zM!_5!qMckXhhjdI=U=NVm}3-VQ8mK_b0}VsESN);ns^U$Jg;X#Tcsv`BNJ20p;tA% z=F4CE|97%gFql~}|ms7R6}NzEeHm_;7#lA4-D9u4}0Rf z)C#D%72;1lyb9`B znj53U>I-P4hqKVbDgISRVaK3qh1FB^LlOO2rXNx)j|QWOjvcZr8-kth8v4L{)I5QLvnjX)Dj7oPs~^ELd(7?9{kmIrURc zS+Jb4HF3dmS|&-=D<^A%7Wu%fpc9(7Ud zub&u3y}k*&&|_?sSMbc(7Y5cHUA`^uzx5eiy)s7hysZD3D5vvE^#Yt#5xwbJed`3T Z+o(QZlGpd%Ucuw*gC=`jp{l4Z{|A^ifwcet delta 10863 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 XUAKuoKl=Ivjjs!d@wqPkPv`#!Ih%U3 diff --git a/Source/Genes/Patches/LustFeeding.cs b/Source/Genes/Patches/LustFeeding.cs index e227d2a..8a4673c 100644 --- a/Source/Genes/Patches/LustFeeding.cs +++ b/Source/Genes/Patches/LustFeeding.cs @@ -71,7 +71,7 @@ namespace RJWLoveFeeding public static bool RJWTryTakeBlood(Pawn pawn, Pawn bloodBag) { - + if (bloodBag == null || pawn == null) return false; Pawn_GeneTracker genes = bloodBag.genes; if ((genes.GetFirstGeneOfType() != null)) { 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 From 8fd19c422640e5ef1fb990b9e7af3b3dba7edb90 Mon Sep 17 00:00:00 2001 From: Jaaldabaoth Date: Tue, 4 Jun 2024 22:51:19 +0200 Subject: [PATCH 2/3] lovefeed bufix --- Common/Assemblies/Rjw-Genes.dll | Bin 147456 -> 147456 bytes Source/Genes/Patches/LustFeeding.cs | 1 + 2 files changed, 1 insertion(+) diff --git a/Common/Assemblies/Rjw-Genes.dll b/Common/Assemblies/Rjw-Genes.dll index 91d46ff3c0e17159059639777cedfc323e9754c8..214b9629b9abe6fad223814c0ea778baf0c93ca3 100644 GIT binary patch delta 10867 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 delta 10867 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 diff --git a/Source/Genes/Patches/LustFeeding.cs b/Source/Genes/Patches/LustFeeding.cs index 8a4673c..bba72a6 100644 --- a/Source/Genes/Patches/LustFeeding.cs +++ b/Source/Genes/Patches/LustFeeding.cs @@ -73,6 +73,7 @@ namespace RJWLoveFeeding if (bloodBag == null || pawn == null) return false; Pawn_GeneTracker genes = bloodBag.genes; + if (genes!=null) if ((genes.GetFirstGeneOfType() != null)) { return false; From b536e17591e63e66e3c3adcc267b4dac578a0245 Mon Sep 17 00:00:00 2001 From: Jaaldabaoth Date: Wed, 5 Jun 2024 12:59:50 +0200 Subject: [PATCH 3/3] royalty dependency fix --- Common/Defs/HediffDefs/Bioscaffold.xml | 50 +++++++++++++++++++ Common/Defs/HediffDefs/LimbicStimulator.xml | 21 ++++++-- Common/Defs/HediffDefs/OvaryAgitator.xml | 17 +++++++ Common/Defs/HediffDefs/Scrambler.xml | 17 +++++++ Common/Defs/ThingDefs/Bioscaffold.xml | 53 --------------------- Common/Defs/ThingDefs/LimbicStimulator.xml | 20 -------- Common/Defs/ThingDefs/OvaryAgitator.xml | 20 -------- Common/Defs/ThingDefs/Scrambler.xml | 21 -------- 8 files changed, 102 insertions(+), 117 deletions(-) delete mode 100644 Common/Defs/ThingDefs/Bioscaffold.xml delete mode 100644 Common/Defs/ThingDefs/LimbicStimulator.xml delete mode 100644 Common/Defs/ThingDefs/OvaryAgitator.xml delete mode 100644 Common/Defs/ThingDefs/Scrambler.xml 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