diff --git a/graphics/AltHUD/BlastDisplay.png b/graphics/AltHUD/BlastDisplay.png new file mode 100644 index 000000000..70ce7a6a4 Binary files /dev/null and b/graphics/AltHUD/BlastDisplay.png differ diff --git a/graphics/AltHUD/BlastRoundActive.png b/graphics/AltHUD/BlastRoundActive.png new file mode 100644 index 000000000..d4c9dc43e Binary files /dev/null and b/graphics/AltHUD/BlastRoundActive.png differ diff --git a/graphics/AltHUD/BlastRoundInert.png b/graphics/AltHUD/BlastRoundInert.png new file mode 100644 index 000000000..6bfc49c2b Binary files /dev/null and b/graphics/AltHUD/BlastRoundInert.png differ diff --git a/graphics/AltHUD/DeepImpactDisplay.png b/graphics/AltHUD/DeepImpactDisplay.png index e8752637a..1cc86b676 100644 Binary files a/graphics/AltHUD/DeepImpactDisplay.png and b/graphics/AltHUD/DeepImpactDisplay.png differ diff --git a/graphics/AltHUD/EvisceratorDisplay.png b/graphics/AltHUD/EvisceratorDisplay.png index 915de3045..9520ae6a1 100644 Binary files a/graphics/AltHUD/EvisceratorDisplay.png and b/graphics/AltHUD/EvisceratorDisplay.png differ diff --git a/graphics/AltHUD/ExplodiumDisplay.png b/graphics/AltHUD/ExplodiumDisplay.png index 025348b24..368ec6c2b 100644 Binary files a/graphics/AltHUD/ExplodiumDisplay.png and b/graphics/AltHUD/ExplodiumDisplay.png differ diff --git a/graphics/AltHUD/ItamexBar.png b/graphics/AltHUD/ItamexBar.png new file mode 100644 index 000000000..efcc9e5e4 Binary files /dev/null and b/graphics/AltHUD/ItamexBar.png differ diff --git a/graphics/AltHUD/ItamexDisplay.png b/graphics/AltHUD/ItamexDisplay.png new file mode 100644 index 000000000..e8752637a Binary files /dev/null and b/graphics/AltHUD/ItamexDisplay.png differ diff --git a/graphics/AltHUD/MisterDisplay.png b/graphics/AltHUD/MisterDisplay.png new file mode 100644 index 000000000..5ccde389f Binary files /dev/null and b/graphics/AltHUD/MisterDisplay.png differ diff --git a/graphics/AltHUD/MisterGrenade.png b/graphics/AltHUD/MisterGrenade.png new file mode 100644 index 000000000..3c068a911 Binary files /dev/null and b/graphics/AltHUD/MisterGrenade.png differ diff --git a/graphics/AltHUD/MisterRound.png b/graphics/AltHUD/MisterRound.png new file mode 100644 index 000000000..0c65e7caf Binary files /dev/null and b/graphics/AltHUD/MisterRound.png differ diff --git a/graphics/AltHUD/PuntzerBetaDisplay.png b/graphics/AltHUD/PuntzerBetaDisplay.png new file mode 100644 index 000000000..2b6c7db8b Binary files /dev/null and b/graphics/AltHUD/PuntzerBetaDisplay.png differ diff --git a/graphics/AltHUD/PuntzerCasing.png b/graphics/AltHUD/PuntzerCasing.png new file mode 100644 index 000000000..6805c8734 Binary files /dev/null and b/graphics/AltHUD/PuntzerCasing.png differ diff --git a/graphics/AltHUD/PuntzerGammaDisplay.png b/graphics/AltHUD/PuntzerGammaDisplay.png new file mode 100644 index 000000000..8887107c3 Binary files /dev/null and b/graphics/AltHUD/PuntzerGammaDisplay.png differ diff --git a/graphics/AltHUD/PuntzerRound.png b/graphics/AltHUD/PuntzerRound.png new file mode 100644 index 000000000..08df21063 Binary files /dev/null and b/graphics/AltHUD/PuntzerRound.png differ diff --git a/graphics/AltHUD/QuadravolCasing.png b/graphics/AltHUD/QuadravolCasing.png new file mode 100644 index 000000000..692a40f93 Binary files /dev/null and b/graphics/AltHUD/QuadravolCasing.png differ diff --git a/graphics/AltHUD/QuadravolDisplay.png b/graphics/AltHUD/QuadravolDisplay.png new file mode 100644 index 000000000..13ff54bc7 Binary files /dev/null and b/graphics/AltHUD/QuadravolDisplay.png differ diff --git a/graphics/AltHUD/QuadravolRound.png b/graphics/AltHUD/QuadravolRound.png new file mode 100644 index 000000000..e7d6e358e Binary files /dev/null and b/graphics/AltHUD/QuadravolRound.png differ diff --git a/graphics/AltHUD/RafankosCasing.png b/graphics/AltHUD/RafankosCasing.png new file mode 100644 index 000000000..d0aafd64f Binary files /dev/null and b/graphics/AltHUD/RafankosCasing.png differ diff --git a/graphics/AltHUD/RafankosDisplay.png b/graphics/AltHUD/RafankosDisplay.png new file mode 100644 index 000000000..41b6c1cfb Binary files /dev/null and b/graphics/AltHUD/RafankosDisplay.png differ diff --git a/graphics/AltHUD/RafankosRound.png b/graphics/AltHUD/RafankosRound.png new file mode 100644 index 000000000..46f71d103 Binary files /dev/null and b/graphics/AltHUD/RafankosRound.png differ diff --git a/graphics/AltHUD/RafankosRoundGlow.png b/graphics/AltHUD/RafankosRoundGlow.png new file mode 100644 index 000000000..4c424e65a Binary files /dev/null and b/graphics/AltHUD/RafankosRoundGlow.png differ diff --git a/graphics/AltHUD/RayKhomBar.png b/graphics/AltHUD/RayKhomBar.png new file mode 100644 index 000000000..42e08f6cd Binary files /dev/null and b/graphics/AltHUD/RayKhomBar.png differ diff --git a/graphics/AltHUD/RayKhomDisplay.png b/graphics/AltHUD/RayKhomDisplay.png new file mode 100644 index 000000000..377650360 Binary files /dev/null and b/graphics/AltHUD/RayKhomDisplay.png differ diff --git a/graphics/AltHUD/RayKhomRound.png b/graphics/AltHUD/RayKhomRound.png new file mode 100644 index 000000000..a02f7c9d0 Binary files /dev/null and b/graphics/AltHUD/RayKhomRound.png differ diff --git a/graphics/AltHUD/ScoreBox.png b/graphics/AltHUD/ScoreBox.png index 69f212f2c..1bca2a6d7 100644 Binary files a/graphics/AltHUD/ScoreBox.png and b/graphics/AltHUD/ScoreBox.png differ diff --git a/graphics/AltHUD/SheenCasing.png b/graphics/AltHUD/SheenCasing.png new file mode 100644 index 000000000..182055319 Binary files /dev/null and b/graphics/AltHUD/SheenCasing.png differ diff --git a/graphics/AltHUD/SheenDisplay.png b/graphics/AltHUD/SheenDisplay.png new file mode 100644 index 000000000..3b03f3e72 Binary files /dev/null and b/graphics/AltHUD/SheenDisplay.png differ diff --git a/graphics/AltHUD/SheenRound.png b/graphics/AltHUD/SheenRound.png new file mode 100644 index 000000000..949bfac54 Binary files /dev/null and b/graphics/AltHUD/SheenRound.png differ diff --git a/graphics/AltHUD/SparksterDisplay.png b/graphics/AltHUD/SparksterDisplay.png new file mode 100644 index 000000000..c71464a58 Binary files /dev/null and b/graphics/AltHUD/SparksterDisplay.png differ diff --git a/graphics/AltHUD/SparksterKinylumActive.png b/graphics/AltHUD/SparksterKinylumActive.png new file mode 100644 index 000000000..855273451 Binary files /dev/null and b/graphics/AltHUD/SparksterKinylumActive.png differ diff --git a/graphics/AltHUD/SparksterKinylumInert.png b/graphics/AltHUD/SparksterKinylumInert.png new file mode 100644 index 000000000..45521a4ac Binary files /dev/null and b/graphics/AltHUD/SparksterKinylumInert.png differ diff --git a/graphics/AltHUD/SparksterNokronActive.png b/graphics/AltHUD/SparksterNokronActive.png new file mode 100644 index 000000000..9e6b3447e Binary files /dev/null and b/graphics/AltHUD/SparksterNokronActive.png differ diff --git a/graphics/AltHUD/SparksterNokronInert.png b/graphics/AltHUD/SparksterNokronInert.png new file mode 100644 index 000000000..335b658c4 Binary files /dev/null and b/graphics/AltHUD/SparksterNokronInert.png differ diff --git a/graphics/AltHUD/YnykronDisplay.png b/graphics/AltHUD/YnykronDisplay.png index 7d0df8873..20decd7e8 100644 Binary files a/graphics/AltHUD/YnykronDisplay.png and b/graphics/AltHUD/YnykronDisplay.png differ diff --git a/language.version b/language.version index 2442b31e0..c51a57c6a 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r111 \cu(Thu 9 Jun 17:16:42 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r111 \cu(2022-06-09 17:16:42)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r112 \cu(Thu 9 Jun 18:49:35 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r112 \cu(2022-06-09 18:49:35)\c-"; diff --git a/zscript/dlc1/swwm_blastin.zsc b/zscript/dlc1/swwm_blastin.zsc index 52b8bcf16..8f6dd8d47 100644 --- a/zscript/dlc1/swwm_blastin.zsc +++ b/zscript/dlc1/swwm_blastin.zsc @@ -25,7 +25,7 @@ Class PlasmaBlast : SWWMWeapon Inventory.MaxAmount 2; Weapon.SisterWeapon "DualPlasmaBlast"; Stamina 7000; - PlasmaBlast.ClipCount 15; + PlasmaBlast.ClipCount 8; +WEAPON.EXPLOSIVE; } States @@ -53,7 +53,7 @@ Class DualPlasmaBlast : SWWMWeapon Weapon.SlotPriority 4.; Weapon.SelectionOrder 1050; Weapon.SisterWeapon "PlasmaBlast"; - DualPlasmaBlast.ClipCount 15; + DualPlasmaBlast.ClipCount 8; +WEAPON.EXPLOSIVE; +SWWMWEAPON.HIDEINMENU; +SWWMWEAPON.NOSWAPWEAPON; diff --git a/zscript/dlc1/swwm_mister.zsc b/zscript/dlc1/swwm_mister.zsc index e0222b9d5..23ce92023 100644 --- a/zscript/dlc1/swwm_mister.zsc +++ b/zscript/dlc1/swwm_mister.zsc @@ -29,7 +29,7 @@ Class MisterRifle : SWWMWeapon Weapon.AmmoType2 "MisterGAmmo"; Weapon.AmmoGive2 1; SWWMWeapon.DropAmmoType "MisterAmmo"; - MisterRifle.ClipCount 30; + MisterRifle.ClipCount 20; Stamina 1600000; +SWWMWEAPON.NOFIRSTGIVE; +WEAPON.BFG; diff --git a/zscript/dlc1/swwm_notashotgun.zsc b/zscript/dlc1/swwm_notashotgun.zsc index 9cf02df9c..b044231ea 100644 --- a/zscript/dlc1/swwm_notashotgun.zsc +++ b/zscript/dlc1/swwm_notashotgun.zsc @@ -5,6 +5,7 @@ Class Quadravol : SWWMWeapon { int clipcount; int chargelevel; + bool chambered, charged; Property ClipCount : clipcount; diff --git a/zscript/dlc1/swwm_thiccbolts.zsc b/zscript/dlc1/swwm_thiccbolts.zsc index aa7d85a8b..12f293385 100644 --- a/zscript/dlc1/swwm_thiccbolts.zsc +++ b/zscript/dlc1/swwm_thiccbolts.zsc @@ -26,7 +26,7 @@ Class RayKhom : SWWMWeapon Weapon.AmmoType1 "RayAmmo"; Weapon.AmmoGive1 1; SWWMWeapon.DropAmmoType "RayAmmo"; - RayKhom.ClipCount 20; + RayKhom.ClipCount 10; Stamina 500000; +SWWMWEAPON.NOFIRSTGIVE; +WEAPON.EXPLOSIVE;