OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Sometimes plans change. DLC Weaponsets merged into one.

Browse source
This commit is contained in:
Mari the Deer 2022-03-05 18:26:20 +01:00
commit 0680b2f382
389 changed files with 530 additions and 1622 deletions
Download patch file Download diff file Expand all files Collapse all files

66
zscript/utility/swwm_utility.zsc
View file

@ -1757,17 +1757,14 @@ Class SWWMUtility
if ( StringTable.Localize("$SWWM_SELLEXTRA_FEM") == "SWWM_SELLEXTRA_FEM" )
return false;
if ( i is 'DeepImpact' ) return true;
if ( i is 'FistGun' ) return true;
if ( i is 'ExplodiumGun' ) return true;
if ( i is 'Wallbuster' ) return true;
if ( i is 'HeavyMahSheenGun' ) return true;
if ( i is 'Quadravol' ) return true;
if ( i is 'Sparkster' ) return true;
if ( i is 'EMPCarbine' ) return true;
if ( i is 'CandyGun' ) return true;
if ( i is 'RayKhom' ) return true;
if ( i is 'GrandLance' ) return true;
if ( i is 'RayKhom' ) return true;
if ( i is 'RafanKos' ) return true;
if ( i is 'HealthNuggetItem' ) return true;
if ( i is 'ArmorNuggetItem' ) return true;
if ( i is 'WarArmor' ) return true;
@ -2003,9 +2000,9 @@ Class SWWMUtility
return true;
if ( target is 'SWWMCollectible' )
return true;
if ( (target is 'Ynykron') || (target is 'GrandLance') || (target is 'RayKhom') )
if ( (target is 'Ynykron') || (target is 'RafanKos') )
return true;
if ( (target is 'GoldShell') || (target is 'YnykronAmmo') || (target is 'GrandAmmo') || (target is 'GrandSpear') || (target is 'UltimatePod') || (target is 'UltimateAmmo') )
if ( (target is 'GoldShell') || (target is 'YnykronAmmo') || (target is 'UltimatePod') || (target is 'UltimateAmmo') )
return true;
if ( (target is 'Mykradvo') || (target is 'AngerySigil') || (target is 'DivineSprite') )
return true;
@ -2017,9 +2014,9 @@ Class SWWMUtility
// used by the store
static bool IsVipItemClass( Class<Actor> target )
{
if ( (target is 'Ynykron') || (target is 'GrandLance') || (target is 'RayKhom') )
if ( (target is 'Ynykron') || (target is 'RafanKos') )
return true;
if ( (target is 'GoldShell') || (target is 'YnykronAmmo') || (target is 'GrandAmmo') || (target is 'GrandSpear') || (target is 'UltimatePod') || (target is 'UltimateAmmo') )
if ( (target is 'GoldShell') || (target is 'YnykronAmmo') || (target is 'UltimatePod') || (target is 'UltimateAmmo') )
return true;
if ( (target is 'Mykradvo') || (target is 'AngerySigil') || (target is 'DivineSprite') )
return true;
@ -2130,14 +2127,13 @@ Class SWWMUtility
{
// 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 hasmelee = (!CheckNeedsItem('PusherWeapon')/*||!CheckNeedsItem('ItamexHammer')||!CheckNeedsItem('FistGun')*/);
bool hasallmelee = (!CheckNeedsItem('PusherWeapon')/*&&!CheckNeedsItem('ItamexHammer')&&!CheckNeedsItem('FistGun')*/);
bool hasmelee = (!CheckNeedsItem('PusherWeapon')/*||!CheckNeedsItem('ItamexHammer')*/);
bool hasallmelee = (!CheckNeedsItem('PusherWeapon')/*&&!CheckNeedsItem('ItamexHammer')*/);
bool gunexists = ItemExists('ExplodiumGun',worldonly:true)/*||ItemExists('PlasmaBlast',worldonly:true)*/;
// if the player already has a melee weapon, 50% chance to spawn either slot 2 weapon as long as one doesn't exist in the map already
// if the player has ALL melee weapons (somehow), that chance becomes 100%
if ( hasmelee && !gunexists && (hasallmelee || Random[Replacements](0,1)) )
return PickSWWMSlot2();
//return PickTrio('PusherWeapon','ItamexHammer','FistGun');
//return PickPair('PusherWeapon','ItamexHammer');
return 'PusherWeapon';
}
@ -2168,26 +2164,24 @@ Class SWWMUtility
// rocket launcher spawn
static Class<Weapon> PickSWWMSlot6()
{
//return PickTrio('Hellblazer','Quadravol','ModernSparkster');
//return PickPair('Hellblazer','Quadravol');
return 'Hellblazer';
}
// first plasma rifle spawn
static Class<Weapon> PickSWWMSlot7()
{
//return PickPair('Sparkster','BlackfireIgniter');
//return PickPair('Sparkster','ModernSparkster');
return 'Sparkster';
}
// second plasma rifle spawn
static Class<Weapon> PickSWWMSlot8()
{
//return PickPair('SilverBullet','EMPCarbine');
//return PickPair('SilverBullet','MisterRifle');
return 'SilverBullet';
}
// first bfg spawn
static Class<Weapon> PickSWWMSlot9()
{
//return PickTrio('CandyGun','RayKhom','MisterRifle');
//return PickPair('CandyGun','RayKhom');
return 'CandyGun';
}
@ -2196,49 +2190,21 @@ Class SWWMUtility
{
/*if ( ItemExists('Ynykron',mapstart:true) )
{
if ( ItemExists('GrandLance',mapstart:true) )
{
if ( ItemExists('RafanKos',null,true) )
return fallback?PickSWWMSlot9():null;
return 'RafanKos';
}
if ( ItemExists('RafanKos',mapstart:true) )
return 'GrandLance';
return Random[Replacements](0,1)?'GrandLance':'RafanKos';
}
if ( ItemExists('GrandLance',mapstart:true) )
{
if ( ItemExists('RafanKos',mapstart:true) )
return 'Ynykron';
return Random[Replacements](0,1)?'Ynykron':'RafanKos';
}
if ( ItemExists('RafanKos',mapstart:truee) )
return Random[Replacements](0,1)?'Ynykron':'GrandLance';
switch ( Random[Replacements](0,2) )
{
case 0:
return 'Ynykron';
case 1:
return 'GrandLance';
}
return 'RafanKos';*/
/*if ( ItemExists('Ynykron',mapstart:true) )
{
if ( ItemExists('GrandLance',mapstart:true) )
return fallback?PickSWWMSlot9():null;
return 'GrandLance';
return 'RafanKos';
}
if ( ItemExists('GrandLance',mapstart:true) )
if ( ItemExists('RafanKos',mapstart:true) )
return 'Ynykron';
return Random[Replacements](0,1)?'Ynykron':'GrandLance';*/
return Random[Replacements](0,1)?'Ynykron':'RafanKos';*/
if ( ItemExists('Ynykron',mapstart:true) ) return fallback?PickSWWMSlot9():null;
return 'Ynykron';
}
// either plasma rifle spawn
static Class<Weapon> PickDoomSlot6()
{
bool hasslot7 = (!CheckNeedsItem('Sparkster')/*||!CheckNeedsItem('BlackfireIgniter')*/);
bool hasslot8 = (!CheckNeedsItem('SilverBullet')/*||!CheckNeedsItem('EMPCarbine')*/);
bool hasslot7 = (!CheckNeedsItem('Sparkster')/*||!CheckNeedsItem('ModernSparkster')*/);
bool hasslot8 = (!CheckNeedsItem('SilverBullet')/*||!CheckNeedsItem('MortalRifle')*/);
// if the player already has a slot 7 weapon...
if ( hasslot7 )
{
@ -2254,8 +2220,8 @@ Class SWWMUtility
// either bfg spawn
static Class<Weapon> PickDoomSlot7()
{
bool hasslot9 = (!CheckNeedsItem('CandyGun')/*||!CheckNeedsItem('RayKhom')||!CheckNeedsItem('MortalRifle')*/);
bool hasslot0 = (!CheckNeedsItem('Ynykron')/*||!CheckNeedsItem('GrandLance')||!CheckNeedsItem('RafanKos')*/);
bool hasslot9 = (!CheckNeedsItem('CandyGun')/*||!CheckNeedsItem('RayKhom')*/);
bool hasslot0 = (!CheckNeedsItem('Ynykron')/*||!CheckNeedsItem('RafanKos')*/);
let rep = PickSWWMSlot0(false);
// if the player already has a slot 9 weapon (and a slot 0 weapon can still spawn)...
if ( hasslot9 && rep )