From 1263285a28cde42235a3d75ead14b485e7eeba0c Mon Sep 17 00:00:00 2001 From: Gefallener Soldat Date: Sun, 7 Aug 2022 17:42:44 +0300 Subject: [PATCH 1/2] Fixed a bug that caused damageTypesToExclude rules to be ignored Fixed a bug that caused damageTypesToExclude rules to be ignored --- 1.3/Assemblies/0JecsTools.dll | Bin 112640 -> 112640 bytes 1.3/Assemblies/AbilityUser.dll | Bin 76288 -> 76288 bytes .../JecsTools/HarmonyPatches.cs | 8 +++++++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/1.3/Assemblies/0JecsTools.dll b/1.3/Assemblies/0JecsTools.dll index 265a30e328bc2517c47b874f2f835ea8cd5de3a9..8f445a30241cfc7b13f10d09deb98636ebb5bcce 100644 GIT binary patch delta 13548 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 JQkN9;{{ZYvqpSb` diff --git a/1.3/Assemblies/AbilityUser.dll b/1.3/Assemblies/AbilityUser.dll index 74a0ca54c49e9f5a5559a5c2adbed29167b7e1ce..8172d2ee645df164031d9dffafb5654993304b39 100644 GIT binary patch delta 398 zcmZp;!qRYsWkLswMcAD+8+&3nI3ySu*i@Nn_f7u5;maWa;cVON%E`;bE5*RT#beRH zz`($fFF84$`!raD%c2D+!j><&*_>wqFBeD=m$n*+|4_2qiIH=2Zj3x5qtxc!SWyvv zWo8BjQ-)0p0*uUz0t}p+Hx@o*nS7{BZE{DM!R8lb`}kS*SzZ>KysAx&`L@Q5$(P%l zS^TW@L?%nMt1;zkZgy%nkhg5KcrMPs5Ni1bNOD>h!`aRjAF#5|T6}|uZ(hAjk(q@_ z;Rws(3oBy;YG2&A!gAu9_Z}6EJGqy|U8g@_WmGp(VNqZZW?)uekYN`UYM9F?q{6Ad z0A#IX6lP#mU=V6p3KCz*D3k$}&)9Cs#`uGuPlbb(ol&S^0UJ9rhfv0LdojimHc6mi e2m_E<8Pm_mF#hIb(Ev&_YcR-czaYzKzykpAB53LW delta 398 zcmZp;!qRYsWkLr_nyt>$jXg0O90H6CY^qGP+a`bD@a2$zaQ1C><>Y1J6=PuF;<0F8 zU|`_L7oHr?eHtvnWzhl@VapfZY|gWQmkXqbOIr=Ze<<1Q#3;2nH%6Y3k#loztf&Y- zCo=bmHo2qBVDpQzef%tbR(c|nSGB1z=WAY`e7Vh; zWuN6;vB^^HYD~8^HaoQ&$Xjw+7K<}5gjzlal8qLx;cRD%4_Mh}Extj-H?Ll%$jowF z&M;*0g_SV^OZK;KINNo{tKHDN)_KaB?b9EyGO8P8uqZGHGcYSK$gqnFHOyrc%HULB z0J2sx3Nx@OFbFj)1&Oa@6jFi8t8BMqWBkF-m%+ix&M4HdfQ_A*Lr7)2y%=K&n Date: Mon, 8 Aug 2022 15:21:26 +0300 Subject: [PATCH 2/2] Grappling pet of the grappler's faction always succeeds --- 1.3/Assemblies/0JecsTools.dll | Bin 112640 -> 112640 bytes 1.3/Languages/English/Keyed/Grapple.xml | 7 ++++--- 1.3/Languages/French/Keyed/Grapple.xml | 3 ++- .../JecsTools/GrappleUtility.cs | 9 +++++++++ 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/1.3/Assemblies/0JecsTools.dll b/1.3/Assemblies/0JecsTools.dll index 8f445a30241cfc7b13f10d09deb98636ebb5bcce..923a6640724d4bde59f680dcb9db4f108ccd731a 100644 GIT binary patch delta 6043 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 U;4pTnq$87$4Lpk1(UYM49|2U@@&Et; delta 5989 zcmZ{odt6jy{>Q)H0}Koxj4&aB!061J84%}?G`}urt=leX* zoPiB@R2%N7YN|Zbubt|0Y#D;%9S5=kzBz+156I6Igg6h!P_3T?{sd2u`60?sDMrab z6DBBSXdfJU7O5r7B)<}PLHGLroxup$_}6xv;G8cNO~DrBA5-_(L!!e+d%;>_Hx6K6 zp##C!S1PF`w-SY1LPE4!YaJO_>&eA$M1r@qfeie8N*c+nq={VCZzUJ&Hgbs_)PMT* z-su=`m5;TVkhgUp5UZn?eZ6B;-c}6(Wm59|xE<7TC%v?g%PPtIIe;o#GM}fn>?ggv z(mhH#i1GSc5o8NuO{2rzC3ET9&WHu(y!@7aotqi1)XsI9eYWt|6G^kf&*sJYTa;7y)J)z1k z)1oHF42A-&c^!gEtM#^JP%8YAJdoD<6}if)&Oov>=HHXC?I;zs=1XMkZTo7lGCw6E zz&EVloKBgS5*e8IXo^J4Q}(As7~Nd!r~yl2)MZNm>kg4(y=|W;-=~-ZrSQIh#G7oM z)CkO0rlv-rjf{f_>-x%RaI-v2Rb@x2Z{QWT`4FWeH6niTkp5ANDea;>{N5d3M8;prcc$yOzDd*C*lku84UARq|J@+RS-|5b2=_@?YS2?)A6%ZW-1y*vl z$T?8i5|j-YTFg-DGbUo4ayBDU^9hl~0%=vYdr`{6jAWFZiJ2{xY4*^ts-dL3b98}UqoXP^GW(KhZ95eIoN%mC%sESEEhCb;}YlA zesVX@pf>-%GmSNYn2Z?ZX0Lpf(;2?2FVQBF%{qdZ$sq$qOjp@XD909+W2ch*yF}^E zP-ofi#(Lsj=X*=qJ#d(k|BMyKD;J-ci0MjT-Vd0oV1BR?u-uGI%7o=7ahDVG7fI4r z!<}TIDZ=%f!McrlM4=b*?G;(owO-i4gAp#nAS1}G?8L(;GHdM(z^)~Q@6JMFDCLV<@ZRB^s!o-%}tB@gqz zX%TzKm@Q3V8ufTm^6)g5lA~(-mIzUC)?zXn9VwX&w8ZJQUyMp<`TdcP$t1-WWU6y2 z`G{p_*SGV9zWtp;|C6HYmws$7S7PWgJH1J%wo zRnrh>I1g>AMtt3wy!o<9x^Gg3)-L6@A>n*G&{elRW){si|A`by_RuG& z4`od4U}cb!B>W^>n(~5@f)f;7Z3F@5*UDW)tMX~R7WXLE>n+lkX6KZKW|aPGc7EM> z0ae!FP+&XcJiPUyH2Cyz0KFv>M&AG+pWC3HVVRXe?n%x)&GEzRtDh!gXn=hSEc$lv zT*9e2HCO)*c;<3y9k(RtFcb@VD|Jaw2eb>)h5k{01cH`w%MHf0`aeS~BS&a+e3tGQ ztZ*Ys9<_A9!Qc<^806X+HbA9iqy9rUB51LtM*k6Lmh+$^EY14ALyDm97w*@)U^OEL zJeTFvpM+aN^RaxOKLv5*kpi@RR-mB&_15?@oH4zXbIVm0jiC$T1ifVm zGhBv~g1)t6>8`;gMh@soH5;yh#tJmQ12V(M8@`27^2tZ*o;)Yfa08kIRnD4g_yM#9 zTsvvWG2Dg%LB)w#y8pm2L5+_sGyDfmGjc%dtd)izVTg_TDUda0t>G>t3A&DDhI>#- zh~!sbF_am8fj5{~=>w^o4c*Ye$OSIbCQUco;Tnv3yvA@JQVMBM7yfS$!hOi*1Ya8t z5ULVXrl#61MwOu(;wc?+qwAFH&@0|`6SYM&MXxr2kqcg(zFl)4(ixROu*Y`I1IX@Y z`70cGj{3PkHKoDuD+E2yiTXW+;f%Q7Z}2!HJAK~mh8{@bran)r4?qw6`~r34>3iTI zCt|sqSo#;Upu+MWjCw84a3Yomh-H_XW!{S{CQLBBO|)kE#SI$lWVJgCfQw5hIv{w& z34<55F(Rj8)_H?BKDC}}^vL+(az;F%Kd#{#J8J$|?WQ$xf(yg08T>JtZFTN905cht z`PhxR?+gPlm!ZoijXeDT)NG&$drdd_9zTh-h#XGWSa8t-s|o0$kPxT1z?yooVb z;6}xaTt3B-I%3%*i0-EtjB&7-P~>MZ#$Z4#r?UePV(mDRArBghDU2FmOYBl(ELI5G z9s394NIWj+NNj;|6nZK&Oaok0zhE4VCm1>4th(IzICcxITmOo2EY{R<%k6XOjN`DV zo{|In2=>R@_allNTUvs zGw^|+I1(lkbz8Y*oLZI_Vo@KBk)OmSLH{P{v+=AT@Qadj@KPVi@*=#ljh%b49sS10 zi^;bZ9@Juvm!C#$A5D{&;Al=hr~P%X1g8jcEUY0kThQXrTOLa=i%~i0#cbl2%Qd*{ zyFkuGO*79BuBNoQnZ5rip__?Awo}ms-N_3yxj2i_b?i>gl9%ElMh!k|v!9li;c7vZ zgz~UV_)Q*I1Npc~&^_`x%Eu;3s6f)#6>>h_?4xJp-{Z_3^!-D`gw(b23Tz@sH`K2g z@N0&^}fgE4v!Cf@s;*xS10xyBd{!c5X`RuEuRbq;*$gn{cFcSK|#qwC-xW z&4~A@8vV&1ili4TVGX7Tq6urze1K|YaMlwEr7+@MtHC)3*txmN+E#;^LZs1%MOAez1g_c7vKtHHM!l|#BzOf3J(i1)At&$wA$5SB(K)DHX~MqI1K zn?f@ZtrnmAQ}0uFfr2%R_}bUu2|;x2>+s1UlV2gGc0qLQ>u@6@TACN3HlfiYT8~|VX!?4b`R=3i^_a)#s(R+UI#WHa z=7e^-^Xsuth%|jYmI|?b@-|}n7eO>V`4=Snad{O)wh`@Prt!_zfL)BPBh?x(?mcSC zd)SBxjJRbZ&g|9b_r^w?&#)XU_@=25KN7Up!)aN^VBIz}>1Sc{`356yqHw@4ysByxlu7 zml0p>7Hkqk+ued!I%rV7+Aa8y5kKiI=y`-{{Ghj>A15{Gww*X?g-B0&3qB)=wz~ya zG2-c4uu5ojwOjEcK{S0Uu73Yf`c|xB#M8H84JWqOTCq`Rbg_e4u|Exy zD_9BoXNBh^pFL)0-9JAH!+58q$5PaB-iBv2n(80&w;g%#ucTL>2?+am!I{F2cgyi$ v%m9D!A8%TQ+_Grapple Failed Downed Attack: Grapple Success Sneak Attack: Grapple Success -Restrained Victim: Grapple Success -Sleeping Victim: Grapple Success - +Restrained Victim: Grapple Success +Sleeping Victim: Grapple Success +Pet Victim: Grapple Success + diff --git a/1.3/Languages/French/Keyed/Grapple.xml b/1.3/Languages/French/Keyed/Grapple.xml index 3596c7fd..bbad95c9 100644 --- a/1.3/Languages/French/Keyed/Grapple.xml +++ b/1.3/Languages/French/Keyed/Grapple.xml @@ -6,6 +6,7 @@ Attaque abattue: succès du grappin Attaque furtive: succès du grappin Victime retenue: succès du grappin -Victime endormie: succès du grappin +Victime endormie: succès du grappin +Victime animal de compagnie: succès du grappin diff --git a/Source/AllModdingComponents/JecsTools/GrappleUtility.cs b/Source/AllModdingComponents/JecsTools/GrappleUtility.cs index 37b330c2..084bd634 100644 --- a/Source/AllModdingComponents/JecsTools/GrappleUtility.cs +++ b/Source/AllModdingComponents/JecsTools/GrappleUtility.cs @@ -150,6 +150,15 @@ public static bool CanGrappleNoContest(Pawn grappler, Pawn victim, bool throwTex MoteMaker.ThrowText(grappler.DrawPos, grappler.Map, "JTGrapple_PrisonerGrapple".Translate()); return true; } + + // If grappler attempts to grapple an animal from the same faction as him, grapple always succeeds + if (victim.Faction != null && victim.Faction == grappler.Faction && victim.RaceProps.Animal) + { + if (throwText) + MoteMaker.ThrowText(grappler.DrawPos, grappler.Map, "JTGrapple_PetGrapple".Translate()); + return true; + } + return false; }