From eaeed01ec4340f17b6d93895e499d1d6e17c1704 Mon Sep 17 00:00:00 2001 From: Marisa the Magician Date: Thu, 9 Jun 2022 10:51:16 +0200 Subject: [PATCH] Prevent manual switch to dual guns if only owning one. --- language.version | 4 ++-- zscript/weapons/swwm_splode.zsc | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/language.version b/language.version index 926eecbf9..c0e190c71 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.2.23 \cu(Tue 7 Jun 23:11:25 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.2.23 \cu(2022-06-07 23:11:25)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.2.23 \cu(Thu 9 Jun 10:53:58 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.2.23 \cu(2022-06-09 10:53:58)\c-"; diff --git a/zscript/weapons/swwm_splode.zsc b/zscript/weapons/swwm_splode.zsc index 47e2f4233..34dcbf243 100644 --- a/zscript/weapons/swwm_splode.zsc +++ b/zscript/weapons/swwm_splode.zsc @@ -760,6 +760,13 @@ Class DualExplodiumGun : SWWMWeapon { return (SisterWeapon&&(SisterWeapon.Amount > 1)); } + override bool Use( bool pickup ) + { + // need to override here because other mods will fuck things up + if ( !SisterWeapon || (SisterWeapon.Amount < 2) ) + return false; + return Super.Use(pickup); + } override bool ReportHUDAmmo() {