OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Disable unimplemented weapons and ammo for now.

Browse source
This commit is contained in:
Mari the Deer 2023-10-10 14:39:12 +02:00
commit d3d503cd81
16 changed files with 108 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

32
zscript/items/swwm_ammospawn.zsc
View file

@ -69,10 +69,10 @@ Class SWWMShellAmmoSmall : SWWMAmmoSpawner
{
override Class<Actor> 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<Actor> 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';
}
}

14
zscript/items/swwm_funstuff.zsc
View file

@ -803,7 +803,7 @@ Class RewardVIPItems : ChanceboxReward
{
Class<Inventory> 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<Inventory> 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
{