From 976bd5b3870f66f0d5ed9c28c9fd04bf82d260fd Mon Sep 17 00:00:00 2001 From: Dastardlii Date: Sun, 6 Sep 2020 05:25:55 -0400 Subject: [PATCH] Version 0.6 --- .gitignore | 2 + About/About.xml | 23 +- About/Manifest.xml | 18 ++ Assemblies/RJW_RBSE.dll | Bin 6144 -> 6656 bytes Defs/HediffDefs/Hediffs_AdvBionic.xml | 317 ++++++++++++++++++-- Defs/HediffDefs/Hediffs_Synthetic.xml | 8 +- Defs/RecipeDefs/Recipe_AdvMedTable.xml | 5 +- Defs/ThingDefs_Items/Items_AdvBionic.xml | 6 +- Defs/ThingDefs_Items/Items_Synthetic.xml | 2 +- Patches/Bodypart_Stats_Advanced.xml | 14 +- Patches/Bodypart_Stats_Bionic.xml | 12 +- Patches/Hediff_Colors.xml | 14 +- Patches/Operation_Research.xml | 248 +-------------- RJW_RBSE.csproj | 8 +- Source/Main.cs | 10 +- Textures/Things/Item/BodyPart/slimepart.png | Bin 1210 -> 2897 bytes 16 files changed, 380 insertions(+), 307 deletions(-) create mode 100644 About/Manifest.xml diff --git a/.gitignore b/.gitignore index f414c40..e2ae5b0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ /obj /bin /.vs +/Assemblies/0Harmony.dll +/Assemblies/0Harmony.xml diff --git a/About/About.xml b/About/About.xml index 92cfc0c..0e51761 100644 --- a/About/About.xml +++ b/About/About.xml @@ -2,9 +2,28 @@ RJW_RBSE dastardlii + https://www.loverslab.com/topic/131529-rjw-rbse-integration/ -
  • 1.0
    • +
  • 1.1
    • +
  • 1.2
    •  + dastardlii.rjw.rbse + +
  • + rim.job.world + RJW + steam://url/CommunityFilePage/2009463077 + https://github.com/pardeike/HarmonyRimWorld/releases/latest +
    • +
  • + Rah.RBSE + Rah's Bionics and Surgery Expansion + https://ludeon.com/forums/index.php?topic=28731.0 +
    • +     + +
  • rim.job.world
    • +
  • Rah.RBSE
    • +     Adjusts RJW bionics and surgery to fit into the style and usage defined by RBSE -     \ No newline at end of file diff --git a/About/Manifest.xml b/About/Manifest.xml new file mode 100644 index 0000000..d7f6e7d --- /dev/null +++ b/About/Manifest.xml @@ -0,0 +1,18 @@ + + + RJW+RBSE + 0.6 + +
  • RimJobWorld
    • +
  • Rah'sBionicsandSurgeryExpansion
    • +     + + +
  • RimJobWorld
    • +
  • Rah'sBionicsandSurgeryExpansion
    • +     + + + + https://www.loverslab.com/topic/131529-rjw-rbse-integration/ +     \ No newline at end of file diff --git a/Assemblies/RJW_RBSE.dll b/Assemblies/RJW_RBSE.dll index 1a3d27d01c9c2f053a26855fa33a9f89b3845176..d1de3af78971409dac4aace1db66e591c1774cd4 100644 GIT binary patch delta 2105 zcmaJ?ZERCj7=F&Z?d^6~x~|*0!Pa@Vv8`;Qlng;)2#)U!7$0Nm0tB|DKp9)d?GP4> zolX=n5t|DMAHitE5Eli_5<<{KO(ez;H0U2clBwa3B!EE^5=|sN=d{A6V%z(i_kEuC zJ?EbHy!UoEIy~pqgH`9g96gEb=SNgoc_In~NEjKiKAIk_D9Jj&Fj+05=-8V6q0;xw zEMSdf9s~C2>B>UyR=`XDLki_irPkj$!t|&h% zcxiA0)lB9L!l^8n=d9JrQU!o%+%+f}N#2_o7C=K@13dLiDU0gJ;XUzJ0GrByl#SqB zVH%AA*i*>_!$nNPBiE?d9TP(GJTm0egpiLJ!l3U-m4u6#<+W3PDqT8L>=GfTlXjuY zo_F7I=hn>BYI71nDt3%~Nw|b&qLffOQ5*Rm?aY5_sm!FG{X;Bp{cADq)x_WYgoP&Y z6Be1oPnbW$yEF4&Pu*X5l2EMO+vOyF!2|f-2k<8!z+cJo>sZD~3kZGk!Wb{8g*}UG z_MkD2`sQ+ZkeRkR%R{}xi;W~N;S9TqQU@5HoW_coMz~BK6%$O?Rfw8q>R|% z0gg$oqn(YC2gt{wdU;375{`cQ?>IBub)v#q=Pq<}N%)<(JCu4?%PeW&EwM>A5YQxk zi+VjDPjfm0LVThbIH)kL@OOom6pkw_Rd^E%n0r~_D#bL39h!;T+9>Bar(dMqOxuUA z^e4%@hfOKn#8FZvyt)ip$bA}Uf(-py@o9xMkTLUU8~9Y0H*`q5s9qP#xE0o&-(guz zeGQf>PZxfUP@aofr!a=KmW)l~Wt^vWkX}lW|$Lyr@YtDfw8@gQBJ20`561gq5g8g!^p71j%Y}DYeBTy(=iV)LcQQ71HgC5sI-FO$!R`+9 zqYK?^!x$_KB0=27BihGtJzDVuW^r7^8Z0GaGpdK`0LLWjCJJoq#9qv#(oH7D9_jz% z*zwvq&248#Ryr#NUMq8!h}vxD-LWH6_9iVTqZTI$I!Gu zOXll_CVU#R`b40GU0Dd9mSZuTlkLvXa*&?e5|oLe5H61htmZKU_DDalN4MZ}Zsl9t zaK8UY+iHRGNZZm4*~;0yjoCUa;2UUeWVXNtU(r2rNjy2Qt7}M>zDQ6#i!J?qyjh?B0cCku5Gi3oDdmTZ?E6LQ9cS6ILCI+t3z}3(+>T zE~ZMbPvUL;YcS%2KiH&A@CS`AHJYl`2NR7kMy)Y@Xwt-oCZxvN_{}Uft0m6nesj)u z&YUxI=G?tg8>bS_%~TF_zIqlb<2))Oc_IP$NSGNi*f_gTUgG-4Wr~8#CbNA3FmRCsx8;XT;W1@4 zgV#jB<#(;KV3(2$#sXZ3+drYr?#*^```yZEF3V|7IsHhYBv!;#X|Mg4wkjphE)go6 zlJo86>++hMXoIXVM~lhZDbgjeAjQ!VLQS^q$p6^hT-BD&1U>s7qvwWPA?Csgos}k= z&dQKYXT{cZZYDPC%5$XkL9+Q`dHsCZbj#}WzSZdytJ7cKK&N$0h4Js4nY)*`nLS{r zyN|I0OxTU|i}A|6UNd%+x`8rPmAXn93u|GUF}jw5oa80DV&xR;u(@a3W&si$s&^mX z5KqLL63rW$71QpCiG$NxZAIBM9O%T{*#UD(SS5i)Gf%Pc%_V z^x_tx59>AFp>dPOE{)w9`!ptr#TdeJnhVA>b&zP{WsPs6MMl^Y%QAs8m@{s}7wDIL zD8jSY&1aV}jIfrgQ6-;7H4fn@Pxl^<<5$cWCnz75ui+^jZ60s%cM%K50^-QSIbs0c z63ftanNt<666@g=abAGJJ2kdz{vP7c=B35dd;pSC)vPUJN=mea@o_^;y&t279llJiF$ic3W@rmTf zUAdvancedBionicJaw an advanced bionic jaw + An upgraded bionic jaw. Nano-motors embedded in the structure of the jaw allow the entire mouth to vibrate at a several different speeds. AdvancedBionicJaw 1.2 @@ -25,59 +26,325 @@ - + AdvancedBionicPenis + an advanced bionic penis + An upgraded bionic penis. Beyond the vibration and sensor features of a normal bionic penic, this model includes temperature controls to provide sensual heat or shocking cold to a partner. The internal servos of this model have also been upgraded to ensure the bear can move comfortable even while the penis is extended to it's maximum size. + AdvancedBionicPenis + AdvancedBionicPenis + Cum + Genitals
  • + + 0.01 - 0.9 + 0.1 + +
    • +
  • + + 0.20 + + 0.1 + +
    • +
  • + + 0.40 + + 0.1 + +
    • +
  • + + 0.60 + + 0.1 + +
    • +
  • + + 0.80 + + 0.1 + +
    • +
  • + + 1.01 + + 0.1
    • - AdvancedBionicPenis -     - - + +
  • + 1.0 + +
  • 0
    • +
  • 5.0
    • +
  • 10.0
    • +
  • 18.0
    • +
  • 25.0
    • +
  • 35.0
    • + + +
  • 0
    • +
  • 5.0
    • +
  • 10.0
    • +
  • 13.0
    • +
  • 17.0
    • +
  • 21.0
    • +     + +     + + + AdvancedBionicVagina + an advanced bionic vagina + An upgraded bionic vagina. This upgraded model includes internal sensors that can trigger instantaneous orgasm upon detection of semen. + AdvancedBionicVagina + AdvancedBionicVagina + Cum + Genitals
  • + + 0.01 - 0.9 - 0.3 + 0.1 + 0.1 + +
    • +
  • + + 0.20 + + 0.1 + 0.1 + +
    • +
  • + + 0.40 + + 0.1 + 0.1 + +
    • +
  • + + 0.60 + + 0.1 + 0.1 + +
    • +
  • + + 0.80 + + 0.1 + 0.1 + +
    • +
  • + + 1.01 + + 0.1 + 0.1
    • - AdvancedBionicVagina -     - - + +
  • + +
  • 0
    • +
  • 5.0
    • +
  • 10.0
    • +
  • 18.0
    • +
  • 25.0
    • +
  • 35.0
    • + + +
  • 0
    • +
  • 5.0
    • +
  • 10.0
    • +
  • 13.0
    • +
  • 17.0
    • +
  • 21.0
    • +     + +     + + + AdvancedBionicBreasts + a set of advanced bionic breasts + A set of upgraded of bionic breasts. This model includes micro inertial dampeners that reduce back and shoulder strain + AdvancedBionicBreasts + AdvancedBionicBreasts + Chest
  • - - 0.9 - 0.2 - 0.05 - + + 0.01 +
    • +
  • + + 0.02 +
    • +
  • + + 0.20 +
    • +
  • + + 0.40 +
    • +
  • + + 0.60 +
    • +
  • + + 0.80 + +
  • + Moving + -0.02 +
    • + + +
  • + + 1.0 + +
  • + Moving + -0.05 +
    • + + +
  • + + 1.2 + +
  • + Moving + -0.7 +
    • + + +
  • + + 1.4 + +
  • + Moving + -0.1 +
    • + + +
  • + + 1.6 + +
  • + Moving + -0.12 +
    • +     - AdvancedBionicBreasts -     - - + +
  • + 1.0 + +
  • 0
    • +
  • 1
    • +
  • 2
    • +
  • 4
    • +
  • 7
    • +
  • 11
    • +
  • 15
    • +
  • 19
    • +
  • 25
    • +
  • 31
    • + + +     + + + AdvancedBionicAnus + an advanced bionic anus + An upgraded bionic anus. This model includes controllable nerve clusters that increase pleasure and decrease discomfort + AdvancedBionicAnus + AdvancedBionicAnus + Anus
  • + + 0.01 - 0.9 - 0.3 + 0.05 + +
    • +
  • + + 0.20 + + 0.05 + +
    • +
  • + + 0.40 + + 0.05 + +
    • +
  • + + 0.60 + + 0.05 + +
    • +
  • + + 0.80 + + 0.05 + +
    • +
  • + + 1.01 + + 0.05
    • - AdvancedBionicAnus -     + +
  • + +
  • 0
    • +
  • 5.0
    • +
  • 10.0
    • +
  • 13.0
    • +
  • 17.0
    • +
  • 21.0
    • + + +     + \ No newline at end of file diff --git a/Defs/HediffDefs/Hediffs_Synthetic.xml b/Defs/HediffDefs/Hediffs_Synthetic.xml index 6de8cb5..93f5f28 100644 --- a/Defs/HediffDefs/Hediffs_Synthetic.xml +++ b/Defs/HediffDefs/Hediffs_Synthetic.xml @@ -7,6 +7,8 @@ SyntheticUterus + a synthetic uterus + An enhanced artificial uterus augmented with nanocells to increase organ efficiency improve defense against disease. SyntheticUterus true @@ -20,7 +22,7 @@
  • - Reproduction + RJW_Fertility 0.2
    • @@ -31,6 +33,8 @@ SyntheticTesticles + a set of synthetic testicles + An enhanced set of atrificial testicles augmented with nanocells to increase organ efficiency and reduce pain from vigorous activity. SyntheticTesticles true @@ -42,7 +46,7 @@ 0.95
  • - Reproduction + RJW_Fertility 0.2
    • diff --git a/Defs/RecipeDefs/Recipe_AdvMedTable.xml b/Defs/RecipeDefs/Recipe_AdvMedTable.xml index f318297..ce172b2 100644 --- a/Defs/RecipeDefs/Recipe_AdvMedTable.xml +++ b/Defs/RecipeDefs/Recipe_AdvMedTable.xml @@ -2,7 +2,7 @@ Creating synthetic organ. - SmithingSpeed + GeneralLaborSpeed Cook Recipe_Tailor 40000 @@ -16,11 +16,12 @@ Upgrading bionic part. - SmithingSpeed + GeneralLaborSpeed Cook RBSESound 40000 UnfinishedProsthesis + AdvancedBionics Crafting 10 diff --git a/Defs/ThingDefs_Items/Items_AdvBionic.xml b/Defs/ThingDefs_Items/Items_AdvBionic.xml index 3f2f737..bee468e 100644 --- a/Defs/ThingDefs_Items/Items_AdvBionic.xml +++ b/Defs/ThingDefs_Items/Items_AdvBionic.xml @@ -1,6 +1,6 @@  - +
  • AdvancedProstheses
    •  @@ -40,7 +40,7 @@ AdvancedBionicPenis An upgraded bionic penis. New Features include: -- Configurable shape ensuring you will always be able to hit the right spots. +- Upgraded internal servos to ensure ease of movement even when at maximum size. - Internal temperature regulator allows you to share sultry heat or shocking cold with your partner. - Increased nerve density ensures maximum sensitivity along the entire length of the penis. @@ -68,7 +68,7 @@ AdvancedBionicBreasts Upgraded prosthetic breasts. New Features include: -- Independantly resizable nipples +- Inertial dampeners to allow more comfortable movement. - Selectable areola shapes, including hearts and stars. 1200 diff --git a/Defs/ThingDefs_Items/Items_Synthetic.xml b/Defs/ThingDefs_Items/Items_Synthetic.xml index 51caf43..cc5d46a 100644 --- a/Defs/ThingDefs_Items/Items_Synthetic.xml +++ b/Defs/ThingDefs_Items/Items_Synthetic.xml @@ -27,7 +27,7 @@ SyntheticTesticles - An enhanced pair of testicles augmented with nanocells to increase organ efficiency and reduce pain from vigorous activity. Should be kept frozen outside of the body to avoid cell death and organ failure.\n\nDoes not trigger transplant rejection.\n\nStats:\nFertility: 20%\nPain Threshold: 95% + An enhanced set of testicles augmented with nanocells to increase organ efficiency and reduce pain from vigorous activity. Should be kept frozen outside of the body to avoid cell death and organ failure.\n\nDoes not trigger transplant rejection.\n\nStats:\nFertility: 20%\nPain Threshold: 95% Things/Item/BodyPart/Bionic2 Graphic_Single diff --git a/Patches/Bodypart_Stats_Advanced.xml b/Patches/Bodypart_Stats_Advanced.xml index e41c861..625e39b 100644 --- a/Patches/Bodypart_Stats_Advanced.xml +++ b/Patches/Bodypart_Stats_Advanced.xml @@ -5,7 +5,7 @@ /Defs/HediffDef[defName="AdvancedBionicSpine"]/stages/li - 0.3 + 0.2 -0.1 @@ -24,7 +24,7 @@
  • - 0.2 + 0.1 -0.2
    • @@ -37,7 +37,7 @@
  • - 0.25 + 0.2 -0.2
    • @@ -64,7 +64,7 @@
  • - 0.1 + 0.05
    • @@ -76,7 +76,7 @@
  • - 0.15 + 0.1
    • @@ -102,7 +102,7 @@
  • - 0.35 + 0.3 -0.3
    • @@ -123,7 +123,7 @@
  • - 0.25 + 0.2
    • diff --git a/Patches/Bodypart_Stats_Bionic.xml b/Patches/Bodypart_Stats_Bionic.xml index e8413dc..9077821 100644 --- a/Patches/Bodypart_Stats_Bionic.xml +++ b/Patches/Bodypart_Stats_Bionic.xml @@ -26,7 +26,7 @@ /Defs/HediffDef[defName="BionicSpine"]/stages/li - 0.2 + 0.1 -0.1 @@ -45,8 +45,8 @@
  • - 0.1 - -0.1 + 0.05 + -0.05
    • @@ -58,7 +58,7 @@
  • - 0.15 + 0.1 -0.1
    • @@ -85,7 +85,7 @@
  • - 0.05 + 0.02
    • @@ -97,7 +97,7 @@
  • - 0.1 + 0.05
    • diff --git a/Patches/Hediff_Colors.xml b/Patches/Hediff_Colors.xml index 4dca670..a998de9 100644 --- a/Patches/Hediff_Colors.xml +++ b/Patches/Hediff_Colors.xml @@ -2,7 +2,7 @@ - /Defs/HediffDef[@Name="NaturalPrivatePartBase"]/defaultLabelColor + /Defs/rjw.HediffDef_PartBase[@Name="NaturalPrivatePartBase"]/defaultLabelColor (255, 255, 240) @@ -10,7 +10,7 @@ - /Defs/HediffDef[@Name="ArtificialPrivatePartLotech"] + /Defs/rjw.HediffDef_PartBase[@Name="ArtificialPrivatePartLotech"] (102,178,255) @@ -18,7 +18,7 @@ - /Defs/HediffDef[@Name="ArtificialPrivatePartHitech"] + /Defs/rjw.HediffDef_PartBase[@Name="ArtificialPrivatePartHitech"] (0.5, 0.5, 0.9) @@ -26,25 +26,25 @@ - /Defs/HediffDef[defName="ArchotechPenis"] + /Defs/rjw.HediffDef_PartBase[defName="ArchotechPenis"] (188,39,242) - /Defs/HediffDef[defName="ArchotechVagina"] + /Defs/rjw.HediffDef_PartBase[defName="ArchotechVagina"] (188,39,242) - /Defs/HediffDef[defName="ArchotechAnus"] + /Defs/rjw.HediffDef_PartBase[defName="ArchotechAnus"] (188,39,242) - /Defs/HediffDef[defName="ArchotechBreasts"] + /Defs/rjw.HediffDef_PartBase[defName="ArchotechBreasts"] (188,39,242) diff --git a/Patches/Operation_Research.xml b/Patches/Operation_Research.xml index fb6f1bb..db21a84 100644 --- a/Patches/Operation_Research.xml +++ b/Patches/Operation_Research.xml @@ -96,30 +96,6 @@ OrganTransplantation - - /Defs/RecipeDef[defName="InstallMicroVagina"] - - OrganTransplantation - - - - /Defs/RecipeDef[defName="InstallTightVagina"] - - OrganTransplantation - - - - /Defs/RecipeDef[defName="InstallLooseVagina"] - - OrganTransplantation - - - - /Defs/RecipeDef[defName="InstallGapingVagina"] - - OrganTransplantation - - /Defs/RecipeDef[defName="InstallCatVagina"] @@ -150,30 +126,6 @@ OrganTransplantation - - /Defs/RecipeDef[defName="AttachMicroPenis"] - - OrganTransplantation - - - - /Defs/RecipeDef[defName="AttachSmallPenis"] - - OrganTransplantation - - - - /Defs/RecipeDef[defName="AttachBigPenis"] - - OrganTransplantation - - - - /Defs/RecipeDef[defName="AttachHugePenis"] - - OrganTransplantation - - /Defs/RecipeDef[defName="AttachHorsePenis"] @@ -205,7 +157,7 @@ - /Defs/RecipeDef[defName="AttachHemipenis"] + /Defs/RecipeDef[defName="AttachHemiPenis"] OrganTransplantation @@ -222,18 +174,6 @@ OrganTransplantation - - /Defs/RecipeDef[defName="AttachFlatBreasts"] - - OrganTransplantation - - - - /Defs/RecipeDef[defName="AttachSmallBreasts"] - - OrganTransplantation - - /Defs/RecipeDef[defName="AttachBreasts"] @@ -241,19 +181,7 @@ - /Defs/RecipeDef[defName="AttachLargeBreasts"] - - OrganTransplantation - - - - /Defs/RecipeDef[defName="AttachHugeBreasts"] - - OrganTransplantation - - - - /Defs/RecipeDef[defName="AttachUdder"] + /Defs/RecipeDef[defName="AttachUdderBreasts"] OrganTransplantation @@ -270,30 +198,6 @@ OrganTransplantation - - /Defs/RecipeDef[defName="InstallMicroAnus"] - - OrganTransplantation - - - - /Defs/RecipeDef[defName="InstallTightAnus"] - - OrganTransplantation - - - - /Defs/RecipeDef[defName="InstallLooseAnus"] - - OrganTransplantation - - - - /Defs/RecipeDef[defName="InstallGapingAnus"] - - OrganTransplantation - - /Defs/RecipeDef[defName="InstallInsectAnus"] @@ -306,30 +210,6 @@ OrganTransplantation - - /Defs/RecipeDef[defName="AddMultiMicroVagina"] - - OrganTransplantation - - - - /Defs/RecipeDef[defName="AddMultiTightVagina"] - - OrganTransplantation - - - - /Defs/RecipeDef[defName="AddMultiLooseVagina"] - - OrganTransplantation - - - - /Defs/RecipeDef[defName="AddMultiGapingVagina"] - - OrganTransplantation - - /Defs/RecipeDef[defName="AddMultiHorseVagina"] @@ -360,30 +240,6 @@ OrganTransplantation - - /Defs/RecipeDef[defName="AddMultiMicropenis"] - - OrganTransplantation - - - - /Defs/RecipeDef[defName="AddMultiSmallPenis"] - - OrganTransplantation - - - - /Defs/RecipeDef[defName="AddMultiBigPenis"] - - OrganTransplantation - - - - /Defs/RecipeDef[defName="AddMultiHugePenis"] - - OrganTransplantation - - /Defs/RecipeDef[defName="AddMultiHorsePenis"] @@ -415,7 +271,7 @@ - /Defs/RecipeDef[defName="AddMultiHemipenis"] + /Defs/RecipeDef[defName="AddMultiHemiPenis"] OrganTransplantation @@ -426,96 +282,24 @@ OrganTransplantation - - /Defs/RecipeDef[defName="AddMultiFlatBreasts"] - - OrganTransplantation - - - - /Defs/RecipeDef[defName="AddMultiSmallBreasts"] - - OrganTransplantation - - /Defs/RecipeDef[defName="AddMultiBreasts"] OrganTransplantation - - /Defs/RecipeDef[defName="AddMultiLargeBreasts"] - - OrganTransplantation - - - - /Defs/RecipeDef[defName="AddMultiHugeBreasts"] - - OrganTransplantation - - /Defs/RecipeDef[defName="AddMultiAnus"] OrganTransplantation - - /Defs/RecipeDef[defName="AddMultiMicroAnus"] - - OrganTransplantation - - - - /Defs/RecipeDef[defName="AddMultiTightAnus"] - - OrganTransplantation - - - - /Defs/RecipeDef[defName="AddMultiLooseAnus"] - - OrganTransplantation - - - - /Defs/RecipeDef[defName="AddMultiGapingAnus"] - - OrganTransplantation - - /Defs/RecipeDef[defName="AddVagina"] OrganTransplantation - - /Defs/RecipeDef[defName="AddMicroVagina"] - - OrganTransplantation - - - - /Defs/RecipeDef[defName="addTightVagina"] - - OrganTransplantation - - - - /Defs/RecipeDef[defName="addLooseVagina"] - - OrganTransplantation - - - - /Defs/RecipeDef[defName="addGapingVagina"] - - OrganTransplantation - - /Defs/RecipeDef[defName="addHorseVagina"] @@ -552,30 +336,6 @@ OrganTransplantation - - /Defs/RecipeDef[defName="AddMicropenis"] - - OrganTransplantation - - - - /Defs/RecipeDef[defName="addSmallPenis"] - - OrganTransplantation - - - - /Defs/RecipeDef[defName="addBigPenis"] - - OrganTransplantation - - - - /Defs/RecipeDef[defName="addHugePenis"] - - OrganTransplantation - - /Defs/RecipeDef[defName="addHorsePenis"] @@ -613,7 +373,7 @@ - /Defs/RecipeDef[defName="addHemipenis"] + /Defs/RecipeDef[defName="addHemiPenis"] OrganTransplantation diff --git a/RJW_RBSE.csproj b/RJW_RBSE.csproj index 66f62fc..d625b3b 100644 --- a/RJW_RBSE.csproj +++ b/RJW_RBSE.csproj @@ -34,9 +34,8 @@ false - - C:\Steam\steamapps\workshop\content\294100\818773962\Assemblies\0Harmony.dll - False + + packages\Lib.Harmony.2.0.2\lib\net45\0Harmony.dll C:\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\Assembly-CSharp.dll @@ -79,5 +78,8 @@ + + + \ No newline at end of file diff --git a/Source/Main.cs b/Source/Main.cs index 7b4a0d7..34566d6 100644 --- a/Source/Main.cs +++ b/Source/Main.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Reflection; using System.Linq; -using Harmony; +using HarmonyLib; using RimWorld; using Verse; @@ -17,7 +17,7 @@ namespace RJW_RBSE return LoadedModManager.RunningModsListForReading.Any(x => x.Name == mod); } - private static void Fix_recipes() + private static void Fix_rjw_rbse_recipes() { //Log.Message("[RJW-RBSE] Startup::fix_recipes"); @@ -77,9 +77,9 @@ namespace RJW_RBSE { //Log.Message("[RJW-RBSE] Startup::Startup() called"); - Fix_recipes(); - var harmony = HarmonyInstance.Create("rjw-rbse"); - harmony.PatchAll(Assembly.GetExecutingAssembly()); + Fix_rjw_rbse_recipes(); + var har = new Harmony("rjw-rbse"); + har.PatchAll(Assembly.GetExecutingAssembly()); } } } diff --git a/Textures/Things/Item/BodyPart/slimepart.png b/Textures/Things/Item/BodyPart/slimepart.png index 0392b081776efb0d21e95b9732176ceca0521a26..ec82442abe52e56681ba9ac0d923d86dc55ee226 100644 GIT binary patch delta 2891 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 FV1ihcSJ40f