From 7d3dcac739d9e98f1b99863adc374df709231b08 Mon Sep 17 00:00:00 2001 From: NoImageAvailable Date: Sun, 8 May 2016 14:10:19 +0200 Subject: [PATCH 1/2] Melee weapons, balance Fixed rocket launcher projectiles, reduced LMG market value, crafting time, increased merc gunner weapon money, removed stat penalties from parka, added armor penetration, weight/bulk to melee weapons --- About/About.xml | 2 +- Assemblies/CombatRealism.dll | Bin 175616 -> 175616 bytes Defs/PawnKindDefs/PawnKinds_Mercenary.xml | 6 +- Defs/StatDefs/Stats_Weapons_Melee.xml | 40 ++++++++ Defs/StatDefs/Stats_Weapons_Ranged.xml | 10 +- Defs/StuffCategoryDefs/StuffCategories.xml | 5 + Defs/ThingDefs/Apparel_Carrying.xml | 1 + Defs/ThingDefs/Apparel_Various.xml | 89 ++++++++++++++++++ Defs/ThingDefs/Weapons_Guns.xml | 8 +- Defs/ThingDefs/Weapons_Melee.xml | 39 +++++--- Defs/ThingDefs_Items/Items_Resource_Stuff.xml | 18 ++-- Languages/English/Keyed/Keys.xml | 1 + .../CombatRealism/Combat_Realism/Utility.cs | 15 +++ .../Effects/MediumLaserRayFiringGreen.png | Bin 2911 -> 0 bytes Textures/Effects/MediumLaserRayFiringRed.png | Bin 331 -> 0 bytes Textures/Effects/TinyLaserRayFiringRed.png | Bin 326 -> 0 bytes 16 files changed, 204 insertions(+), 30 deletions(-) create mode 100644 Defs/StatDefs/Stats_Weapons_Melee.xml delete mode 100644 Textures/Effects/MediumLaserRayFiringGreen.png delete mode 100644 Textures/Effects/MediumLaserRayFiringRed.png delete mode 100644 Textures/Effects/TinyLaserRayFiringRed.png diff --git a/About/About.xml b/About/About.xml index 63aa152..acc64c3 100644 --- a/About/About.xml +++ b/About/About.xml @@ -4,7 +4,7 @@ NoImageAvailable https://ludeon.com/forums/index.php?topic=9759.0 Alpha 13 - Version: 1.6.2 + Version: 1.6.4 An extensive overhaul of the game's combat to make it more realistic. diff --git a/Assemblies/CombatRealism.dll b/Assemblies/CombatRealism.dll index f359289f06cb255f1d98b6617a1b3f3512cfe0a4..b1e87a905af3f95b6e1d1741a571a5c297bb9069 100644 GIT binary patch delta 13885 zcmaKz30zcF`^TT>&ceV9%P{QBATz_T%`ku>i%SCHf{22O8>lGms0d+dXak`Z?uL5R z>-bt=IXT(C z?(`>s0&FiM`1C~xo(0bU6j^+^VDccnclOqEV-25ZEQ$=^M`clAuo7urtY>;Z{ zJhh%FKeMBdOeGu1{<4=0+;m=AuaXZ*`47@*lc@oq_0nofJ|I)YFosPIqP%1g3-;D} zr&O~T4|$Bt$LjhlRHySsZ`m`clE$XhDI>=rD0MzsA6q_P;U3p29{l@jX&%!3)TkLW*v?U)@${) zF8tV><8=<#pfzk;c=$HDsq`@UJ&S*tkA7RtQGbij?kzz7 z@K!Lnl~3d;nwF!q0fopRw5Q6#Yvb?hYK8j&{_U7QK=KcG=5I%StN(--eEpyKCh*)j z_XBWF?YsAFL{{r3(o1U}+#g9C@}S0l-3$E=ewMqA$9gpe_;3E7{>|Lqr;*hvZX7_| z*Z7+Mt`}klKC88h#}+>f@ZZn;VbU=?_wVQa56R#3LjIs<`Ayt^>tR5EU+DAv=YGG? z+E$OEYvDy3y`H___E?!N(#PBAoI~bo&_R!k8 zCPQsSQ-HsTS)G;hpAFAc`$1Erf5HpCf@i*jZP%OHBNo(Jo?OB4wd$vKT6^`==xrmP zs?ci#`d5$hSgN69Bn2h)*J`}A2#tQ+a`k?~S zW(pVokfT8im7@|<#as>Q#UnCo)56Y62aD-)jBjD@FRqZ|01U6E5_1tJh!skF6JM>D zyPyl=Tv4OKE4W*1a7B~L3xf<66J62X($QaB=!$*tWIY9sM|Ac$MvYn6U)-j~ckm(` z+z7nOURu?k&|nw}erB=J9Zk*QNgg=lnXSLL(*yIHrC>9Qt^6=Z?B|Iw%|@x1-em+> zlcB6!{Mr-m;G5!SUTCF~*S#>mS@jo7wOH;{!d;X2s}~v-))Xk)Af|ZZ3fv$b_r_Cn zOdE9AUK)>Cbn(GT{9b(12R~9=Gt;$8+^nOy9_WktUVoDQuhkQ;`qJ|K&2^M5>;}Ot ztp1=M4nbu|7+-BGotS8<|2Tlgg&o9*AbcAO#eG3I3RjC!!8DoQh%XrRFch0S?poLtFF^L5 zC9upVT$G#WaLdGZOgIUb)@#hz3(bea`9;yCWFKuuiY+_G4S~vv^K`9y&k|JjP@EZt zFa39*J%VMv5IC~_$1r>qX(k7SW3szX5 zb{8;NoSB9C`jH8EMsCcpI+uUud^xyT%3gb>7jV5@EJ(qF#?#NtQkaLWIZX=dRo|r@ zekaFrQP&AO;Ntq6PIyPIUG=xH17g1nd{_J9-_7;%E*L7;s$!a}O1*@OZ8K?)q}Pwk zr1K9)i(7i&Axy5P@t=J0y2Gz7d+LX0<4jT^k;?9F># z$`pNb@O`hIEv<9w59MHh+_2paV9x6c2}T4jdJkakmY119uNkC|)?*%y(ZwH%=wI2{ ze1teYgE1)JNQ6>Zt7Y~dMxP+A;LHzW?YOWL;>xiYWjzz2gd^o@nG%e;ZHTZe<9tMJ z<(~u9vfRoaIY&%T%VeOKa8dkiEXH=e93h9g^y|dC>Ay$NmQFiQ+?#WU3Z1ea0=m~0 zQ#tBcE$d$y;P-%fI~c;4kjD64;sbHmI2;t(L}^nx>~lki8+t>I@JSSF-z&aI_TNWi zr1D}yxe^p<=SAIk9E1vS;&?O!x<|^vE3{lt!d$x+m5^299jS%y2K$R^ z$D`TB64}4<+kqDGyYU#Mi;6^;I?zt^&P*Ym9GE7$7Gt)1CW!*STw)i$T(PJa({Ql3 zz8HtKDvDG>iSHp$!t~s+k-3%M2j7ru;jz4wI_avKA(|)9P-?`P6VQ;v=D1JTLh5lW zX9_X5GD^=5%UsB&^_`qr>f@)J)x^xgg{;@Y6XLN6)E^zyL>%O@j_T_AZ4_Ugh;4DJ zxN#zu;w~|G62`j!Co&P%TVJ7Locq!dalj-@)9s@Q9SU#AdBIBVqXAx%y&KXgs$%_1G#?j^1snE1e!3rhxk^N5X z02jtBBi^6^RmYVom5?w7pT*ENqv1}Oz~(($bzj_Bf(A#^3q7-A`pgBR5aznN5s#}` zdy9s(x4N^)?jDTiJv_(~@7YA9PYp~XR`d;sQi5+Ab_Cff{j+wSn?5QL3O$Wce(;tu zocIpJ5yvVR_p0I?^zyqK6EijKC@m$8Z91vkX&Y-_v9SrS=$pX{b*ISFm`#z=@m2I4 zNbS5*cZ$h#E1>q7&g|$L(uPwzTQ!>awLfb&s+sp|f9Caem)fODhZ3%lU}G$%(q`FY z;$mSkh5oZMo7j?JuTnc(qk7-c4unMj&(MpIJ#`a-zq;pR?_@>lQ zkk&;@9K$vx{AXMyv5)Km4UVnQ^RyQ`U}w)Gr5|N2b)BN5Ty+M;vlHNX{EJ&ZnD-J& zWLqDhpZa_xtSrk zmtWBC%?YL34=hn#Z`Yk>LR|VXF89oiRzVjFv+oCGzrJEhIVRyyv9uh6agw-zy*v^( zmSYLNA_h*uD8r0sU+_(433CF9dLj5hC|COdhs+R%O~EAVtx$hhn!-Y=RLj$Xz#q17 zHAjVM+0p)R*Qq|wsTTK6!FhB=&VB{^(wn$7ui)^a<M~A}2T$Wx1 z9|e9cZkkG$rLV+OgY{ko9P(kc`rHv_7w9FkdN6U7Ei}uucqi^*gk<758$9;!747Fjv44Go}W&& zT}9)om?V&O@T>G@%vGH7DvicdeD_uCV(_zeg`k&N=2iTKo;P%Z46Y8S#Hg(zR?tZG zqM-tlx>>9}pyo9exm-13pq11zr~0rsiPV=)l`*gbsbi9Yq~b25t~u4X;x6LbRMVPe z?Fp(XR;(6&Y^yc(glSwIfC;^ku2Isz{R+174HdW#dyDI5(5UmoBQtQNHQ$;GBNwuu zIjZjChm)G&RDR>flbYpJIDWiXJCkOuoQz(zEMYlp?*E$j?M#}O8d3Wi9&;?R7Qp0p znXd|d3lXhDVUJTSG{0*tgno6B@2e4;tVIyIMpD-kHd#l5W}T!~mDXFw!APe%7kI!r z5e}`Fd<_GRSW964`;rP8c*Hsdyy(FcoiH%88BR5;INtUa9CfOvY5ulac<@Xa9JZwpxXxj>i+$u$eq?>K4p!}Kgx2=ZAkDGl4+dHtssTLK#Wcvrm`LoC+0lMCE zUF)EdtNpOdZ!d~_DlrkeiuWsN3A4qHRdl}fwXK7rJ6W|ksx~2m#Of*>?ip-Z55Bv( z5eDZ4i+8GM0}T}ouj6nWDLP)Kx4Xr*_o4C&DMVLLN-AMKSNsCB5t8Xs8>=}d?^W@{ z>(pPR7+6i)sm8Vm?tIC7(zPv@jC4_}sK#K=Nzt3(&99iR3XUW#64zH#e{YK}v*`M@ z#`ZDnIK+GhFt+tZ+rQz;cTCNJ*w*#7UC_i;6+B8lD2|(j!G_~D8r>-tQU!zJkhUTKG>Wa_)7f;DxgjRa!IgMhJT?b|9gVirAiu^Em%|O; zH^a`rO{ePB3u3;9+%p5 zy2I&Yca3Y%#8s8*Cu^bl8sz-R${c`U`7E-Wt12*=(y4p>9ph^qtmFso0@Ex7qW3cZ}1AM*!f zJY?zsTuxFN?!e?nOznqHM+d<@2%u-mZ0oG`qEAK;%#}2w_aH~|@xk1KI* z#OBbETpa+`{XN+Hl=-TldYmHcFNmd2Y|WAPA(<LT9yk@7wfnGw-ncc-S|i+6I+&D>z7f1!xT14IaT(k zD?%f5cd7@Ww?Z3XtW%xJ*o}>_*{N=%20r`L>>0y&MKAAaT;~FfvW>BCOW~t5lUQHnFDZ%Zp05^3s+U}MMk6HAw1w} z4lEfJ1dkw8%{zo|eCX{eY;k9*3O2WAs=J5eJC%CU>k)*}Y*GJJ5L8+o(*%0{ox&Ut zy%8S6t6Uv`9ok^aW0>z$r^c+4J%%ibXr8slFo~-w*eMvjAHzJSqDOt+Phd4y%OSu! z(fAZDI90HBMGRm+8X)ywrFttPJ6gc`OwwRHXxaoc_%g*Wq2$ZsZx*Fx5-^7Qs=$@j zQos&Q^&`!ffLB{nnsY$~?8$uxVAo()Gt~T|Z*?&1!BGn*vu4G#OqAn>j?7sLzVXR6 zIS%Y3shjDwF$#=Jl~hi~x)?Y7K21`U0so3|$Fb>>8ZlyLj3)+UNNRP!z8Ed8aH_>4 zzKQY1gI&1K0rR_`kMYOFU8T_VZEnT{qp=I&!~3s1sFW?dv2_TX>y}?8*EmiT#VicEk@WDA3Gx(W%>5DEqsY+?8gRC4OuSv_QV#x zBuwllMlZx5YnC&n6~!dubf?;-$+xGp$Y_Tv#FB+{vsLFwMJv_$_Vz78I$)^NS0*!h zcWB}3h+Uk%`Q+<}-*EhhcBk4<_fOqL>XQ}!5&tQ;&3U4)U2H@UT%zI9~PUOWvu z;dZC*DqW~LVMIRbSK5|;k8Hzz)v#JwMzz~J)owTzor;~Es!VY#It{a&>RZ*Z=ydFF zb;<{B$D%vqG^ct)GtHjSVlebREnkdVOdodY#H_^_+--|9w1TeMUGZzKq_K5vk=PYa zIV11lYxb7DZuqD8Ar%wU1>!f0F)}2Q_A1*vo9SBItwot`IIBSPT7p4d7o9Oj=nCBp zGlq!m$ZE}@uOL~bO*Y%!4JSL*VPUqtdy6`m^ug7!gu2uZ6<1TDqy11R(TmnL6Z5!| zjwADLiNl?d{h`dBiQ}B=PsKcY4=i)4i@4IBg|$uL@kr_2#PwfAn(VGeF{`aY2Fwdb_(<>G#)?;Tm0J(oWDR=kD5?JhZuzk|`c5B|xO zbS!;ar1!-q&d3pTx9N-C!^ER+(OiTMljh=Ic-Y<#yK}W1R!%r=@82T7Kdx{_M$2dW z^v7Sgl6o4@B60xUbw(~y?9>fFO`+7oD&c~CV2j8>80K&~KbFn*8HByLlFrt_IGHQy zY|Y0lPQ}jFeB3ac6_w7`eEgED2G=u1SM2#MPRQpzc0%UkQ7ID5*}qa`zz7E`(}2Ha zcP3}(2&Sa&^PgXL>0(iUsod9qtos7|sfg$C4hvdz_}s@jEWm40B=4{Q<3>L3uYk=3 ze^0|dCKX^ZcS<*b0?g$~8cacp!3@E2XBjq_A-H0cG#GXd7}8=e&wXq#L$FSYM0O7t zg4aj|HXr?v7ArG^o^d;(X4hg)X^7-U#FSqk-s{|>z@E@7b^O2v;Tl)g*;nxvs;nUvx2KZ>ss=}XvP z&$G@DmFHbM&5~#(W5ffe(NAIY9?@bZiqP+6sb+uqqxy*}uwzKzFTp$A0tep=PE$6G zneDS(_{GnJxw4L(pNRYZP2YS?)$f#*lvL|e6tDNbBE&0(1n$!Bb!!;3M}J$T@#~?9 zSB&g(K>xMdklNjoPi z#eaKtRNlnGpn)MfF}iG|h&#~V@k&T37WSSQa@*}ox;Le{03L z)Ppk^kB)CNG$>IJMlDiImHLmdE=E+2it;pOx~T>&RAjnMdMVI& z43axol*b^t?418um$I-0>SHd6!$QQzJJ674F)mT3Tdl?__3TI&<8;+SpG4zcc)KJB z_JYRN!8l#skd%WGU(w<#BxeT1>b zO*W}mEZK?vtteF8-tc8;170#|vC6G(&;sKHewaJqYQHt&`knM$qUmQAaJczcBlncB(Iw z2ARgmkGCZ|OzLYgeXahWJc2Ap^U|P5Z+%YYs@$7w7qfTKcV}Hq)74+b&2^1e^zA*# zbXMId_9|Y7!};Z=D!Ha-g{ej!S-eiRM9#jI*bX^S4fKsyL+=Hq2K6`ek)Y9Kl*~_jk4&Y?VV&qJ5%u~m+f7U4H`8~Uw!?LwU*NVnDfAmtqf0@+G1E%gmC<`=>OfzUDMxec(uQpsXtRim($#w|Rrwn#_gfop39| zR~@LC-02{?MGOahU>PgEUKe-3XBHly```icxOM zdVS)*RlYe~5w=s_D$7mW`zbwM(~4(5MKh*}kJ(tu!p3Q8J07Cv6e;w;pj7idJxrUf z(PS+Q+p5Uza6=x5?!AK*Yus$~Ik!sF!{?o_D$PUP6`@A+Uh>+om71|p+rrjpzK#7X zY@;SK?rY-F#N%Os$ToK%eoh-Y5HA>hBFou!YS~WBOOq~#)o3D<{tVlzp%^8&%ILGY z`0j4>cehv?Afv=$`C6lKw}|_8W2__2(&*AUF-&pWWx=os?in(_k_gCoX zJyzAYOid~mt}Cu~8g9vzz0>N3e2{FG?;5PpbWB$4-`^>K zO!33mC8nrXt8lHlZAM&pjmud2vNX;0LtRR^tMW{8cX7>UG^x69SNEg-1(dKN>>QQo z7q6psm-KV88kfH5<-%>v!+y+?lfkZAj}lo?&yZKia{MJ0|4W`O{Fv*=kl*FQw}}JcFXBje6fVGQ zN>;&YfCv@Tfg(bHHB?9i>%fgH8^DvOMMZ=L!qA5piGf5Lh7jY>OibYIWbz7-jZ3L! zF6VGu9_~=Vo0P1A705bR%?lmGNNOL#ml&z!O-zZlDD)~mDLnHr)UcBVnsDwq%O2iXY&_TX~I!Kj&M&1m06|uYg z3t~_CR}?vjVid4N&Q^LmZ|{(^mEJ916>bMLEt4H|kU+nz35JeDGZYZ5FpAg)rV-n7 zc6RWWEbizFuaP64TZ%Y~VL4e|hCOi?v4V@qcrF>`k2 zEaI%@T+4Y;%_1*R+d&B$Cd`~goYkCbIrnj1;*`1bNY2ijMV!@~YdQCEUgDH_@OaM7 zoJE|~oNE~!5&O8f#3}RS37nldi#V$}*K+RTyu>N<;_;lFIg2=}Irnj1;*@E5Bxh&N zB2Gs&e_6}9kMk0z%$p~0cIGVNtma(HxsUS_r%cD=IXiO}aaMD#<=n@4iBsmo;~o5^ zGiMQJHRoE+eVm1QzUrKHoO?Jga)N<*Lpf793ppz}>p1stUgU%j7GD^~x(`isu$RR&v&H?%}-12`N01vyiirvySs3XJ|X#C1)KcwEvWK-~Lkvy%cg$ z$yvv_hx4Lje~E?Gai(@+?Ly8<&N|LLoS~V_o61?oxrg&2C-mT5a;9p1stUgS*e#UcwCLn7+9*u!~|6MFMP zjP!MxUzhsqd>_q_5L|pg*L)rS~*s8U`As8)h387?v994Eqch z3_lyL86dMYnJ1ZR&6~{I&7YeC!n%bG z2%8$Fv}i2emT1dMmIBLYONnKQrP@+sS!7vZ+2v!|V>xO$ZTZX6WQhz<56=l79X?r1 zI)G~&LM%N`=;=aSo}nSSj`Jqcueym>Yo979}{#=Hvp-3P!IIc-U7~A;uc;ZFM-ur!rSe5 zyM*%>Zt2&lPb@u%nAnR2RdL=gXYDQBR}y=Uf0r0Eegjd#xj*k?Y8&}{+=$vi?eP9yzhxebUzZK+fkMS{@s%$`vx&Sieri!-nf=qSTf~3mv!Y!Gvw6Ca$VwdRaF5uj{Uc(ZJl39=!s5H|j_>e8`eX>R zd>qdzw;9LU6S(DlPKSpU;{ZamE<`0yo0#iP?IvFqx^fcZ6wc$Et3sGXTKh{@wlq!S z*?^>d@O~2OMv8%4>0oqJEq4@)X$ob#=PY0QTdB-zbnvZ|WM(2JjcvEQ(m*zpj_mlP zEty!Fbu<>EpmUZHp!)W%M7yeXBPlu?2g1zv6^F+@h z^waKn^}~)}n$WYIem#CJ8!r3Z@YtoFF&E~@K9Rj)Y^B;`d@Rh7oq$wRH({pw6WL7l zV_~TIsp_LJohw+nx&DLx&RcTnuP^;Aa@}JD5KDhTpMM|6bBoa^e$YcO)}I?8oc8tx z=vIDd@uxn6Gj}BZ`lNEnhB5VfrU>=H{;@70-V-(6Ri`u>K~M?aRdPY_9xl|^ED@gi v_|kC4I{#}I8~N+39lFHmCzO9Fe*8~iUA@N!;h{`e+O}T1S-6Eu;#~d@a!Gal delta 13592 zcmaKz3tUuH_xIO2b77bnF2it#!5M}@m>C996!6B?yrQ6@BB&s0Dk{RGsaXw(@`Ra6 zqaH0QOuJZCmi3@%rAbz1-ZCvSlf2|DFR3Yl`CogV5vAvOUp^ndXaCk(d#`;vdzf>u z@`SqbgnIe2vMmj^y5|hS@y5EhM|eNmD8LY)pHl*?mera3U6D9eIJLpG0G|ojK~DD5 zkNydufcgrA^SKBpu6t8R+L9yq@5QmMiTk3kyKC{jXs6u@KC+nA0;uP&0Z`9Qr)qjn zou~ibGQC=-wyQzsIsYVp+>0FZ-=Yxa(daZOzp*rusca+J|K%$KwO*^!mc2_VC|~cD zOa%a)R_9grHksy+V|a%kFI&c9y>;Hslxh~^EsvA=+dSJs^*(;+Cu@_cpqPHtL!FN@ zW(tB*@2m5*CxEviXsGg;d(^kTG4OBH>vTGMC~$*XIsbXe5VMp(>4Qe;srw$&%&i-* zAI=`1llr$@@2B&#dxA4i?~$xS-cK*qXPsBz-*VQPUZ?M#asU2(h-6N^JW#KYS9}r% zGlOE5Q>$flYy|!~f4c_+=@nqh2Dv`KrU6~R{AJWveZYf~-G@vo$rQ}HX~RH$pe``( zs4hV6@R#cXDn4<2x<5!3qziH#+aD7atP8gH;bUvx-w<8Mme2#&QGJg3@R}v4;?J-x z0f!6%3a&2ScSECVDzWF5b>H7s;?ON?j@x87dCQl-WP9OGm;RE|?`}BEj2Qr61L3J) z1bKy@Yr~})v~RIp?jqn)*SITDxOvOME8`LOx_-av!u?z3Ut5jnx5fX@=Mg)*4&Ly0 z{pUsqHGc3$C&U>pyw#QJCEa>O_$^|~v0Kk$kh}xT?BE~s15M4rF|;{i#vrIGhR+J)s+1AGX?pPcol-LdUlGP8waeTCE5!?o3rAA05dD<#hLzS7HxPS_GuELFVyhN2@o)o`Gf}u1Df;+gWLvw9-dOm+NcH;o zV8H_^sLfLMn|#pzz=(&XQ4aP+y5~fb59-CqzIX~JiHCG(W9`1`hbB?fVT#*E&EC`D ztOx3__=+D!V~zNwAFiegRr41s^tg+Lm*|f@kT1h}{Ez4#fbS{xnCbWtll{>ko(aGL z--D$8d(A2WY0duOdQV!;?*eg=aNgW7JP602vX!dSLN^3s4MIcj5b76(id#bQCG0H@ z3B!r_r1)_d&F)*GDjW;(s5mj47EdLv3dd2@wX5Oiz@7~e1`L#8k=WIUV{wMK!iX89 zj!CMU35VbUvBre0-iIyhstJM@B5n zlvO+{2HEg$;}<08WcHS~RX)WnAvEI9ii@#gP#oP-qwHAU!OzM=|9_F6hdU^!LsZ#d zN?h52hJUbx`XrsH84Z8N(LIPG#9{Hc1&=g%bixIKaM9ZETxaYjV4&zZ2*Vq$CE_u; z$zgMElc$$ZQ93|@Pn^+kA{B4Q zb#v_xT9?8$h^MmfRo#w%nj4n)L8DxEuFWoGk&C5|TTDP*&WG6E6(Gw|u=F5AF@ArnoK#-}JS%w@z*t zm5af0!*U0JId2&Fnh<>Hsw*C%|{aYSXNc`tEl7Gr4e-i}J8 zOULZLOxjOe%~=q|%AKP2i73`Ryp9m|sd`h>Ag&Gb)zo*FTYXWK>UaWhrKRWsxWh z97OCBI7qx&is_gqCQQR|9md8ep)6n@C}Cc1Nlb3#k71YOI=CmFMoAu1%@N<9MqODb zdQL|}5}U!HQMHtDGG_`gw=y=I4a;1_Chg^%rIh2>9Ff?+sFr0d+AofoPWfn5(=p%U zRccp1e1mv@I(EfPV%Hg1jvtF}&cJxDPhz^k>$WFojEj5k6;IE=bp2=4LeHX0ayk51 z#HKr>_==cRhUw1T)a{dLj6W29O+mC;w0=LuvD$T$G_nM6r0t7IfFYbEoIN?8iakVj z=2gOyZbymphy6?~tc%vj5cW(sN@Z_W=@1+0ryi{_PK3ptidclhnpQGx*0S;kUM#eqH{;LVo@7bzxlK*~FsdhU z{xE&45(2ugk!7ob+RAzApxACu%V}8}qE4EyVm`sl1^~3O$PbC{!Bv{9(hWoL8=*m^}4JDj&;av(l7aNabu*G4Y!q zR&LfX?>9lr>*pnv*{qzWGV9_bYS}C+B|4W2r4;%`CY$iGakHtMt$LC;hwdwu=1E?` zNuh&)jp@8%A@L}#B1S0RBHmDaNYrRPB|av6O?9P33GT-3vY|2)Z{aX`&%!ZYZlZEN z^0Lb39EsQQlGsv?vCf-Rn=KmaWHUJyDW=5)!g65_4f#OY-?S1Bb{AWx2fOPEZD_Wb z57zSk71N{?=oiIxo`O{gapTzjd=Tm0t4_XIJt#=$p(Q@fHY4nWZ;3#jC5*^!354OAqcKh;e4o&Z7Ak)9Y+|0; zNIgyA}Bo+WO~t`GX`DIoX@prSfmQyup5)2ASg% zPxg~M*AgEV!*4JrbO9#Dbz{3IL&3^o65BZ|Rjgc9&Nlta>O?Bv;fd3=%r14SfG6(j zH#<-XEjHgsCA{XHLSAVjL{fUTti7#)pjEKB{DO9Gj*&iepiXt6dnV0IUmOS3V_cF`CF zD^ghXD%Gm=PzZv}T-B&By`MD*Zo1WHInRjMPvCQODF5^X4#VffxH(vib>gx)7}j@{ zHB@@005z%urE9HW5X_!1kov836{#q<(#5Z{hQlDYiim%M)KgsTQ8}!e#Ore~$>&3> z5l-duF2Q>t+r*@~)ax(A;<+@ied3zA)cM2W$8%{!KZ=%l*aw@$(s`I<_}$tCmQR(^ zE*R@jc7a2Zf^(DJ5I>)XvE8p(6Jcj54*~h(Z_pGUY*PwIf>T^o!L`)e)@1l-8jIY6 z`K9-)V&s#Ug>v!nCn=#^eD_I8c+Z-~0_dkvv2G{=JsjabjS5qoT*Ud*ZMA5dPZe}x z`F!g3Ch>W82@*HX$0VoGHUMg$VKr8%#*d07wbHHLE$vL|OSj4zl|<^0q#&s@jnsL! znnG$I)H_)#d*F9^R51v)Rx;&+3qFt827#(dQYX7=BL~4;uJ*vRAt;V}3cY9>On(Y@ z(-*6Rr>VO+V!_k6#x}y13lo;IdNrzkQwvEw zbs_N$+a%C#kkpIiAKIqC1h+aKvdcCd_Ps9onnv!ml|kd1k_sKQ*ESn`>4_8FC@{9{ zXRB>KOmoYxCY`oD4V$@g!EY?YvTM+&V8{aFmEq-D8dTL{UUm~j>SnfW&K z3ap`?_F6dNR{9J-`w}R6Pm0uM1lym7Gi@ruz7#sW|G;OlFNdexYGJ9}{sJ6ytNZDG zb{E`fQ^DiyE5Nu}s(3%Wi+v@`YEu^bDmdX*5g8WyYKZwjij2sJu)hei+LWJtEyR5I zz!z+P8MeCBveFbWzKZVPbg{aMR;i!(O%>gAgY6sO;5JsFM%5)^xahM0i+utuuS38N zZiLZ!fueH(?U8(OBl&QgsHw(S+a&v&Q2B)vqA#3ADsc%{!6kzcHbOFeQ)6w`sGfuzM^ z!b0lAD$%tNllrc;e+XOmG2b4H@4UhOA2|CRQ#BCZ`9u3B(8^U6v?TAge-0-OFkcl6 zdHk|+7X*JVsa)%KqHYo0oktqt7SZqDhF|U9fd5J6tl^#63r8dcBlVla;u@NYP2zJk zbSRw@ch}$=yey9SH-3~P*7YGXs<|-*JgfVJO@47R8-vWP|8(Zuztv5r{{TC z%ca!q^Kej7Dz(lQcOI^}Rj4k3l>b%MXpKrp-GS$!A6E-iQ*x8Yw}h)I)tvx`l6==# z&coC+A@%S5>NCZAF^%(8$#u7+1g| z&r3dtjO<0}m;cG?Rl!Grz2YvxWv=$X$Iy+l11$Y5Fy3dORZu+zqW*&QTuG6) zVG~zU`rD8NNRfM>QxL*!sN|{&lxC*d*W1B;jjB6S&kDC;l#{*>Q3@4(U|Vm)TDMxC z6iO9m3e4B2VheK{Hgi>_YRzH3AGwky_%@uOFC{EJ8~trar0)d}J2TC#*sR?KE&cZP zVD!x}QAyts9^5g_u#h|1-Cq*d3>(}kd*WH48FskU9pgn~Gn{a%AF_5}GZ;O1E2>Lr zq0kIzZe^g~PnyB$R$a_Y(StyiPZgV9Zf%CQJkZHyZut~S_%(M{sf1p0DPg#Zh3&Z8c*8YX8epXse z>M!ezH%*&>bzJeomV9~qH%2L;fa~0mp0o%8Zg#7aG(!TO>r9Qfk3a!;`ip~?V5rkK zjJ558BLkgr?PKH^-b?ZYBy_RMabIsqUCvkLkOiR&F67Q8G))U7^#}bP3ee;kGNF&73*M3x zo+xCI4}338u#;+a`yS68NRe5?cs=|hJCl5mE_xRn#C_E;S8no?lsI8220P2$_GZ}# zN7r_By5UNs?>~d^k^5-6IZx>6_luFJ6|u{=JqWiUoSk#l{CY&Ve_QPU=y5*tKEuC za4HU>M`Y}-8bfzSDo)9B%ZYSIq+*R*d1{$j&sCFW!GuCbYP+>~=woYnA)7wSX+N1N7iZP?5VV|R;DivQEE%siHp%dP8Th}V5Q#`E>j~hP_0r!!SdCxA7*K3`he{`d`7Qrdq;{@{)r0n;7*@fWxHQ&Hm>fal!m6s~X#M31pj zz8K|ejzQ?-bjy3Hw;b6RQi_Z@?=gInbY|8Wdy*R>q%==QxW-{Ht<=gY-px9?@y zbVn`@!`(yd+;jyXoPtDcXm z-M$ZHi~RF(H&@bqIU3J!B^`VP7*)g)Ne5p6h8Hs>-IoQJ!c~*!v654c0=(sXeJ9v3Qb}SU)NA5^=EEM9f67J&(3)|i6%;%Jx zEMXxQN})VqA#QLhmawqhTomFa?vp+R3h_&>q|Ow!>&zHD?{0;4W(;a4O8MA_z!=t< z7~XI8De%zAIx`0SrBGy_0%NdHEL%xmfhLI0(ZyNAebrF!Ve%V`tGJTVk878{2)DXh zVd;x-!{ZOBJKJvj(gst2u%|#LVPi85k&J?xl zOfe>MpR_NEan#g@b5Y!`GY@^NGsRdWMe?aA#6&6J zW$jhN_jK?Uw_C4bJm~iIrTgliKD$Tz0|kcfJE#Y(S6!*G;npo_41rr3QohI)pVOF?mBF$EcR zx}~@Ge|N@Pe4c9NW>-ixR6bW7G=8q6qhfr!k&VY`?#Mue$*;Yy1Q)w~BjkTIG_S^9 z5h1^YZBvJg{yi*R+4}e*|Br;<10yk4)+@7F9MXXCnHAyNWMyT~gr_JL3^^+#D8__* z9KK84l)pXvx=I^3K%1bL&}UcpH|jHe9LkMCKciPjEZ!e>Hv9trqDEhz(=6hy28`{{ z+3=IPHX+GyNIkiCPs29+D?Svit3o=BH(XF3A5$uNZlyO_ZyB1^C4=8JTvsm(Zy+uT z-)D%$@6CtARC4RD8g!a4zng|_@Jn2VK1B0fvQaGCia{R3BDSHmVx0Iq31@jkITj6> z8*yFzC7tK#>YRbjh$iLgm_-q>8up+gRx>(_@!-^(h9+hFfW;A>_;%-I5eb@MNv}kt z3)Zl`5$T$sv?IKHlK7GNkl_%V)}-s^Y0gJ}V%!DyfaKr+ zX&1ay77DvSYfm!GlQ#|QWolCNEj%u((qv=^rYiO7{Jy4jn#Z#8OsF1}QY^3a=-g$N z!0cm8wQAXnNv3_g^G8_cVWXy_>9gP}O|*mRYI+!U8k_KRqz5=m^Uv^sTnV=XpWJ=^un$-Ancmeholtos_wS%6Btd+-Z}ylN@O3Ps+EaVTTes_`EOB`Es!yJgPR zddzMy=WFW*UlP0SK%ECfZIgExs1UPv&}Pw!6L-)b?(`IEchEgGJ!*>9)oUO0l%>#j z`Eu=>^qgy+Ry(j({G5WFtD~y4clBq5TJ3AeuSBiUPL6#qYMu7m_^nYJwf#Fa5)XF! zE-D1s1`ff`Xw!z^3Bz%+{M20|+otV3dR0|h$5omo~qVkPSPylg5q3i zp(R)La)(RueA&W)by%zImGnx~Aif|?+Bw!YESItW@FuvR{XXgoORaWJ^efbt+~gCM z5G?O;(NgQNh_?C^A<0PZqEz%Z3DHf882)w@B-L0Q#o8F2;7#Q|8OLR{9>X$b z3D>oEhcin~)^S;rqNN*a)hA*$Sq}GR@xSMJM<4Q>5OGCbEKf>)GFkyDSVq)B9nlwD z#9(d-=N2QkM8V2vZ-@cWNf$fph*m)k{7xJWmx-g`I&lL06)nIbs;q*w&_b*S=qSKC zYDfheK+#bJZ-JUf4=6fnAqstnG3ZaUV+gSmMi3KuIhniyWaBbwGnbQI9z{D<@GMnU z!D?g)*7AnFMl)IVVN6GFIEZn?BbY@r(4Ve)(;){mx;WuQis>b=x_vmua8Bf$PSnC& zp@g_em`pL7h3UkPgbLzTVNOQ{91&=qob=d>P1Fg&6|JQ|n0>0FADk6hsC-ALqH;4Y zw+c1X5XhdR%5qr+*+XQkyPagq+4y8tG_tO;IvQDjq828|SmIN%mBcf$7m4S&<+AKm zs{04k)q+aCf$UDLd?Q_a@-37sO}>@9S@Nfd{p6n#2g$#n$b5=X zz-BpH>5q7MtDLR$4*AMx2WV)S9H58zP7VlzWTF{H5^YdK>;nHH_TbEP^2ubay{oxH@B0eNX_gr4T~{zW^$HrR&%cBJf&fg zr>X3u3R))2oF$yqoa;GvbDrjudGScjOwJO{YR>hXyE#vD%Dj0zXC`L}XEo<~MrX&} zT%6{V`S1#ynVcn@)tu`&cXOWRl=<>_&P>h{&T7uxoToWuIv&ZH$yvhbtmc>XoVz(s zbISa91sP zI4e2pId^iN;)E0)$yvl%$yv{NiqqJgr{t{XgdW>j`X1ZqVQt4EE-E?eId^iNlI*=% zXgz0IDk~RpR&v&J?&LJ~XWlfDufi{es|{I(VTM_TO2e~;WrmjwpBauBeleUjv>4P8 z@e!F3QzBMHY>2oKF*wp0xia$mNVPfK9B1xso?>2Ve#88}d7D`ul@T>Gsv-(49u_Z) z#gbwfX(_f$wam0UV_9ffY;jpW_P1=ed}}#mxo){_F-P}`9vEF5T`KP0gX^649Q2ic zkPuH##Irnzo>RPtcZ2oBv-TjOpf?bIEr=v;&5R+wn9jV4bQb?bj)VA_KeJSF9+;I# zh@Gu{iDSmG$mpzW;+({xPP%-bK7y#2#H!65IhuHN>`-Dfw;YKp zq4G zHt*T~yQyrU1OV?Dz9uF`>?bzneNQ}~|A}brPPLrypFym0KqzBNCpI~ac_%r~5Epc2 z_U%y@iSHM%Mjso^=IK&5*2JNn*NCY-{vr;|W98{7EWQsHrNMYpYq=9yOskRYo}c*IUrl3Plap_yBr_9n>1?~@mHV@<^kU_L-4kkL-$ReczQWU*k7ZA5?g{zk`>Ksm zde4@qzMg9=eLas_a_QeN`nSw;y9q$d`33zOmK?_8%Nw385sv!#wtO`+zH4L4fTd}> zcDlNrywEW7385j(&*~BCH(l#j^@CO`2r9v^O5V`>1>wHG_h$EhSzTK-6gG&)O~Td&@3(}zGT}sGgKm>>73(^A{2w(lP$mEX diff --git a/Defs/PawnKindDefs/PawnKinds_Mercenary.xml b/Defs/PawnKindDefs/PawnKinds_Mercenary.xml index 1fcac8d..05a85ec 100644 --- a/Defs/PawnKindDefs/PawnKinds_Mercenary.xml +++ b/Defs/PawnKindDefs/PawnKinds_Mercenary.xml @@ -29,7 +29,7 @@ 0.5 300 - 750 + 1000
  • Gun
    • @@ -275,6 +275,10 @@
  • CR_MachineGun
    •  + + 1200 + 2000 + 1 1 diff --git a/Defs/StatDefs/Stats_Weapons_Melee.xml b/Defs/StatDefs/Stats_Weapons_Melee.xml new file mode 100644 index 0000000..dd1eeea --- /dev/null +++ b/Defs/StatDefs/Stats_Weapons_Melee.xml @@ -0,0 +1,40 @@ + + + + + ArmorPenetration + + Capability to penetrate armor on a strike. + Weapon + 0 + PercentTwo + false + +
  • + 0.5 + 0.675 + 0.85 + 1 + 1.1 + 1.2 + 1.3 + 1.4 + 1.5 +
    • +
  • + + +
  • (0,0.0)
    • +
  • (1,1)
    • + + + +     + 896 +     + + + + + +     \ No newline at end of file diff --git a/Defs/StatDefs/Stats_Weapons_Ranged.xml b/Defs/StatDefs/Stats_Weapons_Ranged.xml index 53536a5..a62bd3c 100644 --- a/Defs/StatDefs/Stats_Weapons_Ranged.xml +++ b/Defs/StatDefs/Stats_Weapons_Ranged.xml @@ -15,12 +15,12 @@
  • 0.7 0.8 - 0.93 + 0.9 1 - 1.05 - 1.1 - 1.2 - 1.35 + 1.1 + 1.2 + 1.3 + 1.4 1.5
  • diff --git a/Defs/StuffCategoryDefs/StuffCategories.xml b/Defs/StuffCategoryDefs/StuffCategories.xml index df951aa..48ed783 100644 --- a/Defs/StuffCategoryDefs/StuffCategories.xml +++ b/Defs/StuffCategoryDefs/StuffCategories.xml @@ -5,6 +5,11 @@ Steeled + + + Metallic_Weapon + + diff --git a/Defs/ThingDefs/Apparel_Carrying.xml b/Defs/ThingDefs/Apparel_Carrying.xml index eedbcca..0dcddda 100644 --- a/Defs/ThingDefs/Apparel_Carrying.xml +++ b/Defs/ThingDefs/Apparel_Carrying.xml @@ -3,6 +3,7 @@ Apparel + Midworld Item True 10 diff --git a/Defs/ThingDefs/Apparel_Various.xml b/Defs/ThingDefs/Apparel_Various.xml index 85a25ea..f7fec3f 100644 --- a/Defs/ThingDefs/Apparel_Various.xml +++ b/Defs/ThingDefs/Apparel_Various.xml @@ -30,6 +30,20 @@
    • + + + + TailoringSpeed + Crafting + Tailor + Recipe_Tailor + +
  • ElectricTailoringBench
    • +
  • HandTailoringBench
    • +     + UnfinishedApparel +     +     @@ -45,6 +59,81 @@ + + Apparel_Parka + + A thick parka for staying warm in even the coldest of temperatures. + + Things/Pawn/Humanlike/Apparel/Parka/Parka + Graphic_Single + + 120 + +
  • Fabric
    • +
  • Leathery
    • +     + +
  • Apparel
    • +     + + 200 + 22000 + 0.03 + 0.03 + -40 + -3 + 1 + 10 + 1 + 3 + + + +
  • Torso
    • +
  • Shoulders
    • +
  • Arms
    • +     + Things/Pawn/Humanlike/Apparel/Parka/Parka + +
  • Shell
    • +     + 1 + +
  • Outlander
    • +
  • Tribal
    • +     + +
  • Worker
    • +
  • Soldier
    • +     +     + + +
  • + 10 + RGBA(0.33,0.33,0.33,1) +
    • +
  • + 10 + RGBA(0.65,0.65,0.65,1) +
    • +
  • + 10 + RGBA(0.4,0.3,0.15,1) +
    • +
  • + 15 + RGBA(0.3,0.3,0.3,1) + RGBA(0.5,0.5,0.5,1) +
    • +
  • + 6 + RGBA(0.5,0.5,0.5,1) + RGBA(1,1,1,1) +
    • +     +     +     diff --git a/Defs/ThingDefs/Weapons_Guns.xml b/Defs/ThingDefs/Weapons_Guns.xml index 07cda62..1f51de1 100644 --- a/Defs/ThingDefs/Weapons_Guns.xml +++ b/Defs/ThingDefs/Weapons_Guns.xml @@ -523,8 +523,8 @@ InteractRifle - 22000 - 1600 + 18000 + 1200 0.50 0.08 3.42 @@ -767,7 +767,7 @@ Graphic_Single TransparentPostLight - Projectile_DoomsdayRocket + Combat_Realism.ProjectileCR_Explosive Bomb 250 @@ -845,7 +845,7 @@ Graphic_Single TransparentPostLight - Projectile_Explosive + Combat_Realism.ProjectileCR_Explosive Bomb 180 diff --git a/Defs/ThingDefs/Weapons_Melee.xml b/Defs/ThingDefs/Weapons_Melee.xml index 32666e9..dbbbe81 100644 --- a/Defs/ThingDefs/Weapons_Melee.xml +++ b/Defs/ThingDefs/Weapons_Melee.xml @@ -108,12 +108,15 @@ 50 20000 - 18 + 14 0.975 + 0.2 + 3.5 + 1 -65 -
  • Metallic
    • +
  • Metallic_Weapon
  • Woody
    •  @@ -139,12 +142,15 @@ 120 40000 - 20 + 16 1.25 + 0.225 + 8 + 1.6 -65 -
  • Metallic
    • +
  • Metallic_Weapon
  • Woody
    •  @@ -176,10 +182,13 @@ 6000 12 0.83 + 0.175 + 1 + 0.3     -65 -
  • Metallic
    • +
  • Metallic_Weapon
    •
  • @@ -206,13 +215,16 @@ 10 300 - 11 + 10 0.5 0.83 + 0.125 + 1 + 0.3 -65 -
  • Metallic
    • +
  • Metallic_Weapon
  • Woody
  • Stony
    • @@ -250,10 +262,13 @@ 25000 18 1.15 + 0.275 + 10 + 2.5 -25 -
  • Metallic
    • +
  • Metallic_Weapon
  • Woody
    •  @@ -277,12 +292,12 @@ 75 15000 - 20 + 16 1.05 -65 -
  • Metallic
    • +
  • Metallic_Weapon
  • Woody
    •  @@ -314,13 +329,13 @@ 40 500 - 16 + 13 0.5 1.35 -65 -
  • Metallic
    • +
  • Metallic_Weapon
  • Woody
  • Stony
    •  diff --git a/Defs/ThingDefs_Items/Items_Resource_Stuff.xml b/Defs/ThingDefs_Items/Items_Resource_Stuff.xml index a8b348a..4caf416 100644 --- a/Defs/ThingDefs_Items/Items_Resource_Stuff.xml +++ b/Defs/ThingDefs_Items/Items_Resource_Stuff.xml @@ -127,6 +127,7 @@ +
  • Metallic_Weapon
  • Metallic
  • Steeled
    •  @@ -160,9 +161,8 @@ false 27 - 0.8 - 0.3 - 1.2 + 0.8 + 0.3 1.0 @@ -170,6 +170,7 @@ +
  • Metallic_Weapon
  • Metallic
  • Steeled
    •  @@ -194,6 +195,7 @@ 0.8 1.0 1.15 + 1.3 true     @@ -219,7 +221,6 @@ 2 8 2.2 - 0.7 0.3 0.1 0.3 @@ -246,6 +247,7 @@ 1.2 0.9 0.1 + 0.3     true @@ -277,9 +279,8 @@ Metal_Drop 5 - 2.5 - 0.3 - 1.1 + 2.5 + 0.3 1.4 @@ -289,6 +290,7 @@ true +
  • Metallic_Weapon
  • Metallic
    •  (100,100,100) @@ -303,6 +305,8 @@ 0.0 0.9 1.35 + 1.4 + 2.5 true     diff --git a/Languages/English/Keyed/Keys.xml b/Languages/English/Keyed/Keys.xml index 0f0bb05..187d236 100644 --- a/Languages/English/Keyed/Keys.xml +++ b/Languages/English/Keyed/Keys.xml @@ -47,5 +47,6 @@ Burst shot count Out of ammo Put away {0} + can't do taming job because of a full inventory. diff --git a/Source/CombatRealism/Combat_Realism/Utility.cs b/Source/CombatRealism/Combat_Realism/Utility.cs index f271ac7..eb60731 100644 --- a/Source/CombatRealism/Combat_Realism/Utility.cs +++ b/Source/CombatRealism/Combat_Realism/Utility.cs @@ -168,6 +168,21 @@ public static int GetAfterArmorDamage(Pawn pawn, int damAmountInt, BodyPartRecor { pierceAmount = projectileProps.armorPenetration; } + else if (dinfo.Instigator != null) + { + Pawn instigatorPawn = dinfo.Instigator as Pawn; + if (instigatorPawn != null) + { + if (instigatorPawn.equipment != null && instigatorPawn.equipment.Primary != null) + { + pierceAmount = instigatorPawn.equipment.Primary.GetStatValue(StatDef.Named("ArmorPenetration")); + } + else + { + pierceAmount = instigatorPawn.GetStatValue(StatDef.Named("ArmorPenetration")); + } + } + } } // Run armor calculations on all apparel diff --git a/Textures/Effects/MediumLaserRayFiringGreen.png b/Textures/Effects/MediumLaserRayFiringGreen.png deleted file mode 100644 index b54b26093c922ea861452f90200981c8a84679f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2911 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 diff --git a/Textures/Effects/MediumLaserRayFiringRed.png b/Textures/Effects/MediumLaserRayFiringRed.png deleted file mode 100644 index 10f12ca10635d53bd9b1e0eaf87235ce418171cf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3 zQ$0gN_s>q|KvlauT^vIy;@;lcDcE4Z!*W1-;<^=WuRItVV_H1SJ{U~+z_aaZ&MK|N z$~Rw0`)|5`vQRZ${`a2s>kWVSY}UW8|BU$uvkzl-gX;yo1Zfd=juw|Dr^KBNDIR7T zvSIuI0)c`-LczizBB7#TV%NnlNL-Y>Bz0N(ip*8nYjV$-891F-CMLEhthC(e*6Dk0 nd#Sz;-{iwj3@iy!|B{OIzfP>4`o2aVE*S3j3^P6!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{^MbQ4*Y=R#Ki=l*$m0n3-3i=jR%tP-d)Ws%L2E{@KYKsOpfX zi(^Pd+}oR{d7B*sST3Hm7fEu7a` Date: Sun, 8 May 2016 14:10:42 +0200 Subject: [PATCH 2/2] Update about.xml Updated version number --- About/About.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/About/About.xml b/About/About.xml index acc64c3..af02964 100644 --- a/About/About.xml +++ b/About/About.xml @@ -4,7 +4,7 @@ NoImageAvailable https://ludeon.com/forums/index.php?topic=9759.0 Alpha 13 - Version: 1.6.4 + Version: 1.6.5 An extensive overhaul of the game's combat to make it more realistic.