OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Quadravol fire shouldn't spread to Demolitionist.

Browse source
This commit is contained in:
Mari the Deer 2022-09-05 00:29:08 +02:00
commit bf19ca87d3
2 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
zscript/dlc1/swwm_notashotgun_fx.zsc
View file

@ -986,14 +986,18 @@ Class OnFire : Inventory
{
if ( target == Owner ) return Damage;
// spread ourselves
let t = OnFire(target.FindInventory("OnFire"));
if ( !t )
// note: cannot spread to Demolitionist
if ( !(target is 'Demolitionist') )
{
t = Apply(target,instigator,min(Damage,int(Amount*.6))); // prevent "escalating" spread
t.cnt = 15; // long delay
let t = OnFire(target.FindInventory("OnFire"));
if ( !t )
{
t = Apply(target,instigator,min(Damage,int(Amount*.6))); // prevent "escalating" spread
t.cnt = 15; // long delay
}
else if ( t.Amount < int(Amount*.6) ) t.Amount = min(t.Amount+Damage,int(Amount*.6)); // prevent "escalating" spread
t.instigator = instigator;
}
else if ( t.Amount < int(Amount*.6) ) t.Amount = min(t.Amount+Damage,int(Amount*.6)); // prevent "escalating" spread
t.instigator = instigator;
return clamp(int(Damage*.15),1,50); // reduced direct damage
}
@ -1005,7 +1009,7 @@ Class OnFire : Inventory
Destroy();
return;
}
if ( Owner is 'Demolitionist' ) amount = min(amount-1,200); // Demo's body puts out fire faster
if ( Owner is 'Demolitionist' ) amount = min(amount-1,100); // Demo's body puts out fire faster
if ( !(level.maptime%3) )
amount--;
if ( Owner.player ) amount -= int(abs(actor.deltaangle(Owner.angle,oangle))/30);