diff --git a/language.version b/language.version index bd6ea648e..4f131a382 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r234 \cu(Fri 29 Jul 21:33:00 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r234 \cu(2022-07-29 21:33:00)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r235 \cu(Fri 29 Jul 21:33:25 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r235 \cu(2022-07-29 21:33:25)\c-"; diff --git a/zscript/dlc1/swwm_ammoitems_dlc.zsc b/zscript/dlc1/swwm_ammoitems_dlc.zsc index ab41d5146..1987cddc8 100644 --- a/zscript/dlc1/swwm_ammoitems_dlc.zsc +++ b/zscript/dlc1/swwm_ammoitems_dlc.zsc @@ -60,8 +60,8 @@ Class SheenAmmo : SWWMAmmo SWWMAmmo.PickupTag "SHEENBULLET"; Stamina 600; Inventory.Amount 1; - Inventory.MaxAmount 200; - Ammo.BackpackAmount 20; + Inventory.MaxAmount 400; + Ammo.BackpackAmount 40; Ammo.BackpackMaxAmount 800; Ammo.DropAmount 10; +FLOATBOB; diff --git a/zscript/items/swwm_ammospawn.zsc b/zscript/items/swwm_ammospawn.zsc index 08ddd9a5f..698cc3c94 100644 --- a/zscript/items/swwm_ammospawn.zsc +++ b/zscript/items/swwm_ammospawn.zsc @@ -49,7 +49,9 @@ Class SWWMShellAmmoSmall : SWWMAmmoSpawner static Class PickAmmo() { - if ( Random[Replacements](0,1) && (SWWMUtility.ItemExists('PuntzerBeta') || SWWMUtility.ItemExists('PuntzerGamma')) ) + bool aex = (SWWMUtility.ItemExists('Spreadgun')||SWWMUtility.ItemExists('Wallbuster')), + bex = (SWWMUtility.ItemExists('PuntzerBeta')||SWWMUtility.ItemExists('PuntzerGamma')); + if ( (!aex && bex) || (Random[Replacements](0,1) && bex) ) return Random[Replacements](0,2)?'SMW05SmallAmmo':'SMW05Ammo3'; switch( Random[Replacements](0,9) ) { @@ -75,7 +77,9 @@ Class SWWMShellAmmoBig : SWWMAmmoSpawner static Class PickAmmo() { - if ( Random[Replacements](0,1) && (SWWMUtility.ItemExists('PuntzerBeta') || SWWMUtility.ItemExists('PuntzerGamma')) ) + bool aex = (SWWMUtility.ItemExists('Spreadgun')||SWWMUtility.ItemExists('Wallbuster')), + bex = (SWWMUtility.ItemExists('PuntzerBeta')||SWWMUtility.ItemExists('PuntzerGamma')); + if ( (!aex && bex) || (Random[Replacements](0,1) && bex) ) return Random[Replacements](0,2)?'SMW05SmallAmmo':'SMW05BigAmmo'; switch( Random[Replacements](0,14) ) { @@ -109,12 +113,16 @@ Class SWWMClipAmmoSmall : SWWMAmmoSpawner { if ( !Random[Replacements](0,4) ) { - if ( Random[Replacements](0,1) && SWWMUtility.ItemExists('HeavyMahsheenGun') ) + bool aex = SWWMUtility.ItemExists('Eviscerator'), + bex = SWWMUtility.ItemExists('HeavyMahSheenGun'); + if ( (!aex && bex) || (Random[Replacements](0,1) && bex) ) return Random[Replacements](0,2)?'SheenAmmo3':'SheenSmallAmmo'; - if ( SWWMUtility.ItemExists('Eviscerator') ) + if ( aex ) return 'EvisceratorShell'; } - if ( Random[Replacements](0,1) && (SWWMUtility.ItemExists('PuntzerBeta') || SWWMUtility.ItemExists('PuntzerGamma')) ) + bool aex = (SWWMUtility.ItemExists('Spreadgun')||SWWMUtility.ItemExists('Wallbuster')), + bex = (SWWMUtility.ItemExists('PuntzerBeta')||SWWMUtility.ItemExists('PuntzerGamma')); + if ( (!aex && bex) || (Random[Replacements](0,1) && bex) ) return Random[Replacements](0,2)?'SMW05Ammo':'SMW05Ammo2'; return Random[Replacements](0,1)?'RedShell':'GreenShell'; } @@ -125,7 +133,9 @@ Class SWWMClipAmmoBig : SWWMAmmoSpawner static Class PickAmmo() { - if ( Random[Replacements](0,1) && SWWMUtility.ItemExists('HeavyMahsheenGun') ) + bool aex = SWWMUtility.ItemExists('Eviscerator'), + bex = SWWMUtility.ItemExists('HeavyMahSheenGun'); + 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'; } @@ -136,7 +146,9 @@ Class SWWMBlastAmmoSmall : SWWMAmmoSpawner static Class PickAmmo() { - if ( Random[Replacements](0,1) && SWWMUtility.ItemExists('HeavyMahsheenGun') ) + bool aex = SWWMUtility.ItemExists('Eviscerator'), + bex = SWWMUtility.ItemExists('HeavyMahSheenGun'); + if ( (!aex && bex) || (Random[Replacements](0,1) && bex) ) return Random[Replacements](0,2)?'SheenAmmo3':'SheenSmallAmmo'; return 'EvisceratorShell'; } @@ -147,7 +159,9 @@ Class SWWMBlastAmmoBig : SWWMAmmoSpawner static Class PickAmmo() { - if ( Random[Replacements](0,1) && SWWMUtility.ItemExists('HeavyMahsheenGun') ) + bool aex = SWWMUtility.ItemExists('Eviscerator'), + bex = SWWMUtility.ItemExists('HeavyMahSheenGun'); + 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'; } @@ -158,7 +172,9 @@ Class SWWMRocketAmmoSmall : SWWMAmmoSpawner static Class PickAmmo() { - if ( Random[Replacements](0,1) && SWWMUtility.ItemExists('Quadravol') ) return 'QuadravolAmmo'; + bool aex = SWWMUtility.ItemExists('Hellblazer'), + bex = SWWMUtility.ItemExists('Quadravol'); + if ( (!aex && bex) || (Random[Replacements](0,1) && bex) ) return 'QuadravolAmmo'; return Random[Replacements](0,2)?'HellblazerMissiles':'HellblazerCrackshots'; } } @@ -168,7 +184,9 @@ Class SWWMRocketAmmoBig : SWWMAmmoSpawner static Class PickAmmo() { - if ( Random[Replacements](0,1) && SWWMUtility.ItemExists('Quadravol') ) + bool aex = SWWMUtility.ItemExists('Hellblazer'), + bex = SWWMUtility.ItemExists('Quadravol'); + if ( (!aex && bex) || (Random[Replacements](0,1) && bex) ) return Random[Replacements](0,4)?'QuadravolAmmo2':'QuadravolAmmo3'; switch ( Random[Replacements](0,11) ) { @@ -201,13 +219,19 @@ Class SWWMCellAmmoSmall : SWWMAmmoSpawner { if ( !Random[Replacements](0,3) ) { - if ( !Random[Replacements](0,2) && SWWMUtility.ItemExists('MisterRifle') ) return 'MisterGAmmo'; - if ( SWWMUtility.ItemExists('CandyGun') ) return 'CandyGunBullets'; + bool aex = SWWMUtility.ItemExists('CandyGun'), + bex = SWWMUtility.ItemExists('MisterRifle'); + if ( (!aex && bex) || (!Random[Replacements](0,2) && bex) ) return 'MisterGAmmo'; + if ( aex ) return 'CandyGunBullets'; } - if ( Random[Replacements](0,1) && SWWMUtility.ItemExists('RayKhom') ) return 'RayBolt2'; - if ( SWWMUtility.ItemExists('SilverBullet') ) return Random[Replacements](0,2)?'SilverBullets':'SilverBullets2'; + bool aex = SWWMUtility.ItemExists('SilverBullet'), + bex = SWWMUtility.ItemExists('RayKhom'); + if ( (!aex && bex) || (Random[Replacements](0,1) && bex) ) return 'RayBolt2'; + if ( aex ) return Random[Replacements](0,2)?'SilverBullets':'SilverBullets2'; } - if ( Random[Replacements](0,1) && SWWMUtility.ItemExists('ModernSparkster') ) return Random[Replacements](0,2)?'SparksterBAmmo':'SparksterRAmmo'; + bool aex = SWWMUtility.ItemExists('Sparkster'), + bex = SWWMUtility.ItemExists('ModernSparkster'); + if ( (!aex && bex) || (Random[Replacements](0,1) && bex) ) return Random[Replacements](0,2)?'SparksterBAmmo':'SparksterRAmmo'; return 'SparkUnit'; } } @@ -226,16 +250,25 @@ Class SWWMCellAmmoBig : SWWMAmmoSpawner } if ( Random[Replacements](0,1) ) { - if ( Random[Replacements](0,1) && SWWMUtility.ItemExists('RayKhom') ) return Random[Replacements](0,2)?'RayBolt5':'RayAmmo'; - if ( SWWMUtility.ItemExists('MisterRifle') ) return Random[Replacements](0,2)?'MisterRound5':'MisterAmmo'; + bool aex = SWWMUtility.ItemExists('SilverBullet'), + bex = SWWMUtility.ItemExists('RayKhom'); + if ( (!aex && bex) || (Random[Replacements](0,1) && bex) ) return Random[Replacements](0,2)?'RayBolt5':'RayAmmo'; + if ( aex ) + { + if ( Random[Replacements](0,3) ) return Random[Replacements](0,2)?'SilverBullets_2':'SilverBullets2_2'; + return Random[Replacements](0,2)?'SilverBulletAmmo':'SilverBulletAmmo2'; + } } - if ( !Random[Replacements](0,2) && SWWMUtility.ItemExists('SilverBullet') ) + if ( !Random[Replacements](0,2) ) { - if ( Random[Replacements](0,3) ) return Random[Replacements](0,2)?'SilverBullets_2':'SilverBullets2_2'; - return Random[Replacements](0,2)?'SilverBulletAmmo':'SilverBulletAmmo2'; + bool aex = SWWMUtility.ItemExists('CandyGun'), + bex = SWWMUtility.ItemExists('MisterRifle'); + if ( (!aex && bex) || (Random[Replacements](0,1) && bex) ) return Random[Replacements](0,2)?'MisterRound5':'MisterAmmo'; + if ( aex ) return Random[Replacements](0,3)?'CandyGunBullets3':'CandyGunAmmo'; } - if ( SWWMUtility.ItemExists('CandyGun') ) return Random[Replacements](0,3)?'CandyGunBullets3':'CandyGunAmmo'; - if ( Random[Replacements](0,1) && SWWMUtility.ItemExists('ModernSparkster') ) + bool aex = SWWMUtility.ItemExists('Sparkster'), + bex = SWWMUtility.ItemExists('ModernSparkster'); + if ( (!aex && bex) || (Random[Replacements](0,1) && bex) ) { if ( Random[Replacements](0,1) ) return Random[Replacements](0,2)?'SparksterBAmmo2':'SparksterBAmmo3'; return Random[Replacements](0,2)?'SparksterRAmmo2':'SparksterRAmmo3';