From 8a988f48a527f100649f27eb67696dc88d1c7908 Mon Sep 17 00:00:00 2001 From: Shabakur Date: Mon, 21 Nov 2022 18:52:20 +0100 Subject: [PATCH] Name change fixes and removing genes which moved to RJW_Genes --- .../Common/Assemblies/RJW_More_Genes.dll | Bin 20480 -> 15360 bytes .../Common/Defs/AbilityDefs/Abilities.xml | 7 ++- .../Common/Defs/GeneDefs/GeneDefs_RJW.xml | 30 --------- .../Common/Defs/JobDefs/Jobs_SexAbility.xml | 2 +- ...f89c998f-728f-4e82-9434-7a7cedeb321a.vsidx | Bin 0 -> 43474 bytes .../FileContentIndex/read.lock | 0 .../.vs/RJW_More_Genes/v17/.suo | Bin 0 -> 110080 bytes ...1b32cc0b-75bf-4b8e-b4d3-c2ce07a95f02.vsidx | Bin ...66efd428-daf0-42d1-8c23-97ec74e2ee2a.vsidx | Bin ...8d5baf21-343e-4f22-a2f1-93e155c2917e.vsidx | Bin ...a2e63c8c-c786-4ae2-aef9-dfd55aa13fa7.vsidx | Bin .../FileContentIndex/read.lock | 0 .../CompAbilityEffect_PussyHeal.cs | 2 +- .../CompAbility_SexInteractionRequirements.cs | 2 +- .../CompProperties_AbilityPussyHeal.cs | 2 +- ...mpProperties_SexInteractionRequirements.cs | 3 +- .../GeneDefOf.cs | 5 +- .../Source/RJW_More_Genes/GeneUtility.cs | 21 +++++++ .../HarmonyInit.cs | 4 +- .../JobDriver_CastAbilityAfterSex.cs | 2 +- .../Properties/AssemblyInfo.cs | 0 .../RJW_More_Genes.csproj | 3 - .../RJW_More_Genes.sln | 0 .../SexInteractionUtility.cs | 2 +- .../ThoughtDefOf.cs | 3 +- ...ework,Version=v4.7.2.AssemblyAttributes.cs | 0 ...gnTimeResolveAssemblyReferencesInput.cache | Bin 7218 -> 7207 bytes ..._More_Genes.csproj.AssemblyReference.cache | Bin ..._More_Genes.csproj.CoreCompileInputs.cache | 1 + ...RJW_More_Genes.csproj.FileListAbsolute.txt | 4 ++ .../obj/Debug/RJW_More_Genes.dll | Bin 0 -> 15360 bytes ...genesaddons.csproj.AssemblyReference.cache | Bin ...genesaddons.csproj.CoreCompileInputs.cache | 0 ...be_genesaddons.csproj.FileListAbsolute.txt | 0 .../obj/Debug/shabe_genesaddons.dll | Bin .../.vs/RJW_More_Genes/v17/.suo | Bin 85504 -> 0 bytes .../Source/shabe_genesaddons/GeneUtility.cs | 58 ------------------ .../shabe_genesaddons/PatchMechBirth.cs | 58 ------------------ .../shabe_genesaddons/PatchPawnExtensions.cs | 24 -------- .../shabe_genesaddons/PatchPregnancyHelper.cs | 50 --------------- ..._More_Genes.csproj.CoreCompileInputs.cache | 1 - .../obj/Debug/RJW_More_Genes.dll | Bin 20480 -> 0 bytes 42 files changed, 43 insertions(+), 241 deletions(-) delete mode 100644 RJW_More_Genes/Common/Defs/GeneDefs/GeneDefs_RJW.xml create mode 100644 RJW_More_Genes/Source/RJW_More_Genes/.vs/RJW_More_Genes/FileContentIndex/f89c998f-728f-4e82-9434-7a7cedeb321a.vsidx rename RJW_More_Genes/Source/{shabe_genesaddons/.vs/shabe_genesaddons => RJW_More_Genes/.vs/RJW_More_Genes}/FileContentIndex/read.lock (100%) create mode 100644 RJW_More_Genes/Source/RJW_More_Genes/.vs/RJW_More_Genes/v17/.suo rename RJW_More_Genes/Source/{shabe_genesaddons => RJW_More_Genes}/.vs/shabe_genesaddons/FileContentIndex/1b32cc0b-75bf-4b8e-b4d3-c2ce07a95f02.vsidx (100%) rename RJW_More_Genes/Source/{shabe_genesaddons => RJW_More_Genes}/.vs/shabe_genesaddons/FileContentIndex/66efd428-daf0-42d1-8c23-97ec74e2ee2a.vsidx (100%) rename RJW_More_Genes/Source/{shabe_genesaddons => RJW_More_Genes}/.vs/shabe_genesaddons/FileContentIndex/8d5baf21-343e-4f22-a2f1-93e155c2917e.vsidx (100%) rename RJW_More_Genes/Source/{shabe_genesaddons => RJW_More_Genes}/.vs/shabe_genesaddons/FileContentIndex/a2e63c8c-c786-4ae2-aef9-dfd55aa13fa7.vsidx (100%) create mode 100644 RJW_More_Genes/Source/RJW_More_Genes/.vs/shabe_genesaddons/FileContentIndex/read.lock rename RJW_More_Genes/Source/{shabe_genesaddons => RJW_More_Genes}/CompAbilityEffect_PussyHeal.cs (98%) rename RJW_More_Genes/Source/{shabe_genesaddons => RJW_More_Genes}/CompAbility_SexInteractionRequirements.cs (93%) rename RJW_More_Genes/Source/{shabe_genesaddons => RJW_More_Genes}/CompProperties_AbilityPussyHeal.cs (93%) rename RJW_More_Genes/Source/{shabe_genesaddons => RJW_More_Genes}/CompProperties_SexInteractionRequirements.cs (96%) rename RJW_More_Genes/Source/{shabe_genesaddons => RJW_More_Genes}/GeneDefOf.cs (55%) create mode 100644 RJW_More_Genes/Source/RJW_More_Genes/GeneUtility.cs rename RJW_More_Genes/Source/{shabe_genesaddons => RJW_More_Genes}/HarmonyInit.cs (77%) rename RJW_More_Genes/Source/{shabe_genesaddons => RJW_More_Genes}/JobDriver_CastAbilityAfterSex.cs (99%) rename RJW_More_Genes/Source/{shabe_genesaddons => RJW_More_Genes}/Properties/AssemblyInfo.cs (100%) rename RJW_More_Genes/Source/{shabe_genesaddons => RJW_More_Genes}/RJW_More_Genes.csproj (95%) rename RJW_More_Genes/Source/{shabe_genesaddons => RJW_More_Genes}/RJW_More_Genes.sln (100%) rename RJW_More_Genes/Source/{shabe_genesaddons => RJW_More_Genes}/SexInteractionUtility.cs (99%) rename RJW_More_Genes/Source/{shabe_genesaddons => RJW_More_Genes}/ThoughtDefOf.cs (90%) rename RJW_More_Genes/Source/{shabe_genesaddons => RJW_More_Genes}/obj/Debug/.NETFramework,Version=v4.7.2.AssemblyAttributes.cs (100%) rename RJW_More_Genes/Source/{shabe_genesaddons => RJW_More_Genes}/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache (84%) rename RJW_More_Genes/Source/{shabe_genesaddons => RJW_More_Genes}/obj/Debug/RJW_More_Genes.csproj.AssemblyReference.cache (100%) create mode 100644 RJW_More_Genes/Source/RJW_More_Genes/obj/Debug/RJW_More_Genes.csproj.CoreCompileInputs.cache rename RJW_More_Genes/Source/{shabe_genesaddons => RJW_More_Genes}/obj/Debug/RJW_More_Genes.csproj.FileListAbsolute.txt (51%) create mode 100644 RJW_More_Genes/Source/RJW_More_Genes/obj/Debug/RJW_More_Genes.dll rename RJW_More_Genes/Source/{shabe_genesaddons => RJW_More_Genes}/obj/Debug/shabe_genesaddons.csproj.AssemblyReference.cache (100%) rename RJW_More_Genes/Source/{shabe_genesaddons => RJW_More_Genes}/obj/Debug/shabe_genesaddons.csproj.CoreCompileInputs.cache (100%) rename RJW_More_Genes/Source/{shabe_genesaddons => RJW_More_Genes}/obj/Debug/shabe_genesaddons.csproj.FileListAbsolute.txt (100%) rename RJW_More_Genes/Source/{shabe_genesaddons => RJW_More_Genes}/obj/Debug/shabe_genesaddons.dll (100%) delete mode 100644 RJW_More_Genes/Source/shabe_genesaddons/.vs/RJW_More_Genes/v17/.suo delete mode 100644 RJW_More_Genes/Source/shabe_genesaddons/GeneUtility.cs delete mode 100644 RJW_More_Genes/Source/shabe_genesaddons/PatchMechBirth.cs delete mode 100644 RJW_More_Genes/Source/shabe_genesaddons/PatchPawnExtensions.cs delete mode 100644 RJW_More_Genes/Source/shabe_genesaddons/PatchPregnancyHelper.cs delete mode 100644 RJW_More_Genes/Source/shabe_genesaddons/obj/Debug/RJW_More_Genes.csproj.CoreCompileInputs.cache delete mode 100644 RJW_More_Genes/Source/shabe_genesaddons/obj/Debug/RJW_More_Genes.dll diff --git a/RJW_More_Genes/Common/Assemblies/RJW_More_Genes.dll b/RJW_More_Genes/Common/Assemblies/RJW_More_Genes.dll index e1587b24d1fbd5e96918b9c36f9b8ce04896bb18..06552b3370b2b59c08dac604f3cb7e7d97983759 100644 GIT binary patch delta 7688 zcmcIpd6-nyl|T2sSMOE5+N-*&SD?C^<H@i#7sbM@9{_+G+!KK{tp{6jc?} zh}+n_5kaGZ8Z(&bFB0PRIq?G%ogpJC`Wd6+s7PG!(=i&y=tSH3o%^cVM)T#rDXrf< z%RS3I_uTtlHMxBvclE8;&mGZy$Iqznd5db3eleP890Z0doU{aE65rMM5=9g(iFC#G zPb1pb^Wvz``-_Qwz?#)W&uTq2@j#9!0RCAhs+}6y=&TeYtd_A5CGj2S+#u?Ft3k29 z3C<&8h%W~U0ceu*hN!Km=J@!Wi?1XPm5d^KY$%a%jhSv zHj%2soCcAId!nAk@%>iP7O29YZ9v^dVwNj#`C%L-HQX7bHH;ep+DO^JF3eqT+9N^Q z^$ZPw+B^1kwAhWHuuz$90+Al&Y}2Z;r{``Z{0$e7VGc++ROD2~;R4s6aKPI*jP&#w z>=B!5rN=Ow3D}NJ*0qupw!@-^7@1|~`%OdDrcV$0n)cLFe6*9$L)l_kHNQFWY1EVq z8%<&*RGnK$kLyvraWomJ@sJK{(ubEccv2HUccIYh?PgGhjrv;Kk)xHcCjqfDanD&h z;H(ZW8n53OPsSv0HBPt)It~6HAJsXqJ8FSdCe%g?}ZbUbR$qdeo&aux?3d(Yp zlF&e8x>@2(Sm<=iX!M}T8{#s}lI_S_Pql*bH;~B==DH4usz&Ry74}}X?>-M=i?+|h zkeaWi&x{Fs0jL0ZZ4}oE`pQxZF*f;piB$6

