diff --git a/language.version b/language.version index ea08c5823..50ae383da 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r489 \cu(Tue 20 Sep 22:51:08 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r489 \cu(2022-09-20 22:51:08)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r490 \cu(Tue 20 Sep 22:51:17 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r490 \cu(2022-09-20 22:51:17)\c-"; diff --git a/zscript/kbase/swwm_kbasetab_store.zsc b/zscript/kbase/swwm_kbasetab_store.zsc index a7dab986c..e3d56308f 100644 --- a/zscript/kbase/swwm_kbasetab_store.zsc +++ b/zscript/kbase/swwm_kbasetab_store.zsc @@ -100,8 +100,8 @@ Class DemolitionistStoreTab : DemolitionistMenuTab if ( !(gameinfo.gametype&GAME_DOOM) && (type is 'EBarrier') ) return true; // no gravity/tether outside raven if ( !(gameinfo.gametype&GAME_RAVEN) && ((type is 'GravitySuppressor') || (type is 'SafetyTether')) ) return true; - // can't sell candygun spares - if ( bSell && (type is 'CandyGunSpares') ) return true; + // can't sell candygun spares if we already own a Candy Gun + if ( bSell && (type is 'CandyGunSpares') && players[consoleplayer].mo.FindInventory("CandyGun") ) return true; // skip items we don't own or are depleted if selling if ( bSell && (!cur || (cur.Amount <= 0)) ) return true; else if ( !bSell )