OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

A rebalance attempt™.

Browse source
This commit is contained in:
Mari the Deer 2021-09-06 22:55:58 +02:00
commit c194852ca8
10 changed files with 48 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

32
zscript/items/swwm_ammoitems.zsc
View file

@ -21,14 +21,14 @@ Class RedShell : Ammo
Inventory.Icon "graphics/HUD/Icons/A_ShellsNormal.png";
Inventory.Amount 1;
Inventory.MaxAmount 30;
Ammo.BackpackAmount 3;
Ammo.BackpackAmount 2;
Ammo.BackpackMaxAmount 80;
Ammo.DropAmount 2;
+FLOATBOB;
FloatBobStrength 0.25;
Radius 4;
Height 20;
Accuracy 30;
Accuracy 50;
}
States
{
@ -88,7 +88,7 @@ Class GreenShell : Ammo
FloatBobStrength 0.25;
Radius 4;
Height 20;
Accuracy 35;
Accuracy 55;
}
States
{
@ -147,7 +147,7 @@ Class WhiteShell : Ammo
+FLOATBOB;
FloatBobStrength 0.25;
Radius 4;
Accuracy 50;
Accuracy 70;
}
States
{
@ -207,7 +207,7 @@ Class BlueShell : Ammo
FloatBobStrength 0.25;
Radius 4;
Height 20;
Accuracy 45;
Accuracy 65;
}
States
{
@ -267,7 +267,7 @@ Class BlackShell : Ammo
FloatBobStrength 0.25;
Radius 4;
Height 20;
Accuracy 60;
Accuracy 75;
}
States
{
@ -327,7 +327,7 @@ Class PurpleShell : Ammo
FloatBobStrength 0.25;
Radius 4;
Height 20;
Accuracy 40;
Accuracy 60;
}
States
{
@ -484,14 +484,14 @@ Class EvisceratorShell : Ammo
Inventory.Icon "graphics/HUD/Icons/A_Eviscerator.png";
Inventory.Amount 1;
Inventory.MaxAmount 20;
Ammo.BackpackAmount 2;
Ammo.BackpackAmount 1;
Ammo.BackpackMaxAmount 60;
Ammo.DropAmount 1;
+FLOATBOB;
FloatBobStrength 0.25;
Radius 8;
Height 22;
Accuracy 40;
Accuracy 60;
}
override void ModifyDropAmount( int dropamount )
{
@ -566,7 +566,7 @@ Class HellblazerMissiles : Ammo
FloatBobStrength 0.25;
Radius 6;
Height 22;
Accuracy 60;
Accuracy 70;
}
override void ModifyDropAmount( int dropamount )
{
@ -635,7 +635,7 @@ Class HellblazerCrackshots : Ammo
FloatBobStrength 0.25;
Radius 6;
Height 22;
Accuracy 70;
Accuracy 75;
}
override void ModifyDropAmount( int dropamount )
{
@ -760,7 +760,7 @@ Class HellblazerWarheads : Ammo
FloatBobStrength 0.25;
Radius 6;
Height 22;
Accuracy 90;
Accuracy 85;
}
override void ModifyDropAmount( int dropamount )
{
@ -820,7 +820,7 @@ Class SparkUnit : Ammo
FloatBobStrength 0.25;
Radius 6;
Height 22;
Accuracy 50;
Accuracy 70;
}
override void ModifyDropAmount( int dropamount )
{
@ -879,7 +879,7 @@ Class SilverBulletAmmo : Ammo
FloatBobStrength 0.25;
Radius 10;
Height 26;
Accuracy 60;
Accuracy 75;
}
override void ModifyDropAmount( int dropamount )
{
@ -931,7 +931,7 @@ Class SilverBulletAmmo2 : Ammo
FloatBobStrength 0.25;
Radius 10;
Height 26;
Accuracy 70;
Accuracy 80;
}
override void ModifyDropAmount( int dropamount )
{
@ -1067,7 +1067,7 @@ Class CandyGunAmmo : Ammo
FloatBobStrength 0.25;
Radius 6;
Height 24;
Accuracy 80;
Accuracy 90;
}
override void ModifyDropAmount( int dropamount )
{

31
zscript/items/swwm_ammospawn.zsc
View file

@ -43,11 +43,10 @@ Class SWWMShellAmmoBig : SWWMAmmoSpawner
static Class<Actor> PickAmmo( bool notondemand = false )
{
// shell types (sorted by rarity)
static const Class<Actor> redpool[] = {'RedShell','RedShell2','RedShell4'};
static const Class<Actor> greenpool[] = {'GreenShell','GreenShell2','GreenShell4'};
static const Class<Actor> whitepool[] = {'WhiteShell','WhiteShell2'};
static const Class<Actor> purplepool[] = {'PurpleShell','PurpleShell2','PurpleShell4'};
static const Class<Actor> bluepool[] = {'BlueShell','BlueShell2','BlueShell4'};
static const Class<Actor> redpool[] = {'RedShell','RedShell2'};
static const Class<Actor> greenpool[] = {'GreenShell','GreenShell2'};
static const Class<Actor> purplepool[] = {'PurpleShell','PurpleShell2'};
static const Class<Actor> bluepool[] = {'BlueShell','BlueShell2'};
/*if ( Random[Replacements](0,1) && (notondemand || SWWMUtility.ItemExists('PuntzerBeta') || SWWMUtility.ItemExists('PuntzerGamma')) )
return Random[Replacements](0,2)?'SMW05SmallAmmo':'SMW05BigAmmo';*/
switch( Random[Replacements](0,20) )
@ -57,25 +56,25 @@ Class SWWMShellAmmoBig : SWWMAmmoSpawner
case 2:
case 3:
case 4:
return redpool[Random[Replacements](0,2)];
return redpool[Random[Replacements](0,1)];
case 5:
case 6:
case 7:
case 8:
case 9:
return greenpool[Random[Replacements](0,2)];
return greenpool[Random[Replacements](0,1)];
case 10:
case 11:
case 12:
case 13:
return purplepool[Random[Replacements](0,2)];
return purplepool[Random[Replacements](0,1)];
case 14:
case 15:
case 16:
return bluepool[Random[Replacements](0,2)];
return bluepool[Random[Replacements](0,1)];
case 17:
case 18:
return whitepool[Random[Replacements](0,1)];
return 'WhiteShell';
}
// case 19-20
return 'BlackShell';
@ -89,7 +88,7 @@ Class SWWMClipAmmoBig : SWWMAmmoSpawner
{
/*if ( Random[Replacements](0,1) && (notondemand || SWWMUtility.ItemExists('HeavyMahsheenGun')) )
return Random[Replacements](0,2)?'SheenSmallAmmo':'SheenBigAmmo';*/
return Random[Replacements](0,3)?'EvisceratorShell':'EvisceratorBundleSpawn';
return Random[Replacements](0,5)?'EvisceratorShell':'EvisceratorBundleSpawn';
}
}
Class SWWMBlastAmmoSmall : SWWMAmmoSpawner
@ -111,7 +110,7 @@ Class SWWMBlastAmmoBig : SWWMAmmoSpawner
{
/*if ( Random[Replacements](0,1) && (notondemand || SWWMUtility.ItemExists('HeavyMahsheenGun')) )
return Random[Replacements](0,2)?'SheenBigAmmo':'SheenSmallAmmo';*/
return 'EvisceratorBundleSpawn';
return Random[Replacements](0,2)?'EvisceratorShell':'EvisceratorBundleSpawn';
}
}
Class SWWMRocketAmmoSmall : SWWMAmmoSpawner
@ -142,12 +141,12 @@ Class SWWMRocketAmmoBig : SWWMAmmoSpawner
case 2:
case 3:
case 4:
return Random[Replacements](0,2)?'HellblazerMissiles':'HellblazerMissileBundleSpawn';
return Random[Replacements](0,4)?'HellblazerMissiles':'HellblazerMissileBundleSpawn';
case 5:
case 6:
case 7:
case 8:
return Random[Replacements](0,3)?'HellblazerCrackshots':'HellblazerCrackshotBundleSpawn';
return Random[Replacements](0,7)?'HellblazerCrackshots':'HellblazerCrackshotBundleSpawn';
case 9:
case 10:
return 'HellblazerRavagers';
@ -195,8 +194,8 @@ Class SWWMCellAmmoBig : SWWMAmmoSpawner
if ( Random[Replacements](0,3) ) return Random[Replacements](0,2)?'SilverBulletsBundleSpawn':'SilverBullets2BundleSpawn';
return Random[Replacements](0,2)?'SilverBulletAmmo':'SilverBulletAmmo2';
}
if ( notondemand || SWWMUtility.ItemExists('CandyGun') ) return Random[Replacements](0,2)?'CandyGunBulletsBundleSpawn':'CandyGunAmmo';
if ( notondemand || SWWMUtility.ItemExists('CandyGun') ) return Random[Replacements](0,3)?'CandyGunBulletsBundleSpawn':'CandyGunAmmo';
/*if ( !Random[Replacements](0,2) && (notondemand || SWWMUtility.ItemExists('BlackfireIgniter')) ) return 'DarkCanister';*/
return Random[Replacements](0,2)?'SparkUnit':'SparkUnitBundleSpawn';
return Random[Replacements](0,3)?'SparkUnit':'SparkUnitBundleSpawn';
}
}