diff --git a/language.version b/language.version index 0f58bd7fe..8ba4634d4 100644 --- a/language.version +++ b/language.version @@ -1,2 +1,2 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r648 \cu(Sat 28 Nov 23:36:34 CET 2020)"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r650 \cu(Sun 29 Nov 10:58:52 CET 2020)"; diff --git a/modeldef.hellblazer b/modeldef.hellblazer index ad9cb00c1..fa96a4b4c 100644 --- a/modeldef.hellblazer +++ b/modeldef.hellblazer @@ -282,6 +282,12 @@ Model "Hellblazer" FrameIndex XZWR B 2 148 FrameIndex XZWR C 2 149 FrameIndex XZWR D 2 150 + // ReloadInter + FrameIndex XZWR E 2 153 + FrameIndex XZWR F 2 154 + FrameIndex XZWR G 2 155 + FrameIndex XZWR H 2 156 + FrameIndex XZWR I 2 157 } Model "Hellblazer" @@ -866,4 +872,14 @@ Model "Hellblazer" FrameIndex XZWL P 1 148 FrameIndex XZWL Q 1 149 FrameIndex XZWL R 1 150 + // ReloadInter + SurfaceSkin 1 5 "" + SurfaceSkin 1 6 "" + SurfaceSkin 1 7 "" + SurfaceSkin 1 8 "" + FrameIndex XZWR J 1 153 + FrameIndex XZWR K 1 154 + FrameIndex XZWR L 1 155 + FrameIndex XZWR M 1 156 + FrameIndex XZWR N 1 157 } diff --git a/models/Hellblazer1st.blend b/models/Hellblazer1st.blend index e64b380f9..eb92c57d6 100644 Binary files a/models/Hellblazer1st.blend and b/models/Hellblazer1st.blend differ diff --git a/models/Hellblazer1st_a.3d b/models/Hellblazer1st_a.3d index b7f46e6ce..2d02c8cb6 100644 Binary files a/models/Hellblazer1st_a.3d and b/models/Hellblazer1st_a.3d differ diff --git a/models/extra/BaseCube_d.3d b/models/extra/BaseCube_d.3d index 18f8ff78c..f8de80c2e 100644 Binary files a/models/extra/BaseCube_d.3d and b/models/extra/BaseCube_d.3d differ diff --git a/models/extra/BaseSphere_d.3d b/models/extra/BaseSphere_d.3d index db695f2b8..8fe05cfaa 100644 Binary files a/models/extra/BaseSphere_d.3d and b/models/extra/BaseSphere_d.3d differ diff --git a/models/extra/IAmError_d.3d b/models/extra/IAmError_d.3d index 3eaceff91..1d750fc86 100644 Binary files a/models/extra/IAmError_d.3d and b/models/extra/IAmError_d.3d differ diff --git a/models/extra/WarpBeam_d.3d b/models/extra/WarpBeam_d.3d index e5eb370cc..0a2b36bb7 100644 Binary files a/models/extra/WarpBeam_d.3d and b/models/extra/WarpBeam_d.3d differ diff --git a/zscript/swwm_blazeit.zsc b/zscript/swwm_blazeit.zsc index 9849001f5..698586564 100644 --- a/zscript/swwm_blazeit.zsc +++ b/zscript/swwm_blazeit.zsc @@ -1791,7 +1791,8 @@ Class Hellblazer : SWWMWeapon Unload_1: XZW2 A 2; XZW3 JKLMNOPQRSTUVWXYZ 2; - XZW4 ABCDEFGHI 2; + XZW4 ABCDEFGHIJ 2; + XZWR JKLMN 3; XZW4 J 2 { A_SwapAmmo(); @@ -1801,7 +1802,8 @@ Class Hellblazer : SWWMWeapon Unload_2: XZW6 V 2; XZW8 HIJKLMNOPQRSTUVWXYZ 2; - XZW9 ABCDEFG 2; + XZW9 ABCDEFGH 2; + XZWR JKLMN 3; XZW9 H 2 { A_SwapAmmo(); @@ -1811,7 +1813,8 @@ Class Hellblazer : SWWMWeapon Unload_3: XZWB T 2; XZWD FGHIJKLMNOPQRSTUVWXYZ 2; - XZWE ABCDE 2; + XZWE ABCDEF 2; + XZWR JKLMN 3; XZWE F 2 { A_SwapAmmo(); @@ -1821,7 +1824,8 @@ Class Hellblazer : SWWMWeapon Unload_4: XZWG R 2; XZWI GHIJKLMNOPQRSTUVWXYZ 2; - XZWJ ABCDEF 2; + XZWJ ABCDEFG 2; + XZWR JKLMN 3; XZWJ G 2 { A_SwapAmmo(); @@ -1836,6 +1840,7 @@ Class Hellblazer : SWWMWeapon XZWO ABCDEFGH 2; XZWO I 2 A_StartSound("hellblazer/magout",CHAN_WEAPON,CHANF_OVERLAP); XZWO JKLMNOPQRS 2; + XZWR EFGHI 3; Goto Load_G; Load_1: XZW4 JKLMNOPQRSTUVWXYZ 2;