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

46
zscript/hud/swwm_hud.zsc
View file

@ -175,12 +175,12 @@ Class SWWMStatusBar : BaseStatusBar
int tclabel, tcvalue, tcextra, tccompl, tcsucks;
String tclabel_s, tcextra_s;
int AmmoFlash[19]; // flash when new ammo is received
int AmmoOldAmounts[19]; // to detect when to flash
int AmmoMaxFlash[19]; // flash when ammo max amount changes
int AmmoOldMaxAmounts[19]; // to detect when to flash
Class<SWWMAmmo> AmmoSlots[19]; // ammo type on each slot
String AmmoNames[19]; // ammo 4-letter names
int AmmoFlash[18]; // flash when new ammo is received
int AmmoOldAmounts[18]; // to detect when to flash
int AmmoMaxFlash[18]; // flash when ammo max amount changes
int AmmoOldMaxAmounts[18]; // to detect when to flash
Class<SWWMAmmo> AmmoSlots[18]; // ammo type on each slot
String AmmoNames[18]; // ammo 4-letter names
int HealthFlash; // flash when healing
int LastHealth; // to detect when to flash
int LagHealth[10]; // for delayed decay bar
@ -944,7 +944,7 @@ Class SWWMStatusBar : BaseStatusBar
for ( int i=9; i>0; i-- )
LagHealth[i] = LagHealth[i-1];
// ammo updates
for ( int i=0; i<19; i++ )
for ( int i=0; i<18; i++ )
{
let a = SWWMAmmo(CPlayer.mo.FindInventory(AmmoSlots[i]));
int amt = 0;
@ -1299,14 +1299,13 @@ Class SWWMStatusBar : BaseStatusBar
AmmoSlots[8] = 'SparksterBAmmo';
AmmoSlots[9] = 'SparksterRAmmo';
AmmoSlots[10] = 'SilverBulletAmmo';
AmmoSlots[11] = 'SilverBulletAmmo2';
AmmoSlots[12] = 'RayAmmo';
AmmoSlots[13] = 'CandyGunAmmo';
AmmoSlots[14] = 'CandyGunSpares';
AmmoSlots[15] = 'MisterAmmo';
AmmoSlots[16] = 'MisterGAmmo';
AmmoSlots[17] = 'YnykronAmmo';
AmmoSlots[18] = 'UltimateAmmo';
AmmoSlots[11] = 'RayAmmo';
AmmoSlots[12] = 'CandyGunAmmo';
AmmoSlots[13] = 'CandyGunSpares';
AmmoSlots[14] = 'MisterAmmo';
AmmoSlots[15] = 'MisterGAmmo';
AmmoSlots[16] = 'YnykronAmmo';
AmmoSlots[17] = 'UltimateAmmo';
AmmoNames[0] = "SHOT";
AmmoNames[1] = "GOLD";
AmmoNames[2] = "SCRW";
@ -1318,14 +1317,13 @@ Class SWWMStatusBar : BaseStatusBar
AmmoNames[8] = "KINY";
AmmoNames[9] = "NOKR";
AmmoNames[10] = "RIFL";
AmmoNames[11] = "CHOD";
AmmoNames[12] = "BOLT";
AmmoNames[13] = "CAND";
AmmoNames[14] = "CGUN";
AmmoNames[15] = "MSTR";
AmmoNames[16] = "MGRN";
AmmoNames[17] = "CRYS";
AmmoNames[18] = "ULTI";
AmmoNames[11] = "BOLT";
AmmoNames[12] = "CAND";
AmmoNames[13] = "CGUN";
AmmoNames[14] = "MSTR";
AmmoNames[15] = "MGRN";
AmmoNames[16] = "CRYS";
AmmoNames[17] = "ULTI";
for ( int i=0; i<18; i++ )
{
AmmoFlash[i] = 0;
@ -2694,7 +2692,7 @@ Class SWWMStatusBar : BaseStatusBar
OwnedWeapons.Push(SWWMWeapon(i));
}
String str;
for ( int i=18; i>=0; i-- )
for ( int i=17; i>=0; i-- )
{
let a = AmmoSlots[i];
// check if owned