diff --git a/language.version b/language.version index 9b4a37920..f00b18a73 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r189 \cu(Wed 20 Jul 11:27:19 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r189 \cu(2022-07-20 11:27:19)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r191 \cu(Wed 20 Jul 20:55:47 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r191 \cu(2022-07-20 20:55:47)\c-"; diff --git a/modeldef.sheenhmg b/modeldef.sheenhmg index 3931ee5ed..29dea52a1 100644 --- a/modeldef.sheenhmg +++ b/modeldef.sheenhmg @@ -1,12 +1,13 @@ Model "HeavyMahSheenGun" { - Path "models/extra" + Path "models" - Model 0 "BaseCube_d.3d" - Skin 0 "CHIPTILR" - Scale 0.05 0.05 0.05 - ZOffset 16 - PitchOffset 30 + Model 0 "SheenHMGPickup_d.3d" + SurfaceSkin 0 0 "SheenHMG.png" + SurfaceSkin 0 1 "-noflat-" + Scale 0.16 0.16 0.16 + AngleOffset 90 + ZOffset 20 ROTATING FrameIndex XZW1 A 0 0 diff --git a/models/GibBreast_d.3d b/models/GibBreast_d.3d index 20f66c5eb..2e8f7b9cf 100644 Binary files a/models/GibBreast_d.3d and b/models/GibBreast_d.3d differ diff --git a/models/GibDrumstick_d.3d b/models/GibDrumstick_d.3d index 9533fb649..62f065ecb 100644 Binary files a/models/GibDrumstick_d.3d and b/models/GibDrumstick_d.3d differ diff --git a/models/GibSteak_d.3d b/models/GibSteak_d.3d index 07932d77a..cb17e48fa 100644 Binary files a/models/GibSteak_d.3d and b/models/GibSteak_d.3d differ diff --git a/models/SheenHMG.blend b/models/SheenHMG.blend index 0d9d01d7a..4204f92df 100644 Binary files a/models/SheenHMG.blend and b/models/SheenHMG.blend differ diff --git a/models/SheenHMG.png b/models/SheenHMG.png index b9619cfa0..8f0fa2501 100644 Binary files a/models/SheenHMG.png and b/models/SheenHMG.png differ diff --git a/models/SheenHMGPickup_a.3d b/models/SheenHMGPickup_a.3d new file mode 100644 index 000000000..a71198a49 Binary files /dev/null and b/models/SheenHMGPickup_a.3d differ diff --git a/models/SheenHMGPickup_d.3d b/models/SheenHMGPickup_d.3d new file mode 100644 index 000000000..64ecab513 Binary files /dev/null and b/models/SheenHMGPickup_d.3d differ diff --git a/models/modelnotes.txt b/models/modelnotes.txt index 1620c8bf2..85ae8bfcf 100644 --- a/models/modelnotes.txt +++ b/models/modelnotes.txt @@ -5,6 +5,7 @@ Weapon models: - Plasma Blaster - Puntzer Beta - Puntzer Gamma + ½ Sheen HMG - Quadravol - Sparkster Rifle - Mortal Rifle diff --git a/zscript/dlc1/swwm_heavymahsheengun.zsc b/zscript/dlc1/swwm_heavymahsheengun.zsc index 4590e9966..af1c30613 100644 --- a/zscript/dlc1/swwm_heavymahsheengun.zsc +++ b/zscript/dlc1/swwm_heavymahsheengun.zsc @@ -17,6 +17,8 @@ Class HeavyMahSheenGun : SWWMWeapon Weapon.AmmoGive1 200; SWWMWeapon.DropAmmoType "SheenAmmo"; Stamina 100000; + Radius 30; + Height 28; } States {