From df3b437ffee69584e216b7b41c6aa81e7c691679 Mon Sep 17 00:00:00 2001 From: Marisa the Magician Date: Sat, 15 Jul 2023 20:38:49 +0200 Subject: [PATCH] Remove branching from big biospark arcs (causes an odd visual bug at times). Mortal Rifle should make use of a unique muzzle flash for the overpressure shot. Update Nana's profile picture so she's actually wearing a turtleneck sweater. --- graphics/KBase/PFP_Nana.png | Bin 6044 -> 7062 bytes language.version | 4 ++-- modeldef/dlc1/mortalrifle.txt | 19 +++++++++++++++---- zscript/dlc1/swwm_mister.zsc | 24 +++++++++++++++++++++--- zscript/weapons/swwm_sparkyboi_fx.zsc | 17 ----------------- 5 files changed, 38 insertions(+), 26 deletions(-) diff --git a/graphics/KBase/PFP_Nana.png b/graphics/KBase/PFP_Nana.png index 34513c466082770c6a4d592cd88616823c19f78b..05d56c264afc42a61c7e157e2edd59408deb5985 100644 GIT binary patch literal 7062 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 Mp00i_>zopr0B~)_g8%>k literal 6044 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 diff --git a/language.version b/language.version index be41760a2..e79d1dd28 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r807 \cu(Thu 13 Jul 13:45:12 CEST 2023)\c-"; -SWWM_SHORTVER="\cw1.3pre r807 \cu(2023-07-13 13:45:12)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r808 \cu(Sat 15 Jul 20:41:50 CEST 2023)\c-"; +SWWM_SHORTVER="\cw1.3pre r808 \cu(2023-07-15 20:41:50)\c-"; diff --git a/modeldef/dlc1/mortalrifle.txt b/modeldef/dlc1/mortalrifle.txt index 4f670c716..c3a213fab 100644 --- a/modeldef/dlc1/mortalrifle.txt +++ b/modeldef/dlc1/mortalrifle.txt @@ -155,17 +155,28 @@ Model "MisterRifle" Skin 2 "MRMuz3.png" FrameIndex XZW0 D 2 0 + Scale -50 50 50 + + Skin 2 "RailMuz0.png" + FrameIndex XZW0 E 2 0 + Skin 2 "RailMuz1.png" + FrameIndex XZW0 F 2 0 + Skin 2 "RailMuz2.png" + FrameIndex XZW0 G 2 0 + Skin 2 "RailMuz3.png" + FrameIndex XZW0 H 2 0 + Scale -20 20 20 Offset 15 -80 -26 Skin 2 "MRMuz0.png" - FrameIndex XZW0 E 2 0 + FrameIndex XZW0 I 2 0 Skin 2 "MRMuz1.png" - FrameIndex XZW0 F 2 0 + FrameIndex XZW0 J 2 0 Skin 2 "MRMuz2.png" - FrameIndex XZW0 G 2 0 + FrameIndex XZW0 K 2 0 Skin 2 "MRMuz3.png" - FrameIndex XZW0 H 2 0 + FrameIndex XZW0 L 2 0 } Model "MisterRifle" diff --git a/zscript/dlc1/swwm_mister.zsc b/zscript/dlc1/swwm_mister.zsc index 892580bc7..b3de170f9 100644 --- a/zscript/dlc1/swwm_mister.zsc +++ b/zscript/dlc1/swwm_mister.zsc @@ -706,7 +706,7 @@ Class MisterRifle : SWWMWeapon Vector3 x = SWWMUtility.GetPlayerViewDir(self); Vector3 origin = SWWMUtility.GetFireOffset(self,10,2.8,-2.4); SWWMHandler.DoFlash(self,Color(64,64,224,255),9); - A_SWWMFlash(); + A_SWWMFlash("RailFlash"); invoker.fired = true; A_StartSound("mister/fireover",CHAN_WEAPON,CHANF_OVERLAP); SWWMUtility.DoKnockback(self,-x,90000.); @@ -1567,13 +1567,31 @@ Class MisterRifle : SWWMWeapon psp.frame = Random[GunFlash](0,3); } Stop; - AltFlash: - XZW0 E 2 Bright + RailFlash: + XZW0 E 3 Bright { let psp = player.FindPSprite(PSP_FLASH); psp.frame = Random[GunFlash](4,7); let l = Spawn("MisterWeaponLight",pos); l.target = self; + A_OverlayFlags(PSP_FLASH,PSPF_ALPHA|PSPF_FORCEALPHA,true); + } + XZW0 # 1 Bright + { + let psp = player.FindPSprite(PSP_FLASH); + psp.alpha -= .1; + return A_JumpIf(psp.alpha<=0.,1); + } + Wait; + XZW0 # 0; + Stop; + AltFlash: + XZW0 I 2 Bright + { + let psp = player.FindPSprite(PSP_FLASH); + psp.frame = Random[GunFlash](8,11); + let l = Spawn("MisterWeaponLight",pos); + l.target = self; } Stop; Spawn: diff --git a/zscript/weapons/swwm_sparkyboi_fx.zsc b/zscript/weapons/swwm_sparkyboi_fx.zsc index 2bdff164c..a0de3b942 100644 --- a/zscript/weapons/swwm_sparkyboi_fx.zsc +++ b/zscript/weapons/swwm_sparkyboi_fx.zsc @@ -1404,23 +1404,6 @@ Class BiosparkArc : SWWMNonInteractiveActor } void A_Spread( Sound arcsnd = "", double attn = 1., int extra = 0 ) { - Vector3 tdir = level.Vec3Diff(pos,nextpos); - if ( (extra > 1) && !Random[Sparkster](0,3) ) - { - Vector3 x, y, z; - [x, y, z] = SWWMUtility.GetAxes(angle,pitch,roll); - for ( int i=0; i ReactionTime) || bAMBUSH ) return; let b = Spawn(GetClass(),nextpos); b.angle = atan2(nextdir.y,nextdir.x);