diff --git a/language.version b/language.version index 97c097401..eb773fc75 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1045 \cu(Fri 8 Dec 22:56:41 CET 2023)\c-"; -SWWM_SHORTVER="\cw1.3pre r1045 \cu(2023-12-08 22:56:41)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1046 \cu(Sat 9 Dec 09:35:09 CET 2023)\c-"; +SWWM_SHORTVER="\cw1.3pre r1046 \cu(2023-12-09 09:35:09)\c-"; diff --git a/zscript/items/swwm_ammospawn.zsc b/zscript/items/swwm_ammospawn.zsc index 95a7379fc..48af9787b 100644 --- a/zscript/items/swwm_ammospawn.zsc +++ b/zscript/items/swwm_ammospawn.zsc @@ -94,12 +94,12 @@ 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'; /*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)?'SMW05Ammo':'SMW05Ammo2';*/ + return Random[Replacements](0,1)?'SMW05Ammo':'SMW05Ammo2';*/ return 'RedShell'; } } @@ -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 Random[Replacements](0,3)?'SheenSmallAmmo':'SheenBigAmmo'; - return Random[Replacements](0,3)?'EvisceratorShell2':'EvisceratorShell3'; + return Random[Replacements](0,1)?'SheenSmallAmmo':'SheenBigAmmo'; + return Random[Replacements](0,1)?'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,2)?'SheenAmmo2':'SheenAmmo3'; + return 'SheenSmallAmmo'; 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 Random[Replacements](0,3)?'SheenSmallAmmo':'SheenBigAmmo'; - return Random[Replacements](0,3)?'EvisceratorShell2':'EvisceratorShell3'; + return 'SheenBigAmmo'; + return 'EvisceratorShell3'; } } Class SWWMRocketAmmoSmall : SWWMAmmoSpawner