OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Demoslayer mode now has "ammo orbs" as well.

Browse source
This commit is contained in:
Mari the Deer 2022-08-12 11:15:09 +02:00
commit 7d6562c326
6 changed files with 75 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

49
zscript/items/swwm_ammoextra.zsc
View file

@ -111,20 +111,6 @@ Class AmmoFabricator : Inventory abstract
bool FabricateAmmo()
{
// first we must build an array of all valid weapons, this saves time instead of doing recursive loops
Array<Class<Weapon> > validweapons;
for ( int i=0; i<AllActorClasses.Size(); i++ )
{
let type2 = (class<Weapon>)(AllActorClasses[i]);
if ( !type2 ) continue;
let rep = GetReplacement(type2);
if ( (rep != type2) && !(rep is "DehackedPickup") ) continue;
readonly<Weapon> weap = GetDefaultByType(type2);
if ( !Owner.player || !Owner.player.weapons.LocateWeapon(type2) || weap.bCheatNotWeapon || !weap.CanPickup(Owner) ) continue;
let ready = weap.FindState("Ready");
if ( !ready || !ready.ValidateSpriteFrame() ) continue;
validweapons.Push(type2);
}
Array<Class<SWWMAmmo> > available;
// populate ammo production list
for ( int i=0; i<AllActorClasses.Size(); i++ )
@ -136,23 +122,6 @@ Class AmmoFabricator : Inventory abstract
if ( !a || (a.GetParentClass() != 'SWWMAmmo') ) continue;
let def = GetDefaultByType(a);
if ( (def.Stamina <= 0) || (def.Stamina > maxunitprice) ) continue;
// only ammo for weapons that are valid (can be used)
bool isvalid = false;
for ( int j=0; j<validweapons.Size(); j++ )
{
readonly<Weapon> weap = GetDefaultByType(validweapons[j]);
if ( (validweapons[j] is 'SWWMWeapon') && SWWMWeapon(weap).UsesAmmo(a) )
{
isvalid = true;
break;
}
if ( (weap.AmmoType1 == a) || (weap.AmmoType2 == a) )
{
isvalid = true;
break;
}
}
if ( !isvalid ) continue;
let f = Owner.FindInventory(a);
// don't include maxed out ammo
if ( f && (f.Amount >= f.MaxAmount) ) continue;
@ -228,7 +197,7 @@ Class AmmoFabricator : Inventory abstract
{
if ( FabricateAmmo() )
{
if ( pickup && ((Owner.player == players[consoleplayer]) || bBigPowerup) ) Owner.A_StartSound(UseSound,CHAN_ITEMEXTRA);
if ( pickup && ((Owner.player == players[consoleplayer]) || bBigPowerup) && !bQUIET ) Owner.A_StartSound(UseSound,CHAN_ITEMEXTRA);
return true;
}
return false;
@ -270,8 +239,8 @@ Class FabricatorTier1 : AmmoFabricator
Inventory.PickupMessage "$T_FABRICATOR1";
AmmoFabricator.Budget 3000;
AmmoFabricator.PerType 1;
AmmoFabricator.MaxUnits 1;
AmmoFabricator.MaxTypes 1;
AmmoFabricator.MaxUnits 2;
AmmoFabricator.MaxTypes 2;
AmmoFabricator.MaxUnitPrice 2500;
AmmoFabricator.ChanceFactor 1;
AmmoFabricator.TextColor Font.CR_BLUE;
@ -286,9 +255,9 @@ Class FabricatorTier2 : AmmoFabricator
Tag "$T_FABRICATOR2";
Inventory.PickupMessage "$T_FABRICATOR2";
AmmoFabricator.Budget 20000;
AmmoFabricator.PerType 1;
AmmoFabricator.MaxUnits 2;
AmmoFabricator.MaxTypes 2;
AmmoFabricator.PerType 2;
AmmoFabricator.MaxUnits 5;
AmmoFabricator.MaxTypes 3;
AmmoFabricator.MaxUnitPrice 18000;
AmmoFabricator.ChanceFactor 2;
AmmoFabricator.TextColor Font.CR_GREEN;
@ -303,9 +272,9 @@ Class FabricatorTier3 : AmmoFabricator
Tag "$T_FABRICATOR3";
Inventory.PickupMessage "$T_FABRICATOR3";
AmmoFabricator.Budget 60000;
AmmoFabricator.PerType 2;
AmmoFabricator.MaxUnits 4;
AmmoFabricator.MaxTypes 3;
AmmoFabricator.PerType -25;
AmmoFabricator.MaxUnits 10;
AmmoFabricator.MaxTypes 4;
AmmoFabricator.MaxUnitPrice 50000;
AmmoFabricator.ChanceFactor 4;
AmmoFabricator.TextColor Font.CR_RED;