OrdinaryMagician/flak_m
OrdinaryMagician/flak_m
1
Fork 0
Code Activity

Tweaked fire rates of Enforcer, Shock Rifle, Ripper, Flak Cannon to be even closer to the originals.

Browse source 
Reduced gravity on Biosludge to make it feel more like the original.
Buffed chainsaw altfire, making it hit fast on a wider arc.
Correctly fixed armor + shield belt behaviors.
Made it so jump boots drain after landing, thus preventing fall damage on the last jump in case it's enabled.
Made jump boots drain slowly over time, for balance reasons (especially when jumping is disabled).
This commit is contained in:
Marisa the Magician 2018-08-12 15:39:21 +02:00
commit b5a0c723fe
8 changed files with 64 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

33
zscript/armoritems.zsc
View file

@ -8,7 +8,8 @@ Class UTArmor : Armor
{
+INVENTORY.AUTOACTIVATE;
+INVENTORY.UNTOSSABLE;
+INVENTORY.KEEPDEPLETED;
-INVENTORY.KEEPDEPLETED;
+INVENTORY.ALWAYSPICKUP;
}
override void AbsorbDamage( int damage, Name damageType, out int newdamage )
{
@ -37,7 +38,6 @@ Class UTArmorBonus : UTArmor replaces ArmorBonus
{
Tag "Armor Bonus";
+COUNTITEM;
+INVENTORY.ALWAYSPICKUP;
Inventory.Amount 1;
Inventory.MaxAmount 50;
Inventory.InterHubAmount 50;
@ -62,9 +62,12 @@ Class UTThighPads : UTArmor replaces GreenArmor
let s = Owner.FindInventory("UTShieldBelt");
if ( s )
{
// sum up current amounts
let a = Owner.FindInventory("UTBodyArmor");
int samount = s.amount;
if ( a ) samount += a.amount;
if ( amount < item.amount ) amount = item.amount;
amount = min(s.maxamount-s.amount,amount);
Console.Printf("%d",amount);
amount = min(s.maxamount-samount,amount);
item.bPickupGood = true;
return true;
}
@ -98,9 +101,12 @@ Class UTBodyArmor : UTArmor replaces BlueArmor
let s = Owner.FindInventory("UTShieldBelt");
if ( s )
{
// sum up current amounts
let p = Owner.FindInventory("UTThighPads");
int samount = s.amount;
if ( p ) samount += p.amount;
if ( amount < item.amount ) amount = item.amount;
amount = min(s.maxamount-s.amount,amount);
Console.Printf("%d",amount);
amount = min(s.maxamount-samount,amount);
item.bPickupGood = true;
return true;
}
@ -142,9 +148,20 @@ Class UTShieldBelt : UTArmor replaces Megasphere
{
if ( (item is 'UTBodyArmor') || (item is 'UTThighPads') )
{
item.amount = 1;
amount -= 1;
// sum up current amounts
let a = Owner.FindInventory("UTBodyArmor");
let p = Owner.FindInventory("UTThighPads");
int samount = amount;
if ( a ) samount += a.amount;
if ( p ) samount += p.amount;
item.amount = min(item.amount,maxamount-samount);
if ( item.amount <= 0 )
{
item.amount = 1;
amount -= 1;
}
}
if ( item is 'UTShieldBelt' ) Use(true);
return Super.HandlePickup(item);
}
override bool Use( bool pickup )