From 4cd0807238dc5ba113d22eb7ba89641cdcfe00c8 Mon Sep 17 00:00:00 2001 From: Mlie Date: Thu, 29 Aug 2024 18:57:21 +0200 Subject: [PATCH] Fix for existing custom hand-positions with no rotation-info --- 1.5/Assemblies/ShowMeYourHands.dll | Bin 64512 -> 65024 bytes About/About.xml | 2 +- About/Changelog.txt | 3 +++ About/Manifest.xml | 2 +- About/ModSync.xml | 2 +- Languages/French/Keyed/Mod_Settings.xml | 4 ++-- Languages/German/Keyed/Mod_Settings.xml | 4 ++-- Languages/Russian/Keyed/Mod_Settings.xml | 4 ++-- .../RimWorld_MainMenuDrawer_MainMenuOnGUI.cs | 17 +++++++++++++++-- Source/ShowMeYourHands/ShowMeYourHands.csproj | 2 +- Source/ShowMeYourHands/ShowMeYourHandsMod.cs | 14 ++++++++++++++ Source/ShowMeYourHands/WhandComp.cs | 9 ++------- 12 files changed, 44 insertions(+), 19 deletions(-) diff --git a/1.5/Assemblies/ShowMeYourHands.dll b/1.5/Assemblies/ShowMeYourHands.dll index 943d0ce80779576122dc6964c66a808acb91aff7..66ae0dc1b170cf64fe2f5acfb1b4043c12827845 100644 GIT binary patch delta 17276 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 MOaAQ?YwcnBe=s7QjsO4v delta 17464 zcmb6=31C#!wdcM!^JY)x%}gfCWSMM}mkkq^kN}!Qk2)H{zUp77 z5yan9`YobRoYsFM^2ERO_e56mR8*v&ari5N8D6*%plTC<(ACq!cTJLhDeI|9Qi>J8 zq_i$TsFefQwF(49P6=6hiBeb3+w2BDpKzOj zH|lpQH;V>6$MT2>>jx}z5EfYT5KgvgBD|~B`iv{E2z7Id6GQC_5jm$^f&FgLv9a8a zMfxQFl)&PF@<}BB8Os;zd;A*$O9skoNq!&8m+YF8=oNvb0~Mz9DJ<20l2j77dZ2t7 z$)8{cSMPcwDNV92Lj~2`x=jBzB`lWfR|QfK-Wb>rxMrZ`bh3PpEw9;?oB9VKR_dRo zm8M+BYDpnQIj3OSl$MjE<5k+O(}$$*547}ni6C-LnL`?1vzHd#m+?km#X$MoKKY7W z=3tBPJdIe*0ZxOh*Hdj z*;b3k>`~5(Lg6T^s+q%RccG>wY)7w3_z{eM#P{dE|NcF@Qlu#1?MNRj0H{u-)c|k- z{#r5Q;rNU5mVc-l7oyOM-DodFXRTuZ^pCSM(oS*bG$*=tc!cJ{Pc06C(^_#v=$Sc# z%@k#>{*Rm`VuAjAPBwPrlbmZf?d&PH*c9>?mXSl8>aLJSIhT+I5KxuEq}I!k8T0Bf zg?;F^MMdCMu)`iiimWzF_-zq=W8VrgYo09nrR(Uc@fOGUzEYrU0p(@6KC zLKGlF|2VWVdKLTK|6HXC&Evmw^RkiSREgY&^Y^}X6i0Jh} zM6VMfdcCw?g09d}GmiAGxASgL#43H>pbmt`2F*iw@dca3s$H*La9q0LdJ2Fl(JDmF zDOh-vmYLXx+zygxNjPhr)?!g$4bMVuxE?|K>VY=ciqbNhZC3BH4mm3FaPjkxBx?)F z09PC~;tl!EDIro`#LBI@V^}CZDDf0&S%SQ_38>hg#=>Wk!&jk5TdH>tE6@)N%dKqd zX?_hN=M*e;JqwK_ywKX)2kKl+I#+Y6?RrUBMNSy;EGz((3|fX@q7Z{hZJ8k;Oy68q zP_`UtnU%B%qIN19!D_~7U9=eL4^-8YdDW~A^kiyTp?_YM=DrqX1u2p3K3G;TSkhMN zDZ^77*CDf5@)t<0*XfnRhXz*>ooS5}B*3yT6FzJBdSphbn4{~%$0w{tI$DIDTca4L zfvwh04i6->lDQ~oUxS}M4P&rN;Wj<9+~;UVPDeFG)2>&Q4;vXpy2u@wh+ef0#I>~u zob9AxO$@I?qBzB%T)DRJdZfK3T!e`;!yEJ+<$iI4{$hDiT1@X^vihN(yJEHbMznlw z2X4CBag0X0Nx!QiP28*>8|BjvR9H(`yt7Y?+C}+tD~_B!oQuQ?l2PsO6{?A{wox~Y z2o~Lf0*8q+tPyU}eu7X-Mx%^^jKYkfmQ6@|Egp-uS)VjwqFAlpKVnP)rHzg1>ogi+ zk2zk_Zbhbz^EeZ!+n8Fdubtw{C3WpZ(oMI>1h-Om{r6kGH!Mh5h*k%L=TXB}!nOkTvDcbG&p^<4qN7FoniKEhjx1(x-_EUuB zc%l6aKeam$$R>>>+Ryc=qZa0!pH-9;1^cIsG9IQhC*=QFinIFbQi>Dh@J2o3!jVzR z2X>bxa_qx0tIo*UOzlqQ=Caf>OY1_iaA>@g%Xvffy9_J(u+;Zj-5s+s*xEfvQqS?D zAW&k5&v7dZ;)c_L6-J5L6{+nOoKCdJ`W99$k5fCXruM-IW*V`0gb_R4m3ej;lbvZz-cWKpk}RmVNEx;zv* z04J*lzgz#+MfuTtQMG+2h96nnv+Pi{W3MlKA4)KOJL2G~a)>mhj+|G2k7pwFmGZ`g{C{O6VAEf1or+zygNlKj18M1P|)J-Ql2Tt&4JsCiz;jAlplm>A8@?;-m&YinOSu-R~5 zvm}Y!I>5+d(-JX5xR~{pDs|?0F`DHSre~3H)c{Er zPT?OWDKbDO)^r_NZyzA}(WXBfpb|5lL&m<8{y`bW*#3a=nJ_>nW<8s%+XqO_Z@Lmy zipKF6qo}8hJcOCk9!6jc{%_DlJ85c5^DQMc!Q~Mw6E=F)FI6&`yqwo|+oN zsQ~i{CHy#I#b#|Jt~!sUk98F}siw6<^_sRFRf&$mo~xEb?Fq7`T8t;_dM?b>NQ8fh zY_GliAJ~}3uKkKAhu`aLzZiuchqeP59#?oLeiWHhm)EH}wOwGN{r$XW<|yXa3-^E??l2>_s*j}zXegnu;jaW+fUGk(n_$$ z(~|$QCw6K$Yh6ZZdIrPdR%1-M;)H*POs_k}!Af3eH%^dd4GXi~i#H+aM=MHt1<#U+ z2L-w|Hft_92o=V2Yv?_;l454RCsnWN<;|qHR`rJWASd{5oHC`!s@Kn0crWrIw^GOO zR*3o@Hy>f}<2HT!*n$$;;iVW8o4DzcnIu9c5)V|(jN;(Mj`xhM)}?X9<&?D61_T|$ z5Ex11m#2<0r18m$73L$}Hntz5QC~DJUHs(s<^*R&uicsj`Xl2m6r1#q$CWkyZzI@~ ziRY@rR0?{?g_ne%>mei0QfGU2l4v=$8UY?y#~b-E^-Yp&{s_e4)nQg!tlAzqaQA8T#nE?)mOtirKKnO z*svOnJ>1h6+e9f(1EMFFFCYm2QLnfxpfI{$pLJO|pLN>sMrkh$^>`k7alfs46Xqq> z1D=>Z)(XFf&U*CgF6pQL#=uC1|41b5#4J+$9hhWYt?>^`!96wE`t+KV|0%WQY3HZ* zo|+5KOYPrk&P%Q5^0MgvklJzo$JFA9@IR#%Q{qii(~8V$TJjKcqBp%z_IuOS^rG=b z?)U32US5IMEio~<%oq%`NUgdVCz+w}64I@7qQZp3a|Eiim&t3UA^(#;X=1r}S>HG@ z!%h4)3Ocflv!OpdF=HIf&rNtn5ZY-RQSBA7P4M{mU`g)iaP-o}#?kfw3X%NxB?x93 zyq1H=QxmjT^^7Z0!~uQ86?s-t^Cqf^di51SgGf@7h#1F`WHmWjj8X6%l$+@D?oIIo z)Z}&&YvkFJs;2Z&YM}kk$kblb&s?!GdI-_>!w8Ife`HX4|K-^JUnucwuOn0gks6Zy z1##^S1jf^xJ+gwhZz7`tZ@r+VMsDd*Q&ZdDBJI~m_!tV=E^+e%n5bNT#+rM>1^S6e zBcn%9-a&Iy%?{k9F+~eW%}$L`H1?93opzV@HmVv$O3hA>kvtf`{7-T7(;q($wbHv# ztQvE{ccZhSEG2qQ!Rv`}F^Rl7z>k__+(i1-O{$~(*gpc_)1aLyXupcelHyfTD^-ks zg>^`i)Jk#2SoBCYWHPVE_A)(hvY*PVFMddRJ9X7i!b;mPIr$R0E=9f^7*!%ig>T}k zd*k+H^dC3X-*z8DQgDzERU+5XAlu{KrWRZxKw`NQVei;!_;7uu2n^%pygfsv@4M^>_YfG#6wDC zLoY5B&C=dSX8Vm8Ex$1ucS(E>S6V(mL2d_0v^08SRIEi-YxqOt7F!~>qmROb$e-}T z;6+k`m?RrYxtWv@8n9NZRjD`-36jcR^^2wz4E+cdBVP_M!N{zceNoQthd<1?e$TX` z=uHD7T}hED94SeRr^TBG>Rd-USF;XDv<&Qx7DUjt8OihJuvvOgx9 z`lyeYaY5OzC*YGH}u^#h+y`z{v7nb|m9^uG7-=|bz) zBXt*xZvCmc@%WJXeceRc=jh_fBBypjpFV4n_(FeVR`#fWQfzd7XCJDy@5F1|4(xpT zMn2U*<949hVq>5y_0vU*KBqoI9Ms$D3*u;r7T2>UAGZHgeZjDkFAn|-C86_Xqr_o^S)^CZ_KSb%n`ft7c8XNxNyS##_-d|J zp2T0FwNd%)!Radyc@hs2e+ANmQ+1W7ASm*r)&~8{+1ayr+ox(454LxGh7F<$WZ5?aYe2;P+oko1;FfCZO- zq>RDFJ?}Ky6{%82avxdjEliX$F6+mLEA(h5P_cl=uYhmb1=<(HiTTx?bJq@ds=sq? zmiSu#-Q18kv+KjTc|v@v+vf!l7S0P6pGC{ID=0@T-w}E_qbG1Sv`uA{6{Z;q`l@;P ziT%`;kOh?yG}fPLzcIR86aVhgIXryP;@NR%NnM*anc!8 zd?6y|l*#(BhLFCu!4tS@pa3ILT4XfO?YK(+tYI{M^IbYWQ!LY`%&!p<{ek)8ld!Iu z){M)!FH97 zHTrD}E)CKtuDzot4r80a>tfH7Wru!hK}~M&ou_@nK+Tpu%?)}}V?kj3K=}%i8{5Eo z{jtVtdtTBuH|6USn=1Oq$$e;n9>1_ zaOvb>e05n!N_dMm@nJ|ZZnRVg41HWJCl;owe9!I2U4Y!AM4l%73HmGai0lqUOSx6po|W$P4i?UWWLMHg`u_LxF0Spg}Aen$CP#j?w?0n1lcCpv}$2 zgK3+Wu_E!_Y|Q7aQVTE2TTv8STl5uf4DHk#n@cJha{#j20baw;(fNo^SrKWzW)aRs z03R+p(2zH63ixobxRJ~rJ8k@E{LIl0HV+ZE>te};QFDSo4t5@v$0epKaE{@mc*2Y0 zwx)TZ68AF&X2$)@qrmX^(|!eBj3c;#VK>8c=2tWRZx`7%#*a==;A|Gbgt*ZOcKB6t zw@ZO_IfQ@V>2}3|D{V*A83z+hJDeVvlDY%&wwxVKKV*8(Dhhm(M9nn2PW$ap$p-JE zrX8+EM{zLAOZb5#a(WFmW{1I9-7Y&kr4cMd9XtHdL~xje^k@6X|2qjgoC*X@6xKV^ z=!B>pEGj7tGLxgfNtavfP{*8uDa0w4iL=``*k*@G4svvrOpZbd!LcrKH{5i&MS)~? zsv&NN?RK(FlqoDXd&@+qz#i1GgDuqUN`X^~NXMhx+fHI7<$vw4gOX37oCplIDKHBg z_Cr%1W#S}e!Vg!cpH=*zac;IJj!t+Js&Si(7X;&=jzc+{^a^TLXlE5WjN*n*xXI_C zbb^23Zv0Lmd=!Rghv<#?kq(o%muI~c;|G2UXh<&MO+Lc+V)C=#FHY*~sFXb+97}c) zA0!uVVQ;da0rO#pQ#=HZxQKtXk6=T9;7B*+?`00DlzbwsbfpQP5v;h=)->4(fAw{=b4Fmjc%$eVUm9 zFWNxGziX7nPcn$V6!~_zi-&Iq&z>v2l&wGU{OHc5^|DSS{cawtF%(1; z-sjX!DEu-3@PsCT%+y@Z$uy!&sP2Zp z22Q43i@1elOR`Dk1Ru+;W=$s~u*@2x5}B%049z4A!VL#aM8!c6WdL0XM5$4#(I~Xp zPo`Zi^7${Uuv7<6rd=;4z*uf#K{7ReB}`yyUe?Jp{F5)ZjH&tVy=jj^6V!m5>4t!X zI`K6$tLPn=)iep_a~TD@YqhosURT~@K|cG5KvX({W4Ag zkAJpZz#B;k_-AlkHp18W!}yi!EsW1cT!r5xofRtV(vK}mjJ_L$_%axhts)FDoXl`8 zLO-ldOGCJX;cqhX5x>MX1mS$`LWH-ck3)D9!)pgmWFI6y8gwjx~A-{@i|byb8BthgDe5aJh{-{9ziwj~RcR;ey2IJXwX6 zi3H!xJdG)RA>#`)ll^a^qf7E4=xC7rI)teR{V-1LK>R5;NmnBb!G*z_ajbsJIo`%F zoU zlkxhek#ccD&uqyTGxW<^((uu=xuq^TCfJPeeUN^eTY*w_Gdi4=@P$1DE(}cJdG$kw zlY%&d;l`wzG^!Fadnq$giB&bV6Am+YNyEo@8CKBq;At2Rs^EONzb^Quq8yi8zJg^#_fV~Ji8G!G~pR{9F*WO z9rd9&={a{iOvQ%=qOwyDx)Z>Mf6W50A3h8TNQAeTS_}84zUjtY0w4BCGsE>)cM9Ab zqqb#z<_^G2d|BjfMzNo%Fpo(Jx89iwzmHMb{?qPMc&kShH8bFYUQJ2OfT8$aK{=SA z)MN4gCzTYWF3u!s1%5wFREEW=Wt8XX@z~ zbzwfqo?~i19Q6#2%7t*2$vfbXC!`j_RpY6_8{u73oKyrGm@=9#f^s@UW1tR4ky-?F zlO<|j(h&6mcsxcuYa5}KKoMT44Oz8X3fr0LgqMBe)ge%hH)iT!Rkl-&4uv(7iKJev zvJZprnd-Fu%>A~r43sIXYJJGP11n50M(xe4RfoepG3wRK*+^|;YOS>}uhLu&r()Fb zyv1rcoMmc1Y{@=suYd)3o2EIlMH?)Sh{BQ>83+m(0jrq019EI(bp)j1y`LhzBWa~N z64u11pWskj1V5clvbFG1LWg=0tf@1o(Z1W%(eQYTs!8fn$3kkoA-gH_uzfsec!?&v zU)Xlyju!n0zd@xY9?0CPP5}D5W)gOW4%;t-n`y^FS$xtXY7NX@ZBUyMcd8TdDrrz- za-UYOfY}Dcvjnq?w{_~_e<=bc!Dzhu(SQarh&pOeyuc?xMHH_~M)FBmJ%9=ipw=;E z%!EmB>j2rEOs$9I;yHB^JR75KGrg$R!YeTMokoc&m0)clwmg)M#N-0M4D$V zT+Woy#FbFjPxDG>h-p4A`#o1eGg8?8dbrl)_soMeG2s!&@if2#F{)DXd*;KhW7J$I z^eljvW7OZoU{52w!<5lr6MVvy5n2;`5!39%u$#cS7Vu|1+%J`T7J`qcD3V=R+ZRD< zOz6OK#v-VTQD;m zI_y$2*w>S0bUnN)mwT3gkID6L0Y-Wi%xB8z#Zp)rll=~xSPHLiFq(Lasm(VS)ETCp zj#0FEErn}tBw3G_RZOjihfHHUOQFk4!id!y4_}& zYjx8O>UO&=Fb$;w{)A9MDQW(}L7Y3{2_C|e?LhcG>PW03qtxv-!6Ek9F)cn-Q=PPtAmrx2-nv z)@&orU3sKGGM_wD=i~Sb_{2nlI=nRt@MByO++cCLW%w<-Gy0SgA}Qe#gsgWn;@JuAnChbGKK^7)_ z2o3U_G?VCtgPK(wht;`m#P_*I;xX-bUQnb$RzgVRi_ElQ(JcQmR4N`t+cL3M{#ni_ zl#&P3XWMYrOmPgVlII{isLdB=V1Dj8u~D9`-6W3SU~d++QSoZ}?Z|pUy;tPG?%bWC z2;J=!o$@!%KO)>7`WVfIr++EB64y#E@7Udp-$q7~|Q!KK^ zA^y4Qm5$)|V{y_k_{9GjJSvx2lcb$;ZBCMO2Hpy!OS|RU0y)wlh?Y9?QFXk(M5+^? zddm>*(?%kEh4I=Dah5YYi2R|PgEKHTt64fE=eWaCzI0HFAfNhuMBb;ZL7XylOdjvO zQOXy`9h)!+IxilVr+d4kQS4z9>zo01)N(*NDNj=mOTx6&`KDwu?bF`I81GE^0RMf~ z*VwaTSSG>gt4dcg)%2c^i3gF%FQLIm4X*9;$D31nD z?gaT5bB^X*^VPxAr=LfpmZOOYn>Q{16RYr9f1@alp}C?^3N!&z}<4b z>1!O0Gx7`^xKh*b{7;boxc8L2Ts)X_CMs8$KF>HOPvudsFg=s)G0l$6fKPLWm^$T8 zbEldbIiN;pi#JJ)9M&jK_!+Do^GtQ7oxUd1(wNmyt;2K%y0uNF2GetR;aLF}rQL5@ z18cD}&0?DRYtse}bOUE4+H86%WRjMfbeDiltol<{trh!xubZwnZOJ-fx+muPfcm-V zh-genFmFSSfXAUT7!(^#(d0t&MzITn+bHH@liOmMSfo~%k3gxV(wr~8PrlULEYHX* z6-VTQI7>QB%hk)w+oIf$QZd{$#oQ^r&8b7zG=1u%b>5u_KhD`Hy2W~JiTSu}$-Um( zEnbXYkMMB(Mst^_N!w!HjiJ;)mslOV1Njk+_$~5%<|FcW?IH7%9B8NbhjP+<67>ai ziewAnLFE)eecn1HTAxOY>yYuNiBxu){^>k}rnDTNBN))vh-+S(0Bgb+UIeUdk&;+YkaDpX}Oe}S;6DB2Ho9j-N4Ok;{I)7&QF(Xcv68I7aD(C=_V!bT8yI#pIU9Ekv4+P z+!NLY$?p2fYBPV}_}1#y&Q^RoWishPQFU+qi+Xw7bFM+~X&? z8_#mKHn4{mIA;e~|N5wOj}^B9@xJd?+XkL)8@M;k=)w)jW|yYhnx(V8E`)=;57;Ql zkJ&O!zw+!r80Xkw`-rO=mE5Ngr&9b8Pt1L|-e0oq69=;o+DgqswKr|AbIy)(!$&#L z3Uf5xOU+Nq`pQ;qrhTo#yw$fE;h_M*VjIEj$oYtSP-@P}O|o~wLFZum8SzwFx&1Td zpW;59W!E(vM5nYbXSN-ocb?rOd2*K{{vP6;(%2BeMF_j3nkZhpo!HmC!Y4fw*n+GP z_%Enxc+_`Fol3X8&fKj$VoznAPI*t>=cZkIJZ*n$MXYgx;-vtI^si%@|lMjcYagKcXW6LJkEtTRQ?G&-G z&2&Nj2*>s2-?}OthooR+dH2v^4$+&72W)|xNGX|>V( zMsBlXx%nOps2jh_90~i-XNzN>^bS_X-9RrSyJ0`Vd@(Y#DJs>9J-8nUd75jrBVQcy zZbE!T-g?JwxHB*oy38kXH#&qI&D(;U%)I*$Zt@cRIENe^V9q~t?sIg(6A6d0_t*LU zh4}d7`yAcoa>sX$ZgA&~gc@EoyE%*9lF2HZ-EbKBQ6WosqAm1MC2C>RoG)Wz zW_Vf3(#AOVnZLG8b`F(jVcXk-otj{~U%TWEtC!EK4 z_8gORXTT+t2`O2w(VXy3IVX3x>$r4JJXRWIj`MA&s_d~(c6G{S(a>!C*qF1#Rl}+@ z^B;88a2>1_KI>C1TJg`iI_bd-YbBimx?zxYBy_`V2?TFMNLe|Bn#1$olxoDg@jCAcarfUzh94M8P_PC=!<6SE%ljulwOY&K)C5P=lk2@r1J518`(tEsjT$g-LT(y$o zdoZq6Df2%XH(pt5c_!{S9pCJ@8PIZS6otEvZTywUeIRu*-m&h=n}Kj-KEY~+kGks- zKb(0b@%5*E@`X65KeQ<~dM93S&i_esp3eao$~?M@%DuvJjZnI;_wgQPJ-n6n{v3%r z_apwy1`jWj{eD)4h!|)*TEA*@SMIyg)AnZgqy2fg#`OvooP+Yy_65=nuJv%I>!h3% z_mzBU+*iBuZ=GkeTt2ShnnswiYs1e!9qUdGtbcLNx^UGq%HUVG9-Z#qwdVZ<@33-! zA^6=u>7bH9C507@3x_l8O@|H|+#*aX8+O8nvY*#r$p4~G(#mZR=qlr+Imv?0r3=w*Sv=-X~-#gJX< I>C@uB0X9jmo&W#< diff --git a/About/About.xml b/About/About.xml index e461061..f0c13db 100644 --- a/About/About.xml +++ b/About/About.xml @@ -91,5 +91,5 @@ Since modding is just a hobby for me I expect no donations to keep modding. If y [/list] [url=https://steamcommunity.com/sharedfiles/filedetails/changelog/2475965842][img]https://img.shields.io/github/v/release/emipa606/ShowMeYourHands?label=latest%20version&style=plastic&labelColor=0070cd&color=white[/img][/url] - 1.5.8 + 1.5.9 \ No newline at end of file diff --git a/About/Changelog.txt b/About/Changelog.txt index 86daecf..bbed137 100644 --- a/About/Changelog.txt +++ b/About/Changelog.txt @@ -1,5 +1,8 @@ # Changelog for ShowMeYourHands +1.5.9 - Fix for existing custom hand-positions with no rotation-info + + 1.5.8 - Added rotation support, default enabled when using [url=https://steamcommunity.com/sharedfiles/filedetails/?id=3302328100]Nice Hands Retexture[/url] Used DeepL to update translations for ChineseSimplified, French, German, Russian diff --git a/About/Manifest.xml b/About/Manifest.xml index 658bdf5..90aa327 100644 --- a/About/Manifest.xml +++ b/About/Manifest.xml @@ -1,7 +1,7 @@ ShowMeYourHands - 1.5.8 + 1.5.9 diff --git a/About/ModSync.xml b/About/ModSync.xml index 1643015..975a43c 100644 --- a/About/ModSync.xml +++ b/About/ModSync.xml @@ -2,7 +2,7 @@ a5b440f3-8aa2-46ee-8a29-29561bb7087a Show Me Your Hands - 1.5.8 + 1.5.9 False emipa606 diff --git a/Languages/French/Keyed/Mod_Settings.xml b/Languages/French/Keyed/Mod_Settings.xml index 57cb154..883d270 100644 --- a/Languages/French/Keyed/Mod_Settings.xml +++ b/Languages/French/Keyed/Mod_Settings.xml @@ -1,4 +1,4 @@ - + Paramètres @@ -64,4 +64,4 @@ Rotation hors main {0}° Utilisez la molette de défilement pour faire tourner les aiguilles, maintenez la touche SHIFT enfoncée pour une rotation plus rapide. - \ No newline at end of file + diff --git a/Languages/German/Keyed/Mod_Settings.xml b/Languages/German/Keyed/Mod_Settings.xml index 8ca97d8..90da376 100644 --- a/Languages/German/Keyed/Mod_Settings.xml +++ b/Languages/German/Keyed/Mod_Settings.xml @@ -1,4 +1,4 @@ - + Einstellungen @@ -64,4 +64,4 @@ Drehung aus der Hand {0}° Verwenden Sie das Scrollrad, um die Zeiger zu drehen, halten Sie SHIFT für eine schnellere Drehung - \ No newline at end of file + diff --git a/Languages/Russian/Keyed/Mod_Settings.xml b/Languages/Russian/Keyed/Mod_Settings.xml index 74cb24a..c44fcff 100644 --- a/Languages/Russian/Keyed/Mod_Settings.xml +++ b/Languages/Russian/Keyed/Mod_Settings.xml @@ -1,4 +1,4 @@ - + Настройки @@ -64,4 +64,4 @@ Вращение без помощи рук {0}° Используйте колесо прокрутки для поворота стрелок, удерживайте SHIFT для ускорения вращения. - \ No newline at end of file + diff --git a/Source/ShowMeYourHands/RimWorld_MainMenuDrawer_MainMenuOnGUI.cs b/Source/ShowMeYourHands/RimWorld_MainMenuDrawer_MainMenuOnGUI.cs index 3c6fbe7..e257fcd 100644 --- a/Source/ShowMeYourHands/RimWorld_MainMenuDrawer_MainMenuOnGUI.cs +++ b/Source/ShowMeYourHands/RimWorld_MainMenuDrawer_MainMenuOnGUI.cs @@ -151,6 +151,9 @@ public static void FigureOutSpecific(ThingDef weapon) compProps.MainHand = mainHand; } } + + compProps.MainRotation = 0; + compProps.SecRotation = 0; } private static void FigureOutTheRest() @@ -202,6 +205,8 @@ where weapon.IsWeapon && !weapon.destroyOnDrop && } } + compProps.MainRotation = 0; + compProps.SecRotation = 0; doneWeapons.Add(weapon); } } @@ -249,17 +254,25 @@ private static void LoadFromSettings() : Vector3.zero; } - if (ShowMeYourHandsMod.instance?.Settings?.ManualMainHandRotations.TryGetValue(keyValuePair.Key, + if (ShowMeYourHandsMod.instance?.Settings?.ManualMainHandRotations?.TryGetValue(keyValuePair.Key, out var mainHandRotation) == true) { compProps.MainRotation = mainHandRotation; } + else + { + compProps.MainRotation = 0; + } - if (ShowMeYourHandsMod.instance?.Settings?.ManualOffHandRotations.TryGetValue(keyValuePair.Key, + if (ShowMeYourHandsMod.instance?.Settings?.ManualOffHandRotations?.TryGetValue(keyValuePair.Key, out var offHandRotation) == true) { compProps.SecRotation = offHandRotation; } + else + { + compProps.SecRotation = 0; + } doneWeapons.Add(weapon); } diff --git a/Source/ShowMeYourHands/ShowMeYourHands.csproj b/Source/ShowMeYourHands/ShowMeYourHands.csproj index def247b..10f6866 100644 --- a/Source/ShowMeYourHands/ShowMeYourHands.csproj +++ b/Source/ShowMeYourHands/ShowMeYourHands.csproj @@ -6,7 +6,7 @@ false None latest - 1.5.8 + 1.5.9 diff --git a/Source/ShowMeYourHands/ShowMeYourHandsMod.cs b/Source/ShowMeYourHands/ShowMeYourHandsMod.cs index c6035bd..9ed28b5 100644 --- a/Source/ShowMeYourHands/ShowMeYourHandsMod.cs +++ b/Source/ShowMeYourHands/ShowMeYourHandsMod.cs @@ -98,9 +98,23 @@ public ShowMeYourHandsMod(ModContentPack content) if (Settings.ManualMainHandPositions == null) { Settings.ManualMainHandPositions = new Dictionary(); + } + + if (Settings.ManualOffHandPositions == null) + { Settings.ManualOffHandPositions = new Dictionary(); } + if (Settings.ManualMainHandRotations == null) + { + Settings.ManualMainHandRotations = new Dictionary(); + } + + if (Settings.ManualOffHandRotations == null) + { + Settings.ManualOffHandRotations = new Dictionary(); + } + currentVersion = VersionFromManifest.GetVersionFromModMetaData(content.ModMetaData); } diff --git a/Source/ShowMeYourHands/WhandComp.cs b/Source/ShowMeYourHands/WhandComp.cs index f795623..7935df4 100644 --- a/Source/ShowMeYourHands/WhandComp.cs +++ b/Source/ShowMeYourHands/WhandComp.cs @@ -1,10 +1,5 @@ -using UnityEngine; -using Verse; +using Verse; namespace ShowMeYourHands; -public class WhandComp : ThingComp -{ - public Vector3 MHand; - public Vector3 SHand; -} \ No newline at end of file +public class WhandComp : ThingComp; \ No newline at end of file