diff --git a/language.version b/language.version index e0e4f123b..056ae8b5a 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r735 \cu(Thu 19 Jan 22:40:26 CET 2023)\c-"; -SWWM_SHORTVER="\cw1.3pre r735 \cu(2023-01-19 22:40:26)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r736 \cu(Fri 20 Jan 22:38:45 CET 2023)\c-"; +SWWM_SHORTVER="\cw1.3pre r736 \cu(2023-01-20 22:38:45)\c-"; diff --git a/zscript/items/swwm_ammospawn.zsc b/zscript/items/swwm_ammospawn.zsc index 7843c8978..7312ae4e9 100644 --- a/zscript/items/swwm_ammospawn.zsc +++ b/zscript/items/swwm_ammospawn.zsc @@ -83,8 +83,8 @@ Class SWWMShellAmmoBig : SWWMAmmoSpawner bool aex = (SWWMUtility.ItemExists('Spreadgun',ownedonly:enemydrop)||SWWMUtility.ItemExists('Wallbuster',ownedonly:enemydrop)), bex = (SWWMUtility.ItemExists('PuntzerBeta',ownedonly:enemydrop)||SWWMUtility.ItemExists('PuntzerGamma',ownedonly:enemydrop)); if ( (!aex && bex) || (Random[Replacements](0,1) && bex) ) - return Random[Replacements](0,2)?'SMW05SmallAmmo':'SMW05BigAmmo'; - return Random[Replacements](0,2)?'RedShell4':'RedShell6'; + return Random[Replacements](0,3)?'SMW05SmallAmmo':'SMW05BigAmmo'; + return Random[Replacements](0,3)?'RedShell4':'RedShell6'; } } Class SWWMClipAmmoSmall : SWWMAmmoSpawner @@ -94,7 +94,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,1)?'SheenAmmo2':'SheenAmmo3'; + return Random[Replacements](0,2)?'SheenAmmo2':'SheenAmmo3'; if ( aex ) return 'EvisceratorShell'; aex = (SWWMUtility.ItemExists('Spreadgun',ownedonly:enemydrop)||SWWMUtility.ItemExists('Wallbuster',ownedonly:enemydrop)); bex = (SWWMUtility.ItemExists('PuntzerBeta',ownedonly:enemydrop)||SWWMUtility.ItemExists('PuntzerGamma',ownedonly:enemydrop)); @@ -111,7 +111,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 'SheenSmallAmmo'; + return Random[Replacements](0,2)?'SheenAmmo3':'SheenSmallAmmo'; return Random[Replacements](0,2)?'EvisceratorShell':'EvisceratorShell2'; } } @@ -122,8 +122,8 @@ 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 'SheenBigAmmo'; - return Random[Replacements](0,2)?'EvisceratorShell2':'EvisceratorShell3'; + return Random[Replacements](0,3)?'SheenSmallAmmo':'SheenBigAmmo'; + return Random[Replacements](0,3)?'EvisceratorShell2':'EvisceratorShell3'; } } Class SWWMBlastAmmoSmall : SWWMAmmoSpawner @@ -133,7 +133,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,1)?'SheenAmmo3':'SheenSmallAmmo'; + return Random[Replacements](0,2)?'SheenAmmo2':'SheenAmmo3'; return 'EvisceratorShell'; } } @@ -144,8 +144,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 'SheenBigAmmo'; - return Random[Replacements](0,2)?'EvisceratorShell2':'EvisceratorShell3'; + return Random[Replacements](0,3)?'SheenSmallAmmo':'SheenBigAmmo'; + return Random[Replacements](0,3)?'EvisceratorShell2':'EvisceratorShell3'; } } Class SWWMRocketAmmoSmall : SWWMAmmoSpawner