From a2a4225598027ce925a7750a21f992fa8465ccfe Mon Sep 17 00:00:00 2001 From: Alex Noir Date: Sun, 10 Dec 2017 22:17:14 +0300 Subject: [PATCH 1/2] Added a fully functional syringe gun! Accepts syringes as ammo. Has custom sprite and sound. Made syringes have a "projectile" component for syringe guns Adds several missing signal components to the fabricator, as well as medical syringe to medical fabricator Adds support for status effects applied to characters from onImpact Removed "contained.Condition = 0.0f;" in Projectile.cs due to it limiting the possibilities of the .xml content creation Added a couple null checks in StatusEffect.cs due to crashes caused by the new projectile changes - might need to debug further, perhaps there's a root cause? Added itemlist console command --- .../BarotraumaShared.projitems | 3 ++ .../Content/Items/Fabricators/fabricators.xml | 6 +++- .../Content/Items/Medical/medical.xml | 9 +++++ .../Content/Items/Weapons/syringegun.ogg | Bin 0 -> 6508 bytes .../Content/Items/Weapons/weapons.png | Bin 13883 -> 17026 bytes .../Content/Items/Weapons/weapons.xml | 32 ++++++++++++++++++ .../Source/Characters/StatusEffect.cs | 2 +- .../BarotraumaShared/Source/DebugConsole.cs | 11 ++++++ .../Source/Items/Components/Projectile.cs | 13 ++++--- 9 files changed, 69 insertions(+), 7 deletions(-) create mode 100644 Barotrauma/BarotraumaShared/Content/Items/Weapons/syringegun.ogg diff --git a/Barotrauma/BarotraumaShared/BarotraumaShared.projitems b/Barotrauma/BarotraumaShared/BarotraumaShared.projitems index 0f3ac76c9..5a76b4df1 100644 --- a/Barotrauma/BarotraumaShared/BarotraumaShared.projitems +++ b/Barotrauma/BarotraumaShared/BarotraumaShared.projitems @@ -1021,6 +1021,9 @@ PreserveNewest + + PreserveNewest + PreserveNewest diff --git a/Barotrauma/BarotraumaShared/Content/Items/Fabricators/fabricators.xml b/Barotrauma/BarotraumaShared/Content/Items/Fabricators/fabricators.xml index e90a36068..9ccb70b2f 100644 --- a/Barotrauma/BarotraumaShared/Content/Items/Fabricators/fabricators.xml +++ b/Barotrauma/BarotraumaShared/Content/Items/Fabricators/fabricators.xml @@ -40,13 +40,16 @@ + + + - + @@ -96,6 +99,7 @@ + diff --git a/Barotrauma/BarotraumaShared/Content/Items/Medical/medical.xml b/Barotrauma/BarotraumaShared/Content/Items/Medical/medical.xml index 229e9bce8..5a2d67126 100644 --- a/Barotrauma/BarotraumaShared/Content/Items/Medical/medical.xml +++ b/Barotrauma/BarotraumaShared/Content/Items/Medical/medical.xml @@ -25,6 +25,15 @@ + + + + + + + + + >wglS@r; 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 h|27NSjTd^r#yiHput>oi diff --git a/Barotrauma/BarotraumaShared/Content/Items/Weapons/weapons.xml b/Barotrauma/BarotraumaShared/Content/Items/Weapons/weapons.xml index 454ed82e2..e3988b2db 100644 --- a/Barotrauma/BarotraumaShared/Content/Items/Weapons/weapons.xml +++ b/Barotrauma/BarotraumaShared/Content/Items/Weapons/weapons.xml @@ -56,6 +56,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + 0.0f) { diff --git a/Barotrauma/BarotraumaShared/Source/DebugConsole.cs b/Barotrauma/BarotraumaShared/Source/DebugConsole.cs index 15b2e7ffa..6c86da3b1 100644 --- a/Barotrauma/BarotraumaShared/Source/DebugConsole.cs +++ b/Barotrauma/BarotraumaShared/Source/DebugConsole.cs @@ -114,6 +114,17 @@ namespace Barotrauma NewMessage("The code words are: " + traitorManager.codeWords + ", response: " + traitorManager.codeResponse + ".", Color.Cyan); })); + commands.Add(new Command("itemlist", "itemlist: List all the item prefabs available for spawning.", (string[] args) => + { + NewMessage("***************", Color.Cyan); + foreach (ItemPrefab itemPrefab in MapEntityPrefab.List) + { + + NewMessage("- " + itemPrefab.Name, Color.Cyan); + } + NewMessage("***************", Color.Cyan); + })); + commands.Add(new Command("createfilelist", "", (string[] args) => { UpdaterUtil.SaveFileList("filelist.xml"); diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/Projectile.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/Projectile.cs index 16e8b97a7..6eb8cd2ab 100644 --- a/Barotrauma/BarotraumaShared/Source/Items/Components/Projectile.cs +++ b/Barotrauma/BarotraumaShared/Source/Items/Components/Projectile.cs @@ -237,6 +237,7 @@ namespace Barotrauma.Items.Components } AttackResult attackResult = new AttackResult(); + Character character = null; if (attack != null) { var submarine = target.Body.UserData as Submarine; @@ -248,11 +249,13 @@ namespace Barotrauma.Items.Components return true; } - Limb limb; + Limb limb = target.Body.UserData as Limb; Structure structure; - if ((limb = (target.Body.UserData as Limb)) != null) + if (limb != null) { attackResult = attack.DoDamageToLimb(User, limb, item.WorldPosition, 1.0f); + if (limb.character != null) + character = limb.character; } else if ((structure = (target.Body.UserData as Structure)) != null) { @@ -260,8 +263,8 @@ namespace Barotrauma.Items.Components } } - ApplyStatusEffects(ActionType.OnUse, 1.0f); - ApplyStatusEffects(ActionType.OnImpact, 1.0f); + ApplyStatusEffects(ActionType.OnUse, 1.0f, character); + ApplyStatusEffects(ActionType.OnImpact, 1.0f, character); IsActive = false; @@ -306,7 +309,7 @@ namespace Barotrauma.Items.Components { contained.SetTransform(item.SimPosition, contained.body.Rotation); } - contained.Condition = 0.0f; + //contained.Condition = 0.0f; //Let the freaking .xml handle it jeez } } From f34968be30c7fdfec40ea6ac2c6600b7d8db7d5a Mon Sep 17 00:00:00 2001 From: Alex Noir Date: Mon, 11 Dec 2017 12:33:59 +0300 Subject: [PATCH 2/2] Tweaked visuals a bit Added tiny bleeding and structure damage to the syringes --- .../Content/Items/Medical/medical.xml | 2 +- .../Content/Items/Weapons/weapons.png | Bin 17026 -> 16957 bytes .../Content/Items/Weapons/weapons.xml | 4 ++-- .../BarotraumaShared/Source/DebugConsole.cs | 5 +++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Barotrauma/BarotraumaShared/Content/Items/Medical/medical.xml b/Barotrauma/BarotraumaShared/Content/Items/Medical/medical.xml index 5a2d67126..e09b4a293 100644 --- a/Barotrauma/BarotraumaShared/Content/Items/Medical/medical.xml +++ b/Barotrauma/BarotraumaShared/Content/Items/Medical/medical.xml @@ -27,7 +27,7 @@ - + diff --git a/Barotrauma/BarotraumaShared/Content/Items/Weapons/weapons.png b/Barotrauma/BarotraumaShared/Content/Items/Weapons/weapons.png index 2be499b8863065acce4c007fe987d74277ce9a60..2bd2a36f06f51013ee0f9469c45c76760b69a051 100644 GIT binary patch delta 16631 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 delta 16722 zcmY&k$Z>YcyXB;n+Jo<>%?!ELPfOj{Zm@?N%Cmn%Q=#>@uE3w zJqS-f&Wqw6ry|I%);WniG%tcsjy*5OIaSgss=BL5S;KGs5gYKWtf4{J+TOab(${_| z2FyfIGvgS46pXBy=j|6bAx9y+6qxqP&&pKvKXUCj1> zJjY=4U>m}9t@#;Q_(V_QJz4cQLXr&^420wPCpFRiV9`2PCZqXwoI0I?7M`pSB!-X2 zWVB@{qs;`Th+m+)T2_t2(klP|z8_+BQ}a%Qed^uOUIRv9rd>oY-4kaQuUcma%HY3e zE7|STURMZ{+ZWr;6=Qxh)Fa?e#teO+`nOa24Y>&ZFlyQxylDpuRZviH7cgS16cp{x zBcY)b`74vyGAD`EDBz|}A6f#hceV)GP|>z^I)_d4tMUB(P48k}BLAV$ZL(|jUI2q3 zHe+4s%Gl}$Tf3Vx1jes{8gkKILOi-`n$%LS$eg%0lgL7$&T2isPXB0o-alkHG*4_6sPN_1PoL(Jz#;nk3aez ze|)1iL1dy9z??~x5oy#ui@(z9J(L)H`xRu z-*2KJnM9a`yk$F~?)!PM6VypTHD0@hFeANMd8V%94Ou#JIT}gB3+O^1S5$UJLg6kp z=D@ZbD_+W|+YtOX3-NG<=npE^VX>06f1DL2e_wCiiV{m{f7w=4y z`=MnsjHPe{{(;F*G#D;IY=#uAumJOVCX9f zc9h&F33|v(1E%ep!4R&%?7kNdcX~eGb-h`gOX!Mz#j4cszg=~xJDEftCz5T1y433J zH+m1#0)v|T%j<0w&YH&37Uy%(eqilXXu8l&m|&wGIIhKA>=?S;0M_nzm=s<~?cMZf zDcYAO{lA0CJ{1W|8`0J2vtRyle^DAvNI)3=eMK1{BV!bC1*3XcA=>1DgAIQ&mv;lL zu0euOG3fsn6q*X2z8V{bvQ!mzP))-W79)t9IF82&pt{D$z|J##Y#r{K2?z+>Xt=ocOn>Q5|l_S7>Q7Z;`Y z_bBgRIVtbZ3SWayq58k>mWAR}q4yF7Wz0e}I_3 z>=;MM`GcbjJzqmi4C6_88fDh%hDK?+il$iQx$IeLYNh4nIU#z62eR}ZUGfTcNmy7w z|6KQQH06u0;e*0O+k5{QzO1&w8ycaAq>R2DJ=fX~N5`mlQT2Jz+j`OV8^>yZ4EXQ z2M6Q%H~CxgRy(Fh8LZo|%P1`n8Y21@E=0v|j4IAd7AnsTKbaJ(4aNQ?qJ7zY-umu% zi4rbS$)BK8H9mi_QU|QWw$Pbvx}X1(xO-ybhML^&2b=yYTZl-5>WA2u6%Obd#jU== z@1hV@ASRIYle<3k#88>B8QPiAhlWc05ZepwibW+%C-rNx?CnDqHkG8yG57@{Or`W| z5pI$`X{dG#bV29jaqn91B76srsj7AM%Z*L!&D}iRrpF`*2p&|*LmC#eQ-BK%4Q0-= zErKhuNDn}$op%FbxQlm!SB2@b>{zW6N_vy4?h?E6X*{ie2 zr-Pe*;Pe_3@T)+zSJM~$WxtfAxF!nQX)LBD-(Gu<^L>&4QHnU!ve++{$C$b+Ha6B3 zjuhfXFg6|TCj{?e>?s@{usb|8EPrH=+@Z!QiNLnjOIg*U$KT*hs5n%8YFJ5dSOkaoJvcf)#eLRs)(*n8lAEuvUmxC1B#8092Lb z&M&2(1R=eny$K}V4OTpBW>!1TXqEkT+zHW10eN`@V#2}+WhTZCEvqd2vG_| zWiuhr5p3jWT&w<Yu) zwvn<4uk}bPV>C-z;Z|~@gJoN(q*|~|KRDp^g*s*iDkZ$#F+uE zCAwuO*7q0uhI&_C-QC64uOoq!g+*zj&qxNgmCqQt>X7a!7x_`#GJ3tJ)?q+_x9#DPU77Fk^eLi1&`S!2@T=$>|D0y50 zT`=$kCnuvHJH#K0X#OEh0J+$oG zyQQ_h-LJ^CKkcW|{FE~pv>$cfiQrIroY$}^=GvCXa+YmaRyIbZig{$&#CD2J>48&Vl!yUpO{Q!^hq<;^4$q>r4LTb26)m((7!oA`P$WHMwjWXZAeq!37JseHjo+CK0(= zJwW6~Pzk@+`t`uu4+f>gu^(vx*B;;Vd?Z#{*y7Ss*YGfWLP7#O0s=z4Y|_QyVK6W{Dicn~(~vxsE0J4K zA$t~ewY;nzj>{^}Y(87G@A%FzA$^Q%u~4yQZW)&v@=P||X7RZoRViF>GQ#f) z3e9=T1^+7W@#eDW1Cz3F_qgWF!S8b;(sVP;tdW-#KJy2Ci(`#r2jxYz-2A?Y88v1JaA+jiFYgZuVw0O8>1_#3$Ee;M!{=QuesDn`WaSVAS5~0eqF!FLflke+XpqcsF>LIkLYmkHN(!E zBE;MEc<=)l{kW+7!Nl&u?txQcGf})0XcLQq#4J=(HoUcgfkHLvTWHHM3>ifWrAC*R zhl|SX(-kgc-89mj_oV|E7#P+w0Ys`5fC~keC6Aq!wp3a4H|@YQ0k%)Ei<47>ubI7d z?s?Nrb_XgEYG-r#)69R8~P83^vZHEzo0lpUUB;25+Y9U<96a;1+}&vR#4w)JWAvqZ)HknxV@ z%`8d#&5)OtzoEi=+eJc&a#jvDJbXXj-UvhF{+^se139zVJcYCqi1{Eb^!5pN<2}D% z2ylUu?xoHLEeCMTHn;jE$V-}?X2%mY=1{bF8N%NjWc1dJx0PQ%5nc(B;Ru<3)2kOO zxA)CiPt7ksPTc6Eu-X;y^da(*bTzVVaEe6dOfpOf$L5@Yvs`_B4uF{C14FVt1jqRh zLl9K&zsN_1=1}gFYdnPb$^xsD7$#;}@?qGRtaAYUc8ujv>YQv#2Zzq!jK9e)ss}@6iT9$c_xy<82u6(Rt@Hmiyzw6bnOLKB*5Zn zUJ{sTy~TepkqK0;zLoqg#c0hPlrQk3N%uvK+We|mM$7hGrPnh{-C?HwP+;4*y!2DG z{U=xlJj$gAvh?a}=VJEh7-sI2qxZ&V z=Ec53lbtrv(fcTyxZ=`J+}WC)$giFqQwuNjXdser(OFdgyWk+ zJ_jY(4lsH{Qvkez!4B75^#U&oKwE^OJCmFdyqBGjgu5IcGPyI5sKqXhKXsfutFN%F z&-JOn*3R%%<{3eE2QTp6ioEM2yGEMuK1|lZ8OCW72m&>2*fy(@6tt!u_aEUS=RcyK zvs0T^@4+~lCLaly952@2xIfqEe7IhU9`1B5Ac3O&V#C;yLPCd~5K5g8qN2+1qP-Az zUyg0*RUy`aQRWVI|I#0SC*5nfZRN$6B-4r+JTy8ZKBifOgs)Ti(@Zs=e!W!#pWVs+ zC2zI+H8}3JknHcwI!c7xyOyZ^v;XVXcdan<0kd4=(V3FM@p;YGx4PLbvE^0A74A_j zpym5}axJ!7@^i$>YBxmi*l^<@F_+u*qpLJyL}tfrsah%fTeW_7-3Kip>yzfyAzTlF z#Jp2#ldalxZ@`ES;dg^~0qFtR_d4C(!^#_4iL+Yg8(27L$znQUoe#aU(SV{fwzt&4 zh?NJv=hd)`07Pu%IH*cb&h=$o$UL$NW9~3 zBYG$VjVGihK9vsdQU^WQzo=lpVaSuXLQn zs~CT6vE2ak7;nIGrM!8Mv$_9yF!?Od{cnN2gGh$*zY~cYB_jpEjlwf8Biz&dLsEt@ z`nF$Y-xIsf=(n|NPvAw=&*8^W9%?-H$n#5tNFhO0h@4m!)bu1cj*G8NF3)6?T<8iR zxUgYAg=0X?NP!*C)V%v`EjgVkN! zBqk$D%AcuzM}M#Y{ry$3B#P0D7F1T_iGjN08;ZE5JkWk@TC1?j(<7Nick&Aj_xcKa`h`UV!$YHZ6tY#t z-RUHB8xQ|wy;0@)MYF2LIDI(E4sGju?q3_DIM7ZG8j}HFNi!_H!)&qsi`?Y>MFb(R zf8R~UqrgPncq{L*?vyn<2JQnMHbhLD*Qt%BBxFtBXp!xL5&qFcR;SI>BkHRI}_0YpQo29PqzfeApyt4tH*v+r;Y$g zT19VZ*ijYuXG}J4y|_HejcMI~?3h|@{I(AqSjF*XH{~I|v)s|r&?nYe{W8W^uH5kb z{>!+nEcUx5Hr_&`LGG!^%Q&QDD89cBA5YhGD>mKBy?4ATifZbEztx9!)y0N}-a;j| z}~-}ZgUBMY_=oK9iU{cS=KqH4ml!yZ z*Ltu=jLc|;xt={094alcoaK>+nGkv~D6+qaX0&)+!d!&M2aaAa?q8~sRd;C_G9i4{ z^bLpEoS@t=KqadUO7QzP!AjAUARTY63y8I&ScXI#M+@&YTsCs++sHSZ0o2v~tH*!Zn1cwS63Bd*$LK(P-QT$?o2cgCL z6dVYz&9ggfj=_C0;LUP5{Bu#cehjhj^7@(i*Km$S(Ff0@vWU8H_dI3onO2z zt4?6#g1j#64^iY^-Y=saP*&P)tB=b8(XZQ_79}+{VsT)?-DDu*t-vH(j@jP}q;xb; z+ThdEklmZ~dbUcWq&vSrsec1@eMyf>rJ0)C$cHVCnF`$KC}lDNf85nF+f1>{smP`C zV_Wp4PZ!ZD+n_qP;7a#7GU~JujVN1n)?l7gJM?kWfv^~Lay1_#*Iud|2Z#`XZwvuJ zg&a~NG?$k?RJNO&io>RIA$FOr_pSu*W6YTR&aY4e05GRZF>y?zG&9w^^V1f3%jPUGVv2Y{iMT;oJju#pyiW zwi4d?beW1|hUk}>VPex(5DEbXk;?hlJ$FEf9(cXhg$E<+Tb1qUcdBz!C4%<1mzh_zqcCkq`>sHrn~+4 zHc60W?$|(c6_d@?fqUi$}X$il*J&W$nhIb!+i`^o|kE*J}DAQ@f`#k$6 zg3qyAE;mR&&r9?UqUhaV^`mTp?3Q4N+-s6QYiPXW52DSt;z6;ui z2y*L!hRA2l*U{#&dC|+Xq}%3u99Y_E+a~=dU){1$PV0*CH1=W+9WIq;@N1AlKJ1s; zlP1pKu|}jE15(2dLrL>g5)Bq)nQzbera8jw`l^C5yu_amMUq$nI2uDHm*dfq;d1SP zA?&Nxtd=9i!inwt+5@}y_^_f(c1Y%GyI=}CJC^le2@en7=Z$uM|K0)@ee{Td-Wj!T;eZH%N|Dmb&ky>3T&4WL;rb@92d6#D<2<>tH|(N zTzP>tDdk|6b^oiFYPAc6a`}pX48p#CSHc`lwK;>i@_1i1nVi%JpYI0mOPc)xW7{jd zY%5@kx6+Fs59?5j&CovIO9ApUK)OKpF?4AWI8?xm5g;K@&NaWE z8HmhOTHmZ+*gzFZQz_R72u$-7%g@9dPw((nVSH7N2i_tYF>Ko2kk>&%tqaLk*P`|8$-UG2XU0wld|>DVqq3K$L^Xj?8HR1ulD&Qb3?-h)B*HTZF}-gkb;tu< zN%=O1c-Ka9;`r9ypGr2k zz3+Yb3mcYLBaK(kt~Y1m;n%kwJ&*V{Z1I>3TFw5Azz2h|9BzQ=(SZTbcQ*j_k8ItW z^9XC(HxK{PS(tnPhJ_PjAqs4u9roJR6juvu0PNk1W&5GtKUdM__SA}!^wKvK@eALZ z2nZD`sA^H^$mCBn$<2FKo|21yU=JTJ0e=j05}jYgQSAYn_F&8tZ)JaZT=9l);NEe` zaz8x}UJMssVPM)dvu8R`rFV1R&ysc#rrR*YW?Lu&gU@(>xjmZ8@&IVMqK8Uk@4reI zmR;e0zp&Z2H5g=u6&b&|``0$EcO_3FC!F5z$QNOh68%Of@J?C~j^~4l!eh1+3H#s_ zH(5M2_R{oqH8Gn^xbITP;bk1_(g_FF`Go({(b1I4uQRF2&`=C$AyI{9pKlmHoSH#| zq(9R&+kvH00r{zT%OLdNF+TK@7oULtF#9(+N-Hkg#e`Uj6YzH{S6+cnT&pzmmjJ#2 zm5j(+xN8z+cNVA1mC5w%QWB{_=riu$d51Nx{WR#&cyO}hMq6CGgtE?@eA;T$AsRZh zc4%5(I9fX_$SJSMr=pSJ}V0uQ>Kb)rWz{eBr-$sCD8O# zeS41%H;}6Rvvpz_rRyy5#a(hyG&l%Sn3s_J{A>9--n(qV@S`>R+oq`=GL^5#|1K;{ww2j7M-LyU^tY*_W+*cYC`xg$y{b(lL%Fx^dNdP<5 z_!XC1gSN+g`97#6f{Os=UcBQx9Tl5!&Yt0mm}tMgYDLHG%@k~8a8PX!@hRaNh%m90 zo`lP@D8K#AUe`SqTc`U7a@361)@d^9l;^~rt~dIxwno|YPdv!CN3COdc-0{uX$MUsy|h+m02vi zRfVSbi%>@>a|FE;rx)JQys2L!PfBso%u^QBNGI;zGWzh60cOW z1GbNEc^d++rwA%qJoQV2;+LR-ut_vjyyRfuvdEAE6^$r;njk99PC}^_mPXs3qFaI7 zkS&zzn??v7L$dI&pvSL-JR=ezUIkx7&7J%(b8<+y;=dWgb(DrY31)OFlKSQq!OU_2 zfo9)?vvg1`Uy?)YUb^*k0XTfS27)YGf<+Xkx984g8%9+)$gySsix_>X#u~bBpw|E} z*CJ(s4j>hRb`9~X(M}w;DM#px_RZc?whQsYTIOoftf^{vSrD|~!DU<=UhD!@5b@hS z+$w58@%fj!pfPr!x;zDSYCy-GuY*g`Wwdv}+YH_8Es|10cnNLM$dWuk`)D%lO%@_$r00KhJ_D#a^?kOgvAU}qz>Fn$$V(y?8oH8t3!3Qud#$vx;Jfc zPvo<<;B1|*1V6Ob^o-^a5{x}Dlzkm_;Gn|R^>4NLraIg?hECpma@({$T%bK_YGYHWeJ2ZzOi-l#+RLf4I{0u8YTt<>0Wxi1wqAT5|H8H(B(9uXpln*` zprb)&s!OC=ZQ+1cE@WNZ(Pxwy-odU|$l&yKA$ z!Bi-UW=h`^rGtOR(gV~gP6GFl@ZtT%jU|PyT^{isC*`qc=hb^w)B5YX*V~j`wxFa( zlZ3L>a_VOBO2yK7Amw- zJCwRPbrhwukJ|nE~!H1MLaXMw&-3@Q2;|)jQV(l_|+U*gJ(pM zZZ*N?VG|+QO!X}QrN(CNda)a~Fy;vjcE7K;mrbPSq<`P*`SvLHJ~cMh@AcKg2*;Yo zI*o6>vax5WcHZSE-^Vw;PD$eqzqh9cE0u$bgnwMI?N2nc;h@1bGpiw9$8UKBh3su^ z&4n%Q4Yg5~dEghAhfR$2;rUt%?IZMc2A?|(&H@yP{*%mjC+-3VS$Vp_HxW-2BMPQDu~O zZ4m=q2Yke{mf{-f7aM6v z3nW>%LlH);K!4kjeI6iD4J1y_S;*>II-6WXjL04!#efj|syFfvISauXb5JS=MmMpu z30aHx#R4y5?aPaKd$tA#uLcv+M5Uwr7Yr~B`iK%>%&^Ag2bye9{V*Q)bqzuWFoJ}kx&FwWmzbjuBt-6BlQ)k^F6g{ z`{nMWQ2i@ycz4#-QNj}aC1yo)*uskyUIu+~Adok8$KO&^B-w>!35#TvR?wo^{dVIn z@QUPRV7l65H%zTqAY=Bvi~pdbjO7~$4bW*GGD0Ju^-vWlmjdkLsPJ(I-O-sAWONdU z3u?+b2ZcvC*Suzi?Fkvgxw>ymhFYNhr+6mPC8p@EIl)G@TAPmjpBh7>lDuo^VSv=onkqM{spGQ zBz9jLmO>Yh5_#f5DD4LvC-+#=9L5)j)l4ES5a^NO(QQ z^c!L4iNt`AIYabbTbR}pG7LV2a>}I^=SpE6;BhPHYTf;!*g679_=1!xX|_e2?K2IOMzrD;+X=S<{f4lpk?1g+^zo7lH zuG#7`W!U`9)WfSk;Xsy5G5nU4`!?Etfp*dJI44WhAxif@E%Q|~#s1EcgcmpR+_fex z_XLu+!J~ob{)UZLi+_!^PYA#spD4BK{Yg^w{g1bpjbP6&)D0+s7jEZs&EFX))_;vg z621wQX*9~h>5U}NOCbgdKXP$797aE9Fi#{0=2s)}#Ul3!f*-DD^}%_=tg|^P7=RIR z$^}zNFxy@hMm?H2$W9zmBuPwUN9}VN?NDbxa(jYFqUchib~hp4z|8<$!v}2P+Wv>R z4#@8Xa+wwFP%_zv8Gf0$bA8uVmm0yZSXu9$`if71c5QUoI8SW`ZoGK${d3S&{vf%cc(mlVvl%WR(9tJK9C_I0a_n)+f_F-dM6Oaqk_9o4e*lbnCh7=Q? z5Cp$;^Jah@M_trHMSfnSm&dT=YG#6Ed}LaaXL^Prfe*6n>~jauo(FPoPhg+xzk~*o zvS7qBH&@*{uHl1v?E7&NX0mZyy)5V0t{e4CJ>GnyXAMSDppUIHt<$MQL8#g<`#-96 za<{*IY4EV_vGeo#9j(8)8G~(qy96oXM2N^0vHSbG6P0G6ZjuD&0wuwp!^EJwZ&}C# zq|HsYM}*86xK9lL?;HH?gAb{p=VVoL3@%=e2Rp$$dK>ixq2ya#8iEkP;AHga#Sz@C zP`FHX!>6XoRn7P~_p_P306)~HdyD;9DeQ0uvi}>FY#(ROBuwfn{aRQR0g(9QFU;a^ zfGljMAm|U#tU%36xTXl|VdJw_)yAf75yVS?ez!TK?>GW71V@@NM(1TzBp{~{*tB-J z26#!uTSUTRznOm&eR?va_S`J85b|(LO|=j)Fdl>!xjD6U@opTNWFOt1J=T~iM7l1U z92}xV97u5ChdH$vEf7cWgh^7Qb~fdR$)$U69mvMG-@)8Bt6L5stqbxX~%PF73c?(WP`)h(#W~K!rFwicL z8zX_FxycI=BU?`sJHJ|R>Eq_O$O~Z+=Z&4YMLGod>TBcL=;zu^VD@K|vRs@G&DiqM zMnpX%6X!h(c9XRM8eZrEeTn5ZK{(td_xQ-|Q~%ZQ)QZCIp|!dd3?$JbS^#KFJu)B# z#McUb;zJQbkbJ^g2W3^qhx+)D);9qauaA2&y+$)N(}z`O#^pKy%(MKZYg9_SPI)?q z{M3kqJ|a6G*9|Fdp881UWXusRdECR3C$NO>=8K7r3Sub%WryB#&_`nM!c^~yC*ydl zz)Qu-6AHh}hmA_b>rri~iopBp@!ZHy57LuNgimmQ8=yEV@^|)~!rm*q=3yfN(`_mSc=8Wx+txneg2XzJ$MDw!g{1xf0M@mtiC}+40 ze+C+^BTg2SEL9tu_2-6-Fr~5R3EHj4N`|d8I2OuO+v}Wm0_(-_=PM(Z{<*6t^=wl( z)*4TE1%E8sKlkRYKiha>Lqk-7<|A=g_ea9R!yE6UsQUW)1_Dt4;`i6bs~tH6lX=UP z`-O>0&8K~09l$d`!~)`-AvhZ|Q@ib%W2;TBLfiAFi-?Qjm&^C|0pgFBPe+(n2k`O! zK?Z|N(ByG@I0bxKs~&GYEm&TpX2chZ)jPSLQfZr9-f0V3JFD~g>cZ#!#q889*Q=80 z1D`E1H~%7BwFrO?Qi%)q|Ena594X?U$7@cRxVb&_Q?;cx=w4 z(J5uc$BGnSkuQTfWRTuGTeo)h;B;&lU4{nv*f_r=tGNP_atEFvn#qL+lDv>H3U;bY zCd;Jnb|$b`@0l|7k|pK_j??Sa~X z$VID->U#63?End?pUKx_ht&oO8XQ>PhOUC6kO47E8MYiUGSGkt^v-s4Ty$_!ktwqW z(Kh;{<0Uycc>(nyxbZ|vdqzjCx&2qK7l&^Q1T=l6aw?m*@A|yoX`nQA)5HtKTgO;_ zLdYj(MiC2CoU>l8`y-m8leb|)b<+Ozpb2(n|IsrX@1l%of4i4xr-|rxeYb!~#h}%F zwE$@M{K00R&cN=8G5D3RHx%jlGOIPdHVYK`bz_`lo2eZo@Le4rB3rLKaJ@yId_Hh!^+6w;p(t2kWcvsX*^sN|dD@?|AjS zU#%|WD=95)$K%gI`~CfU5g{KQI+dIPL@)r0)H_a?YJ02p{_-%h_|Jl4-fA(Jex>14 zUxUui#~d6Q7m><=Wgvy{`=toNB#gpDy4!i;`6D5rzY)rNig{no(0d<9S5_YUWaaXhd=5&m2QP56Fw7)Pba#OL zz>Y@?RV-Jk+G7m=3pyZQBcv+c?%layp*C%7W%VaO-H|if%3*g}> z-+Wv6;1p71gWKdg3Y$ZsUN^}~avP4b$&z_XGknh^?Zz8*M-d4kXEl$%#}$~{a=`F63&IQ~FA&Pb%KykZ!aeKl1+Vz{$>n=rc~Dqt2${ zGcTIDmWwut0v{{2^h>P7DcQ zpPZbsw9)5E%{PWDaOcz4+7}>gv%Q(!b4=*dGfX3|&LZ<{Z1*xPMN3Ol<#5Demp${L zCg5rqm3;SoIc;gCPAm-DVkCiafxS}gikRxbiVdz)?J*9T#rr4)wlj7Od?pYBGh5TY zn=0_>5|ozPL^uvdaI zFf^KFJ=$d9=;-*N+33~7@#(aCeK|bd&Zs8~GIg92TRv3-X6p86m0wZ8Q8~60wzRhV z3fSPYtTKuC+VAhL&08Up)5_EZ+Aw!oX9iamWef(}Q(Q4vBQka5b+y#By%O666bCM~ z4p-hM&ulPaLj+*38PfjSXIxao#QJ`q$mz)Jgb|rc#Di;wH-q{#+5@2cKtx#Y6>1ab z#_U*F&Mts!lK>7L)}4{O?&Vfqp5e{#@RlrX0=?aOjozG=21mv0U|{`7y%DWfGz?Q- zMCW^BsV>8~tR;INtPQOM^ftBI`jN0+sfn-N6HIw;0R`6W>e=N;% zi4PVp4om85g%+m2Gb`|z>uW#yFV@@h$~9Wtn*IE0m9*P$Tb7C{a3i>G@a363{KH|; zP%$tdRInRkr!!w*_gOleV=qSp1vbp@uM7s}%{16;Cht#|bI#V<#8w(jN*g>+o->8P z07{UYZDL{2fX1iy%if>9-R5Gws(UiXw%A>qfsDi;8A`4Lj+6!svnx8 zf7W#!wi(P`3=Bv%pT|WX3BSg zFrg6;B;j#%g6&Tt5|;lLZR>;|V` z6udac=)Al}qwrqiVK;Mkvi@|{FPB-Z)SR23d+UCCO;=>$ZyP;<@R0g3J#08%^~>K@ zQ?w?|h~g9t6Z5XAS0e$;`0fmYqQ8SZ*QU_s_{E8cf2r(7YiF$4loTugM~6foIHV(0 zrONOob(x(Vf5%7IpU^TlvMLQ1aIppNCdfmn@Ce6^kdq2Tp8re%aAAe2O0@<)N!4+-0zXw!TwJeNYOPDax3*^I zOe>{!B~vws!`XA6QmvKxfR;93EdCN~0x0N%()tm4+m405?F;7IPO);je1c#9prcV~ z)z&17fT_^RDkZAhntMS?OS^-Ft>UZ{S=2q5^PeGG2--K(X0bKDC-Baqp5mr}P3|BZ z?&@Lol~=27I>$Hl8yM9VO(vt^$$?l}r#F~3*`wt221pj+#$T_SP7kQERm&2TIlGY1 zv$QpkNk53lsyCm5cT!FW4ucib?*AHxwV&PGieXR^m|OQ1B_>;FVSP2v3LWG@L)w|W z+|rR`x%A|&lZlKB{~VMFph9C~eCCF!|NHRv&Z;zGxTrH9Gn;K2SjqY02v=4p3{$0 zo*%k4HZHj6@9qoy&MP>4?09^b>ijPb08V`;Ts(D+W3p3pb~{P9ZHs&CWTSl znCR`47%et?eOG3*64V-#9Q&sgG*|)ga zpTs?ZFSIifCF~0k{TDR|bNhaQ!J_jXskGX0jiyYs70kd~T-)8b#VKg>W?cC!+`F;S z^mDe#@;l*Ke-HKc4ILS+7j17wRb(bQ8yM*8S{U6`@0M!xeISG*S%(+jw1U{$pN40E zHB2?LV%0_u5PO+==$M6yZh5bXOosR0?k*Rbp!)_`uaGZ8#|#c%r-O9o?tvbpp)2MhYFyv!r%$k? z?t5IOiNnSwWuXg(Sfq-B=Mx3{+!=x0adr4ICdK&E(?gfp>LW_j%Ev1J16S%f-pkk+ zJz@l3-<g3aQYy1X7_^(XI9LP=T{TX|NQzOY^^GAhGBB&_MclB-u`EP9k=bP0 Hl+XkKjW`fu diff --git a/Barotrauma/BarotraumaShared/Content/Items/Weapons/weapons.xml b/Barotrauma/BarotraumaShared/Content/Items/Weapons/weapons.xml index e3988b2db..47df72bc1 100644 --- a/Barotrauma/BarotraumaShared/Content/Items/Weapons/weapons.xml +++ b/Barotrauma/BarotraumaShared/Content/Items/Weapons/weapons.xml @@ -76,14 +76,14 @@ - + - + diff --git a/Barotrauma/BarotraumaShared/Source/DebugConsole.cs b/Barotrauma/BarotraumaShared/Source/DebugConsole.cs index 6c86da3b1..12e257202 100644 --- a/Barotrauma/BarotraumaShared/Source/DebugConsole.cs +++ b/Barotrauma/BarotraumaShared/Source/DebugConsole.cs @@ -117,9 +117,10 @@ namespace Barotrauma commands.Add(new Command("itemlist", "itemlist: List all the item prefabs available for spawning.", (string[] args) => { NewMessage("***************", Color.Cyan); - foreach (ItemPrefab itemPrefab in MapEntityPrefab.List) + foreach (MapEntityPrefab ep in MapEntityPrefab.List) { - + var itemPrefab = ep as ItemPrefab; + if (itemPrefab == null || itemPrefab.Name == null) continue; NewMessage("- " + itemPrefab.Name, Color.Cyan); } NewMessage("***************", Color.Cyan);