diff --git a/modeldef.sparkster b/modeldef.sparkster index d25662de6..bf23c82ef 100644 --- a/modeldef.sparkster +++ b/modeldef.sparkster @@ -117,6 +117,65 @@ Model "Sparkster" FrameIndex XZWZ A 2 0 } +Model "Sparkster" +{ + Path "models/extra" + + Model 3 "SparksterVent_d.3d" + AngleOffset -90 + Scale -0.005 0.0025 0.005 + DONTCULLBACKFACES + + Skin 3 "VentSmoke0.png" + FrameIndex XZWY A 3 0 + Skin 3 "VentSmoke1.png" + FrameIndex XZWY B 3 0 + Skin 3 "VentSmoke2.png" + FrameIndex XZWY C 3 0 + Skin 3 "VentSmoke3.png" + FrameIndex XZWY D 3 0 + Skin 3 "VentSmoke4.png" + FrameIndex XZWY E 3 0 + Skin 3 "VentSmoke5.png" + FrameIndex XZWY F 3 0 + Skin 3 "VentSmoke6.png" + FrameIndex XZWY G 3 0 + Skin 3 "VentSmoke7.png" + FrameIndex XZWY H 3 0 + Skin 3 "VentSmoke8.png" + FrameIndex XZWY I 3 0 + Skin 3 "VentSmoke9.png" + FrameIndex XZWY J 3 0 + Skin 3 "VentSmoke10.png" + FrameIndex XZWY K 3 0 + Skin 3 "VentSmoke11.png" + FrameIndex XZWY L 3 0 + Skin 3 "VentSmoke12.png" + FrameIndex XZWY M 3 0 + Skin 3 "VentSmoke13.png" + FrameIndex XZWY N 3 0 + Skin 3 "VentSmoke14.png" + FrameIndex XZWY O 3 0 + Skin 3 "VentSmoke15.png" + FrameIndex XZWY P 3 0 + Skin 3 "VentSmoke16.png" + FrameIndex XZWY Q 3 0 + Skin 3 "VentSmoke17.png" + FrameIndex XZWY R 3 0 + Skin 3 "VentSmoke18.png" + FrameIndex XZWY S 3 0 + Skin 3 "VentSmoke19.png" + FrameIndex XZWY T 3 0 + Skin 3 "VentSmoke20.png" + FrameIndex XZWY U 3 0 + Skin 3 "VentSmoke21.png" + FrameIndex XZWY V 3 0 + Skin 3 "VentSmoke22.png" + FrameIndex XZWY W 3 0 + Skin 3 "VentSmoke23.png" + FrameIndex XZWY X 3 0 +} + Model "Sparkster" { Path "models" diff --git a/models/extra/SparksterVent_a.3d b/models/extra/SparksterVent_a.3d new file mode 100644 index 000000000..91beec2c1 Binary files /dev/null and b/models/extra/SparksterVent_a.3d differ diff --git a/models/extra/SparksterVent_d.3d b/models/extra/SparksterVent_d.3d new file mode 100644 index 000000000..99c0898f9 Binary files /dev/null and b/models/extra/SparksterVent_d.3d differ diff --git a/models/extra/VentSmoke0.png b/models/extra/VentSmoke0.png new file mode 100644 index 000000000..e06aec0b8 Binary files /dev/null and b/models/extra/VentSmoke0.png differ diff --git a/models/extra/VentSmoke1.png b/models/extra/VentSmoke1.png new file mode 100644 index 000000000..e880db574 Binary files /dev/null and b/models/extra/VentSmoke1.png differ diff --git a/models/extra/VentSmoke10.png b/models/extra/VentSmoke10.png new file mode 100644 index 000000000..84694d5ed Binary files /dev/null and b/models/extra/VentSmoke10.png differ diff --git a/models/extra/VentSmoke11.png b/models/extra/VentSmoke11.png new file mode 100644 index 000000000..bcec6d4a2 Binary files /dev/null and b/models/extra/VentSmoke11.png differ diff --git a/models/extra/VentSmoke12.png b/models/extra/VentSmoke12.png new file mode 100644 index 000000000..cd3d0ec64 Binary files /dev/null and b/models/extra/VentSmoke12.png differ diff --git a/models/extra/VentSmoke13.png b/models/extra/VentSmoke13.png new file mode 100644 index 000000000..84865b517 Binary files /dev/null and b/models/extra/VentSmoke13.png differ diff --git a/models/extra/VentSmoke14.png b/models/extra/VentSmoke14.png new file mode 100644 index 000000000..1e808d800 Binary files /dev/null and b/models/extra/VentSmoke14.png differ diff --git a/models/extra/VentSmoke15.png b/models/extra/VentSmoke15.png new file mode 100644 index 000000000..1432b795e Binary files /dev/null and b/models/extra/VentSmoke15.png differ diff --git a/models/extra/VentSmoke16.png b/models/extra/VentSmoke16.png new file mode 100644 index 000000000..8f36d3f70 Binary files /dev/null and b/models/extra/VentSmoke16.png differ diff --git a/models/extra/VentSmoke17.png b/models/extra/VentSmoke17.png new file mode 100644 index 000000000..a1dbc9dee Binary files /dev/null and b/models/extra/VentSmoke17.png differ diff --git a/models/extra/VentSmoke18.png b/models/extra/VentSmoke18.png new file mode 100644 index 000000000..c56db4551 Binary files /dev/null and b/models/extra/VentSmoke18.png differ diff --git a/models/extra/VentSmoke19.png b/models/extra/VentSmoke19.png new file mode 100644 index 000000000..61e81ca5d Binary files /dev/null and b/models/extra/VentSmoke19.png differ diff --git a/models/extra/VentSmoke2.png b/models/extra/VentSmoke2.png new file mode 100644 index 000000000..0a3b88368 Binary files /dev/null and b/models/extra/VentSmoke2.png differ diff --git a/models/extra/VentSmoke20.png b/models/extra/VentSmoke20.png new file mode 100644 index 000000000..b35caafdc Binary files /dev/null and b/models/extra/VentSmoke20.png differ diff --git a/models/extra/VentSmoke21.png b/models/extra/VentSmoke21.png new file mode 100644 index 000000000..f42394703 Binary files /dev/null and b/models/extra/VentSmoke21.png differ diff --git a/models/extra/VentSmoke22.png b/models/extra/VentSmoke22.png new file mode 100644 index 000000000..b2da0bee7 Binary files /dev/null and b/models/extra/VentSmoke22.png differ diff --git a/models/extra/VentSmoke23.png b/models/extra/VentSmoke23.png new file mode 100644 index 000000000..97c2a8d43 Binary files /dev/null and b/models/extra/VentSmoke23.png differ diff --git a/models/extra/VentSmoke3.png b/models/extra/VentSmoke3.png new file mode 100644 index 000000000..82dd5a55f Binary files /dev/null and b/models/extra/VentSmoke3.png differ diff --git a/models/extra/VentSmoke4.png b/models/extra/VentSmoke4.png new file mode 100644 index 000000000..5c727f259 Binary files /dev/null and b/models/extra/VentSmoke4.png differ diff --git a/models/extra/VentSmoke5.png b/models/extra/VentSmoke5.png new file mode 100644 index 000000000..3fc60c294 Binary files /dev/null and b/models/extra/VentSmoke5.png differ diff --git a/models/extra/VentSmoke6.png b/models/extra/VentSmoke6.png new file mode 100644 index 000000000..a3574d96e Binary files /dev/null and b/models/extra/VentSmoke6.png differ diff --git a/models/extra/VentSmoke7.png b/models/extra/VentSmoke7.png new file mode 100644 index 000000000..5c5f4b3af Binary files /dev/null and b/models/extra/VentSmoke7.png differ diff --git a/models/extra/VentSmoke8.png b/models/extra/VentSmoke8.png new file mode 100644 index 000000000..b9bb26cab Binary files /dev/null and b/models/extra/VentSmoke8.png differ diff --git a/models/extra/VentSmoke9.png b/models/extra/VentSmoke9.png new file mode 100644 index 000000000..26f228937 Binary files /dev/null and b/models/extra/VentSmoke9.png differ diff --git a/zscript/swwm_sparkyboi.zsc b/zscript/swwm_sparkyboi.zsc index 6938c8a5d..6eed04ea0 100644 --- a/zscript/swwm_sparkyboi.zsc +++ b/zscript/swwm_sparkyboi.zsc @@ -673,13 +673,27 @@ Class Sparkster : SWWMWeapon XZW2 A 12 A_StartSound("biospark/prefire",CHAN_WEAPON,CHANF_OVERLAP); XZW2 A 1 A_FireSpark(0); XZW2 NOPQ 2; + XZW2 A 0 A_JumpIf(!(player.cmd.buttons&BT_ATTACK)||(invoker.ClipCount<=0),"Vent"); Goto Ready; AltFire: XZW2 A 0 A_JumpIf(invoker.ClipCount<=0,"Reload"); XZW2 A 12 A_StartSound("biospark/prefire",CHAN_WEAPON,CHANF_OVERLAP); XZW2 A 1 A_FireSpark(1); XZW2 RSTU 2; + XZW2 A 0 A_JumpIf(!(player.cmd.buttons&BT_ALTATTACK)||(invoker.ClipCount<=0),"Vent"); Goto Ready; + Vent: + XZW2 A 12 + { + A_Overlay(PSP_WEAPON+2,"VentFlash"); + A_OverlayFlags(PSP_WEAPON+2,PSPF_RENDERSTYLE|PSPF_FORCESTYLE,true); + A_OverlayRenderStyle(PSP_WEAPON+2,STYLE_Add); + A_StartSound("biospark/hiss",CHAN_WEAPON,CHANF_OVERLAP); + } + Goto Ready; + VentFlash: + XZWY ABCDEFGHIJKLMNOPQRSTUVWX 1; + Stop; Zoom: XZW2 A 0 A_JumpIf(invoker.ClipCount<4,"Reload"); XZW2 A 12 A_StartSound("biospark/prethird",CHAN_WEAPON,CHANF_OVERLAP); @@ -708,7 +722,7 @@ Class Sparkster : SWWMWeapon XZW3 X 2 A_StartSound("biospark/meleeend",CHAN_WEAPON,CHANF_OVERLAP); XZW3 YZ 2; XZW4 ABCD 2; - Goto Ready; + Goto Vent; User1: XZW2 A 2 {