From 71b194c6c34a5e5c43b62cb819e80e22266a7faa Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Fri, 1 Jun 2018 17:49:49 +0200 Subject: [PATCH] Renamed some sprites for compatibility with Smooth Doom. Added water step/land sounds. Made footsteps toggleable (in case the player is using another mod that adds them). Added handling of liquid terrain on all actors that need it. Fixed dual enforcers breaking after level transition. Fixed some refire issues caused by the use of the Resurrect cheat. Made guided redeemer missiles explode on player death. Replaced pure particles on pulse gun effects with actor particles. --- cvarinfo.txt | 1 + menudef.txt | 3 + sndinfo.txt | 3 + sounds/DSplash.ogg | Bin 0 -> 15386 bytes sounds/LSplash.ogg | Bin 0 -> 12296 bytes sprites/{ABALA0.png => ASMBA0.png} | Bin sprites/{ABALB0.png => ASMBB0.png} | Bin sprites/{ABALC0.png => ASMBC0.png} | Bin sprites/{ABALD0.png => ASMBD0.png} | Bin sprites/{AEXPA0.png => ASMXA0.png} | Bin sprites/{AEXPB0.png => ASMXB0.png} | Bin sprites/{AEXPC0.png => ASMXC0.png} | Bin sprites/{AEXPD0.png => ASMXD0.png} | Bin sprites/{AEXPE0.png => ASMXE0.png} | Bin sprites/{AEXPF0.png => ASMXF0.png} | Bin sprites/{AEXPG0.png => ASMXG0.png} | Bin sprites/{AEXPH0.png => ASMXH0.png} | Bin sprites/{AEXPI0.png => ASMXI0.png} | Bin sprites/{AEXPJ0.png => ASMXJ0.png} | Bin sprites/{AEXPK0.png => ASMXK0.png} | Bin sprites/{AEXPL0.png => ASMXL0.png} | Bin sprites/{REXPA0.png => RIPXA0.png} | Bin sprites/{REXPB0.png => RIPXB0.png} | Bin sprites/{REXPC0.png => RIPXC0.png} | Bin sprites/{REXPD0.png => RIPXD0.png} | Bin sprites/{REXPE0.png => RIPXE0.png} | Bin sprites/{REXPF0.png => RIPXF0.png} | Bin sprites/{REXPG0.png => RIPXG0.png} | Bin sprites/{SBALA0.png => SSMBA0.png} | Bin sprites/{SBALB0.png => SSMBB0.png} | Bin sprites/{SBALC0.png => SSMBC0.png} | Bin sprites/{SBALD0.png => SSMBD0.png} | Bin sprites/{SEXPA0.png => SSMXA0.png} | Bin sprites/{SEXPB0.png => SSMXB0.png} | Bin sprites/{SEXPC0.png => SSMXC0.png} | Bin sprites/{SEXPD0.png => SSMXD0.png} | Bin sprites/{SEXPE0.png => SSMXE0.png} | Bin sprites/{SEXPF0.png => SSMXF0.png} | Bin sprites/{SEXPG0.png => SSMXG0.png} | Bin sprites/{SEXPH0.png => SSMXH0.png} | Bin sprites/{SEXPI0.png => SSMXI0.png} | Bin sprites/{SEXPJ0.png => SSMXJ0.png} | Bin zscript/biorifle.zsc | 6 +- zscript/eightball.zsc | 7 ++- zscript/enforcer.zsc | 13 ++++ zscript/flakcannon.zsc | 8 ++- zscript/pulsegun.zsc | 95 ++++++++++++++++++++++------- zscript/ripper.zsc | 10 ++- zscript/shockrifle.zsc | 24 +++++--- zscript/translocator.zsc | 9 +++ zscript/utcommon.zsc | 31 ++++++++-- zscript/warheadlauncher.zsc | 13 ++++ 52 files changed, 182 insertions(+), 41 deletions(-) create mode 100644 sounds/DSplash.ogg create mode 100644 sounds/LSplash.ogg rename sprites/{ABALA0.png => ASMBA0.png} (100%) rename sprites/{ABALB0.png => ASMBB0.png} (100%) rename sprites/{ABALC0.png => ASMBC0.png} (100%) rename sprites/{ABALD0.png => ASMBD0.png} (100%) rename sprites/{AEXPA0.png => ASMXA0.png} (100%) rename sprites/{AEXPB0.png => ASMXB0.png} (100%) rename sprites/{AEXPC0.png => ASMXC0.png} (100%) rename sprites/{AEXPD0.png => ASMXD0.png} (100%) rename sprites/{AEXPE0.png => ASMXE0.png} (100%) rename sprites/{AEXPF0.png => ASMXF0.png} (100%) rename sprites/{AEXPG0.png => ASMXG0.png} (100%) rename sprites/{AEXPH0.png => ASMXH0.png} (100%) rename sprites/{AEXPI0.png => ASMXI0.png} (100%) rename sprites/{AEXPJ0.png => ASMXJ0.png} (100%) rename sprites/{AEXPK0.png => ASMXK0.png} (100%) rename sprites/{AEXPL0.png => ASMXL0.png} (100%) rename sprites/{REXPA0.png => RIPXA0.png} (100%) rename sprites/{REXPB0.png => RIPXB0.png} (100%) rename sprites/{REXPC0.png => RIPXC0.png} (100%) rename sprites/{REXPD0.png => RIPXD0.png} (100%) rename sprites/{REXPE0.png => RIPXE0.png} (100%) rename sprites/{REXPF0.png => RIPXF0.png} (100%) rename sprites/{REXPG0.png => RIPXG0.png} (100%) rename sprites/{SBALA0.png => SSMBA0.png} (100%) rename sprites/{SBALB0.png => SSMBB0.png} (100%) rename sprites/{SBALC0.png => SSMBC0.png} (100%) rename sprites/{SBALD0.png => SSMBD0.png} (100%) rename sprites/{SEXPA0.png => SSMXA0.png} (100%) rename sprites/{SEXPB0.png => SSMXB0.png} (100%) rename sprites/{SEXPC0.png => SSMXC0.png} (100%) rename sprites/{SEXPD0.png => SSMXD0.png} (100%) rename sprites/{SEXPE0.png => SSMXE0.png} (100%) rename sprites/{SEXPF0.png => SSMXF0.png} (100%) rename sprites/{SEXPG0.png => SSMXG0.png} (100%) rename sprites/{SEXPH0.png => SSMXH0.png} (100%) rename sprites/{SEXPI0.png => SSMXI0.png} (100%) rename sprites/{SEXPJ0.png => SSMXJ0.png} (100%) diff --git a/cvarinfo.txt b/cvarinfo.txt index 11b7961..e1d998c 100644 --- a/cvarinfo.txt +++ b/cvarinfo.txt @@ -17,3 +17,4 @@ user bool flak_showinfo = true; user float flak_hudsize = 1.0; // 0.2 <-> 1.0 in steps of 0.2 (default 1.0) user float flak_weaponsize = 0.8; // 0.2 <-> 1.0 in steps of 0.2 (default 0.8) user float flak_statussize = 1.0; // 0.5 <-> 1.5 in steps of 0.1 (default 1.0) +user bool flak_footsteps = true; diff --git a/menudef.txt b/menudef.txt index 34a06db..fa48fbd 100644 --- a/menudef.txt +++ b/menudef.txt @@ -36,6 +36,9 @@ OptionMenu "UTOptionMenu" Option "Color Choice", "flak_colorprefs", "ColorPrefs" ColorPicker "Custom Color", "flak_colorcustom" Slider "HUD Opacity", "flak_opacity", 1, 16, 1, 0 + StaticText " " + StaticText "Misc Options", "Gold" + Option "UT Footsteps", "flak_footsteps", "YesNo" } AddOptionMenu "OptionsMenu" diff --git a/sndinfo.txt b/sndinfo.txt index 4c55933..1a5bc75 100644 --- a/sndinfo.txt +++ b/sndinfo.txt @@ -92,6 +92,9 @@ ut/playerfootstep2 stone04 ut/playerfootstep3 stone05 $random ut/playerfootstep { ut/playerfootstep1 ut/playerfootstep2 ut/playerfootstep3 } +ut/playerfootstepwet lsplash +ut/wetsplash dsplash + // everything else misc/secret capsound diff --git a/sounds/DSplash.ogg b/sounds/DSplash.ogg new file mode 100644 index 0000000000000000000000000000000000000000..8fd70472c1a77685591b49e11513b909460ad84b GIT binary patch literal 15386 zcmeZIPY-5bVt|4}ulFl}m`;l~uV$2EEXyxS$}9#6Fe-(CCOH9?jzvO)||adHl0WN=_$kZ=;vVqKfuXLUkUu}5;z z0;f}&$7P)^C@xlU?yx#$dR!veeP>FS)5*pQ6G9n48kWd}2NZegKA%&(SR(vP;R}W5 zbBdoTq@O9|RDC|DxX<$Wq@q4Uh%8@`CP-bQhh6M{Xx*lop2}o_?VmQITAmC6a;yzKtd!x+hiz>VvypgO742%pM z3=9iA+Lm~9Esf|)%bcfHwMb*uBCXY%GEZ&NIlbxiE4AElDEkE``e!I22o+szjWse4)Z|w^_hx$DHcZJHOwn1_uQL2g3n{76B&?MG&F6 zWJ-{S=CT<{U7E*biq9AxS7_!jda+=#pVi4Fll-hssVwdb%GTT}66~|_saW#bt=Hxh zuXof;?lC+jfgqH@!O+0KAiyS>GQp8Uu|))IXwezN<1!F$H86m4gN$pCihGfY`y`c< zlXN^M+nnAELcUjAd__aAhUQ-XmK*;q_x{z?``=P;UrmjjmU?$RPsP)vByn%QEpJriF^D85lSj7-WwZ%D5NG94`d< z3LL@;%nS+)49Cz*I}wmE&-<@}eJK(o@|@LaGG1`d!CkQpIXT(p zbg|9x$u^#sO?-(&pnzp!NMT@*IXa^{$ZO>}M-M~wbn9a>TV~AW6Ls>5(ltxzkWgED z{F0{AgvGPGPE0WD%F68nG$CfO+7NxaxiyQ}Uq#%O}BLf46;xU2b4nsD@ zW&y)v3MB$c$7EV~oY)knhM4UV{lX#q-&6#q>Qgi8)YfhRgU3(l)%$YpNQeAb* zr6A3vTLZkZ!4hk?Ud!@bdsNCRQ+LXxD9xo?uSE5(-72MgOd;i*=gB#fgS;}=PPr8I zOlB&dlb3AE6fZB`X;Y%k%$a=2(S2$2gdk7VZIgm}RHxqX@-mz@B`HVu*sY{Brc*9O zK_qmyNk#XVy7xGq1Y5ooWXH;_XDl^kTc%jCt4^Jgq@%iZhNU{lD0aoAlY(+om)>yF zTnmx7k#uJ3)*D$GE02QgSSk_Svvu2ztT#)xhy``(PPvrSz46+$sI?2HNO*%S?=ie~ zCuxo4luJpTs>db;b?a`6iS997eyu21_u8GLGp5I4s@HCPekE${%B@k+J*LN{iq~v? zcF!?WcZyK7#>%7DqSopji*nZ72)6tv*z$;C4Ukbis$k2HNfi67y?P_*jOo^}?6q5; zOJu)+7`6RI*4nM#;)>sFWngGvWM^n#5I*IwP*Iz)L4$$eki=4n<_ii-rX&kUwMmpf1Db3R5Npc?mlCSh6X$1O;X3I(cY5lW7U?@>(0}WB5#_MZn8*p7N+ivtORhv^gTmCd8(gd-**B+e_@YkcQPk&n zVu8y!L(Z8kCoJ8UPM+k+xp3+=Bh7_VCq+G(Gx<{BsTEVEIc3gVaw#ffAp^q(W_E@R z%-jnvOqj~xAjiPaI3cLV^0`b-mm>3vN7(AO( z92Ar_C5gw0W9gDB8b>8S!K_)#2j)f{lPD1ag*u;;1}GqVWLv;o32Tm}OQr;68M^_)mF=~1t3>jet=E_s4hYLIG;rla$Ua<>p|b(( zM>d870t^Qj85o%P7#JAUrZhS^hcPj%1O*?+<1Il_OTqEF(!|S>9h4?c&6ynF1&(_4 zrBi}}veq^SczJ1V6-#DcIAuyumhLe=CoK@SR~DRrj!8Icg19|f+d%2*m_)WNh}*mM zSrkaIRQB1e3=A!7piq|%bGOix;?^-qQDvCG&fuVML?XGzvVBSts3G9&Wq51`D6}O& zfeMm%KBpKYQGCu4Bmr+1^npSf+(JMiI2jnU3K$qTHUy>=H%(js_Txi{ACF6v2nA)$ zXyS9?P+fAtY4MC=0dPPYy;!m&#LH{#(P@_IOP2%%d96Ll=LAlUJ%(ih;3S&VvlZld z-J=o7Yr(!2q+@%*sBu zclos>kdoqedl?uev$Hd-V3AIb@U+sF;nf3&gET{f!jT!p=RmbDsB#BqQcw-AI3>ty ziAXYBqNT_1`GRHvCyu34g1j^(p%PviOIw7jz!IEbiKQjyEI~~KFHmOldI`#(5FJaW zTmsn<0FlsC1=#`7F(t?gp+j@&6qp@gSxB}9S-Esd5Y%$8#8OZh0AWoD^5R?wRRS_z z2t8pfGC@aO#)=3L0?J2uy&DqzfU!P&)G=gM@A3V;*hK^wz}(Tie#K zFkE6{U`Uoo?$JE4WV2ZETHa&6N6_Tc6AHyaN~6p!D``Z^i{r&y`!Fir?9?$J=l$U2-j| z$Ch2b$6(QvX-R7~UX!U2bdw15^42{ztNQF-iR2b9&0|s3=XO4i=@GPBDwe!%=Xbdp zy+c19C7rSS{-~MXjw7*Wg5k3p#UJ*HC-?9lIuTQ>cSz!Kx51$w3OQ?cvd8xbx=AG0 zyf^)^pxW>dhjNeMA&$Gn7hQiO^%%NI#J4aq>=fi<=-_q}3QCs@lPY}7DWNn0+!{7y zU|=ykrm$o}keB9Bq!uTr?KvkIlyMmt4zPe~I_(=%Bcrwk-nrr#_r>vnuvL<=(UTyp zv?8S!6Q!~?3cb0&mG^-OT$C|LGB7+@GG$7Xu9VX$$4t|X6ADjNj;bgnPiVT-w0weL zhvzBTWG+S4m1P$UTSXR21#!&`;>ucO+16*c!chHT5a&`h1_lQK1_cEbh64YJz`RJPHtX&_%XAJONt6ufdj(>W(EaCMx{kFXRh9` zh9`pd$Q`Kn3vF!9or{{f0irRZ}q(5>RwCltJTHR zR=qnL8MWPZQ$%^?m89mkf!(~@+;y+|^HE^7sGuZM9GT{6G44 zKmY&zdH;8O|Nr`%@!tP8e!HLE|MKt0OVYQJP0g>0rfT_qX56#O&aslG_>;|@8+PgU zz?ezJTvE`w_SY8<1)rzy(v)`Bzle|#KfCRWn0);6h4r7OMf1t}EZ=EASMAbyXNi7! z+g~@&yFZn%DporFeER0L+wT2!|5^eq&so`5HRaAd-`t)s@k{#h;LJA#pZo7urI^X@ zDLg$fl5=DIiW5ISuL+nRzputHU%r=B$8*O;9t+1AX?|N=?uwtAd*bH3cR_aVf4n`; z|JCND-G`ccqCPXP@2Zbo^Sx7lns>#LqRmY%c2(Pw_E?6wK2IT z=Y8q%j<(9rdw->F`}iov!2Q*;fNdr#x<6U+rbPe!`g?Y``n|n#^ZB1k?5oS}cgqRW z@igw(v`E28iACcBmv_BhaiVG1-c!4)SLe5Nzq`2h*pVIEP5Qnby0gjj@B@!0mmcn0 zKPUU0SxWX!m%KNri8k$0*X?%*t~su9HQ00SwVIgS=i)a<kvQ(%p1=c5vN5np+B_mfNvlZ?z+|9V^9{~0m0Vt-Qj zx^HXiUp?FV_R{pYm&>a@?%rJ$w>^Cy=PKPGT`#%4avNpVXx5|=Yz66RczB2XPnl{;omPT1$zm#*l zRMj!@=Q43opwm5m)6Zu!?&Yizp*?hiDj!og;A7}f|W*2=Ezq{kmzNnWn|9ZFm z6LS4ExkD&~+xsF*x%<`T#KTp)Kl+sh|dhoNiQ%)3r%K7~?eZQFTOST-> zmrG`BZd|eHeYWxv-&sM~0=il*Yocp6&kb3YJKtyZ<_{%3i)L`oy?i ze!Mx0bLCc}zPE4gW@>-)pEg%0s>Qz|A!;=P4^PXxi$5>j`!AX}XZpg4+uP*RdfT$! zOJ~+Ee&ISr+CH1_`L1{G-`+Skb7p^pZ4QEK1*C>Zf~d z(nm$-YJ+(K_4fH+?7q}~VwmIm^T20c(Ov4{94;#@y}y2c^w#maY>x6&O`rK!)l*L` zS~M^3;iubXs%LL4y5eh@IpzIrTmAQzI-X(QA1!u2Q@=|jrT6nPAN5Azt%vl?rWNOX zSD*3x{jqr8SBjQ)CA&h-F4_1iM)Q}^_UmUJesvG?&U^fgkDW`(M^&Vwi}{*}y!57Q z#SEp%vIlF9T$&ZVD%4zsw`Ufg(=>*c~$D@nE0Yn%i`zyFC}Qse!5>;HMZH{+gt zYp?puI49(jk8@Uk$mW0VZLVCur5PBfZoI|z?OZ#XrQd{Z$6TIkpt!=E^`Ers0S1N_ zXaAJ#5cJ_tE4PuA1&lBxW9;9 zXy)s4TIJ_|pSx|jUdBD@cq~IwXI|{#$qyZF>MdVol)ThU+|*U-JL|<>yYv+`3~|;^ zXDs$*c=6RX;=mb^#3#3x&%AqlQv7`HkJI}+)1E}>gs)tAaeH$9`3t9=-7TkY?R@g< zYQ(F=>>H6Xua!^TnebjG^_iXV<5K^_Cz*~{iQk?f^5(o{i{^=vFaCONd7-JFt+$>! z-?csa?vIS+Ji$%hT<5l}Idb;RrjI$*GRc<>s;9He)9PiI;>T3=`LoarLD!DH6Z22M zjh2_5ru6yh3rpW#yRSyy_nq@}4!^bk&n*kX-dRrGm5-I5SmzdQpB%wt*Z;jHs)biC z-sJVEV>L4>l&0IA@mq3lqxGZjng?G?e6i~b*{`BHb;rYRpHyvHjN;_O?#~tJHUE6f zA|-_NO_#HG+4P&U+~uU^3beg25qNX^`@RD+G?jmCipsZ&FIl+Fdi(9ue2ZIW+>dGL z*(qQ?{hYC=bUy;B~o_6qOH|B7XaWYt8ki(g_XJL@(>c%Q3)o%Tzm^PN-gI$wIb zBK1byousKRjK9hp{IV)UxZi8z`df3R-qhQwE)`Z$=%BXhc6>U=)FVsTyL+F0Db{6} zH|q;1jm*8$!0jd3y)W(TEy?#eYA&`}&wDo(S*|N<7TUest#ndyUZJ;ZbcDIPs`GZ! zr0LHdZRLFW$L9Z?$&%$I7F(W8XscEX5x916?Y3EeR{#HIKIh~F0p+zpM`oMraZOPV zEp(gf8M15Q(HFTNT3y0!d$TDS$N&C)rC0E~9mYJ{aU)!)va(S!Egw~Mt8aLSXf9#sv!M$H7T}eBid-iF^iR&uv zSaC%(?`RX6*sy8VeD~}_`>u4HJTv8&Oq2EDzNVya8(!MqVKLdZYxg9pJ3CIL8)eU0 zvQbUkr_SxoF~>6n0i?4%8?j$3{7%|G|qyW1~*?wwqpF0ZyN{{7E+(}S!R%HMnc zuXgXbx3c{wFW**i4#=xo`dr9=HP@qlpYLz}=Pfq+vibcQ#rQ>Mz{7gu%cpCLxn=~bemPy=~gAHe7%-6zu6OY?d_V+tsD9RcEnA$YCT`~ zbb9$Oqui8(JeJn?(#@2P=KfmrY0APEA1??5bB6C+Z1T=?bIH1Q=T@HF8GQUt?cR`k zx3+L}crjJ|FE{EpT-3Ai^8X(m@AcO%`&sn%NuKS#b@9&*JbftlRmA?W4@Z`!`_^TB z|1?@+Jvq*npO|tY*Vy7zC;#bA!`A{EBW{0{&W?V*xUz1$eOxs&A7^*$<`+l*Z|qTe zle5_+>e-ihzb$_HfBCX!vYo5DtIv*rB9*^~6^~7Ke-zKhXVS*7?^h4Yj4tMDjq&ee zoKC&_G(%K6*e&9?#3~cT)xnpHJ#9lGV~;zZ*<8yNyv+Yr$q$!R7YmD()TW!eELS|X zUHH*8rca@<<;UCBCH1Ks-L}$>`50sH@pc}y&s%GD*EgS9HMOYLXa6)G*|oEmUDlbsY=7GWRRK;N2D#fyI6Ar*tK4!7+|F<~?%(wH_w$?=Tzlu* z^G{uv>(=k+8-FLic6#d#b!V0xhTZc`A1+(+R97Q2?Dc!|d1}+_bX?z=UGr-PGu&B;5Z>(-WR6)TpIUMg|&MZBK-$&}XL%c9TZ7kI2ra9 zpP6Tod`d)m;{WwwHqq^ugCGAjD$m?yIk*3TM}awi&E%!tD&HoH3YUxAnbP|7U24Xf zvo)(lJ6F#!om8iObLHww_i8lHAA9fY`qNV;^H+2>i?__*4^M=>Ef&swT(D!RLel+& z`Es_~p3HH*RqT37_GitO(`B1>9sd7XkF`5*%|pR|r>^iY2wkY&Zk#9*+_NI2>-D~M z8@%G$ldmnxxBqb`BJ-x#Yg;4J%|Z?pcHNH+ryEqwlr^ZXwq07P|A~41zV&&Pchx38 zJ$I?(?lPPErMon4Yz>p0^-xFk>cxKbBQsOh_@%wQ+cI;pYp>qsr^fw@c7E$EvVRk{ z*{aQqlBXv#y@csaA_koRqok?M;bQFGOmY&b~c+?&9soca3bb{vXR~ z3~8S!sXF0Zc0b#qm9v=qHZY3>-E&ns;KwiaZvE0Y;jO!CHt$cfTej1rf2rj|NjaaV zQ%^Nac{$UIA&&bf2Mar&(_V3*Gd_mP*pA;ge)0C>xUD<>7k+hZ`nzYX8~B&6D+uHW2=_Tv zzQb_eiFGSx{J3;??$@n)H)sAjbL{Tyq;N~_bF0`4`hDNz&u@RU>0x+%R>cvY{A$Ly zS6>(yn4F%91TQOjA+!H(QRv*g{-1sy-uiZZ)yubWrw)~<&NMWdb!(QCcByH>spjjC zR}1Jq+RLv~X3VxK^S#lhXOYoj(T2hGlh-@l{pR-L!nA}9mtuZgdFQ=;`q!N|II_3i z%X115%&VQ}GBvPk()_jazHff=U`y=fg>L1C9ZjUow)DB?$W0N?pTqo*b1ee{S3>pq zSwUe-UoA*FETUZEG}-_6+9{pCIJ8zRb2O^8=lgqiQm=P>$OE)l?lZaJ{#j4b z@GIBVkeUPQ4qC3Cc;|0@D^>-bz?L0K*Y1XHp0{aNUU>hj znzAk2iPNUkt!xawwQ5Sj{_F3*U1n06`uf4_-|LKbFaE?Qeo*w~n^|p!fo(gh6_TPh z$L8F&x%1lmw(R+Z;`&Sea9zE6^6dF7f2FlQ_I-YPxa0QCx3z+ImM`L27OW+|B~C5j z`58gys7g0^2I!bV9%4*^nSp_!a}ke${DkJd=B~E>mI=Kb^)1bvZJm7`t(}v7s%sWD z^|ZA%$E}Kz4`s`->>)a|5p(6T|bcFm-9E7lS{&M&R_fH z?$A}NcWk%(p?A-||FwJ)n4Wom`nB%Y30JMZZJSfVb){lucb@L0T@7!#CeO^-^16+= z?&TXng*1jKhKo2BZeP0b{zmgVbIMEm?6$^SwY)HS`ud+|=dDxR>hki*#iJ@2#z)*W z-`--uUamk0ipsBb$e^o zGQFOrOM7q3k66s-?_2og-`Df2Z~r@=lC@p-c~q&I`aiGu?Em}M?9kL-BUKb8`L@dR zyV8aS+su+}UNOZiWr%yZ#!z_|g95MN(HV=={r3O=@;UDE*3bVx9oqFwW%rp!$G2?Q zuhe_E<9Pb}kni`nJ*qF*zP#e?x$OFlKmPiyyL;y^+Y+T7`TbDr?VC?M`!`1Il9v@{ zmCT>EOW}3gVk5r}!yj%O`b$qMT)VjZ=9cwx>am-{1cTQ{Xm6XR`OUjJGp<~E)*Q3x z7o_wU>|VY}bTeUGkbjF=SVXbszy9}S`>);I7pEz3GvWXL^pU^Qtd1Zu}jmlJ)EM|4UCkNGsbV=R95V zsLrHtuiE5f#U<~wTTe+@Pi9)tz4}C9dh!n+nWU91htu!Dz+Oy}5Y%1j2_57Ij4j0bLGG00J=9lYT;}c=>^P6&H;hG66A8@AL zw0Kka?t;Xopl#9DysgUSeP+3_|3&W?`}w(TZyyJDRBbh$t{~O(PLxZ1my!LnjZ1jA zCms*qIN_!AWI3zt#$W%x7U270&s@i;%W+snqT|cri{<(~GmX+FXYz&=TD`sa>+6p@ z`*P0yjhZ*3Qn=Tp`0cvbyFDGNLe|9j_&nMB{)h9aPm?#TSaxHt+gF)cSN2TuW1h8Q zm#WOvlk&Xzua>lbn0Wrqw)JyYMU)qw*Na;mcjDTqk}E~Ajc@AKyRR+YE?LL!`#y55 z%lWjzqxP?|w_aLNqOBLO!9`}DWG{z?Ec3)V#`&6gK8DM(rTH!v_=bIVfAdy;FZcJD zW1oX~MA<(|#edGM-f6_IvM3~SrmRE1?H1PqIijv?ch*SHel*)@Z)xQLg=s8hkE*U) zO;ZtOKNg+7Hm~)vRNB|s_qV+5t@y(?{ljjKX3SHZAhimKC!u9sKw?aQRyKy9Uhje$?gt zwUb{QR5CrxMQW-~Xn;oQuX~T(I?si^ew!7sY*k+K8i6fL3yeO9>b%aeeDSf$**)h{ zj`Q=9p28=Kv;*W~LLZ$rlX_LPHLP*fl%uRl1RaH?$fo5CEIyQ-5*pPK87?Oiyhxa^&#y6J1pbD4`91HVpcO|;=om^bUz z_4vEb9_sOi-+7pNBrNC4oM?aFiyP$*ZxCiMeRo9o@14T%Yd?8=7XSO?y7}Eqsec9D z8?savD&Js^P@l|j@1_n5^MeMHV_h^LaKWDf_?|)Y@1(J|2yjHj`(YNvoutW3NF^y4S)YN=<<6jS!2z;o*C;d z@l5I0T7Brnn$3*qd(-_+Zf}d#F)F@0A@B0(g`21QrSWiS%lz3k`Su?3D=c+C*RZZQ z;1FhS>H}(9w*T;S{}HugUP|@rtAP*ie7eUwkxMW9;*sc2`$|hyb(eiwH^*jA+FsX_ zm;cut-1b!ORM^8se5Vt(KY3bsBHX#L=ST|2)XtFdz{sF;H_qRRj;aq=T=Hzk+gJPd zE#Fex6RUXgZu#+|?H3{9?sBQS-c{|6$ka7g`+2 zsSF7FJ6CCG=gj!`|E~TGDq_Dn%j$Nx`mIa7+1pPFt;<#0mr@jGB^!NtNBZsse+#!t zxMgj5r*o~imw)@!KdlOqWzQKH{&mDKGB8Xy#}Rnuf7Qas{hwx>y_#BkcJB|#$A4a~ z-}C+3rKhpw)31HA^e8?awrhJ@=IwbpyW7gVc$0Ff`8;cCrZ(T4=9RZnS0~E^obtxWBIqe zbe;QLGWGt;ZQgY=*EldSOgPtL@N7SCp8K6o^Q!VLyE?pg>ym#Jeq{mAORGIg&mOUL z-rm1BY1fJi^R|Zm+EwD8H0k=(j9bZTxMrC0ui5t8!tA-!XYsi!CLLL{-tJYSW?APm z+24*k6G#aZ*rt)D4x2s?D*yZ7a#;>+F%9Z0#ayFF;B`d{hCuWugB z6o->#ACNzveZuJr556K zs8=ZI#Nrow?JQrsGg??DpdahsG5HyfM&{{_>e#60Q{=C~0J$bhF{E^9E?z(?I{Z!kZ#^XUw(;Poa`4$|S(ZejE5I6gZ;-#BE zL*IGtGrs9_+Uj@Q)vtB$4#nS|eQagU>kAz-E&uJ9ld!;-AwvAd+kkC6->(&g8T$x6 zTb;5;G z-P`+BBXeoY?!B3-U*9m?KTq}?r|$`-`Yf$qXU}~XpRBU?O>yr_zZKSAi=Vs-e$CU{ zVHNLl`G)*?%N@HGevvHRq03sfa*K#Y71IShevLCCicx>dymwnjUoVO-ezo$--v?*n zSAH;={d;!F^P`vEzUwtU8REXVrugUA^}Z34Zu2*qsG3eHOB56hD?fF*efpbQ#qGj3 zm*o|%+cMj_G)2><&H0zgt0X?%FMrOSmeGH^&!_B&QtqU)X7eA)1$QnjEWO4Xzbo5m zPM@oPpl`Y2mDxMWul)-VWYqDs$O$lz_@P~LE$;Se ztchMTu5$dm!4g=K5uG}5`lrove?6-XdojHz_tef8cJFqdvTam|&*gcWoz0)e7hCi? za>94p&Cgx``hA&Wmp^&-yz1mVIn_Gye;+Pf&$}#f^6e|nN~&+~`xEu5RP$=Kv9D&P z`=&k9U;ca@+7_2qptnT*TFqM?8CUkn!C$Lph^Prw)vD&?dhW@WyOG_wa^LKt$KmO< z7cWk%)mnGfyYyZ74zVx4rq{9VH=DOHNqNin(^ax&@82(3mm%SQc*W6*-P4m}zn%EH z*YWr1njcqwC8aH|d9i5!rjrjj9n~wj?`hBP|B)|nDkkgy-#^ducimr7^+}M|YUURP z1_q;8jh>%xy5F|uaWB$2z3FLOPR6=@+xC6jJ8w_kVfRZazMoIeF00zLd3HyT|otSGtYYJV~M{lpt?oJuB)yo>gg z2(??a1}svndSaK~*e~MqsC(9D#Vu2MEzhk!us7?~3CY)rzklxb%5<&UF^9otroea6 z`P;SMG`G#-3d-g`=~ry7x@G-qR=&M2lr?|X-zqpz!&v75sxdbF-IS4*&LF$R(23(S zZ~nZ6y_=8k6Z+4Z9b7y?lP@{0Z=6`gVh+n&td%lI$j%Zx@&hQIHf4{GO3QECZWuJzAE^zNE-YxIt_tCxOL z{I0#}>ydt6HpAwIW43e8sr){qd2IKMmVG`mcTacg6xldw-&fW8&R3bG)8AZb$q)Ns zaeD6j4KDn9kNn_zw{MHK;nk37e)_WZrfoNEZdXkH67>J^+`X4etls|EWwrJG>&@1C z4eMCubw2S}X7;ebB&|!})kkyxvMs9;>(7;yHtpSU>xlpR^L8)4#&NISvTJj?`Qdeq z*FHw+I!As_-}=t!ZRq7ivRd;@3iq9Q-g0m09F5--*FAo-{5|P9cAf9{X=!`R7D- zl;Zn$`mfbj@xQuv$L#I>@7uSe&4`cr^|!iWl^)x5-8DX@$)}I6OJ23|59#cuv;f%Tt%CReuH+;eP4)N7$~_V;Sb!*_1a->vare&4CAcL6=0 z?Z3Y~8=F~iQt!I0jMmrB*U#Ggljs3W+q|F8amT=QhVib_=(A04gY=dyjy$~a&!yte zmMb@l6kZUyy36PCJn^ter*8KazWP%1+j`|IQF*_$Ml0!_iFL?W9 zUU@jfx%k@5=#BjUBCZ^`pv5*x`8%7Q!Lb?t>g)bqe=N;D(<^du#EI=$-@}%hRkKZB zs&qwH(&+XgUS7Q&%*R+Sy)3yOtsSGr*UDRKyhnhgdh&|SJIj6B>*MVyu307L z_RSW$zuIcu+|7b7*xzniY@f~-dz}5tuF0x<4$rMia18fbs(YS|rKFZ?_shI8D_bM6 ze;!*}1REN5#NW(uFjyw>`2H@N$C~~oUUTcyswetL*ZFL}xBKenw`(R}FW+>3+Myj9 zlIpv+-&^czw&&%(r|iKE4hOVW&$h6tnSDKU)7*WkXTHg7VV?VI?wMJiuI;bNe9O}H ztNvc=o^`vljRr<0mj@fl_(HG^jwdcY__f;OZcGvQ--FBhsTh;9tBbT@<+p_M; zx}TXZCcm-d+MAy@c;-BR-@NIKs924OufaE~+r3}+rEv91Z{L4x->=2fH9xIDkyk;ceAMYo`15fl4TJsjc;9TMT6azE32HIvEhYzc%)?KztVJuIsYydZRPg) zCN4d1;l~dZo$bGF*K7{;6Y;EUyqWw7J9A|p-?YB6?26^Qviv80=W8{!kFH<;Nm_jivz+G^9tNoe-wgz(7#)iU zfAeSWKA)boHx^}Wh}!pOy~oNsrJo|M_6DDye`d$p>O9v)pX8)%S>r_Qy-gZC8Dr*Xp+Z z`|2}$XT@#)@_ZTpW8aw6R^A|WYac7qt9~05Tuxk@viGvH`qh}or0)lI{PtaU`$t;t zX9hV59TtJPY#zy8g3JED*>=DDs(a}E#jEpn>9c>|d^PIZ_BmT$H&xC2m|Jo&cJIn; zhbd};O^L4pnoQZnZHq$IbqY%_?m1aFb>l|^Ew9;%d(D^BUX_e^U-{wen*|Gv~Xj(Yr+ayxB6Rh7;m9ukb0nyS(_&yzpO-PchW}=;mSIaj|L*O7PK4e)W3W zm6M(RcHEnaOE$dA`&k{m(LB2D^R$hjZ-V(RUoGfaTJtSX_@CWtznv17P2X89iwC*({p`oj zq`h1@--Iox!p!4D_)^`OpB}#~IA8yVao&r~EDT%?KY(i&$Px$T&dF!93mJ9{tw?hSul{PvpJLsMzzKWiVY z`{KQ3ew_B=*tV0eIyNobq%4%0vzV)W^W?L+8FQj%gq^<=>pSaHcCgNTwf?wIfxSDj zx?UXHdWCyM)|uX>uWORcMRjeArA)&ECq1ub**a@_UHqa5Mz@y?avWEIO2Whb85g>c!eoo^ww$4M$p9^B9NVfLx%ad6v&>UDh>t6Xc`LeVRTz;>E zm%I?II`Z_7?0UQ3iYB+rkL~-Myv0o>^;J#iz3rzN7#PxSZ0%z+IL489=Th#@x_$k# zuazG@uVq?U_Wq9liKMDt-CIsBU!x7bNlS(@`yEUUUzl*oW})BJy*VB(yT0Ao_U>D{ zsqO03f0suY|K}I(j9Mc%ZKVNU?U|=%K;dow}Rmk?J^9qG;=Px8?awv;e&sCt{QTVHr>m|k zZm!W~+PA!$fq}v8FJoSh!ROwkwHfcu#ZM`-&|LSkwpukIr2ENcw?5+&FH1k4uP-w7 zf4%n1y;WNT*LMaVTbI@H_oetYwDv&GkLvU*JDEO{&k4VISC7wne~)wW=8!O- z1&?C?f3GZ_`@2VTZ}QG3ha7LaXKlH)Ct~-{DL*QowOQTFQ=YfI`+x|;>kHx@BCaBe zRq-LupB}#0bMf!0%H{6YmZ+_i?yt{T-X*4*)baA$q>s-ocBFo>ues~@)BO8$Q{I;; zi+DMm&czxmOg;7B|R+;9#`ggilrJrxOz!0(|IXsF_du>cr`NCM!#J8(9 zMYNjE-n)IbQR$~U_RCHmd$T^hZd>}%B#TKEyMLO7O{{vnEcI|y#B;H|^?gZEiNbO1 zlNA^lJkpm<`6zx)Ebid#KaX_dn&QQn?w9 zmg~N&Wfiu~Iq$VC;pv8FDe=4>6DG=k_MU40`c2lGkgC|;x2iTW=S+V8R=4#%cTaMW z|G`I(Bwyv8eQY?hBz1|~wIub%>lrpPp3jNiyxV%W*X9+y-hm8u?#>Tb82C@l&|I`4 z&h>f7_P6`$A0}*VOfvr%I;HYq%7vn&`szC6&X=>IFRlR@k3?#z^Qzq*~2-?+zhO5_Z07|=r&JJy?gVB=<#3O)l+R5-tLHB zU!GC^sP@wFi`6r3%w(%OE|tMDRd;#k5)Q>P9Cv1ZKDYb9o~^Qy>c3~3+t*f|l9ro( zHEV0sQ46zwH`Sz9T$^ttTKn_Y*13;Y1}|TwM+f{x?!x DrT#3p literal 0 HcmV?d00001 diff --git a/sounds/LSplash.ogg b/sounds/LSplash.ogg new file mode 100644 index 0000000000000000000000000000000000000000..50184b87a385e89c0d4e06a3b0693c5c9571fa37 GIT binary patch literal 12296 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 xKHluvdNM&mTsl|ZyWq>$3a+j38@Ry literal 0 HcmV?d00001 diff --git a/sprites/ABALA0.png b/sprites/ASMBA0.png similarity index 100% rename from sprites/ABALA0.png rename to sprites/ASMBA0.png diff --git a/sprites/ABALB0.png b/sprites/ASMBB0.png similarity index 100% rename from sprites/ABALB0.png rename to sprites/ASMBB0.png diff --git a/sprites/ABALC0.png b/sprites/ASMBC0.png similarity index 100% rename from sprites/ABALC0.png rename to sprites/ASMBC0.png diff --git a/sprites/ABALD0.png b/sprites/ASMBD0.png similarity index 100% rename from sprites/ABALD0.png rename to sprites/ASMBD0.png diff --git a/sprites/AEXPA0.png b/sprites/ASMXA0.png similarity index 100% rename from sprites/AEXPA0.png rename to sprites/ASMXA0.png diff --git a/sprites/AEXPB0.png b/sprites/ASMXB0.png similarity index 100% rename from sprites/AEXPB0.png rename to sprites/ASMXB0.png diff --git a/sprites/AEXPC0.png b/sprites/ASMXC0.png similarity index 100% rename from sprites/AEXPC0.png rename to sprites/ASMXC0.png diff --git a/sprites/AEXPD0.png b/sprites/ASMXD0.png similarity index 100% rename from sprites/AEXPD0.png rename to sprites/ASMXD0.png diff --git a/sprites/AEXPE0.png b/sprites/ASMXE0.png similarity index 100% rename from sprites/AEXPE0.png rename to sprites/ASMXE0.png diff --git a/sprites/AEXPF0.png b/sprites/ASMXF0.png similarity index 100% rename from sprites/AEXPF0.png rename to sprites/ASMXF0.png diff --git a/sprites/AEXPG0.png b/sprites/ASMXG0.png similarity index 100% rename from sprites/AEXPG0.png rename to sprites/ASMXG0.png diff --git a/sprites/AEXPH0.png b/sprites/ASMXH0.png similarity index 100% rename from sprites/AEXPH0.png rename to sprites/ASMXH0.png diff --git a/sprites/AEXPI0.png b/sprites/ASMXI0.png similarity index 100% rename from sprites/AEXPI0.png rename to sprites/ASMXI0.png diff --git a/sprites/AEXPJ0.png b/sprites/ASMXJ0.png similarity index 100% rename from sprites/AEXPJ0.png rename to sprites/ASMXJ0.png diff --git a/sprites/AEXPK0.png b/sprites/ASMXK0.png similarity index 100% rename from sprites/AEXPK0.png rename to sprites/ASMXK0.png diff --git a/sprites/AEXPL0.png b/sprites/ASMXL0.png similarity index 100% rename from sprites/AEXPL0.png rename to sprites/ASMXL0.png diff --git a/sprites/REXPA0.png b/sprites/RIPXA0.png similarity index 100% rename from sprites/REXPA0.png rename to sprites/RIPXA0.png diff --git a/sprites/REXPB0.png b/sprites/RIPXB0.png similarity index 100% rename from sprites/REXPB0.png rename to sprites/RIPXB0.png diff --git a/sprites/REXPC0.png b/sprites/RIPXC0.png similarity index 100% rename from sprites/REXPC0.png rename to sprites/RIPXC0.png diff --git a/sprites/REXPD0.png b/sprites/RIPXD0.png similarity index 100% rename from sprites/REXPD0.png rename to sprites/RIPXD0.png diff --git a/sprites/REXPE0.png b/sprites/RIPXE0.png similarity index 100% rename from sprites/REXPE0.png rename to sprites/RIPXE0.png diff --git a/sprites/REXPF0.png b/sprites/RIPXF0.png similarity index 100% rename from sprites/REXPF0.png rename to sprites/RIPXF0.png diff --git a/sprites/REXPG0.png b/sprites/RIPXG0.png similarity index 100% rename from sprites/REXPG0.png rename to sprites/RIPXG0.png diff --git a/sprites/SBALA0.png b/sprites/SSMBA0.png similarity index 100% rename from sprites/SBALA0.png rename to sprites/SSMBA0.png diff --git a/sprites/SBALB0.png b/sprites/SSMBB0.png similarity index 100% rename from sprites/SBALB0.png rename to sprites/SSMBB0.png diff --git a/sprites/SBALC0.png b/sprites/SSMBC0.png similarity index 100% rename from sprites/SBALC0.png rename to sprites/SSMBC0.png diff --git a/sprites/SBALD0.png b/sprites/SSMBD0.png similarity index 100% rename from sprites/SBALD0.png rename to sprites/SSMBD0.png diff --git a/sprites/SEXPA0.png b/sprites/SSMXA0.png similarity index 100% rename from sprites/SEXPA0.png rename to sprites/SSMXA0.png diff --git a/sprites/SEXPB0.png b/sprites/SSMXB0.png similarity index 100% rename from sprites/SEXPB0.png rename to sprites/SSMXB0.png diff --git a/sprites/SEXPC0.png b/sprites/SSMXC0.png similarity index 100% rename from sprites/SEXPC0.png rename to sprites/SSMXC0.png diff --git a/sprites/SEXPD0.png b/sprites/SSMXD0.png similarity index 100% rename from sprites/SEXPD0.png rename to sprites/SSMXD0.png diff --git a/sprites/SEXPE0.png b/sprites/SSMXE0.png similarity index 100% rename from sprites/SEXPE0.png rename to sprites/SSMXE0.png diff --git a/sprites/SEXPF0.png b/sprites/SSMXF0.png similarity index 100% rename from sprites/SEXPF0.png rename to sprites/SSMXF0.png diff --git a/sprites/SEXPG0.png b/sprites/SSMXG0.png similarity index 100% rename from sprites/SEXPG0.png rename to sprites/SSMXG0.png diff --git a/sprites/SEXPH0.png b/sprites/SSMXH0.png similarity index 100% rename from sprites/SEXPH0.png rename to sprites/SSMXH0.png diff --git a/sprites/SEXPI0.png b/sprites/SSMXI0.png similarity index 100% rename from sprites/SEXPI0.png rename to sprites/SSMXI0.png diff --git a/sprites/SEXPJ0.png b/sprites/SSMXJ0.png similarity index 100% rename from sprites/SEXPJ0.png rename to sprites/SSMXJ0.png diff --git a/zscript/biorifle.zsc b/zscript/biorifle.zsc index d8a854b..88d1c6d 100644 --- a/zscript/biorifle.zsc +++ b/zscript/biorifle.zsc @@ -43,7 +43,7 @@ Class BioSpark : Actor { RenderStyle "Add"; Radius 2; - Height 0; + Height 2; +NOBLOCKMAP; +FORCEXYBILLBOARD; +MISSILE; @@ -52,6 +52,9 @@ Class BioSpark : Actor +ROLLSPRITE; +ROLLCENTER; +NOTELEPORT; + +DONTSPLASH; + -BOUNCEAUTOOFF; + +BOUNCEAUTOOFFFLOORONLY; BounceType "Doom"; BounceFactor 0.5; WallBounceFactor 0.5; @@ -350,6 +353,7 @@ Class BioGel : Actor PROJECTILE; -NOGRAVITY; +SKYEXPLODE; + +EXPLODEONWATER; +FORCERADIUSDMG; +FORCEXYBILLBOARD; +MOVEWITHSECTOR; diff --git a/zscript/eightball.zsc b/zscript/eightball.zsc index 753f76e..e54e4f8 100644 --- a/zscript/eightball.zsc +++ b/zscript/eightball.zsc @@ -112,6 +112,7 @@ Class UTRocket : Actor Speed 30; PROJECTILE; +SKYEXPLODE; + +EXPLODEONWATER; +SEEKERMISSILE; } override void PostBeginPlay() @@ -170,7 +171,7 @@ Class UTRocket : Actor Wait; Death: TNT1 A 0 A_RocketExplode(); - SEXP ABCDEFGHIJ 2 Bright; + SSMX ABCDEFGHIJ 2 Bright; Stop; } } @@ -185,6 +186,10 @@ Class UTGrenade : UTRocket DamageType 'GrenadeDeath'; -NOGRAVITY; +USEBOUNCESTATE; + -BOUNCEAUTOOFF; + +BOUNCEAUTOOFFFLOORONLY; + -EXPLODEONWATER; + +CANBOUNCEWATER; BounceType "Doom"; BounceFactor 0.75; ReactionTime 85; diff --git a/zscript/enforcer.zsc b/zscript/enforcer.zsc index 9a883fc..4788a82 100644 --- a/zscript/enforcer.zsc +++ b/zscript/enforcer.zsc @@ -345,11 +345,24 @@ Class Enforcer : UTWeapon replaces Pistol return "%k riddled %o full of holes with the Enforcer."; } + override void Travelled() + { + Super.Travelled(); + slaveactive = false; + } + + override void OwnerDied() + { + Super.OwnerDied(); + slaverefire = 0; + } + Default { Tag "Enforcer"; Inventory.PickupMessage "You picked up another Enforcer!"; Inventory.MaxAmount 2; + Inventory.InterHubAmount 2; Weapon.UpSound "enforcer/select"; Weapon.SlotNumber 2; Weapon.SelectionOrder 8; diff --git a/zscript/flakcannon.zsc b/zscript/flakcannon.zsc index 7987716..b28faaa 100644 --- a/zscript/flakcannon.zsc +++ b/zscript/flakcannon.zsc @@ -145,8 +145,11 @@ Class FlakChunk : Actor BounceType "Doom"; BounceFactor 0.8; PROJECTILE; - +USEBOUNCESTATE - -BOUNCEAUTOOFF + +USEBOUNCESTATE; + -BOUNCEAUTOOFF; + +BOUNCEAUTOOFFFLOORONLY; + +CANBOUNCEWATER; + +SKYEXPLODE; Scale 0.5; } override bool CanCollideWith( Actor other, bool passive ) @@ -363,6 +366,7 @@ Class FlakSlug : Actor PROJECTILE; -NOGRAVITY; +SKYEXPLODE; + +EXPLODEONWATER; +HITTRACER; } override void PostBeginPlay() diff --git a/zscript/pulsegun.zsc b/zscript/pulsegun.zsc index 1864e9e..a553376 100644 --- a/zscript/pulsegun.zsc +++ b/zscript/pulsegun.zsc @@ -36,6 +36,54 @@ Class PulseAmmo : Ammo } } +Class PulseSpark : Actor +{ + Default + { + RenderStyle "Add"; + Radius 2; + Height 2; + +NOBLOCKMAP; + +NOGRAVITY; + +MISSILE; + +FORCEXYBILLBOARD; + +THRUACTORS; + +ROLLSPRITE; + +ROLLCENTER; + +NOTELEPORT; + +DONTSPLASH; + +CANBOUNCEWATER; + -BOUNCEAUTOOFF; + BounceType "Doom"; + BounceFactor 1.0; + WallBounceFactor 1.0; + Scale 0.03; + } + override void PostBeginPlay() + { + Super.PostBeginPlay(); + if ( !bAMBUSH ) + { + roll = FRandom[Pulse](0,360); + let s = Spawn(GetClass(),pos); + s.bAMBUSH = true; + s.vel = vel; + s.scale = scale; + s.roll = roll; + } + } + States + { + Spawn: + PSPK A 1 Bright + { + A_FadeOut(FRandom[Pulse](0.0,0.15)); + vel *= 0.96; + } + Wait; + } +} + Class PulseBallLight : DynamicLight { double pulseofs; @@ -96,6 +144,8 @@ Class PulseBall : Actor RenderStyle "Add"; DamageFunction Random[Pulse](15,25); PROJECTILE; + +EXPLODEONWATER; + +SKYEXPLODE; Scale 0.2; Speed 30; Radius 2; @@ -117,8 +167,8 @@ Class PulseBall : Actor for ( int i=0; i= 19 ) { int numpt = Random[Pulse](5,10)*!Random[Pulse](0,5); for ( int i=0; i= 1.0) && player.onground && (player.cmd.forwardmove || player.cmd.sidemove) ) - A_PlaySound("ut/playerfootstep",CHAN_5,abs(vel.xy.length())*0.03); + { + if ( (waterlevel > 0) || GetFloorTerrain().IsLiquid ) A_PlaySound("ut/playerfootstepwet",CHAN_5,abs(vel.xy.length())*0.03); + else A_PlaySound("ut/playerfootstep",CHAN_5,abs(vel.xy.length())*0.03); + } if ( player.onground && !bNoGravity && !lastground && (lastvelz < -2) && (lastvelz >= -8) ) - A_PlaySound("*land",CHAN_AUTO,abs(lastvelz*0.0625)); + { + if ( (waterlevel > 0) || GetFloorTerrain().IsLiquid ) A_PlaySound("ut/wetsplash",CHAN_AUTO,abs(lastvelz*0.0625)); + else A_PlaySound("*land",CHAN_AUTO,abs(lastvelz*0.0625)); + } lastground = player.onground; lastvelz = prevvelz; prevvelz = vel.z; @@ -231,6 +240,12 @@ Class UTWeapon : Weapon if ( amp ) amp.FireEffect(); } + override void OwnerDied() + { + Super.OwnerDied(); + A_ClearRefire(); + } + Default { Weapon.BobStyle "Smooth"; @@ -339,13 +354,14 @@ Class UTSpark : Actor { RenderStyle "Add"; Radius 2; - Height 0; + Height 2; +NOBLOCKMAP; +FORCEXYBILLBOARD; +MISSILE; +MOVEWITHSECTOR; +THRUACTORS; +NOTELEPORT; + +DONTSPLASH; BounceType "Doom"; BounceFactor 0.4; Gravity 0.5; @@ -381,12 +397,13 @@ Class UTChip : Actor Default { Radius 2; - Height 0; + Height 2; +NOBLOCKMAP; +MISSILE; +MOVEWITHSECTOR; +THRUACTORS; +NOTELEPORT; + +DONTSPLASH; BounceType "Doom"; BounceFactor 0.3; Gravity 0.7; @@ -446,7 +463,7 @@ Class UTBubble : Actor { RenderStyle "Add"; Radius 2; - Height 0; + Height 2; +NOBLOCKMAP; +NOGRAVITY; +DONTSPLASH; @@ -488,13 +505,15 @@ Class UTSmoke : Actor RenderStyle "Shaded"; StencilColor "FFFFFF"; Radius 2; - Height 0; + Height 2; +NOBLOCKMAP; +NOGRAVITY; +DONTSPLASH; +FORCEXYBILLBOARD; +THRUACTORS; +NOTELEPORT; + +CANBOUNCEWATER; + -BOUNCEAUTOOFF; BounceType "Hexen"; BounceFactor 1.0; WallBounceFactor 1.0; diff --git a/zscript/warheadlauncher.zsc b/zscript/warheadlauncher.zsc index e0600cd..cfb991b 100644 --- a/zscript/warheadlauncher.zsc +++ b/zscript/warheadlauncher.zsc @@ -251,6 +251,7 @@ Class WarShell : Actor +FORCEXYBILLBOARD; +SKYEXPLODE; +FORCERADIUSDMG; + +EXPLODEONWATER; } override void PostBeginPlay() { @@ -634,6 +635,18 @@ Class WarheadLauncher : UTWeapon replaces BFG9000 return Super.CreateTossable(); } + override void OwnerDied() + { + Super.OwnerDied(); + if ( guided ) guided.ExplodeMissile(); + } + + override void OnDestroy() + { + Super.OnDestroy(); + if ( guided ) guided.ExplodeMissile(); + } + Default { Tag "Redeemer";