OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Tweak how chainsaw replacements are selected.

Browse source
This commit is contained in:
Mari the Deer 2021-10-09 21:35:48 +02:00
commit 4058fe9383
2 changed files with 33 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
language.version
View file

@ -1,3 +1,3 @@
[default]
SWWM_MODVER="\chSWWM \czGZ\c- \cw1.1.18 \cu(Thu 7 Oct 19:47:39 CEST 2021)\c-";
SWWM_SHORTVER="\cw1.1.18 \cu(2021-10-07 19:47:39)\c-";
SWWM_MODVER="\chSWWM \czGZ\c- \cw1.1.18 \cu(Sat 9 Oct 21:35:48 CEST 2021)\c-";
SWWM_SHORTVER="\cw1.1.18 \cu(2021-10-09 21:35:48)\c-";

31
zscript/utility/swwm_utility.zsc
View file

@ -1975,8 +1975,39 @@ Class SWWMUtility
return Random[Replacements](weight1,0)?a:Random[Replacements](weight2,0)?b:c;
}
// boy, this one got complicated fast
static Class<Inventory> PickSWWMSlot1()
{
// so the player can recover it if they decided to drop it in a previous map, or they didn't start with it
if ( CheckNeedsItem('DeepImpact') ) return 'DeepImpact';
bool needsmelee = CheckNeedsItem('PusherWeapon')/*|CheckNeedsItem('ItamexHammer')|CheckNeedsItem('FistGun')*/;
bool needsgun = CheckNeedsItem('ExplodiumGun',true)/*|CheckNeedsItem('PlasmaBlast',true)*/;
if ( !needsmelee && !needsgun )
{
static const Class<Weapon> wpns[] =
{
'ExplodiumGun', 'PusherWeapon',
'PlasmaBlast', 'ItamexHammer',
'FistGun'
};
//return wpns[Random[Replacements](0,4)];
//return wpns[Random[Replacements](0,3)];
return wpns[Random[Replacements](0,1)];
}
if ( !needsmelee && needsgun )
{
bool needsexplo = CheckNeedsItem('ExplodiumGun',true);
bool needsblast = CheckNeedsItem('PlasmaBlast',true);
if ( needsexplo && !needsblast ) return 'ExplodiumGun';
if ( !needsexplo && needsblast ) return 'PlasmaBlast';
return Random[Replacements](0,1)?'ExplodiumGun':'PlasmaBlast';
}
if ( needsmelee && !needsgun )
{
//return PickTrio('PusherWeapon','ItamexHammer','FistGun');
//return PickPair('PusherWeapon','ItamexHammer');
return 'PusherWeapon';
}
if ( CheckNeedsItem('ExplodiumGun',true) && Random[Replacements](0,1) ) return 'ExplodiumGun';
//if ( CheckNeedsItem('PlasmaBlast',true) && Random[Replacements](0,1) ) return 'PlasmaBlast';
//return PickTrio('PusherWeapon','ItamexHammer','FistGun');