o?5C)x5!Ero-rjsx$!MTR%E6aqMh zk7b~me)UE;Ci)VFlQSEI&*?QQvm7d@;>Ps>fzbsP>K5~;;BkXgjHpovfz)CL5)+d&6? zGIJS5pO(3t2h+X+L#BgiZ)S}wCx%Rl>B5n9k3a@pR)}ebaaPoQ zuWlfNO5)D*R^b0LhyDZAPvBez3ENJ7_gtDdtGId4b$WU|Qnfb#T;A>~@^&|JM8tN5gU zjf~)h?=wzCg-&0Mxv4GeXrPosr*Sh_i43l!qAtCS#i+KG-VR9N2C}S%MKQ8-p!{U2 zdvX)slO=r`Ztn3#QI=&vH-d|*5CcN`Y+ScSCJ#qAoMit9MAHN4D(XvMPmBFru-L)V z3Xa%hfKU4xwu}vM4T;HDQ(5L(rz1EdTevOzx1(Tu9qjBM18{$iEjSrxoAdWJv1iEP(ylGf7mi; ziHGrzTE+^~%P5CI0bTPNbX4Jkx|Rhq$-^Q;;Shy0l==&8H;jL;@Ma~sP+x9XlnnZ% zMQz@Fnnf#s23Tmh_As8r_baO{f+ZJGooUh6 zo{0DXtyZfvmF<7~p7k4a6>JUqt7LkUo`LNj5I#if%q4+PmR3bLFI{Dq2%HRC^d8g} z`Fx!F@*v|w5yp98#)ZZ{EkVDdRiJaK26I9z-;PyUv>sZE-cU7oGQxhUeT-uy0buUP`YE#tpw#&+)n7)(D^>fiwJG-RQfmI zEMQA;03Hr9XMkg$<&jE%9-Los&w*ndpScLVpDnOq<>q$f1}|5n!6_f54LEErH&Ssv z97uyckeBHOHT%~9zY2B%p9fB$DZZu(YF~#ksQNC(n z(uV_dUizY-+ZOKCy>#nPPHi{s3qPS-v}c6Ng#!Pf2WhD7a@j%R6+J?|ioH%H6Qf5? z;|?os2fc{G$EcC_fp$=WYQQZla5I%|UA?Q@t+?q8F82$?EhupBDDGm#Azs!JaFbE& z32`lUCQi8m_d>V^+`%SxbHaBxbV85Q<1Qz*1bOD+f=-6Vg8TP^?tgvnVWxkSvJ=y+ zxzKTocLn*XUW>OrK^J3aur4O0cGY+Wm==BU^YAr6>QM9sgoE}w^|?LMPRc0j4EU< z@FmsAzgm4XQr;WU#6%g4REr*3pw)^Klre14D!&Reibe83@Jz8%{x&>WbjYV=i`XEW z#XPY^mdo=+ULDQ6s>%U{2Nn9nFs)M@q1M1=F;q#8P?pQ}C71}X&%jNm>d`|Z{Wpu9 za)q`Ffq71&!XEjA|FCF80gsAts<3{c@?2U#R34D)~-vCBp0! zH3)f79tplA_p7A$3ohw?(d|QF<;38-kauYxvsU{I_(YhoJj%Ez@)y}7&k1I~0&}yW zX-Cz5?4$$1O6|D3+}A~~%H^U~>!GWyGqe+OqnHJ{LtLRv6rXxJK|kmHktVd4@h~|d zANBnh9v%W{GXuj4)!ACM{3JT@Qmw` z6C!VGW3-=&Q_#-A%f@lJCisaqLz{1Yu01Y4$Mc|7+w3*;8da?taifgs*&6YXEYmx* zwN^D0UzoM}aruDRtJR3z3TGIf$!oCp)%pzWY;zRmyl0*bd`K`yj{9{0U zh8GEyysw^|g-OFv3~akaTWq_;l#vjw@HBy4GDvvpX-Pm*c{lAFJAN$XVU8(D_|Uy_tJeH)6T}a{k)Vl+AtQ zNm4BL32xG8?ti>KlF{7PA&?MY_}Wi86dz$mC;+RxM>Arrep4@v%@?snUMX4VV+b-t z8A|<0O~i69$690gih${jwMzWY9}k`>u~v?luhEhe@?=SdLLt1O#_}U$xl?RChC_y! z&*N7B{>>xS>IUu3I! zhIb@)WY^3@_NZD3jNP=Ea0`<=R?r+PYL1okR|Uq%{y2Z}n?nqy(pc_h3?7U9V&Tzz z8wlONC=ISGs(>zGJ0lb~wOH;hB)(rbx6KSs$ejuhOJcdb(b>`2ybl{V=zg@*PYp%L zx?}*Z?~3L(#qwLQ(fN$?+RV{Lo+r0Eky**?acOvQVIikeUbIa#e>3ZD3!uS3qbtE! zNnN1ixlBP8FjEyN-^1Sgp|YahK}GanAhNwc*^$I3!6p$@PF3?fiUp z4gL^Z>@x0-FlmK0U@lhT=TaSaX&gb&PI69ZiEdLY!cgJ?z?+SKEL}b4oA@k2(-+TO zv1)#*t9{iu?Vau2qnzfcgPdLGl}7QWJg&3RkOM1Qj3kDu{rWK1IPFNS}BWKK4CO_*_xsQN$<6MPHwwuU<*tckOe| zWRe!td++D-{&;W7S!eIH*IsMwwbxpE?{iM*yz*nD5Rr=O)G4Azap&J!0pA;pp*h^} z%`kl}aBTjg(w1ZMdj@h=V#qZ5&GcX*lP(mDVxm`1n59A@S4eE!+MO6QvU+oMb?|J5 z^|m&mEs{c?xXgOomG&~7m8gQ&Elx16QMmS_dPoM%k{}kGF z6O;0PlXs`eDEzYEyOj%LL_cCfO#j_O6asED=;lmsd#`$e$Y0U!N1cb`{+f&Wfg&p3 z-UN`q#f^^MD2ZQ!XjijonHkiCZeu9$L|u%l;XV`ttDDt zQ5D5I*{=B6;ypBT1yRdVBFRSo%`ny?k%nIAuaP{GAPN?tvK(wA?_%I%Eh<%^5$d5` zQIqpQK{ZnHEZl?M_=Hp)X!6p^-+;EZ$~&?E=#jG-ECdMojdO6TyCSAGn&j71<6Klr z8z65OMX_RVX9?jEqUb&Z?gc{!K0Mz6nP*m2TX|T>{1SDVGI8S~Xn$T6ShYicI1(F9tru>{Zr$01*`8O7xL7{HN(XMOsv+}b4U z8pP1$k!2{1v;ugO3j6M2VV4hL%&2OlP8)WxwyN}&PIfp%nAu7qM@}4fad>ET9_5D8Z^m@(EdgxerG6H}`?|e{&ybKCKTtkKpMV!GL2I zA-Iv0yj4D!!wU?py%L2`Bl+2=a2+x6^~g=vq7iedk+ltlARW9EH)A_MRpW-JlbvzNt3+t6kG1`_P%sVKcmkwv*JcOV|Ne!wa@F%rO9YK()A)#fpP&uYn z=!_5xf;{RGddIvZ^wYeKf}F|%n#i}mMAp*0VpuU>ZOo5oz6xr^f{hK)VDf4%R*~k@ zs*G#69MVGYjylj0nm+*4lAmHk!HHTJ-5rtUX93k(H7E4zA;5@ihTREx5xI*0=E3^UI% z#~7H$k~$aT%seipjhWBTW|W!7l6@}o*hFphBy-~A6RXu~SAB`qCVz$Abzog*>phcM z&ouhMgjvthW|djjP3m2D2EAu%vzruZ>;>mZrR%}D-d1`JbDm=iIGpEdbIY9TCzYI!NG-JPlk9^;dvRfHqq}hl zXT+WHFW`C~EJZan&mh9gOL2ry+RN*DW0g<%a=mcZkhL48s}9JcdvFgZqj|phl7qO77P#ymHSF6E z-)cuOY!Hl^;+C{<8!d9V9HX3TM<;bjA`k!HQKg)}$_1=n)wBz`!G$@WBkf@6L$IhL zC5$1t55TS`_q+Av0hB7SBf~&=>*KX`apb8PVMK$kwl*qH%)l(w`)lhAWJ+Ysn=3dO zSi*uM*8$i7v_iCQchZjNz!+`?oIBkoecGkGibj8?D~7;I!lKa3Wb!pZGj^nnL$caODr=m)?f zk-E02P;cZT=$5<<0IPAUBeg=HaXXqS>q}5S_;=jtqX4jluyzH7T@>c8t4n^2i7HTM z@nV@gG>H|uoR0lCD6sp*^kPX3yBt0tL@vI-ts{lNL%N*m2pcQ;_X4-uS#)J(6v2#5 z(j7pL!avl-I3=)67TR&I$s6`xZc^B1(X_B`6p1squy*uwe6u-Bc;`S5>pyYVdl-oRGtbn26z&IQ z8P*F*f|QBuRiN#o>9_d2_%&3;V*w$C z4F+o>7eQOD@bPmMRs+<|$a3WoHe&_tEQj``p-IB83qm%; zZRcTGsGy$hQm-#l+mi`7aba<12H<|d3kD}now9w4TX|+`gD?5zWFx!{hYGkStrN4# z!ywuOAK?q@jrf_4!`LjFLJn&f8L1nA#MZ8eD^caR+JN4e0>@wNxZ-e_j4PfX#FejB z99224YJnML&q5h#TODPe6fw4RT8ts%xG^>##nWPp+bd#hPC3R_yjP4}hjC*7(3$%q z#@GnJ@vQS$B2ie4T?v`I(C_;o^CL`6$|w-+-}4&*c`GA9XolioC<&y9hV-edyvuB&;DKk_D|C zgKV@i&W=dTJ4YmU!}1*RuR0$TKrr48%|{_lgl5wm2mMuG?5Ox5>%&oju&oZP`V+ds z_a6ho@%;qYAo^G~qOXai!}qx=AN(fBwEjckrX_EK+IVx4VuHY}TMR19RUOLu`w#{tLf zj`>A64vBDNH{@2H7CRi5JKM(4 zUAl@f9?CNw3)X^zLs7b5r#rYM9RT{k}R(&qn?n3DQ@+isGe-nh}4Hj(M5p?BFA6l&*<4%VGLmm5B#A zA67^Fc+??A@pZv}jsN$Om!46ZtAq5I=%veyd4QNt)c1R7D;>jBdTEa68w}kX_R^E+ z>!paw_qe9dx{TB;b11e!tf)6jUtOK1BT{v>c!AWWTMrhGBRTHP+R zdJ6a;y$Sup^rXL`CQNm49@i`}x>rCSq(7rINI%Aif^=4dp%rKN<0wNNR;r~wsfhAB z!iLK<#-AN#c$2Wjiu|$~x%KDoFh*&%!5tY=^Zq%;#f5 zhv$Wrb_@IO6qG*&Pdp@peS&lpoWpc1ZpOm2uj;LEm^LdujCzxDbvQ_a&@D`Fz*ZlT zJ_-j5(%n_Rm%{XSzy#@YVsuA>zn6makpRP|6oyX-iAMzG{oov=!+zH10}{i-LaSFn zCU4bV6?uQz+6;k}5g zAdP|Foe{1DP-8Cl#iHSH)T#vKKY|OlRg2o@uw4tIUxaR{vTHS>-`#P$#%f0B8&0iO z^m|aq3s5~N=*L6Y3u$%@*$TA~mTGRps)t&X7FX07s1;*6rTlML_0j4-1HKkfJzn}2 z;0nqG{eaI`G5nw?dqnwpIRu)E<&VR{->KF-5`ABNR*~qd(HST|C_h`qf0$+i^J`+f zOEb@*k?3>b1>kcRphRo^OHf`6D3MMx!R>zuxL8^S%#G6dfR9V70lzOXhrgcNKH|QL z)DHN5!L1}Q|4DA!5-<&o`=1G40-7OF`zP8NzY+GlWj?pvOy7=e^C%R@szCHlbV9yP z@{peoHgxmMS3_PLR^oOITrT(cXz7%;3#Qb1rqr$zwL>$16S@ZdJ}YWZ($A{Xs69A^ z@)1$HgU+wYqwPmd?U%9ZJpp>NqOFQltXM>M&{e?|QZ=n~YTv6`fhf#7wM)=eL-#nf zKcW_)=bT#B|6z|t5*9yqd{GLC+8tCC`|pfX46qov#m6To}N;BPSkFoI}w?4Xf2j>q8qTh%||Wk)DCf0rZHaR(54B>?k2l- ziKz8DwFg9PpQy1s3H=U<+HvXA@a?(uNvD>I%}4F~&CKO^;E&pqp1E|)u1Rgk33KT= zr|p(#D{3z~ZMC7NLD}#=(NB6HbTQh_6*XJlT-xZgvAlV7qf=vfSe=(~zi~Vt=C-+_ zc08~u`n+czEwpPw`aEiK+F1HLTJE%68TvUWZ*XcXeI9*8)NJYV=u1u;OK+gpoEl4S zAU;aD(i`Z0QM08t&=I>Pq&Lu`P8&;apeLL*mfk=$*uKGLV(i#CAwt$5Ey?t!D3_lM zaG5cTk3?kBv2)-^XZ%`hKwO$H2%715yY=0mOlKp(xg5Bx&_&o2y*Gw)1=F}Ng8Uev z$8ce7r-yJI!PA8(uE%hNaXp0V2r&HbF58*n3Y|UP!0eWc`U=UgL)lh_%3b;zZ zbpmz>c&UI_2$%+(K{-+0E8wtzF93S!gn*j#YG^hs0`$@q(nFZVw8XO)qWhxFC}-iD zY3V-9OPrn#t);!v)9`{}L4PaYHaaBAa|Hd_g662e+)uv^8}L2OYPZt20=Lm2`jYPu zVzeo82e!u#SAPcYGMX5&s{xhD@lp@FJ3V9&*8r@H8wYMlOKN&a)DS_&Ml#|yhVQH_tr6wi~%hy%U zl*VN}K36&S#4Iz$ikc2f3(U+?qkdDiF z^F^`UjY9w1g#L?^H^M(sZWE)Bq&K4QRpoa73hAVD zy?-X;-dppml2d-*drny--x+vO8CHH3eFgYerC$U7%=Z>_J{3KM^6tp9khM(AR|va_ z*X8fWyy~sWA-P&zr2GJ6Mk@(ekjWl%wilc|86k z%CCl=2L8{|Vet8*{1VCqluszvfX@l#9hu>YD8mB!o=|oGFC)kNL2c%D+umlJ+5&*} zlmuKrO92~cGhnNL@24)5HwgSCbQQ|o0)Lf&8M+pjJ@f@Yi;j4|MTyvcWu^h?k@A^j`h_ayH1GVnJ5GX9s+Cjb?h;Q|3S z2)I`L2{5|^yhp$%1bkUQ@^EWHz_kMI67UHDUlx$Of=0l#0`3xUOu&}~B%h!WaIJv5 z1l&y)-l;8;ZjkPlJ}=!XeO>yt)GWUuFIGOKXzI1<2h|^||E#_S`(j^+btwX{{(zS`vc%j+Mmu)c6oTwU#5lNAk(>6CuHJzlc@#!dw$Yh z1GoxOBGiud2)-#>1b8v#FhW~s31AoA4M%7j){+Qqr&iGJ1f@oogHofbal+T=1EADs z7brFAr3(SGpp4Q0D5JC+lu;^xGD<_BjFJh;C>22&rG21W2u&`hH2nkJA-yR5QMyO| zhWuUmS@{L|awV;NM|o1YM14$E$9TQ0{Cx(iI2O_J?@e_T9!fBkN}ov_?64c+{Cr~C z&m-t$jDC{i)%;Lm+HZ?sUxPDM1eXR2Mq$67;B%~2X`yrO);v+Oc$)7TwXWVWCdahjX-V5;+sIwb{FmYmTcPW z=e~VLsgO-&()s+F^HQm$w0baoK=1Fja@XpEB^S45rD&SM7NVC@d#RAwwUoL_`Fy%J zucO$}RwxbX=CoSTFwwRpXBBZ16?p`wGox|={;Miqfp$bXIcpW%C*v#Y$mmRIaJ6Ma@K&JWs#`n ztU*09&}-^?)>Z?!>CDc6IuC=iQYqXr_{z1TU=__$rkFDd%ytD>7}-)@Uqd|urm??M zFQz*(MxhO(Iy=xNEh{P{Qy3w9kMnWgFDmxupbSit<*ld zxH)YO8inC4xn3HyGKQH)ffcvW8Qe^>iK;C{xT8Qf7Jxl@4oXI-ko@drr@1F&%w?+jE1LVJKN@D`d$S zf)#KVWH86(w8c!>(=KBtCfIQRU-@)lu2P)_N`nkKw&?q_m~C_x<8ithX18wc%Vl&i zES{ls0hO&o8!%z8SaAR{F-k*d3s#Wx;$xvfZ(xfIBelc_Ur4i$#p>(h^Kk9JUb^kwqPx77UBWPTNa` zVs23H86JX33Rz$_=|!%!o5rAn*@3AUZY#iPbWE+uDAa%Tz%}Icqy6 zhAjO6Gb3~NemG!}i;j;}DA8=|quU-#A|d55M{ta#sT6FBBHN2|lTd?#UG^NjrF|5!3K*OjtSt>sK%;cQVsi zeK2kAnUv9kl&BZm@xi*j->7V`71GVkxolQ1Om=X2wPRQux`>w38#fq*zFdC^DxI-; zqi$u)+|blU+f<^*c0HdyAWGKhytkQ{$4v3`h7HEhu$k*0IAhb`P`WTY*~jr8mI*n% zIrg~8R-Ubmdf(PQ*K64sY(zUU#2&lYGhmb;&8{G)pn%*4x9>sb3UOXOpk94c^w*hjg0~>5;Reh!#vQa$Yf~TPcTZ zvK>}}UvJ?x4?)(7?3<_UNVdc6hS`NU<*a4vv@Q>BSZjGLL0&ZV6i8FwLA)H#&hrS+{_^(`=_JtGQyXQQ?$4h{Z@m2QM<%Q(*00 zC(=CEx0yQI*+KB~j^&%&i5W%wlPX^S0P6nEGC%ax8H0ul4pm20qD- z>g;Mbv#0vmB~lf8oeFGD^mVC`BnEVoO~Ts?lR6E~vRvAR5vMptvC@|7>}yjH?A^tI zDJWjCEf{k$T)CypF$Hbbr!DLnc{|0O+?Aip@4i24cFC|vuI3cRJIQADt2Nld z6`g(g-@s#XONl+hlz{jv7*;4VO?t-`_6e~>Q!{VA0mW^%(QCQm+n7uD7Yqx|ZBc>U z!){E+PxrOH?`2TJ|EqzFC2LH$l8K3ClX0 z<+5ETlOvCfmz&8m4b*^>@k&rml9q_Qjb?g3G9_h@x@-*F(Bfpv^Untw8-aqzRqt*9 zJM3&$;w=2`q+5G;Bh^{7#W42R36`f>>?f@0%c?tE`)IIT-&@L=Vok9ro!RGztjG&f z$i&2^diCOdT`#1NpG=6hlR114K@X9IjJORBO}db~pxf)dP|FeKVC+%wC?TA8-3Vcx zo$b!Pf~)qns2e5Q_qdd^hYT;|&8!@no^z9LR2DPC7|nOwQ= z_VOy(+%^cblNLBVQ7UEX7M5+o5e3_XHhV!PtGo%TuvO(|pc0LKVuMzRdpG}V#jlbp8wMD)p`;UA<;mDwT265Dhq(7YU0e?~ELOO?C4AywJ~2 zC4gcm_AFwPipeZu%WoCQ)N!=Y*}sbAgn_-h{p6z}8sQB5T&YZRh9+^6Wt#0er-qKg zP^pN0%RW3u!(ZNtXD~fng4dDzNTJKvFLGE9p2J|5%=;aCndf8xRSTQb`#6DBH1IPN zCy3Ye;W)#shky)z2l&4PV8vY z=I|x@FprZrFzvil4NpDpI5=3zJ@GggJj%dnfuFb0x}hP!7RO-fi-nM7m%eLctwp->v+2`FyTFv!z*6@f=P5Sxdh1C+$0ZtlWjo2dh|MS;oSk#!UL zRkm{Pq0_KE;KGBz=@vZtM0+=6VWC5P5L~-aG94P`X-jFvJ9(~cM~iJ_6FOxQJX#~wlDkeZ+v0W*g&w=*V? zAki2jPlBRjM|=sHdxhOD$6U%|s!xhW6mK*g@%f`2KzB;fOJ%<-%iKq6)7rp2+M#-* z;~oY9pVy{wZV>B-jxq8>Jy}LI1gl#m>1a4ayP?iu zNgMm3xXV8DX~Tqvh})uLcL_JfJl)OW1)|J4arZDJ^=ngp==c&h+7}4=V+fkx-TZ8Ur-Bhlo`t~B8!Z_J%@v4qt~Z0U-XNP zz0T|yyV?JZYp>opYx&E!;+?BkyT&%7rXv;PaFuuz5()`6aesjncB+|4%9GgTOQ_HG*Z3j| zzj^%4X^&ic8D9K!890_YkIlqJ%#uLolbEg+-yWTQ0QyfJiBU@ zo>`g2ckJN06rZ=_AO7GNU(_{swe^(W2sAklhA+e?@aH!#!yv-(a-;L2md_w@?v*IF zBn0&)iPoPsn&!!EkBvy-mEFdCz7rdD`{k~#i>LS8dTJqf zOczt;^KUQk7u@1cYR9JX;MgU6=Rv38nQk+#%h57~eB}Oyl;tSy#FjAy*oMt#H@2f& z@dZc<_bzNQw+hnlsK1-Azrh@t1%fGWl zFW!jrmK+b@aK|$ev=&4=(ZlL9U@A@7FrUupK|#}kaohivWA_gm&}{US@EwwY?erkF zzPyzefAoSj{J&|+ZM;1$V1wR;JJa!RGroSYH|7~^!14dS!Z#pNc@(^{$Kx(&p2Gp4 zQs=+ooZ`rK$Kf6*Cda)L5?jg_L23-L?Lz`@;Q4%%uh4cozTLSD^VNxw@~J09o5W~Y z$7UQL@_Y!uZzsOtk}wjyS{5AGGD8?Qj{@)BFb)#dnu<%{8_L8qdn9mFX~88v>cv<5 zZ0AY7_Kfn$YY=iw9I#xg^Z)9K$FkLt$;Tufi)#z6*)#Chj%lNqmu=u@V5B9?NwLB* z1j&E#+=#Cw*%zkrm_94h=VYbmvkv_Epg1Vby2G&3U+O0&;@<*x*?-^lDF31K|Ns3z HXMz6%j^5Bw diff --git a/RJW_More_Genes/Common/Defs/AbilityDefs/Abilities.xml b/RJW_More_Genes/Common/Defs/AbilityDefs/Abilities.xml index 098dbdb..ffefe06 100644 --- a/RJW_More_Genes/Common/Defs/AbilityDefs/Abilities.xml +++ b/RJW_More_Genes/Common/Defs/AbilityDefs/Abilities.xml @@ -8,6 +8,7 @@ false true false + 60000 Mote_CoagulateStencil Coagulate Coagulate_Cast @@ -27,15 +28,15 @@ -

  • +
  • 0.4~0.8
  • Manipulation
  • -
  • +
  • -
  • Consensual
  • +
  • Rape
  • diff --git a/RJW_More_Genes/Common/Defs/GeneDefs/GeneDefs_RJW.xml b/RJW_More_Genes/Common/Defs/GeneDefs/GeneDefs_RJW.xml deleted file mode 100644 index dc6aa7f..0000000 --- a/RJW_More_Genes/Common/Defs/GeneDefs/GeneDefs_RJW.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - rjw_genes_mechbreeder - - Pawns with this gene are able to birth mechanoids unharmed. - World/WorldObjects/Expanding/Mechanoids - 51 - Reproduction - - - - rjw_genes_insectincubator - - Pawns with this gene are able to hold more insect eggs. - World/WorldObjects/Expanding/Mechanoids - 52 - Reproduction - - - - rjw_genes_insectbreeder - - Pawns with this gene are able to fertilize eggs with any fertile penis. - World/WorldObjects/Expanding/Mechanoids - 53 - Reproduction - - \ No newline at end of file diff --git a/RJW_More_Genes/Common/Defs/JobDefs/Jobs_SexAbility.xml b/RJW_More_Genes/Common/Defs/JobDefs/Jobs_SexAbility.xml index f4237fa..6614897 100644 --- a/RJW_More_Genes/Common/Defs/JobDefs/Jobs_SexAbility.xml +++ b/RJW_More_Genes/Common/Defs/JobDefs/Jobs_SexAbility.xml @@ -3,7 +3,7 @@ HealPussy - shabe_genesaddons.JobDriver_CastAbilityAfterSex + RJW_More_Genes.JobDriver_CastAbilityAfterSex Healing someone with sex. false diff --git a/RJW_More_Genes/Source/RJW_More_Genes/.vs/RJW_More_Genes/FileContentIndex/f89c998f-728f-4e82-9434-7a7cedeb321a.vsidx b/RJW_More_Genes/Source/RJW_More_Genes/.vs/RJW_More_Genes/FileContentIndex/f89c998f-728f-4e82-9434-7a7cedeb321a.vsidx new file mode 100644 index 0000000000000000000000000000000000000000..155325406d62e61089682d2fd94d3656effe7361 GIT binary patch literal 43474 zcmchf378~RmA11L#Bl?p8x`ETT!@6~sHWK|#EOi#nHgP?5z!HmRh29zi_M})Bi*Q| zC@L=Cj-nzsqyB^IIF35*iVN!RzB@YZ+qj^Ej?RptqW}56`%Pxqf5SBTJmixVZ=SoJ zd+xdC-iXZZIO*NK)oQ)w^>(q>9v-bV#(VDX1>~=flJ#-4zMHP^x%HV_-$d(|)Ai%= z%uIWxJwMYvc_wUTHqOi(8qOS+%yf#GIGTxznWUKMr8E6s1c?ihG)Rh|8wK4W=((Wpg4Eu5kk&y~1i1_HVNjGo83kn()GnwO zgL)V=QPA{*W)v*BU^%sswA=ITFlmSVcGEw2rhUjE_MYFcp}k>aXTzc04Tm4Sp|f#= zOTw9Uc<@ZP(cWQrL^nM0h%jo0(QFuX!YB!&ZWyIuREAL@9!_W;vmxtXb?51Hi3wti?6=6RL`z}leVVZ|&9i~mVxd^i;%#tum!$A}d zTsSDg!7$9DFn3|m35#x6IG4+ z9rePfcYM@yQ7?^pgQ!3o#NQJO_*9&Ik7#rbH_MOhGK?I^Pk-6%_=EQ_*1l+{tz zMAYXNynyb(*`qiC#pM9 z(}{~t(&;3wlTvde#ab?Gu*mT^ulO~-s>!ej@v+HE`PCMDCGl)8av{MwFV%Vu% zr|Nd9rc;NVVcHos@dMg%I1?W>8y}s-QD%0DqcV=_ICgPd#4e0o61#5f(%5COt7A8g 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 jZW^;0%~*rW9xcJH_J1|6rzad;%`&TM!su>W7T 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 literal 0 HcmV?d00001 diff --git a/RJW_More_Genes/Source/shabe_genesaddons/.vs/shabe_genesaddons/FileContentIndex/1b32cc0b-75bf-4b8e-b4d3-c2ce07a95f02.vsidx b/RJW_More_Genes/Source/RJW_More_Genes/.vs/shabe_genesaddons/FileContentIndex/1b32cc0b-75bf-4b8e-b4d3-c2ce07a95f02.vsidx similarity index 100% rename from RJW_More_Genes/Source/shabe_genesaddons/.vs/shabe_genesaddons/FileContentIndex/1b32cc0b-75bf-4b8e-b4d3-c2ce07a95f02.vsidx rename to RJW_More_Genes/Source/RJW_More_Genes/.vs/shabe_genesaddons/FileContentIndex/1b32cc0b-75bf-4b8e-b4d3-c2ce07a95f02.vsidx diff --git a/RJW_More_Genes/Source/shabe_genesaddons/.vs/shabe_genesaddons/FileContentIndex/66efd428-daf0-42d1-8c23-97ec74e2ee2a.vsidx b/RJW_More_Genes/Source/RJW_More_Genes/.vs/shabe_genesaddons/FileContentIndex/66efd428-daf0-42d1-8c23-97ec74e2ee2a.vsidx similarity index 100% rename from RJW_More_Genes/Source/shabe_genesaddons/.vs/shabe_genesaddons/FileContentIndex/66efd428-daf0-42d1-8c23-97ec74e2ee2a.vsidx rename to RJW_More_Genes/Source/RJW_More_Genes/.vs/shabe_genesaddons/FileContentIndex/66efd428-daf0-42d1-8c23-97ec74e2ee2a.vsidx diff --git a/RJW_More_Genes/Source/shabe_genesaddons/.vs/shabe_genesaddons/FileContentIndex/8d5baf21-343e-4f22-a2f1-93e155c2917e.vsidx b/RJW_More_Genes/Source/RJW_More_Genes/.vs/shabe_genesaddons/FileContentIndex/8d5baf21-343e-4f22-a2f1-93e155c2917e.vsidx similarity index 100% rename from RJW_More_Genes/Source/shabe_genesaddons/.vs/shabe_genesaddons/FileContentIndex/8d5baf21-343e-4f22-a2f1-93e155c2917e.vsidx rename to RJW_More_Genes/Source/RJW_More_Genes/.vs/shabe_genesaddons/FileContentIndex/8d5baf21-343e-4f22-a2f1-93e155c2917e.vsidx diff --git a/RJW_More_Genes/Source/shabe_genesaddons/.vs/shabe_genesaddons/FileContentIndex/a2e63c8c-c786-4ae2-aef9-dfd55aa13fa7.vsidx b/RJW_More_Genes/Source/RJW_More_Genes/.vs/shabe_genesaddons/FileContentIndex/a2e63c8c-c786-4ae2-aef9-dfd55aa13fa7.vsidx similarity index 100% rename from RJW_More_Genes/Source/shabe_genesaddons/.vs/shabe_genesaddons/FileContentIndex/a2e63c8c-c786-4ae2-aef9-dfd55aa13fa7.vsidx rename to RJW_More_Genes/Source/RJW_More_Genes/.vs/shabe_genesaddons/FileContentIndex/a2e63c8c-c786-4ae2-aef9-dfd55aa13fa7.vsidx diff --git a/RJW_More_Genes/Source/RJW_More_Genes/.vs/shabe_genesaddons/FileContentIndex/read.lock b/RJW_More_Genes/Source/RJW_More_Genes/.vs/shabe_genesaddons/FileContentIndex/read.lock new file mode 100644 index 0000000..e69de29 diff --git a/RJW_More_Genes/Source/shabe_genesaddons/CompAbilityEffect_PussyHeal.cs b/RJW_More_Genes/Source/RJW_More_Genes/CompAbilityEffect_PussyHeal.cs similarity index 98% rename from RJW_More_Genes/Source/shabe_genesaddons/CompAbilityEffect_PussyHeal.cs rename to RJW_More_Genes/Source/RJW_More_Genes/CompAbilityEffect_PussyHeal.cs index a0e47e0..48c1d11 100644 --- a/RJW_More_Genes/Source/shabe_genesaddons/CompAbilityEffect_PussyHeal.cs +++ b/RJW_More_Genes/Source/RJW_More_Genes/CompAbilityEffect_PussyHeal.cs @@ -9,7 +9,7 @@ using RimWorld; using rjw; using rjw.Modules.Interactions.Helpers; -namespace shabe_genesaddons +namespace RJW_More_Genes { public class CompAbilityEffect_PussyHeal : CompAbilityEffect { diff --git a/RJW_More_Genes/Source/shabe_genesaddons/CompAbility_SexInteractionRequirements.cs b/RJW_More_Genes/Source/RJW_More_Genes/CompAbility_SexInteractionRequirements.cs similarity index 93% rename from RJW_More_Genes/Source/shabe_genesaddons/CompAbility_SexInteractionRequirements.cs rename to RJW_More_Genes/Source/RJW_More_Genes/CompAbility_SexInteractionRequirements.cs index 12b578c..b15e31f 100644 --- a/RJW_More_Genes/Source/shabe_genesaddons/CompAbility_SexInteractionRequirements.cs +++ b/RJW_More_Genes/Source/RJW_More_Genes/CompAbility_SexInteractionRequirements.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using Verse; using RimWorld; -namespace shabe_genesaddons +namespace RJW_More_Genes { public class CompAbility_SexInteractionRequirements : AbilityComp { diff --git a/RJW_More_Genes/Source/shabe_genesaddons/CompProperties_AbilityPussyHeal.cs b/RJW_More_Genes/Source/RJW_More_Genes/CompProperties_AbilityPussyHeal.cs similarity index 93% rename from RJW_More_Genes/Source/shabe_genesaddons/CompProperties_AbilityPussyHeal.cs rename to RJW_More_Genes/Source/RJW_More_Genes/CompProperties_AbilityPussyHeal.cs index 292273e..6c4be07 100644 --- a/RJW_More_Genes/Source/shabe_genesaddons/CompProperties_AbilityPussyHeal.cs +++ b/RJW_More_Genes/Source/RJW_More_Genes/CompProperties_AbilityPussyHeal.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; using Verse; using RimWorld; -namespace shabe_genesaddons +namespace RJW_More_Genes { public class CompProperties_AbilityPussyHeal : CompProperties_AbilityEffect { diff --git a/RJW_More_Genes/Source/shabe_genesaddons/CompProperties_SexInteractionRequirements.cs b/RJW_More_Genes/Source/RJW_More_Genes/CompProperties_SexInteractionRequirements.cs similarity index 96% rename from RJW_More_Genes/Source/shabe_genesaddons/CompProperties_SexInteractionRequirements.cs rename to RJW_More_Genes/Source/RJW_More_Genes/CompProperties_SexInteractionRequirements.cs index 0760d5c..b268ec7 100644 --- a/RJW_More_Genes/Source/shabe_genesaddons/CompProperties_SexInteractionRequirements.cs +++ b/RJW_More_Genes/Source/RJW_More_Genes/CompProperties_SexInteractionRequirements.cs @@ -8,7 +8,8 @@ using RimWorld; using rjw; using rjw.Modules.Interactions.Defs.DefFragment; using rjw.Modules.Interactions.Enums; -namespace shabe_genesaddons + +namespace RJW_More_Genes { public class CompProperties_SexInteractionRequirements : AbilityCompProperties { diff --git a/RJW_More_Genes/Source/shabe_genesaddons/GeneDefOf.cs b/RJW_More_Genes/Source/RJW_More_Genes/GeneDefOf.cs similarity index 55% rename from RJW_More_Genes/Source/shabe_genesaddons/GeneDefOf.cs rename to RJW_More_Genes/Source/RJW_More_Genes/GeneDefOf.cs index 05255d6..585d640 100644 --- a/RJW_More_Genes/Source/shabe_genesaddons/GeneDefOf.cs +++ b/RJW_More_Genes/Source/RJW_More_Genes/GeneDefOf.cs @@ -6,14 +6,11 @@ using System.Threading.Tasks; using Verse; using RimWorld; -namespace shabe_genesaddons +namespace RJW_More_Genes { [DefOf] public static class GeneDefOf { - public static readonly GeneDef rjw_genes_mechbreeder; - public static readonly GeneDef rjw_genes_insectincubator; - public static readonly GeneDef rjw_genes_insectbreeder; public static readonly GeneDef rjw_genes_pussyhealer; } } diff --git a/RJW_More_Genes/Source/RJW_More_Genes/GeneUtility.cs b/RJW_More_Genes/Source/RJW_More_Genes/GeneUtility.cs new file mode 100644 index 0000000..d81ee50 --- /dev/null +++ b/RJW_More_Genes/Source/RJW_More_Genes/GeneUtility.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Verse; + +namespace RJW_More_Genes +{ + public class GeneUtility + { + public static bool isPussyHealer(Pawn pawn) + { + if (pawn.genes == null) + { + return false; + } + return pawn.genes.HasGene(GeneDefOf.rjw_genes_pussyhealer); + } + } +} diff --git a/RJW_More_Genes/Source/shabe_genesaddons/HarmonyInit.cs b/RJW_More_Genes/Source/RJW_More_Genes/HarmonyInit.cs similarity index 77% rename from RJW_More_Genes/Source/shabe_genesaddons/HarmonyInit.cs rename to RJW_More_Genes/Source/RJW_More_Genes/HarmonyInit.cs index bea2181..b2a753f 100644 --- a/RJW_More_Genes/Source/shabe_genesaddons/HarmonyInit.cs +++ b/RJW_More_Genes/Source/RJW_More_Genes/HarmonyInit.cs @@ -7,14 +7,14 @@ using Verse; using HarmonyLib; -namespace shabe_genesaddons +namespace RJW_More_Genes { [StaticConstructorOnStartup] internal static class HarmonyInit { static HarmonyInit() { - Harmony harmony = new Harmony("shabe_genesaddons"); + Harmony harmony = new Harmony("RJW_More_Genes"); harmony.PatchAll(); } } diff --git a/RJW_More_Genes/Source/shabe_genesaddons/JobDriver_CastAbilityAfterSex.cs b/RJW_More_Genes/Source/RJW_More_Genes/JobDriver_CastAbilityAfterSex.cs similarity index 99% rename from RJW_More_Genes/Source/shabe_genesaddons/JobDriver_CastAbilityAfterSex.cs rename to RJW_More_Genes/Source/RJW_More_Genes/JobDriver_CastAbilityAfterSex.cs index 2382ef5..587a73a 100644 --- a/RJW_More_Genes/Source/shabe_genesaddons/JobDriver_CastAbilityAfterSex.cs +++ b/RJW_More_Genes/Source/RJW_More_Genes/JobDriver_CastAbilityAfterSex.cs @@ -8,7 +8,7 @@ using Verse; using Verse.AI; using rjw; -namespace shabe_genesaddons +namespace RJW_More_Genes { public class JobDriver_CastAbilityAfterSex : JobDriver_SexBaseInitiator { diff --git a/RJW_More_Genes/Source/shabe_genesaddons/Properties/AssemblyInfo.cs b/RJW_More_Genes/Source/RJW_More_Genes/Properties/AssemblyInfo.cs similarity index 100% rename from RJW_More_Genes/Source/shabe_genesaddons/Properties/AssemblyInfo.cs rename to RJW_More_Genes/Source/RJW_More_Genes/Properties/AssemblyInfo.cs diff --git a/RJW_More_Genes/Source/shabe_genesaddons/RJW_More_Genes.csproj b/RJW_More_Genes/Source/RJW_More_Genes/RJW_More_Genes.csproj similarity index 95% rename from RJW_More_Genes/Source/shabe_genesaddons/RJW_More_Genes.csproj rename to RJW_More_Genes/Source/RJW_More_Genes/RJW_More_Genes.csproj index 6f6a149..6f563d5 100644 --- a/RJW_More_Genes/Source/shabe_genesaddons/RJW_More_Genes.csproj +++ b/RJW_More_Genes/Source/RJW_More_Genes/RJW_More_Genes.csproj @@ -64,9 +64,6 @@ - - - diff --git a/RJW_More_Genes/Source/shabe_genesaddons/RJW_More_Genes.sln b/RJW_More_Genes/Source/RJW_More_Genes/RJW_More_Genes.sln similarity index 100% rename from RJW_More_Genes/Source/shabe_genesaddons/RJW_More_Genes.sln rename to RJW_More_Genes/Source/RJW_More_Genes/RJW_More_Genes.sln diff --git a/RJW_More_Genes/Source/shabe_genesaddons/SexInteractionUtility.cs b/RJW_More_Genes/Source/RJW_More_Genes/SexInteractionUtility.cs similarity index 99% rename from RJW_More_Genes/Source/shabe_genesaddons/SexInteractionUtility.cs rename to RJW_More_Genes/Source/RJW_More_Genes/SexInteractionUtility.cs index 2654470..e112ec0 100644 --- a/RJW_More_Genes/Source/shabe_genesaddons/SexInteractionUtility.cs +++ b/RJW_More_Genes/Source/RJW_More_Genes/SexInteractionUtility.cs @@ -13,7 +13,7 @@ using rjw.Modules.Interactions.Implementation; using rjw.Modules.Interactions.Defs.DefFragment; //using rjw.Modules.Interactions.Enums; -namespace shabe_genesaddons +namespace RJW_More_Genes { class SexInteractionUtility { diff --git a/RJW_More_Genes/Source/shabe_genesaddons/ThoughtDefOf.cs b/RJW_More_Genes/Source/RJW_More_Genes/ThoughtDefOf.cs similarity index 90% rename from RJW_More_Genes/Source/shabe_genesaddons/ThoughtDefOf.cs rename to RJW_More_Genes/Source/RJW_More_Genes/ThoughtDefOf.cs index f3d584b..973d912 100644 --- a/RJW_More_Genes/Source/shabe_genesaddons/ThoughtDefOf.cs +++ b/RJW_More_Genes/Source/RJW_More_Genes/ThoughtDefOf.cs @@ -5,7 +5,8 @@ using System.Text; using System.Threading.Tasks; using Verse; using RimWorld; -namespace shabe_genesaddons + +namespace RJW_More_Genes { [DefOf] public static class ThoughtDefOf diff --git a/RJW_More_Genes/Source/shabe_genesaddons/obj/Debug/.NETFramework,Version=v4.7.2.AssemblyAttributes.cs b/RJW_More_Genes/Source/RJW_More_Genes/obj/Debug/.NETFramework,Version=v4.7.2.AssemblyAttributes.cs similarity index 100% rename from RJW_More_Genes/Source/shabe_genesaddons/obj/Debug/.NETFramework,Version=v4.7.2.AssemblyAttributes.cs rename to RJW_More_Genes/Source/RJW_More_Genes/obj/Debug/.NETFramework,Version=v4.7.2.AssemblyAttributes.cs diff --git a/RJW_More_Genes/Source/shabe_genesaddons/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/RJW_More_Genes/Source/RJW_More_Genes/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache similarity index 84% rename from RJW_More_Genes/Source/shabe_genesaddons/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache rename to RJW_More_Genes/Source/RJW_More_Genes/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 05556ca84ae7f2f26c8cc5f825adab603dfd8899..1b4f562f4fc7c4449d80fc58b4798408270e1b65 100644 GIT binary patch delta 101 zcmdmFvD{+A5^lzclb3Sq>-pvvrN+Cb=A{DT>a`{F2Jd0Dl1_H2?qr delta 113 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 IAMn8c28(w)ZvX%Q literal 0 HcmV?d00001 diff --git a/RJW_More_Genes/Source/shabe_genesaddons/obj/Debug/shabe_genesaddons.csproj.AssemblyReference.cache b/RJW_More_Genes/Source/RJW_More_Genes/obj/Debug/shabe_genesaddons.csproj.AssemblyReference.cache similarity index 100% rename from RJW_More_Genes/Source/shabe_genesaddons/obj/Debug/shabe_genesaddons.csproj.AssemblyReference.cache rename to RJW_More_Genes/Source/RJW_More_Genes/obj/Debug/shabe_genesaddons.csproj.AssemblyReference.cache diff --git a/RJW_More_Genes/Source/shabe_genesaddons/obj/Debug/shabe_genesaddons.csproj.CoreCompileInputs.cache b/RJW_More_Genes/Source/RJW_More_Genes/obj/Debug/shabe_genesaddons.csproj.CoreCompileInputs.cache similarity index 100% rename from RJW_More_Genes/Source/shabe_genesaddons/obj/Debug/shabe_genesaddons.csproj.CoreCompileInputs.cache rename to RJW_More_Genes/Source/RJW_More_Genes/obj/Debug/shabe_genesaddons.csproj.CoreCompileInputs.cache diff --git a/RJW_More_Genes/Source/shabe_genesaddons/obj/Debug/shabe_genesaddons.csproj.FileListAbsolute.txt b/RJW_More_Genes/Source/RJW_More_Genes/obj/Debug/shabe_genesaddons.csproj.FileListAbsolute.txt similarity index 100% rename from RJW_More_Genes/Source/shabe_genesaddons/obj/Debug/shabe_genesaddons.csproj.FileListAbsolute.txt rename to RJW_More_Genes/Source/RJW_More_Genes/obj/Debug/shabe_genesaddons.csproj.FileListAbsolute.txt diff --git a/RJW_More_Genes/Source/shabe_genesaddons/obj/Debug/shabe_genesaddons.dll b/RJW_More_Genes/Source/RJW_More_Genes/obj/Debug/shabe_genesaddons.dll similarity index 100% rename from RJW_More_Genes/Source/shabe_genesaddons/obj/Debug/shabe_genesaddons.dll rename to RJW_More_Genes/Source/RJW_More_Genes/obj/Debug/shabe_genesaddons.dll diff --git a/RJW_More_Genes/Source/shabe_genesaddons/.vs/RJW_More_Genes/v17/.suo b/RJW_More_Genes/Source/shabe_genesaddons/.vs/RJW_More_Genes/v17/.suo deleted file mode 100644 index 5231458d55ca07cb610e6868741fb00c3d1ac6b3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 85504 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®4M({mGlB zzL7mbe2OmWNWGT4#xaa@+;0DA9FYVp2}{5{S>RFUjJ{y(K^E8E%)z3OT7A|L@4%;~@a{VBa^90OB06}H_8=|OWz@NdtBWGybsonm za&hKFDY6ICM-HDsjiZtV8g|@TvQ>d%@3hxXQcKx#z$Y zc3G7bul+tG+dQA#DVy_s-yKUewS;4QVeiMvHN~MU1tK*6dX8%*>I)cA(bC zIaJwKjpGePfs1dZmdmf=7z@ID97kKV4gY88mu-E9I=s?Q{GVrRoB#8z8jk-P8L{8( z8{JVlQfKnV!#Jh>;Bo3^{#Xxh64uTdp?|p^c+1MwSyS~dd2S1r+^J*x*MolZ&EUt* zoYA=job_mDE7|Yc9VO9dIUB)#>vr0`g5es zmus;eot_R=qcC(b`Z}avg8GEEUTPp~8cM7G$(ffNZ%?E~9v8afh_})owgg*~Iv2f&W%x=I|Bps3 z>}|tyw$FoIw@?3iryAxR&cVmZ$RBCr*Wmezfa)brdg{moMYrS)LN!__2u6fhPqs|x))mZ;dfHM_xMxwqhpEtEoM?Ks08MS|l z7X^ozcbavVqjxLss2pB3|IiTgPSe9;mldyCj-vmJ`ii~YoCk7x+Po++I-WH~U^?qB zeNtYv9_IFM=V@zge|JtVN{q4(j{dT4e0Rw1NOnJ+JfEGOnVvoF$h5(KLhJL#y}gJ! z&_>dazwynByHA%Z#p=0Pv(dn(T=m_P7uVK;&SDa``Yx}RSxm)~YDTi#Sxn+*Je@mj zJpEU z=O|zn?~~SJGnPSjuk1#JxScN}BYIA(kJ zMFPJ*S-=^inKbP#>uc$K;;Xfbu#Yo{9*W|A1{%+v%U++l^-Tl%*+Pe`AKsjULT#@c_Q)NjV0c3T$730xWA09rqR zww*z{>u717$8aXsZ({GrZ|oxYm69+8ewYRyhVdl-rjeVx7=#nvjux2`Z7$=frXex& zR{QfCsP^^QrzNM-$*4Xxk%;QXftdq(Y69w<=)KxSZ^_j+l)ao4Uj`M>c8l;(ok067 zK}r}$M>~rhsEjP6@5(u&5=IRZxSP->kc+J!hLjlMkJpp976*k2f^tRBbVA%uiK}7Y zV7=&@Bt}LO5|i|Ubi%GyRFD$WTw^JV(!|9&1n&gh_QYe+QX~~C>al1zrW-~qsV57? zoE|Za9PWg3k%`3BMBtgTiCi|>aa3tub~kES!}s6LZPq;(@1N$crwIIV}%@tBcGrDmp+nYGoHr3KVl z0)@%!3f3{GXB!u4)qJ*EF^ggugJN?TgZXk}0m~TF&YY8L6U&aw%N)N}4XfhU_FyaYg z?K6FGMiD@|J$d+z7?&N%L}1d=ISL2SjnV|HhQ5?)$Y_r8z|yy zeJbL>TE?oYSt^-@##}G0^0_`$*|SwPUc6uQsd$5Kk^XdRf7GYi`!!B~O8ReoD(OJl z=}a{*w2RtYAy;o$Oqwe}Gr(ZfMUVD{K2^GPYtyiMGIWwBb#q(h>jxnLb zEt%9)@nT7zFmt6?$}r7XJT;DGR}&LSu9xddnH@`7_~AF`r*2W9=peK#$o^Q;w@>4Z zQ_{^gH*20h-1J!A=X8#So(&B|YyuZ(TNFLG9L8GZ@CHq+eQ1+SekzgxWOjV`n`Px} zh7W%)g#xQ?t62&lIWb{?%pAFgL8N}xgNO?S{n%aw?jX4c~58V1bqekvZkdk z?Iq~z@`DJZTJJ?49!M{0N4cf&2WQ2f3B48PO7fV^n>v`u z1SirhScX0@ICnUc>9$v>7I3zVOwL^oH=nXqoFB#)ZGqTQ`sq48^8 ztVAdN=OP5%uKr<)Z}#oq@N?xfej_Wtc6F}V$vqVE;_F$tn)7j#k?8`~z2rB!T&0_3 z)HHTt|BCODxsyk`Z-eE!$M?S~>(J}Y4nf=BUPt@4#jWk%x|{>QRpzdiEBI1+0WHCA ziA&g-qJ;W#@5HM^L29~n_pq?jrrY-CjxQT&|KXrY`}UXoP9DB#1i8Q|?{oMn-^AWK zhedzn-r>l**WxOJl1AL&^q&It3B$n?s@Jvm2C}9c)wWNcAbG;cDKqFBxhoUb7E$fb zRd(_nWMs70i!h-9#DqRD0lk1bSaClg>I+=4!oZyz&hl8hA_mCe9(9W-j=UPjSSopr zqc2C>IWg`o3VooqPG@@bk8f)_lez`a)fB6MaAgo`C#181b5cDI>c^0)1RasOTMSoo zLO-M4C|3(nBfOMpYO7iYsbHgB&g`#66b^_8n6Dcw!(UQV4( zj_GNfafcbMK&51u+VO)Os4&_xoC3#4`AmX~D3|0lu0>-Ce&e2YQRE5ZHwwPuALW?O zCBbXdCAlx^BB(rv(U96UpK11!T!-^tMrfRLu8B|Gf&G`_D8|cd?@@ug5&;)Q!3Cz^ zBlh?cIE$ix;_61SKQr)O(c&zQBw_Gf1l+~7zU@|-*G`kt;@;Ika)+t^x)+j@hb5-g z#j6Qvk}IJ*=^^zK#c!96m~^R8!@JeFD&pA=tv=fQbq+F;vPOH3^oHo4bC#Tyz(Y~M z1mukV8>yX93R6M`>6P%dcDPdp*IVTNvfN*_xvsk6G)9I0{Rs8r&7FqnSCd*1cP(Dn z*8G(~ugulysIM2$Ka;b#ek1vecT(Uk@>d>rsWHUCY1BRoLgS2pzm&(t*=u=OP+Vv3 z=Oe^XO&yfpMibt(3aC~AZKOxZZP{Fd`d=CvJzrblJjW4wO@rd+%FU{euAr9l zz|-(Y)AsJ=z)!p?wasX|!Mdv%^#ic}XCTR3J$f3_tV0*2Kj8q*H9jTIb!H7UMm%KZjn` z{>Q+5XVCMo{tCD3dFmLO80znzl>D(z3rhc+k$124+NM|Ll<4EmwUojiztTS_&q49q z>EDU}{jpPb?SB0020#6CehK_1bZm~Nz0{xkPq5#;09m63Gz)2v5n4KAe;T7Qy^7rB zA%$P=7~tdy^#391^Tf^MS5|c|h7;piBkD&-JVhq~tri<-Y`s^XQFg zVlPYa5l z`g%M3QWNFw-clFl9KW(r*%#VvAojn+ zt5Q3h?(5Xo`jr%J9{csqZr(G@`2E`dxaf=I{%r@uSj1Rvrz9%=Q#1%dH;$L8{r&Kt z0ycVL=%dN6duaGX5my&PN$#=uzZ?9F?pFPuAO6$A3aj|qqtPDtpF{7<7NPv`+vV>d zC_(#V8TN7x@~GP3Zq%RhOus2@G-#00Z#)y z0r)MzGk|9SzYX{uz;l4#1$+|lDZr-zzX$jX;CTT1`hSn(9{~Ok@HxQe0bc-o5%2=w zMZlK;Uk1Dc;4_4swD}YuA6Tj|&bm(&1{L`oRr|)_2vUinVdH<8I;k@)~|NQ;`_@DOu)rF7mPhb7U(+ey0>0i2t^Z)uM z|9$UAp8V5qz46TcboNs({`7@^KDqi6T%Z24Z~fVoA3i(zO+35jvv+;|!IwY%SC8R* z`K1?QKWzM;znDaxH?F_>TQ?rr^R*<-pE>oPFa6>pmwam(=l1fnqYV2ImcL2E<$K!Y z^}4=M`pq0Ypi~*J*LS=YJvDorWlv*YWB0ct7jb=bW~)`4Ds?H^IQETQ<;>->=wr`l z%m3r2PksCK?}i@Rru82edLPGLmDWaz5{$e%gUA)t-YU+YGeLE51})xkK79>2xtECXlc$tT(ELblaN}$ z=t#e6^JeR1LDzd>V|s7(JPsXm(PsP7UUSn**--0bvrgWNx1JSw=x3shH)*xa!Ss>CH{(6@d$A3BiLoKa@;#hC_kPbtzKBw9f1mB` za`vF}SC?L2-KqEK9pC2{X~Vg*)^AVMS6m7QwG9<{N{+C9E1~jG()?n-RlfHkU+`$& zDd3V^A!{K=9`&wk@UCW58GRvgA85|Q)8cXF=A3skH_y(2gPI;J#Z&Iu-{5+VqoIH7 znkpZ?Y+h~57;f2j@@oKklR1CL`7>vUNmE64ub3!>hfyPbt?c(Ky^H?eJ1Q)9A*WZr zFb*4Q2JdLvyyuXw2A}9&%!$Z(DJiXYL3$0;k^N~D;HJV9T8(o#>|+^CK&!1uk<84I z!<5e)${~ANNn6gv(8e1>3HYT2pBh8N!g=)XaYV#qK^wk{dAQHLI_K;(eKT3%!(YN( z_9*P<$~ZqQ>cE*b?pR#KkvSRfKh`;GMZbyws3P}O(|wB!6% z4IE0D4AQ0#c3s2%NoNgO=s85fFa|-&c@2EZ_;vZ+jJ?lQd?K})AT=|)uGw43t+Qf| zl6~D0>Q8-!G83ep=Z3hRs<#?n@3%NEHrkBxQfKw+i-)<*o3!X$&kqf8n|H2Vd5CNG z0l~lH&?BfD1shk3LtNkc(O+?8nbB@lRZB)FR$zezsqa$Pt-8^XwKu(xF+z+2xqx1m z7CURmkw=X|Qkz~uD|a4`sPo%_`Z42&rG7k)Hxvafj&9UcXhks=g!yRiwR&XypJ7}^ z>ocqiHOV}*3IFGB?fCpLL5=2@texJ-h<*POwZ73Er9)l06CV1)`h&;0-hn^84sQ}x z<*QQGbL%P#{^fe$Ei0ESxxQ}qx32Q#U-G7Pd=fgaw7#=K8Wjfz31dMjfI2J?yLZ69%^n@8x_W!O+Eal2JN+M{;@e?-f!ptc zOO7;pejfS}{XIes0^lFgU^G2I)KEHkixs2aED9hJkY<{ttr zrIs3WE^6!egqt1~yR3NCauoe%)K~2F<~$HR#Z6C}7bQl=v&N`?XZ@v5%B$AH-2Ux6 zZLRI^&gn&oQTD;nU)GK94%r>a?x&OIv(qz(lXPU-;6I`DneyIV)Gh`o=-Yn$jc;Du zeY#vJR?p3vjYhdLU*A1>acwQAhlP0fjhOVvb?;$OJgK}4-L3#n{JZ$$N*lT6dex@> ztJe+eWg^bM28@npN>Yz;G5lVFUUaU4*N!rtG;bFacoOgC z1BV!EDgTHqj2U|MzyF!arH(S5lh$>w?f)E}WzXMh`wPK!yZ3HXK1Hus>5%4o`)9H+ zf=+)KDu^u<_!*g(X8nIRzw= zf&3}_aix_c&exzDO3x1GuJ~mi=hqks+yJT79vbv$HA`UNKW7QjD2a}DW)KCJ#+h6{ zkY{Nj6+8>$JdSdEm7s_S7bjk>|AClg8&<{*I`c^Dojt9YX6N=zZnnRZCNBIaAkl4Xnn3uK7+_4wmQ#a zIFsx5uy^DdKN0*&W}gB-OoI=@c#?n9$W2}h!U=Cji%f|&mtDp*C^m1kKcjlv*Jq#O zJ5}{%mH)Um+H1>lH3zOk@J`TePdpYaMN+Y%9*c%!x?#kUda_W==@HY&;Z8UgnaEwC zRWp-e{9O!NN$1h^qwcM(?w_qLt~AQk%H6B?-FtfOXtid}al5Gc>gvU?kxovflTm$Y zA`#V%12YHo)Wr0RJ`s&Z4Z}#s({W>MwK7Z0*dsIqvpVpUV}C)k>Wgba6qqF4U_lwSt*# z*%2{YH_w;xs#>l<5`)f*<;DeUpa|kl#itX7F_qNAGsYB%I~~`P$@r8WjvLWrEIeVv z6UN$S`c&DLE%`QDus8cuuz~FB=i18IS@)Xx@JhL6vdQaRw9Fs(i2yAvvl)fm*?4QiVJc5mlxTA$KeacaGq^eq-}U@yYM14r4VQRMWFpz~U;RnM#z2H`~j5!2B`I2le% z>zO1R1x9KnttV&FGx$knCgSmUEHM>XTg^=vxneSA=&5KVr5m|iT+dG=Q+hm{$d#gz zLd=ZDw`sL8HxT0d08{y%5%-Z@p{4JfJuw-HCg})_MB>G0G!@m&SfZ#KkwQ_=g%b(g z%;yTZf>B5o3dUMy#7T0cQ+`8_3`E0pBDFe=>pZV+y%O!snbAZpo)3d@j0qiX$)ui& z7fbqtnJdLohH1v)sd2cH6B9|Um+MNI9ZOpH;Wy}~ZqZrkAhayV{#eqtPvebKdEuL$ zn>EiLZhEZmb2>*u&xQsfHh~MYEs7po4r8ryc!MU^-nYpnKNU#;GCMx}%`z)D!-v0@ zLUFuST{dftGUlTE1@*bX32M+XZLbRSS!fvpLcz@pl`-6#M{CoJ;ogdK^~iF^YWVtLh5IAy^%`Gq^ z<4=yS)aw@xnYl%Z)<*{;TK=UNg+lg0q<+~FC>|K|yBCn@a_XUFGD%Ik3`7GV&ti&4 zncEio_7d>)!hqZi8z|y#GPTW+w+1eUcs(^Z@$xUps1>#k;zlu3iObq^VXe$gWXJ{# zs2(Fjt~wzjTry_q7$aOlje&GlF05O#6n*A%F1R85*xMpn;TN z3uW81$%NjDb0vAq=1m>UWP%gv7A!*_7@Rw%$aLE)R0}v;Mkc>RUL4}z2tKJdpz3gy z1b&~L$GL(3asm?gCO3t%628^VSbEhfpq!GpE`rPG(AL(+tfcL;hbuZZ=Y1p^E>0NScttn?{feobA1l-Oe=aTJXd_jSx?$mBiiq zpUF{e`}7H18S=cVXPCi=$6c8?rpa+juCkNwAS0u_UW5q^ASU#I3Frmfi!2WsQC}!R z8!&JuhqJskfm{B?*8G(~uN(&7 zP+u>geGe<_cPvlsWWpt#Q5&qs)(nmQ=G zO`Z18)->+!eQ5`78>TU=bIZ@!^l_!9E7@Zd*Dpqh8{|0c-P?MPZVaaRn-QXbYFV`= MHLAChwm1d;KQ?m3NB{r; diff --git a/RJW_More_Genes/Source/shabe_genesaddons/GeneUtility.cs b/RJW_More_Genes/Source/shabe_genesaddons/GeneUtility.cs deleted file mode 100644 index 022d7f4..0000000 --- a/RJW_More_Genes/Source/shabe_genesaddons/GeneUtility.cs +++ /dev/null @@ -1,58 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Verse; - -namespace shabe_genesaddons -{ - public class GeneUtility - { - public static bool IsMechbreeder(Pawn pawn) - { - if (pawn.genes == null) - { - return false; - } - return pawn.genes.HasGene(GeneDefOf.rjw_genes_mechbreeder); - } - - public static bool IsInsectIncubator(Pawn pawn) - { - if (pawn.genes == null) - { - return false; - } - return pawn.genes.HasGene(GeneDefOf.rjw_genes_insectincubator); - } - - public static bool isInsectBreeder(Pawn pawn) - { - if (pawn.genes == null) - { - return false; - } - return pawn.genes.HasGene(GeneDefOf.rjw_genes_insectbreeder); - } - - public static bool isPussyHealer(Pawn pawn) - { - if (pawn.genes == null) - { - return false; - } - return pawn.genes.HasGene(GeneDefOf.rjw_genes_pussyhealer); - } - - public static float MaxEggSizeMul(Pawn pawn) - { - float MaxEggSize = 1; - if (IsInsectIncubator(pawn)) - { - MaxEggSize *= 2; - } - return MaxEggSize; - } - } -} diff --git a/RJW_More_Genes/Source/shabe_genesaddons/PatchMechBirth.cs b/RJW_More_Genes/Source/shabe_genesaddons/PatchMechBirth.cs deleted file mode 100644 index 30dafd8..0000000 --- a/RJW_More_Genes/Source/shabe_genesaddons/PatchMechBirth.cs +++ /dev/null @@ -1,58 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Reflection; -using System.Reflection.Emit; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using HarmonyLib; -using rjw; -namespace shabe_genesaddons -{ - [HarmonyPatch(typeof(Hediff_MechanoidPregnancy), "GiveBirth")] - public static class PatchMechBirth - { - [HarmonyTranspiler] - public static IEnumerable Transpiler(IEnumerable instructions, ILGenerator il) - { - bool found_call = false; - bool found_skip = false; - Label skip_label = il.DefineLabel(); - MethodInfo ismechbreeder = AccessTools.Method(typeof(GeneUtility), "IsMechbreeder"); - foreach(CodeInstruction codeInstruction in instructions) - { - //Check if the first opcode after endfinally ldloc_0 is and in that case add the label to skip the code - if (found_skip && codeInstruction.opcode == OpCodes.Ldloc_0) - { - codeInstruction.labels.Add(skip_label); - } - found_skip = false; - if (codeInstruction.opcode == OpCodes.Endfinally) - { - found_skip = true; - } - - yield return codeInstruction; - - if (codeInstruction.opcode == OpCodes.Call) - { - //Log.Message(codeInstruction.operand.ToString()); - if (codeInstruction.operand.ToString() == "Boolean TryMakeFilth(Verse.IntVec3, Verse.Map, Verse.ThingDef, System.String, Int32, RimWorld.FilthSourceFlags)") - { - found_call = true; - } - } - //Triggers after the pop opcode (after generating filth in c#). - else if (found_call) - { - //Load pawn, call function to check if a mechbreeder, and skip past the part which does damage - yield return new CodeInstruction(OpCodes.Ldloc_0, null); - yield return new CodeInstruction(OpCodes.Call, ismechbreeder); - yield return new CodeInstruction(OpCodes.Brtrue_S, skip_label); - found_call = false; - } - } - yield break; - } - } -} diff --git a/RJW_More_Genes/Source/shabe_genesaddons/PatchPawnExtensions.cs b/RJW_More_Genes/Source/shabe_genesaddons/PatchPawnExtensions.cs deleted file mode 100644 index da43f55..0000000 --- a/RJW_More_Genes/Source/shabe_genesaddons/PatchPawnExtensions.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using HarmonyLib; -using rjw; -using Verse; -using RimWorld; -namespace shabe_genesaddons -{ - [HarmonyPatch(typeof(PawnExtensions), "RaceImplantEggs")] - public static class PatchPawnExtensions - { - [HarmonyPostfix] - public static void Postfix(Pawn pawn, ref bool __result) - { - if (!__result) - { - __result = GeneUtility.isInsectBreeder(pawn); - } - } - } -} diff --git a/RJW_More_Genes/Source/shabe_genesaddons/PatchPregnancyHelper.cs b/RJW_More_Genes/Source/shabe_genesaddons/PatchPregnancyHelper.cs deleted file mode 100644 index 3ed2001..0000000 --- a/RJW_More_Genes/Source/shabe_genesaddons/PatchPregnancyHelper.cs +++ /dev/null @@ -1,50 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Reflection.Emit; -using System.Reflection; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using HarmonyLib; -using Verse; -using RimWorld; -using rjw; - -namespace shabe_genesaddons -{ - [HarmonyPatch(typeof(PregnancyHelper), "DoEgg")] - static class PatchPregnancyHelper - { - [HarmonyTranspiler] - public static IEnumerable Transpiler(IEnumerable instructions, ILGenerator il) - { - //MethodInfo isinsectincubator = AccessTools.Method(typeof(GeneUtility), "IsInsectIncubator"); - MethodInfo maxeggsizemul = AccessTools.Method(typeof(GeneUtility), "MaxEggSizeMul"); - FieldInfo partner = AccessTools.Field(typeof(SexProps), "partner"); - - Label skiplabel = il.DefineLabel(); - bool finished = false; - foreach (CodeInstruction codeInstruction in instructions) - { - if (!finished) - { - if (codeInstruction.opcode == OpCodes.Ldc_R4 && codeInstruction.operand.ToString() == "0") - { - yield return new CodeInstruction(OpCodes.Ldarg_0, null); - yield return new CodeInstruction(OpCodes.Ldfld, partner); - //yield return new CodeInstruction(OpCodes.Call, isinsectincubator); - yield return new CodeInstruction(OpCodes.Callvirt, maxeggsizemul); - //yield return new CodeInstruction(OpCodes.Brfalse_S, skiplabel); - yield return new CodeInstruction(OpCodes.Ldloc_0, null); - //yield return new CodeInstruction(OpCodes.Ldc_R4, 2f); - yield return new CodeInstruction(OpCodes.Mul, null); - yield return new CodeInstruction(OpCodes.Stloc_0, null); - //codeInstruction.labels.Add(skiplabel); - finished = true; - } - } - yield return codeInstruction; - } - } - } -} diff --git a/RJW_More_Genes/Source/shabe_genesaddons/obj/Debug/RJW_More_Genes.csproj.CoreCompileInputs.cache b/RJW_More_Genes/Source/shabe_genesaddons/obj/Debug/RJW_More_Genes.csproj.CoreCompileInputs.cache deleted file mode 100644 index 1838639..0000000 --- a/RJW_More_Genes/Source/shabe_genesaddons/obj/Debug/RJW_More_Genes.csproj.CoreCompileInputs.cache +++ /dev/null @@ -1 +0,0 @@ -6ecf46e37be50c69fa3cb87cd34ade9851fe6e74 diff --git a/RJW_More_Genes/Source/shabe_genesaddons/obj/Debug/RJW_More_Genes.dll b/RJW_More_Genes/Source/shabe_genesaddons/obj/Debug/RJW_More_Genes.dll deleted file mode 100644 index e1587b24d1fbd5e96918b9c36f9b8ce04896bb18..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20480 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 HXMz6%j^5Bw