OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Remove fat chodes, Silver Bullet reimplemented.

Browse source
This commit is contained in:
Mari the Deer 2022-10-07 20:13:10 +02:00
commit 62d10ed11c
46 changed files with 333 additions and 1413 deletions
Download patch file Download diff file Expand all files Collapse all files

75
zscript/items/swwm_ammoitems.zsc
View file

@ -328,9 +328,9 @@ Class SilverBulletAmmo : SWWMAmmo
SWWMAmmo.PickupTag "XSBMAG";
Stamina 70000;
Inventory.Amount 1;
Inventory.MaxAmount 3;
Inventory.MaxAmount 5;
Ammo.BackpackAmount 0;
Ammo.BackpackMaxAmount 6;
Ammo.BackpackMaxAmount 11;
Ammo.DropAmount 1;
SWWMAmmo.MagAmmoType "SilverBullets";
+FLOATBOB;
@ -347,33 +347,6 @@ Class SilverBulletAmmo : SWWMAmmo
}
}
Class SilverBulletAmmo2 : SWWMAmmo
{
Default
{
Tag "$T_FCBMAG";
SWWMAmmo.PickupTag "FCBMAG";
Stamina 80000;
Inventory.Amount 1;
Inventory.MaxAmount 2;
Ammo.BackpackAmount 0;
Ammo.BackpackMaxAmount 4;
Ammo.DropAmount 1;
SWWMAmmo.MagAmmoType "SilverBullets2";
+FLOATBOB;
FloatBobStrength 0.25;
Radius 10;
Height 26;
Accuracy 80;
}
States
{
Spawn:
XZW1 A -1;
Stop;
}
}
Class SilverBullets : MagAmmo
{
Default
@ -397,7 +370,7 @@ Class SilverBullets : MagAmmo
Stop;
}
}
Class SilverBullets_2 : SilverBullets
Class SilverBullets2 : SilverBullets
{
Default
{
@ -406,47 +379,7 @@ Class SilverBullets_2 : SilverBullets
Height 24;
}
}
Class SilverBullets_3 : SilverBullets
{
Default
{
Inventory.Amount 3;
Radius 6;
Height 24;
}
}
Class SilverBullets2 : MagAmmo
{
Default
{
Tag "$T_FCBBULLET";
MagAmmo.PickupTag "FCBBULLET";
Stamina -15000;
MagAmmo.ParentAmmo "SilverBulletAmmo2";
MagAmmo.ClipSize 5;
Inventory.MaxAmount 5;
+FLOATBOB;
FloatBobStrength 0.25;
Radius 4;
Height 22;
}
States
{
Spawn:
XZW1 A -1;
Stop;
}
}
Class SilverBullets2_2 : SilverBullets2
{
Default
{
Inventory.Amount 2;
Radius 6;
Height 24;
}
}
Class SilverBullets2_3 : SilverBullets2
Class SilverBullets3 : SilverBullets
{
Default
{

6
zscript/items/swwm_ammospawn.zsc
View file

@ -216,11 +216,7 @@ Class SWWMCellAmmoBig : SWWMAmmoSpawner
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 )
{
if ( Random[Replacements](0,3) ) return Random[Replacements](0,2)?'SilverBullets_2':'SilverBullets2_2';
return Random[Replacements](0,2)?'SilverBulletAmmo':'SilverBulletAmmo2';
}
if ( aex ) return Random[Replacements](0,3)?'SilverBullets3':'SilverBulletAmmo';
}
bool aex = SWWMUtility.ItemExists('Sparkster',ownedonly:enemydrop),
bex = SWWMUtility.ItemExists('ModernSparkster',ownedonly:enemydrop);

6
zscript/items/swwm_funstuff.zsc
View file

@ -891,11 +891,11 @@ Class RewardCandyGun : ChanceboxReward
override void SpawnReward( Vector3 pos )
{
SpawnCenter(pos,"CandyGun");
SpawnCircle(pos,6,"CandyGunBullets");
SpawnCircle(pos,7,"CandyGunBullets");
}
}
// TODO ray-khom bolts all over
// them silver bullets, of two types
// them silver bullets
Class RewardSilverBullets : ChanceboxReward
{
override bool CheckRequirements()
@ -905,7 +905,7 @@ Class RewardSilverBullets : ChanceboxReward
override void SpawnReward( Vector3 pos )
{
SpawnCircle(pos,3,"SilverBullets2");
SpawnCircle(pos,4,"SilverBullets");
SpawnCircle(pos,6,"SilverBullets",3.);
}
}