From 66fc9f99ae9099d89b7ade6e66533a3a9a821371 Mon Sep 17 00:00:00 2001 From: Dastardlii Date: Sun, 6 Sep 2020 05:36:04 -0400 Subject: [PATCH] Trying to remove DLL requirement. Waiting on patch to RJW --- .gitignore | 2 + About/About.xml | 3 +- Assemblies/RJW_RBSE.dll | Bin 6656 -> 5120 bytes Defs/RecipeDefs/Recipe_AdvMedTable.xml | 6 +++ Patches/Recipes_RJW_Prosthetics.xml | 12 +++++ Source/Main.cs | 64 ++++++++++++------------- packages.config | 4 ++ 7 files changed, 57 insertions(+), 34 deletions(-) create mode 100644 Patches/Recipes_RJW_Prosthetics.xml create mode 100644 packages.config diff --git a/.gitignore b/.gitignore index e2ae5b0..f854df2 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ /.vs /Assemblies/0Harmony.dll /Assemblies/0Harmony.xml +/Changelog.txt +/packages diff --git a/About/About.xml b/About/About.xml index 0e51761..584eee5 100644 --- a/About/About.xml +++ b/About/About.xml @@ -12,8 +12,7 @@
  • rim.job.world RJW - steam://url/CommunityFilePage/2009463077 - https://github.com/pardeike/HarmonyRimWorld/releases/latest + https://gitgud.io/Ed86/rjw
  • Rah.RBSE diff --git a/Assemblies/RJW_RBSE.dll b/Assemblies/RJW_RBSE.dll index d1de3af78971409dac4aace1db66e591c1774cd4..5d1c84b1066f6f8d158fa2b2204962f431166530 100644 GIT binary patch delta 1260 zcmYk6TWnNS6o&t`&&-+jbTZ7GGQ+eWo@r@jm}1k0MhnKo7D#O^N>htzMAHfeY9p0t z6Db5{ES6AG(a8=(9x$5tBJrWg7@yRH@Zjyi8^l{e8XioIQ3z=C1>?W>l!Tp}Z?D@~ zd#!aYrOs0B%~MTVi!*;IO#z%cxkA<_vwbXbcn4JxqwgDbuqwm^{?_QbX zRmNuOKP_3u#Xpvx;%~JIy$p5nD;AWCm&EW1%WIYwEiYT%!9tPl?@+@OiR<-n>%4kl;M4n79^8kgY)lMLV zlXiB3S$YKprxwecQi62RKzi6n#?fK9#j@M5h(4zbkx7hO`HohFz-BwFR)V$vI%p{x0rVJP@Ys{n78rovc&!P3Fn*%w4n|QWIbnEY{Oc7 zNTnH{kgfQN+-&)<XrQ)y+M0SK)rB3;c4pgabTqUvZ~Z@PU1D23D}f*UekVS5YC0UO*qK$>~bXQ*PhX zz~tDzN@MLgseI{mOQkWoQCboOyoguu019}X^}WCY_=EUn!|2ud>jR7Kj-NY!|Grbl z<1IZS;t#q>|5@3&ZN|pd`0=&r4n0x+o=tz|E9mTRubtOQf`m@5An{+ Ae*gdg delta 2574 zcma)8YiyHM7=F(Ax^C;b*>(3DbQ^4C>{0>|j3L@FfsGB2QE&)>uKQqu*99v}R^du#Hex0mJ3+Gc4G07Kr3xKF2Tu7oSSvitW-a&Wf9=cCw z>9TFJ7ITDIssjmLtrOK*%u*yRGQ%Nhff%0>Tj2Wi!ZY|h8Lu)CKW@K#nvc$K*gdV7 z!JoVff8{Q`FlH`{sq8958py`?8B?h7mvS4o@Kxtzf}47aZ#HGVBF85&m$IRzUa8J# zEwmWnITYkU#<6+lS|!GU<+%({`3x}3@fRhx4@G+V zcMUQ$x>JE;iVL&@8Gt&`m8$~HO&ndEziS;bs-q04vVb~uJj*=M(3vS~#oPEQUBX7m zz`2oi#2{_EXNnH^yUR-p5wMfum#`a2m?yA@mX#Ls@>S`7w?2p=_2?w&N2+ zC3HkyP!(dO0v47oFw9bH#yabitsr^|lUVOjsxiEbb2K;{pPev1WN*$_XkB5Yo?X+k z7YfUmzQk{OHiCRy)Lj(dwPu8KMmow2!HrgSMMMV{5M5ZL@d1r~g;6x?$)g%OGzN)z z=+W{XjR!OyBHHnm#t+aUJ^YH589scDE5`k}if3g9a`7s5s#1(Tlxle%eDXQW!;3hA z<2ufDoHveAJ}plm`jQU!4#U2Q8~DLEjd~uP%fuXfMJ(ZF)$@aQi?|RrQO~9;d{E;G z&98xjOuJ?t*BC+tncZk54x&S>z(Jf5A&d}<(TY*_V>|ZY=`FAg$Br927k|{pS{=f~ zGmelJ1)JPm7Hy01KkHpppao4{RcDq5SE3rLtRA~Jv&r1q6dVe61_#X@i>y(5AjjX; zh33K5aInkl!YXrUZLn|hSNm(CXoJ}o-e+Qi8R{7@>4%NoyjT<_htnE`bC)@^-QU}* z)sq*~YelqtC4%Tggj*G&G{iBCel)@)hR_WZZPXUMWE$gIWy{MtH+jC9ei3%7bK0}c zk1qBns3Vz_+ovcjs zN?-mTeUz1KVt`%Ds-GhkCQN4Mo?L4SEuRFc6SnO*K<^=T%hVkVA;8gOays?8yW2%K z(oAKqTB=&iEE^K$_evqDszv|DenydtZ+mpi+M(nsXEpbB757T(_I3rV2}gcsKsU8h zSLR`rVR(46d$6D52DD%^8aOucC_F+&?PZAC0o{jsi0lZSV594(>11b2ewOikz~-RNnQE8P-5mR+ zK#D9$uRh^!=7%r`Su)K-a|YWJqt&2hDIP&JQRKjuD%@?n*zUb*?%r#7kYydr@Q8r* zdd5v_)alAX{GXP(#>GBs!dWbxzR53~O~P_zem0qvb<;?viTd|e>zmAW{~^YFss93! C|Duxs diff --git a/Defs/RecipeDefs/Recipe_AdvMedTable.xml b/Defs/RecipeDefs/Recipe_AdvMedTable.xml index ce172b2..651b1bb 100644 --- a/Defs/RecipeDefs/Recipe_AdvMedTable.xml +++ b/Defs/RecipeDefs/Recipe_AdvMedTable.xml @@ -12,6 +12,9 @@ 10 + +
  • AdvancedMedicalStation
    • + @@ -26,6 +29,9 @@ 10 + +
  • AdvancedMedicalStation
    • +     diff --git a/Patches/Recipes_RJW_Prosthetics.xml b/Patches/Recipes_RJW_Prosthetics.xml new file mode 100644 index 0000000..6a613c8 --- /dev/null +++ b/Patches/Recipes_RJW_Prosthetics.xml @@ -0,0 +1,12 @@ + + + + + /Defs/RecipeDef[@Name="MakeStandardPrivates"]/recipeUsers + + +
  • BionicWorkbench
    • +     +     +     +     \ No newline at end of file diff --git a/Source/Main.cs b/Source/Main.cs index 34566d6..aeb2ced 100644 --- a/Source/Main.cs +++ b/Source/Main.cs @@ -33,43 +33,43 @@ namespace RJW_RBSE return; } - try - { - //Vanilla bench - var fab_ben = DefDatabase.GetNamed("FabricationBench"); + //try + //{ + // //Vanilla bench + // var fab_ben = DefDatabase.GetNamed("FabricationBench"); - //EPOE bench - var bio_ben = DefDatabase.GetNamed("TableBionics", false); + // //EPOE bench + // var bio_ben = DefDatabase.GetNamed("TableBionics", false); - //RBSE benches - var rbse_bio = DefDatabase.GetNamed("BionicWorkbench", false); - var rbse_adv = DefDatabase.GetNamed("AdvancedMedicalStation", false); + // //RBSE benches + // var rbse_bio = DefDatabase.GetNamed("BionicWorkbench", false); + // var rbse_adv = DefDatabase.GetNamed("AdvancedMedicalStation", false); - // Remove existing Bionic recipes - (bio_ben ?? fab_ben).AllRecipes.Remove(DefDatabase.GetNamed("MakeBionicAnus")); - (bio_ben ?? fab_ben).AllRecipes.Remove(DefDatabase.GetNamed("MakeBionicBreasts")); - (bio_ben ?? fab_ben).AllRecipes.Remove(DefDatabase.GetNamed("MakeBionicPenis")); - (bio_ben ?? fab_ben).AllRecipes.Remove(DefDatabase.GetNamed("MakeBionicVagina")); + // // Remove existing Bionic recipes + // (bio_ben ?? fab_ben).AllRecipes.Remove(DefDatabase.GetNamed("MakeBionicAnus")); + // (bio_ben ?? fab_ben).AllRecipes.Remove(DefDatabase.GetNamed("MakeBionicBreasts")); + // (bio_ben ?? fab_ben).AllRecipes.Remove(DefDatabase.GetNamed("MakeBionicPenis")); + // (bio_ben ?? fab_ben).AllRecipes.Remove(DefDatabase.GetNamed("MakeBionicVagina")); - // Add recipes to RBSE bionics bench - rbse_bio.AllRecipes.Add(DefDatabase.GetNamed("MakeBionicAnus")); - rbse_bio.AllRecipes.Add(DefDatabase.GetNamed("MakeBionicBreasts")); - rbse_bio.AllRecipes.Add(DefDatabase.GetNamed("MakeBionicPenis")); - rbse_bio.AllRecipes.Add(DefDatabase.GetNamed("MakeBionicVagina")); + // // Add recipes to RBSE bionics bench + // rbse_bio.AllRecipes.Add(DefDatabase.GetNamed("MakeBionicAnus")); + // rbse_bio.AllRecipes.Add(DefDatabase.GetNamed("MakeBionicBreasts")); + // rbse_bio.AllRecipes.Add(DefDatabase.GetNamed("MakeBionicPenis")); + // rbse_bio.AllRecipes.Add(DefDatabase.GetNamed("MakeBionicVagina")); - // Add recipes to RBSE Advanced Medical bench - rbse_adv.AllRecipes.Add(DefDatabase.GetNamed("MakeAdvancedBionicJaw")); - rbse_adv.AllRecipes.Add(DefDatabase.GetNamed("MakeSyntheticUterus")); - rbse_adv.AllRecipes.Add(DefDatabase.GetNamed("MakeSyntheticTesticles")); - rbse_adv.AllRecipes.Add(DefDatabase.GetNamed("MakeAdvancedBionicPenis")); - rbse_adv.AllRecipes.Add(DefDatabase.GetNamed("MakeAdvancedBionicVagina")); - rbse_adv.AllRecipes.Add(DefDatabase.GetNamed("MakeAdvancedBionicBreasts")); - rbse_adv.AllRecipes.Add(DefDatabase.GetNamed("MakeAdvancedBionicAnus")); - } - catch - { - Log.Warning("[RJW-RBSE] Unable to fix RJW/RBSE recipes."); - } + // // Add recipes to RBSE Advanced Medical bench + // // rbse_adv.AllRecipes.Add(DefDatabase.GetNamed("MakeAdvancedBionicJaw")); + // // rbse_adv.AllRecipes.Add(DefDatabase.GetNamed("MakeSyntheticUterus")); + // // rbse_adv.AllRecipes.Add(DefDatabase.GetNamed("MakeSyntheticTesticles")); + // // rbse_adv.AllRecipes.Add(DefDatabase.GetNamed("MakeAdvancedBionicPenis")); + // // rbse_adv.AllRecipes.Add(DefDatabase.GetNamed("MakeAdvancedBionicVagina")); + // // rbse_adv.AllRecipes.Add(DefDatabase.GetNamed("MakeAdvancedBionicBreasts")); + // // rbse_adv.AllRecipes.Add(DefDatabase.GetNamed("MakeAdvancedBionicAnus")); + //} + //catch + //{ + // Log.Warning("[RJW-RBSE] Unable to fix RJW/RBSE recipes."); + //} } diff --git a/packages.config b/packages.config new file mode 100644 index 0000000..a46a21b --- /dev/null +++ b/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file