marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fire: only reduce own fire strength if incineration of nearby object was successful

master
Maikel de Vries 2018-06-23 10:02:16 +02:00
parent 446564f703
commit b11a25db4b
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
planet/System.ocg/Fire.c
View File

@ -424,16 +424,17 @@ global func FxFireTimer(object target, proplist effect, int time)
continue;
var old_fire_value = obj->OnFire();
if(old_fire_value < 100) // only if the object was not already fully ablaze
if (old_fire_value < 100) // only if the object was not already fully ablaze
{
// incinerate the other object a bit
obj->Incinerate(Max(10, amount), effect.caused_by, false, effect.incinerating_obj);
// Incinerating other objects weakens the own fire.
// This is done in order to make fires spread slower especially as a chain reaction.
var min = Min(10, effect.strength);
if(effect.strength > 50) min = 50;
effect.strength = BoundBy(effect.strength - amount/2, min, 100);
if (obj->Incinerate(Max(10, amount), effect.caused_by, false, effect.incinerating_obj))
{
// Incinerating other objects weakens the own fire.
// This is done in order to make fires spread slower especially as a chain reaction.
var min = Min(10, effect.strength);
if (effect.strength > 50) min = 50;
effect.strength = BoundBy(effect.strength - amount / 2, min, 100);
}
}
}
}