OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Tweak ammo spawns again.

Browse source
This commit is contained in:
Mari the Deer 2022-08-07 20:19:27 +02:00
commit afccfcb5ff
2 changed files with 10 additions and 11 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="\cyDEMOLITIONIST \cw1.3pre r270 \cu(Sun 7 Aug 15:16:28 CEST 2022)\c-";
SWWM_SHORTVER="\cw1.3pre r270 \cu(2022-08-07 15:16:28)\c-";
SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r271 \cu(Sun 7 Aug 20:19:27 CEST 2022)\c-";
SWWM_SHORTVER="\cw1.3pre r271 \cu(2022-08-07 20:19:27)\c-";

17
zscript/items/swwm_ammospawn.zsc
View file

@ -129,14 +129,13 @@ Class SWWMClipAmmoSmall : SWWMAmmoSpawner
{
override Class<Actor> PickAmmo( bool enemydrop )
{
if ( !Random[Replacements](0,4) )
if ( !Random[Replacements](0,2) )
{
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';
if ( aex )
return 'EvisceratorShell';
return Random[Replacements](0,2)?'SheenAmmo2':'SheenAmmo3';
if ( aex ) return 'EvisceratorShell';
}
bool aex = (SWWMUtility.ItemExists('Spreadgun',ownedonly:enemydrop)||SWWMUtility.ItemExists('Wallbuster',ownedonly:enemydrop)),
bex = (SWWMUtility.ItemExists('PuntzerBeta',ownedonly:enemydrop)||SWWMUtility.ItemExists('PuntzerGamma',ownedonly:enemydrop));
@ -153,8 +152,8 @@ 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)?'SheenAmmo3':'SheenSmallAmmo';
return Random[Replacements](0,1)?'EvisceratorShell':'EvisceratorShell2';
return Random[Replacements](0,2)?'SheenSmallAmmo':'SheenAmmo3';
return Random[Replacements](0,2)?'EvisceratorShell2':'EvisceratorShell';
}
}
Class SWWMClipAmmoBig : SWWMAmmoSpawner
@ -165,7 +164,7 @@ Class SWWMClipAmmoBig : SWWMAmmoSpawner
bex = SWWMUtility.ItemExists('HeavyMahSheenGun',ownedonly:enemydrop);
if ( (!aex && bex) || (Random[Replacements](0,1) && bex) )
return Random[Replacements](0,2)?'SheenSmallAmmo':'SheenBigAmmo';
return Random[Replacements](0,5)?'EvisceratorShell':Random[Replacements](0,2)?'EvisceratorShell2':'EvisceratorShell3';
return Random[Replacements](0,2)?'EvisceratorShell2':'EvisceratorShell3';
}
}
Class SWWMBlastAmmoSmall : SWWMAmmoSpawner
@ -186,8 +185,8 @@ 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)?'SheenSmallAmmo':'SheenBigAmmo';
return Random[Replacements](0,2)?'EvisceratorShell':Random[Replacements](0,1)?'EvisceratorShell2':'EvisceratorShell3';
return Random[Replacements](0,2)?'SheenBigAmmo':'SheenSmallAmmo';
return Random[Replacements](0,2)?'EvisceratorShell3':'EvisceratorShell2';
}
}
Class SWWMRocketAmmoSmall : SWWMAmmoSpawner