diff --git a/MAPPING.md b/MAPPING.md index 0225097da..537ada003 100644 --- a/MAPPING.md +++ b/MAPPING.md @@ -63,8 +63,6 @@ DoomEdNums 29023 = "RedShell4" 29024 = "RedShell6" 29025 = "GoldShell" - 29026 = "GoldShell2" - 29027 = "GoldShell4" 29028 = "EvisceratorShell" 29029 = "EvisceratorShell2" 29030 = "EvisceratorShell3" diff --git a/gldefs.txt b/gldefs.txt index e89b3dea7..0924763d3 100644 --- a/gldefs.txt +++ b/gldefs.txt @@ -23,7 +23,7 @@ // dlc weaponset #include "gldefs/dlc1/dlcammo.txt" #include "gldefs/dlc1/hammer.txt" -#include "gldefs/dlc1/plasmablast.txt" +//#include "gldefs/dlc1/plasmablast.txt" #include "gldefs/dlc1/sheenhmg.txt" #include "gldefs/dlc1/quadravol.txt" #include "gldefs/dlc1/mortalrifle.txt" diff --git a/language.version b/language.version index fd4f2fe7f..e12026cd4 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r973 \cu(Wed 4 Oct 18:24:25 CEST 2023)\c-"; -SWWM_SHORTVER="\cw1.3pre r973 \cu(2023-10-04 18:24:25)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r974 \cu(Tue 10 Oct 14:39:12 CEST 2023)\c-"; +SWWM_SHORTVER="\cw1.3pre r974 \cu(2023-10-10 14:39:12)\c-"; diff --git a/modeldef.txt b/modeldef.txt index 4e6ce7b3a..e18d374fb 100644 --- a/modeldef.txt +++ b/modeldef.txt @@ -23,12 +23,12 @@ // dlc weaponset #include "modeldef/dlc1/dlcammo.txt" #include "modeldef/dlc1/hammer.txt" -#include "modeldef/dlc1/plasmablast.txt" -#include "modeldef/dlc1/puntzerbeta.txt" -#include "modeldef/dlc1/puntzergamma.txt" +//#include "modeldef/dlc1/plasmablast.txt" +//#include "modeldef/dlc1/puntzerbeta.txt" +//#include "modeldef/dlc1/puntzergamma.txt" #include "modeldef/dlc1/sheenhmg.txt" #include "modeldef/dlc1/quadravol.txt" -#include "modeldef/dlc1/newsparkster.txt" -#include "modeldef/dlc1/raykhom.txt" +//#include "modeldef/dlc1/newsparkster.txt" +//#include "modeldef/dlc1/raykhom.txt" #include "modeldef/dlc1/mortalrifle.txt" -#include "modeldef/dlc1/rafankos.txt" +//#include "modeldef/dlc1/rafankos.txt" diff --git a/modeldef/dlc1/dlcammo.txt b/modeldef/dlc1/dlcammo.txt index 65cc43149..703593350 100644 --- a/modeldef/dlc1/dlcammo.txt +++ b/modeldef/dlc1/dlcammo.txt @@ -1,6 +1,6 @@ // dlc ammunition -Model "SMW05Ammo" +/*Model "SMW05Ammo" { Path "models/extra" @@ -64,7 +64,7 @@ Model "SMW05BigAmmo" CORRECTPIXELSTRETCH FrameIndex XZW1 A 0 0 -} +}*/ Model "SheenAmmo" { @@ -165,7 +165,7 @@ Model "QuadravolAmmo3" FrameIndex XZW1 A 0 0 } -Model "SparksterBAmmo" +/*Model "SparksterBAmmo" { Path "models/extra" @@ -295,7 +295,7 @@ Model "RayAmmo" CORRECTPIXELSTRETCH FrameIndex XZW1 A 0 0 -} +}*/ Model "MisterRound" { @@ -369,7 +369,7 @@ Model "MisterGAmmo" FrameIndex XZW1 A 0 0 } -Model "UltimatePod" +/*Model "UltimatePod" { Path "models/extra" @@ -394,4 +394,4 @@ Model "UltimateAmmo" CORRECTPIXELSTRETCH FrameIndex XZW1 A 0 0 -} +}*/ diff --git a/zscript.txt b/zscript.txt index cb657d291..93ab88ece 100644 --- a/zscript.txt +++ b/zscript.txt @@ -154,24 +154,24 @@ version "4.11" #include "zscript/dlc1/swwm_ammoitems_dlc.zsc" #include "zscript/dlc1/swwm_hammertime.zsc" #include "zscript/dlc1/swwm_hammertime_fx.zsc" -#include "zscript/dlc1/swwm_blastin.zsc" -#include "zscript/dlc1/swwm_blastin_fx.zsc" -#include "zscript/dlc1/swwm_rebolber.zsc" -#include "zscript/dlc1/swwm_rebolber_fx.zsc" -#include "zscript/dlc1/swwm_supermarioworld.zsc" -#include "zscript/dlc1/swwm_supermarioworld_fx.zsc" +//#include "zscript/dlc1/swwm_blastin.zsc" +//#include "zscript/dlc1/swwm_blastin_fx.zsc" +//#include "zscript/dlc1/swwm_rebolber.zsc" +//#include "zscript/dlc1/swwm_rebolber_fx.zsc" +//#include "zscript/dlc1/swwm_supermarioworld.zsc" +//#include "zscript/dlc1/swwm_supermarioworld_fx.zsc" #include "zscript/dlc1/swwm_heavymahsheengun.zsc" #include "zscript/dlc1/swwm_heavymahsheengun_fx.zsc" #include "zscript/dlc1/swwm_notashotgun.zsc" #include "zscript/dlc1/swwm_notashotgun_fx.zsc" -#include "zscript/dlc1/swwm_blueballs.zsc" -#include "zscript/dlc1/swwm_blueballs_fx.zsc" +//#include "zscript/dlc1/swwm_blueballs.zsc" +//#include "zscript/dlc1/swwm_blueballs_fx.zsc" #include "zscript/dlc1/swwm_mister.zsc" #include "zscript/dlc1/swwm_mister_fx.zsc" -#include "zscript/dlc1/swwm_thiccbolts.zsc" -#include "zscript/dlc1/swwm_thiccbolts_fx.zsc" -#include "zscript/dlc1/swwm_ultimate.zsc" -#include "zscript/dlc1/swwm_ultimate_fx.zsc" +//#include "zscript/dlc1/swwm_thiccbolts.zsc" +//#include "zscript/dlc1/swwm_thiccbolts_fx.zsc" +//#include "zscript/dlc1/swwm_ultimate.zsc" +//#include "zscript/dlc1/swwm_ultimate_fx.zsc" #include "zscript/dlc1/swwm_dlcweapons_hud.zsc" #include "zscript/dlc1/swwm_dlcweapons_canvas.zsc" // DLC2 - Game Set diff --git a/zscript/dlc1/swwm_ammoitems_dlc.zsc b/zscript/dlc1/swwm_ammoitems_dlc.zsc index 3e9cd1ff0..a9e4f4913 100644 --- a/zscript/dlc1/swwm_ammoitems_dlc.zsc +++ b/zscript/dlc1/swwm_ammoitems_dlc.zsc @@ -1,6 +1,6 @@ // All DLC weapon ammo pickups -Class SMW05Ammo : SWWMAmmo +/*Class SMW05Ammo : SWWMAmmo { Default { @@ -48,7 +48,7 @@ Class SMW05BigAmmo : SMW05Ammo { Inventory.Amount 30; } -} +}*/ Class SheenAmmo : SWWMAmmo { @@ -136,7 +136,7 @@ Class QuadravolAmmo3 : QuadravolAmmo } } -Class SparksterBAmmo : SWWMAmmo +/*Class SparksterBAmmo : SWWMAmmo { Default { @@ -263,7 +263,7 @@ Class RayAmmo : SWWMAmmo XZW1 A -1; Stop; } -} +}*/ Class MisterRound : MagAmmo { @@ -351,7 +351,7 @@ Class MisterGAmmo : SWWMAmmo } } -Class UltimatePod : MagAmmo +/*Class UltimatePod : MagAmmo { Default { @@ -392,4 +392,4 @@ Class UltimateAmmo : SWWMAmmo XZW1 A -1; Stop; } -} +}*/ diff --git a/zscript/dlc1/swwm_dlcweapons_canvas.zsc b/zscript/dlc1/swwm_dlcweapons_canvas.zsc index 33804e25a..566f07e73 100644 --- a/zscript/dlc1/swwm_dlcweapons_canvas.zsc +++ b/zscript/dlc1/swwm_dlcweapons_canvas.zsc @@ -1,7 +1,7 @@ // RenderTexture code for DLC weapons // Plasma Blaster -extend Class PlasmaBlast +/*extend Class PlasmaBlast { override void RenderTexture( RenderEvent e ) { @@ -19,7 +19,7 @@ extend Class DualPlasmaBlast // ammo display // dynamic glow } -} +}*/ // Sheen HMG extend Class HeavyMahSheenGun @@ -104,13 +104,13 @@ extend Class Quadravol } // Ray-Khom -extend Class RayKhom +/*extend Class RayKhom { override void RenderTexture( RenderEvent e ) { // ammo display } -} +}*/ // Mortal Rifle extend Class MisterRifle @@ -283,11 +283,11 @@ extend Class MisterRifle } // Rafan-Kos -extend Class RafanKos +/*extend Class RafanKos { override void RenderTexture( RenderEvent e ) { // ammo display // dynamic glow } -} +}*/ diff --git a/zscript/dlc1/swwm_dlcweapons_hud.zsc b/zscript/dlc1/swwm_dlcweapons_hud.zsc index b61fa4b83..e4eff1e83 100644 --- a/zscript/dlc1/swwm_dlcweapons_hud.zsc +++ b/zscript/dlc1/swwm_dlcweapons_hud.zsc @@ -20,7 +20,7 @@ extend Class ItamexHammer } // Plasma Blaster -extend Class PlasmaBlast +/*extend Class PlasmaBlast { override void DrawWeapon( double TicFrac, double bx, double by, double hs, Vector2 ss ) { @@ -48,7 +48,7 @@ extend Class PuntzerGamma override void DrawWeapon( double TicFrac, double bx, double by, double hs, Vector2 ss ) { } -} +}*/ // Sheen HMG extend Class HeavyMahSheenGun @@ -128,7 +128,7 @@ extend Class Quadravol } // Sparkster Rifle -extend Class ModernSparkster +/*extend Class ModernSparkster { override void DrawWeapon( double TicFrac, double bx, double by, double hs, Vector2 ss ) { @@ -141,7 +141,7 @@ extend Class RayKhom override void DrawWeapon( double TicFrac, double bx, double by, double hs, Vector2 ss ) { } -} +}*/ // Mortal Rifle extend Class MisterRifle @@ -167,9 +167,9 @@ extend Class MisterRifle } // Rafan-Kos -extend Class RafanKos +/*extend Class RafanKos { override void DrawWeapon( double TicFrac, double bx, double by, double hs, Vector2 ss ) { } -} +}*/ diff --git a/zscript/hud/swwm_hud.zsc b/zscript/hud/swwm_hud.zsc index 4142aec76..fe3a22567 100644 --- a/zscript/hud/swwm_hud.zsc +++ b/zscript/hud/swwm_hud.zsc @@ -377,40 +377,40 @@ Class SWWMStatusBar : BaseStatusBar for ( int i=0; i<10; i++ ) LagHealth[i] = LastHealth; AmmoSlots[0] = 'RedShell'; AmmoSlots[1] = 'GoldShell'; - AmmoSlots[2] = 'SMW05Ammo'; + //AmmoSlots[2] = 'SMW05Ammo'; AmmoSlots[3] = 'EvisceratorShell'; AmmoSlots[4] = 'SheenAmmo'; AmmoSlots[5] = 'HellblazerMissiles'; AmmoSlots[6] = 'QuadravolAmmo'; AmmoSlots[7] = 'SparkUnit'; - AmmoSlots[8] = 'SparksterBAmmo'; - AmmoSlots[9] = 'SparksterRAmmo'; + //AmmoSlots[8] = 'SparksterBAmmo'; + //AmmoSlots[9] = 'SparksterRAmmo'; AmmoSlots[10] = 'SilverBulletAmmo'; - AmmoSlots[11] = 'RayAmmo'; + //AmmoSlots[11] = 'RayAmmo'; AmmoSlots[12] = 'CandyGunAmmo'; AmmoSlots[13] = 'CandyGunSpares'; AmmoSlots[14] = 'MisterAmmo'; AmmoSlots[15] = 'MisterGAmmo'; AmmoSlots[16] = 'YnykronAmmo'; - AmmoSlots[17] = 'UltimateAmmo'; + //AmmoSlots[17] = 'UltimateAmmo'; AmmoNames[0] = "SHOT"; AmmoNames[1] = "GOLD"; - AmmoNames[2] = "SCRW"; + //AmmoNames[2] = "SCRW"; AmmoNames[3] = "FLAK"; AmmoNames[4] = "MACH"; AmmoNames[5] = "MISL"; AmmoNames[6] = "QUAD"; AmmoNames[7] = "BSPK"; - AmmoNames[8] = "KINY"; - AmmoNames[9] = "NOKR"; + //AmmoNames[8] = "KINY"; + //AmmoNames[9] = "NOKR"; AmmoNames[10] = "RIFL"; - AmmoNames[11] = "BOLT"; + //AmmoNames[11] = "BOLT"; AmmoNames[12] = "CAND"; AmmoNames[13] = "CGUN"; AmmoNames[14] = "MSTR"; AmmoNames[15] = "MGRN"; AmmoNames[16] = "CRYS"; - AmmoNames[17] = "ULTI"; + //AmmoNames[17] = "ULTI"; for ( int i=0; i<18; i++ ) { AmmoFlash[i] = 0; diff --git a/zscript/hud/swwm_hud_weapons.zsc b/zscript/hud/swwm_hud_weapons.zsc index e250144f5..aa556ea51 100644 --- a/zscript/hud/swwm_hud_weapons.zsc +++ b/zscript/hud/swwm_hud_weapons.zsc @@ -6,6 +6,7 @@ extend Class SWWMStatusBar // ammo updates for ( int i=0; i<18; i++ ) { + if ( !AmmoSlots[i] ) continue; let a = SWWMAmmo(CPlayer.mo.FindInventory(AmmoSlots[i])); int amt = 0; int maxamt = 0; @@ -142,6 +143,7 @@ extend Class SWWMStatusBar for ( int i=17; i>=0; i-- ) { let a = AmmoSlots[i]; + if ( !a ) continue; // check if owned if ( checkowned ) { diff --git a/zscript/items/swwm_ammospawn.zsc b/zscript/items/swwm_ammospawn.zsc index 7312ae4e9..18c090fab 100644 --- a/zscript/items/swwm_ammospawn.zsc +++ b/zscript/items/swwm_ammospawn.zsc @@ -69,10 +69,10 @@ Class SWWMShellAmmoSmall : SWWMAmmoSpawner { override Class PickAmmo( bool enemydrop ) { - bool aex = (SWWMUtility.ItemExists('Spreadgun',ownedonly:enemydrop)||SWWMUtility.ItemExists('Wallbuster',ownedonly:enemydrop)), + /*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)?'SMW05Ammo2':'SMW05Ammo3'; + return Random[Replacements](0,2)?'SMW05Ammo2':'SMW05Ammo3';*/ return Random[Replacements](0,2)?'RedShell':'RedShell2'; } } @@ -80,10 +80,10 @@ Class SWWMShellAmmoBig : SWWMAmmoSpawner { override Class PickAmmo( bool enemydrop ) { - bool aex = (SWWMUtility.ItemExists('Spreadgun',ownedonly:enemydrop)||SWWMUtility.ItemExists('Wallbuster',ownedonly:enemydrop)), + /*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,3)?'SMW05SmallAmmo':'SMW05BigAmmo'; + return Random[Replacements](0,3)?'SMW05SmallAmmo':'SMW05BigAmmo';*/ return Random[Replacements](0,3)?'RedShell4':'RedShell6'; } } @@ -96,10 +96,10 @@ Class SWWMClipAmmoSmall : SWWMAmmoSpawner if ( (!aex && bex) || (Random[Replacements](0,1) && bex) ) return Random[Replacements](0,2)?'SheenAmmo2':'SheenAmmo3'; if ( aex ) return 'EvisceratorShell'; - aex = (SWWMUtility.ItemExists('Spreadgun',ownedonly:enemydrop)||SWWMUtility.ItemExists('Wallbuster',ownedonly:enemydrop)); + /*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,2)?'SMW05Ammo':'SMW05Ammo2';*/ return 'RedShell'; } } @@ -182,14 +182,14 @@ Class SWWMCellAmmoSmall : SWWMAmmoSpawner } if ( Random[Replacements](0,1) ) { - bool aex = SWWMUtility.ItemExists('SilverBullet',ownedonly:enemydrop), + bool aex = SWWMUtility.ItemExists('SilverBullet',ownedonly:enemydrop)/*, bex = SWWMUtility.ItemExists('RayKhom',ownedonly:enemydrop); - if ( (!aex && bex) || (Random[Replacements](0,1) && bex) ) return 'RayBolt2'; + if ( (!aex && bex) || (Random[Replacements](0,1) && bex) ) return 'RayBolt2'*/; if ( aex ) return Random[Replacements](0,2)?'SilverBullets':'SilverBullets2'; } - bool aex = SWWMUtility.ItemExists('Sparkster',ownedonly:enemydrop), + /*bool aex = SWWMUtility.ItemExists('Sparkster',ownedonly:enemydrop), bex = SWWMUtility.ItemExists('ModernSparkster',ownedonly:enemydrop); - if ( (!aex && bex) || (Random[Replacements](0,1) && bex) ) return Random[Replacements](0,2)?'SparksterBAmmo':'SparksterRAmmo'; + if ( (!aex && bex) || (Random[Replacements](0,1) && bex) ) return Random[Replacements](0,2)?'SparksterBAmmo':'SparksterRAmmo';*/ return 'SparkUnit'; } } @@ -199,8 +199,8 @@ Class SWWMCellAmmoBig : SWWMAmmoSpawner { if ( !Random[Replacements](0,3) ) { - if ( Random[Replacements](0,1) && SWWMUtility.ItemExists('RafanKos') && SWWMUtility.CheckNeedsItem('UltimateAmmo',true) && !SWWMUtility.ItemExists('UltimateAmmo',worldonly:true) && !SWWMUtility.ItemExists('RafanKos',worldonly:true) ) - return 'UltimateAmmo'; + /*if ( Random[Replacements](0,1) && SWWMUtility.ItemExists('RafanKos') && SWWMUtility.CheckNeedsItem('UltimateAmmo',true) && !SWWMUtility.ItemExists('UltimateAmmo',worldonly:true) && !SWWMUtility.ItemExists('RafanKos',worldonly:true) ) + return 'UltimateAmmo';*/ if ( (SWWMUtility.ItemExists('Ynykron')) && SWWMUtility.CheckNeedsItem('YnykronAmmo',true) && !SWWMUtility.ItemExists('YnykronAmmo',worldonly:true) && !SWWMUtility.ItemExists('Ynykron',worldonly:true) ) return 'YnykronAmmo'; } @@ -213,18 +213,18 @@ Class SWWMCellAmmoBig : SWWMAmmoSpawner } if ( Random[Replacements](0,1) ) { - bool aex = SWWMUtility.ItemExists('SilverBullet',ownedonly:enemydrop), + bool aex = SWWMUtility.ItemExists('SilverBullet',ownedonly:enemydrop)/*, bex = SWWMUtility.ItemExists('RayKhom',ownedonly:enemydrop); - if ( (!aex && bex) || (Random[Replacements](0,1) && bex) ) return Random[Replacements](0,2)?'RayBolt5':'RayAmmo'; + if ( (!aex && bex) || (Random[Replacements](0,1) && bex) ) return Random[Replacements](0,2)?'RayBolt5':'RayAmmo'*/; if ( aex ) return Random[Replacements](0,3)?'SilverBullets3':'SilverBulletAmmo'; } - bool aex = SWWMUtility.ItemExists('Sparkster',ownedonly:enemydrop), + /*bool aex = SWWMUtility.ItemExists('Sparkster',ownedonly:enemydrop), bex = SWWMUtility.ItemExists('ModernSparkster',ownedonly:enemydrop); 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'; - } + }*/ return Random[Replacements](0,3)?'SparkUnit':'SparkUnit2'; } } diff --git a/zscript/items/swwm_funstuff.zsc b/zscript/items/swwm_funstuff.zsc index bc141353d..8d00bfc46 100644 --- a/zscript/items/swwm_funstuff.zsc +++ b/zscript/items/swwm_funstuff.zsc @@ -803,7 +803,7 @@ Class RewardVIPItems : ChanceboxReward { Class vipammodrop = null; if ( SWWMUtility.ItemExists("Ynykron",ownedonly:true) && SWWMUtility.CheckNeedsItem("YnykronAmmo",true) && Random[Chancebox](0,1) ) vipammodrop = "YnykronAmmo"; - if ( SWWMUtility.ItemExists("RafanKos",ownedonly:true) && SWWMUtility.CheckNeedsItem("UltimateAmmo",true) && Random[Chancebox](0,1) && !vipammodrop ) vipammodrop = "UltimateAmmo"; + //if ( SWWMUtility.ItemExists("RafanKos",ownedonly:true) && SWWMUtility.CheckNeedsItem("UltimateAmmo",true) && Random[Chancebox](0,1) && !vipammodrop ) vipammodrop = "UltimateAmmo"; if ( SWWMUtility.ItemExists("Spreadgun",ownedonly:true) && SWWMUtility.CheckNeedsItem("GoldShell",true) && !vipammodrop ) vipammodrop = "GoldShell"; Class vipitemdrop = null; if ( SWWMUtility.CheckNeedsItem("Mykradvo",true) && !SWWMUtility.ItemExists("Mykradvo",worldonly:true) && Random[Chancebox](0,1) ) vipitemdrop = "Mykradvo"; @@ -857,7 +857,7 @@ Class RewardCandyGun : ChanceboxReward } } // them big bolts -Class RewardThiccBolts : ChanceboxReward +/*Class RewardThiccBolts : ChanceboxReward { override bool CheckRequirements() { @@ -870,7 +870,7 @@ Class RewardThiccBolts : ChanceboxReward SpawnCircle(pos,4,"RayBolt"); SpawnCircle(pos,6,"RayBolt",3.); } -} +}*/ // them silver bullets Class RewardSilverBullets : ChanceboxReward { @@ -886,7 +886,7 @@ Class RewardSilverBullets : ChanceboxReward } } // blues 'n reds -Class RewardSparkCells : ChanceboxReward +/*Class RewardSparkCells : ChanceboxReward { override bool CheckRequirements() { @@ -897,7 +897,7 @@ Class RewardSparkCells : ChanceboxReward { SpawnCircle(pos,6,"SparksterBAmmo",item2:"SparksterRAmmo"); } -} +}*/ // buncha spark units Class RewardSparkUnits : ChanceboxReward { @@ -972,7 +972,7 @@ Class RewardFlakShells : ChanceboxReward } } // screwbullet droppage -Class RewardScrews : ChanceboxReward +/*Class RewardScrews : ChanceboxReward { override bool CheckRequirements() { @@ -985,7 +985,7 @@ Class RewardScrews : ChanceboxReward SpawnCircle(pos,6,"SMW05Ammo2",2.); SpawnCircle(pos,12,"SMW05Ammo",4.); } -} +}*/ // Lotta shells Class RewardShells : ChanceboxReward { diff --git a/zscript/utility/swwm_utility_info.zsc b/zscript/utility/swwm_utility_info.zsc index d861c5813..4d2cc8713 100644 --- a/zscript/utility/swwm_utility_info.zsc +++ b/zscript/utility/swwm_utility_info.zsc @@ -293,8 +293,8 @@ extend Class SWWMUtility if ( i is 'Quadravol' ) return true; if ( i is 'Sparkster' ) return true; if ( i is 'CandyGun' ) return true; - if ( i is 'RayKhom' ) return true; - if ( i is 'RafanKos' ) return true; + //if ( i is 'RayKhom' ) return true; + //if ( i is 'RafanKos' ) return true; if ( i is 'HealthNuggetItem' ) return true; if ( i is 'ArmorNuggetItem' ) return true; if ( i is 'WarArmor' ) return true; @@ -406,9 +406,9 @@ extend Class SWWMUtility return true; if ( target is 'SWWMCollectible' ) return true; - if ( (target is 'Ynykron') || (target is 'RafanKos') ) + if ( (target is 'Ynykron')/* || (target is 'RafanKos')*/ ) return true; - if ( (target is 'GoldShell') || (target is 'YnykronAmmo') || (target is 'UltimatePod') || (target is 'UltimateAmmo') ) + if ( (target is 'GoldShell') || (target is 'YnykronAmmo')/* || (target is 'UltimatePod') || (target is 'UltimateAmmo')*/ ) return true; if ( (target is 'Mykradvo') || (target is 'AngerySigil') || (target is 'DivineSprite') ) return true; @@ -420,9 +420,9 @@ extend Class SWWMUtility // used by the store static bool IsVipItemClass( Class target ) { - if ( (target is 'Ynykron') || (target is 'RafanKos') ) + if ( (target is 'Ynykron')/* || (target is 'RafanKos')*/ ) return true; - if ( (target is 'GoldShell') || (target is 'YnykronAmmo') || (target is 'UltimatePod') || (target is 'UltimateAmmo') ) + if ( (target is 'GoldShell') || (target is 'YnykronAmmo')/* || (target is 'UltimatePod') || (target is 'UltimateAmmo')*/ ) return true; if ( (target is 'Mykradvo') || (target is 'AngerySigil') || (target is 'DivineSprite') ) return true; diff --git a/zscript/utility/swwm_utility_item.zsc b/zscript/utility/swwm_utility_item.zsc index 76d1ba17e..472fa018d 100644 --- a/zscript/utility/swwm_utility_item.zsc +++ b/zscript/utility/swwm_utility_item.zsc @@ -215,22 +215,25 @@ extend Class SWWMUtility // pistol spawn, pretty simple static Class PickSWWMSlot2() { + return 'ExplodiumGun'; // as they are dual-wieldable, there should be a 50% chance for spares to also appear if needed - if ( Random[Replacements](0,1) && !CheckNeedsItem('ExplodiumGun') && CheckNeedsItem('ExplodiumGun',true) ) + /*if ( Random[Replacements](0,1) && !CheckNeedsItem('ExplodiumGun') && CheckNeedsItem('ExplodiumGun',true) ) return 'ExplodiumGun'; if ( Random[Replacements](0,1) && !CheckNeedsItem('PlasmaBlast') && CheckNeedsItem('PlasmaBlast',true) ) return 'PlasmaBlast'; - return PickPair('ExplodiumGun','PlasmaBlast'); + return PickPair('ExplodiumGun','PlasmaBlast');*/ } // shotgun spawn static Class PickSWWMSlot3() { - return PickPair('Spreadgun','PuntzerBeta'); + return 'Spreadgun'; + //return PickPair('Spreadgun','PuntzerBeta'); } // super shotgun spawn static Class PickSWWMSlot4() { - return PickPair('Wallbuster','PuntzerGamma'); + return 'Wallbuster'; + //return PickPair('Wallbuster','PuntzerGamma'); } // chaingun spawn static Class PickSWWMSlot5() @@ -245,12 +248,14 @@ extend Class SWWMUtility // first plasma rifle spawn static Class PickSWWMSlot7() { - return PickPair('Sparkster','ModernSparkster'); + return 'Sparkster'; + //return PickPair('Sparkster','ModernSparkster'); } // second plasma rifle spawn static Class PickSWWMSlot8() { - return PickPair('SilverBullet','RayKhom'); + return 'SilverBullet'; + //return PickPair('SilverBullet','RayKhom'); } // first bfg spawn static Class PickSWWMSlot9() @@ -265,19 +270,19 @@ extend Class SWWMUtility { if ( ItemExists('Ynykron',mapstart:true) ) { - if ( ItemExists('RafanKos',mapstart:true) ) + //if ( ItemExists('RafanKos',mapstart:true) ) return fallback?PickSWWMSlot9():null; - return 'RafanKos'; + //return 'RafanKos'; } - if ( ItemExists('RafanKos',mapstart:true) ) + //if ( ItemExists('RafanKos',mapstart:true) ) return 'Ynykron'; - return Random[Replacements](0,1)?'Ynykron':'RafanKos'; + //return Random[Replacements](0,1)?'Ynykron':'RafanKos'; } // either plasma rifle spawn static Class PickDoomSlot6() { - bool hasslot7 = (!CheckNeedsItem('Sparkster')||!CheckNeedsItem('ModernSparkster')); - bool hasslot8 = (!CheckNeedsItem('SilverBullet')||!CheckNeedsItem('RayKhom')); + bool hasslot7 = (!CheckNeedsItem('Sparkster')/*||!CheckNeedsItem('ModernSparkster')*/); + bool hasslot8 = (!CheckNeedsItem('SilverBullet')/*||!CheckNeedsItem('RayKhom')*/); // if the player already has a slot 7 weapon... if ( hasslot7 ) { @@ -293,7 +298,7 @@ extend Class SWWMUtility static Class PickDoomSlot7() { bool hasslot9 = (!CheckNeedsItem('CandyGun')||!CheckNeedsItem('MisterRifle')); - bool hasslot0 = (!CheckNeedsItem('Ynykron')||!CheckNeedsItem('RafanKos')); + bool hasslot0 = (!CheckNeedsItem('Ynykron')/*||!CheckNeedsItem('RafanKos')*/); let rep = PickSWWMSlot0(false); // if the player already has a slot 9 weapon (and a slot 0 weapon can still spawn)... if ( hasslot9 && rep ) @@ -311,8 +316,8 @@ extend Class SWWMUtility { // always slot 3 after map start, prevents shotgun guys from dropping wallbusters, which is weird af if ( level.maptime ) return PickSWWMSlot3(); - bool hasslot3 = (!CheckNeedsItem('Spreadgun')||!CheckNeedsItem('PuntzerBeta')); - bool hasslot4 = (!CheckNeedsItem('Wallbuster')||!CheckNeedsItem('PuntzerGamma')); + bool hasslot3 = (!CheckNeedsItem('Spreadgun')/*||!CheckNeedsItem('PuntzerBeta')*/); + bool hasslot4 = (!CheckNeedsItem('Wallbuster')/*||!CheckNeedsItem('PuntzerGamma')*/); // if the player already has a slot 3 weapon... if ( hasslot3 ) { diff --git a/zscript/weapons/swwm_baseweapon.zsc b/zscript/weapons/swwm_baseweapon.zsc index 1b2b89ac4..c0ebcacee 100644 --- a/zscript/weapons/swwm_baseweapon.zsc +++ b/zscript/weapons/swwm_baseweapon.zsc @@ -924,12 +924,12 @@ Class SWWMDualWeaponGiver : Inventory void SetPickupState() { - if ( giveme[0] is 'PlasmaBlast' ) + /*if ( giveme[0] is 'PlasmaBlast' ) { SetTag("$T_PLASMABLAST2"); SetState(SpawnState+1); } - else + else*/ { SetTag("$T_EXPLODIUM2"); SetState(SpawnState);