diff --git a/language.version b/language.version index 3a3173cb4..7d4a3703e 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r478 \cu(Mon 19 Sep 01:02:40 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r478 \cu(2022-09-19 01:02:40)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r479 \cu(Mon 19 Sep 13:12:06 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r479 \cu(2022-09-19 13:12:06)\c-"; diff --git a/zscript/items/swwm_ammoitems.zsc b/zscript/items/swwm_ammoitems.zsc index 729f92595..e2213ea1d 100644 --- a/zscript/items/swwm_ammoitems.zsc +++ b/zscript/items/swwm_ammoitems.zsc @@ -233,6 +233,7 @@ Class GoldShellSparkle : Actor +NOGRAVITY; +NOBLOCKMAP; +NOINTERACTION; + +SYNCHRONIZED; +DONTSPLASH; +NOTELEPORT; +FORCEXYBILLBOARD; diff --git a/zscript/items/swwm_funstuff.zsc b/zscript/items/swwm_funstuff.zsc index 793fabf38..0f82c3773 100644 --- a/zscript/items/swwm_funstuff.zsc +++ b/zscript/items/swwm_funstuff.zsc @@ -372,6 +372,8 @@ Class FancyConfetti : Actor +INTERPOLATEANGLES; +ROLLSPRITE; +ROLLCENTER; + +NOINTERACTION; + +SYNCHRONIZED; Gravity 0.05; FloatBobPhase 0; } @@ -564,6 +566,7 @@ Class SuperFancySparkle : Actor +INTERPOLATEANGLES; +FORCEXYBILLBOARD; +NOINTERACTION; + +SYNCHRONIZED; FloatBobPhase 0; } override void PostBeginPlay() diff --git a/zscript/items/swwm_keys_gesture.zsc b/zscript/items/swwm_keys_gesture.zsc index 670df8d5a..3c46c5543 100644 --- a/zscript/items/swwm_keys_gesture.zsc +++ b/zscript/items/swwm_keys_gesture.zsc @@ -58,7 +58,9 @@ Class SWWMKeyGesture : SWWMItemGesture abstract States { Fire: - XZW1 A 3 A_Jump(128,"Fire2","Fire3"); + XZW1 A 0 A_Jump(256,"Fire1","Fire2","Fire3"); + Fire1: + XZW1 A 3; XZW1 B 3 A_StartSound("demolitionist/handsup",CHAN_WEAPON,CHANF_OVERLAP); XZW1 CDEF 3; XZW1 GHIJKLMNO 4; diff --git a/zscript/swwm_common_fx.zsc b/zscript/swwm_common_fx.zsc index 87ad6aea1..1bcad9df0 100644 --- a/zscript/swwm_common_fx.zsc +++ b/zscript/swwm_common_fx.zsc @@ -86,6 +86,7 @@ Class SWWMSmoke : Actor +THRUACTORS; +NOTELEPORT; +NOINTERACTION; + +SYNCHRONIZED; Scale .3; FloatBobPhase 0; } @@ -204,6 +205,7 @@ Class SWWMHalfSmoke : Actor +ROLLCENTER; +NOTELEPORT; +NOINTERACTION; + +SYNCHRONIZED; Scale 0.3; FloatBobPhase 0; } @@ -288,6 +290,7 @@ Class SWWMBubble : Actor +NOTELEPORT; +THRUACTORS; +NOINTERACTION; + +SYNCHRONIZED; Scale 0.5; FloatBobPhase 0; } @@ -422,6 +425,7 @@ Class SWWMSpark : Actor +NOTELEPORT; +DONTSPLASH; +NOINTERACTION; + +SYNCHRONIZED; Gravity 0.2; Scale 0.05; FloatBobPhase 0; @@ -590,6 +594,7 @@ Class SWWMChip : Actor +ROLLCENTER; +FORCEXYBILLBOARD; +NOINTERACTION; + +SYNCHRONIZED; Gravity 0.35; Scale 0.2; FloatBobPhase 0; @@ -789,6 +794,7 @@ Class SWWMItemFog : Actor +ROLLSPRITE; +ROLLCENTER; +NOINTERACTION; + +SYNCHRONIZED; +FORCEXYBILLBOARD; FloatBobPhase 0; } @@ -858,6 +864,7 @@ Class SWWMTeleportSparkle : Actor +ROLLCENTER; +FORCEXYBILLBOARD; +NOINTERACTION; + +SYNCHRONIZED; FloatBobPhase 0; } override void Tick() @@ -967,6 +974,7 @@ Class SWWMTeleportFog : Actor +NOBLOCKMAP; +DONTSPLASH; +NOINTERACTION; + +SYNCHRONIZED; +FORCEXYBILLBOARD; Radius .1; Height 0.; @@ -1042,6 +1050,7 @@ Class SWWMPickupFlash : Actor +ROLLSPRITE; +ROLLCENTER; +NOINTERACTION; + +SYNCHRONIZED; +FORCEXYBILLBOARD; FloatBobPhase 0; } @@ -1189,6 +1198,7 @@ Class InvisibleSplasher : Actor Radius 2; Height 4; +NOBLOCKMAP; // needed to prevent infinite loops with some 3D floor water (yes, you read that right) + +SYNCHRONIZED; FloatBobPhase 0; } States @@ -1314,6 +1324,7 @@ Class SWWMPuff : Actor Height 0.; +NOBLOCKMAP; +NOINTERACTION; + +SYNCHRONIZED; +DONTSPLASH; +NOTELEPORT; +ALWAYSPUFF; @@ -1415,6 +1426,7 @@ Class SWWMShadow : Actor Height 0.; +NOBLOCKMAP; +NOINTERACTION; + +SYNCHRONIZED; +DONTSPLASH; +NOTELEPORT; FloatBobPhase 0; @@ -1436,6 +1448,7 @@ Class SWWMBaseSplash : Actor Height 0.; +NOBLOCKMAP; +NOINTERACTION; + +SYNCHRONIZED; +DONTSPLASH; +NOTELEPORT; FloatBobPhase 0; diff --git a/zscript/swwm_player_fx.zsc b/zscript/swwm_player_fx.zsc index 7747c7cb6..02fcba8ac 100644 --- a/zscript/swwm_player_fx.zsc +++ b/zscript/swwm_player_fx.zsc @@ -277,6 +277,7 @@ Class DashTrail : Actor +DONTSPLASH; +NOTELEPORT; +NOINTERACTION; + +SYNCHRONIZED; +MASTERNOSEE; FloatBobPhase 0; } @@ -335,6 +336,7 @@ Class DashTrail2 : Actor +DONTSPLASH; +NOTELEPORT; +NOINTERACTION; + +SYNCHRONIZED; +MASTERNOSEE; FloatBobPhase 0; } @@ -388,6 +390,8 @@ Class DemolitionistRadiusShockwaveTail : Actor +DONTSPLASH; +NOTELEPORT; +NOINTERACTION; + +SYNCHRONIZED; + FloatBobPhase 0; } override void Tick() { diff --git a/zscript/weapons/swwm_baseweapon_fx.zsc b/zscript/weapons/swwm_baseweapon_fx.zsc index 832a3e7c5..8e409fd9a 100644 --- a/zscript/weapons/swwm_baseweapon_fx.zsc +++ b/zscript/weapons/swwm_baseweapon_fx.zsc @@ -22,6 +22,7 @@ Class SWWMCasing : Actor abstract +NOTELEPORT; +ROLLSPRITE; +ROLLCENTER; + +SYNCHRONIZED; Mass 1; Gravity 0.35; BounceType "Hexen";