OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Swap slots of Ray-Khom and Mortal Rifle.

Browse source
This commit is contained in:
Mari the Deer 2022-05-08 00:19:55 +02:00
commit e270e4de2c
14 changed files with 176 additions and 222 deletions
Download patch file Download diff file Expand all files Collapse all files

9
zscript/items/swwm_ammospawn.zsc
View file

@ -201,15 +201,14 @@ Class SWWMCellAmmoSmall : SWWMAmmoSpawner
static Class<Actor> PickAmmo( bool notondemand = false )
{
if ( !Random[Replacements](0,2) && (notondemand || SWWMUtility.ItemExists('RayKhom')) ) return 'RayBattery';
if ( !Random[Replacements](0,2) )
{
if ( !Random[Replacements](0,3) )
{
if ( Random[Replacements](0,1) && (notondemand || SWWMUtility.ItemExists('RayKhom')) ) return 'RayBolt2';
if ( !Random[Replacements](0,2) && (notondemand || SWWMUtility.ItemExists('MisterRifle')) ) return 'MisterGAmmo';
if ( notondemand || SWWMUtility.ItemExists('CandyGun') ) return 'CandyGunBullets';
}
if ( !Random[Replacements](0,2) && (notondemand || SWWMUtility.ItemExists('MisterRifle')) ) return 'MisterGAmmo';
if ( Random[Replacements](0,1) && (notondemand || SWWMUtility.ItemExists('RayKhom')) ) return 'RayBolt2';
if ( notondemand || SWWMUtility.ItemExists('SilverBullet') ) return Random[Replacements](0,2)?'SilverBullets':'SilverBullets2';
}
if ( Random[Replacements](0,1) && (notondemand || SWWMUtility.ItemExists('ModernSparkster')) ) return Random[Replacements](0,2)?'SparksterBAmmo':'SparksterRAmmo';
@ -231,8 +230,8 @@ Class SWWMCellAmmoBig : SWWMAmmoSpawner
}
if ( Random[Replacements](0,1) )
{
if ( Random[Replacements](0,1) && (notondemand || SWWMUtility.ItemExists('MisterRifle')) ) return Random[Replacements](0,2)?'MisterRound5':'MisterAmmo';
if ( notondemand || SWWMUtility.ItemExists('RayKhom') ) return Random[Replacements](0,2)?'RayBolt5':'RayAmmo';
if ( Random[Replacements](0,1) && (notondemand || SWWMUtility.ItemExists('RayKhom')) ) return Random[Replacements](0,2)?'RayBolt5':'RayAmmo';
if ( notondemand || SWWMUtility.ItemExists('MisterRifle') ) return Random[Replacements](0,2)?'MisterRound5':'MisterAmmo';
}
if ( !Random[Replacements](0,2) && (notondemand || SWWMUtility.ItemExists('SilverBullet')) )
{