diff --git a/language.version b/language.version index dfe1a21cf..ac597d01c 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r370 \cu(Wed 24 Aug 15:20:57 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r370 \cu(2022-08-24 15:20:57)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r371 \cu(Thu 25 Aug 09:07:39 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r371 \cu(2022-08-25 09:07:39)\c-"; diff --git a/modeldef.quadravol b/modeldef.quadravol index d027eba2d..11b2a31fb 100644 --- a/modeldef.quadravol +++ b/modeldef.quadravol @@ -516,4 +516,6 @@ Model "Quadravol" FrameIndex XZWF J 1 377 FrameIndex XZWF K 1 378 FrameIndex XZWF L 1 379 + // Spin Skip (needed if we migrate to skeletal animation) + FrameIndex XZWF M 1 381 // Copy of frame 280 with rotation quat inverted } diff --git a/models/Quadravol1st.blend b/models/Quadravol1st.blend index 0067d82dc..f58a8ba92 100644 Binary files a/models/Quadravol1st.blend and b/models/Quadravol1st.blend differ diff --git a/models/Quadravol1st_a.3d b/models/Quadravol1st_a.3d index acb0df3b6..5b5eea902 100644 Binary files a/models/Quadravol1st_a.3d and b/models/Quadravol1st_a.3d differ diff --git a/models/Quadravol1st_d.3d b/models/Quadravol1st_d.3d index 91f366cac..532dcf054 100644 Binary files a/models/Quadravol1st_d.3d and b/models/Quadravol1st_d.3d differ diff --git a/zscript/dlc1/swwm_notashotgun.zsc b/zscript/dlc1/swwm_notashotgun.zsc index 0c547a954..7e86136a5 100644 --- a/zscript/dlc1/swwm_notashotgun.zsc +++ b/zscript/dlc1/swwm_notashotgun.zsc @@ -691,7 +691,8 @@ Class Quadravol : SWWMWeapon XZWB TUV 2; XZWB W 2 A_StartSound("demolitionist/swing",CHAN_WEAPON,CHANF_OVERLAP,pitch:.4); XZWB XY 1; - XZWB Z 1 A_StartSound("quadshot/leverback",CHAN_WEAPON,CHANF_OVERLAP); + XZWB Z 0 A_StartSound("quadshot/leverback",CHAN_WEAPON,CHANF_OVERLAP); // skip frame to undo 360 degree rotation + XZWF M 1; XZWC A 2; XZWC B 2 A_Fill(); XZWC CDEF 3;