OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Ammo spawn tweaks (AGAIN).

Browse source
This commit is contained in:
Mari the Deer 2022-08-09 00:53:32 +02:00
commit 6ebd9358c8
14 changed files with 32 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

12
zscript/items/swwm_ammospawn.zsc
View file

@ -11,7 +11,6 @@ Class SWWMAmmoSpawner : Inventory abstract
enemydrop = true;
return false;
}
abstract Class<Actor> PickAmmo( bool enemydrop = false );
void SpawnAmmo()
@ -29,6 +28,7 @@ Class SWWMAmmoSpawner : Inventory abstract
{
let i = Inventory(a);
i.bTossed = true;
i.ModifyDropAmount(i.Amount);
if ( i.SpecialDropAction(dropper) )
{
i.Destroy();
@ -134,7 +134,7 @@ Class SWWMClipAmmoSmall : SWWMAmmoSpawner
bool aex = SWWMUtility.ItemExists('Eviscerator',ownedonly:enemydrop),
bex = SWWMUtility.ItemExists('HeavyMahSheenGun',ownedonly:enemydrop);
if ( (!aex && bex) || (Random[Replacements](0,1) && bex) )
return Random[Replacements](0,2)?'SheenAmmo2':'SheenAmmo3';
return Random[Replacements](0,1)?'SheenAmmo2':'SheenAmmo3';
if ( aex ) return 'EvisceratorShell';
}
bool aex = (SWWMUtility.ItemExists('Spreadgun',ownedonly:enemydrop)||SWWMUtility.ItemExists('Wallbuster',ownedonly:enemydrop)),
@ -152,7 +152,7 @@ Class SWWMClipAmmoMed : SWWMAmmoSpawner
bool aex = SWWMUtility.ItemExists('Eviscerator',ownedonly:enemydrop),
bex = SWWMUtility.ItemExists('HeavyMahSheenGun',ownedonly:enemydrop);
if ( (!aex && bex) || (Random[Replacements](0,1) && bex) )
return Random[Replacements](0,1)?'SheenSmallAmmo':'SheenAmmo3';
return 'SheenSmallAmmo';
return Random[Replacements](0,1)?'EvisceratorShell2':'EvisceratorShell';
}
}
@ -163,7 +163,7 @@ Class SWWMClipAmmoBig : SWWMAmmoSpawner
bool aex = SWWMUtility.ItemExists('Eviscerator',ownedonly:enemydrop),
bex = SWWMUtility.ItemExists('HeavyMahSheenGun',ownedonly:enemydrop);
if ( (!aex && bex) || (Random[Replacements](0,1) && bex) )
return Random[Replacements](0,1)?'SheenSmallAmmo':'SheenBigAmmo';
return 'SheenBigAmmo';
return Random[Replacements](0,1)?'EvisceratorShell2':'EvisceratorShell3';
}
}
@ -174,7 +174,7 @@ Class SWWMBlastAmmoSmall : SWWMAmmoSpawner
bool aex = SWWMUtility.ItemExists('Eviscerator',ownedonly:enemydrop),
bex = SWWMUtility.ItemExists('HeavyMahSheenGun',ownedonly:enemydrop);
if ( (!aex && bex) || (Random[Replacements](0,1) && bex) )
return Random[Replacements](0,2)?'SheenAmmo3':'SheenSmallAmmo';
return Random[Replacements](0,1)?'SheenAmmo3':'SheenSmallAmmo';
return 'EvisceratorShell';
}
}
@ -185,7 +185,7 @@ Class SWWMBlastAmmoBig : SWWMAmmoSpawner
bool aex = SWWMUtility.ItemExists('Eviscerator',ownedonly:enemydrop),
bex = SWWMUtility.ItemExists('HeavyMahSheenGun',ownedonly:enemydrop);
if ( (!aex && bex) || (Random[Replacements](0,1) && bex) )
return Random[Replacements](0,2)?'SheenBigAmmo':'SheenSmallAmmo';
return 'SheenBigAmmo';
return Random[Replacements](0,2)?'EvisceratorShell3':'EvisceratorShell2';
}
}