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

reduced fire and explosive arrow strength

issue1247
Maikel de Vries 2015-01-09 23:37:04 +01:00
parent 9c0263faef
commit 3cc644f6fc
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
planet/Objects.ocd/Items.ocd/Weapons.ocd/Bow.ocd/BombArrow.ocd/Script.c
View File

@ -12,10 +12,10 @@
// Callback from the hitcheck effect: explode on impact with target.
public func HitObject(object obj)
{
// First let the normal arrow hit take place, then explode for additonal damage.
// First let the normal arrow hit with reduced damage take place, then explode for additonal damage.
_inherited(obj, ...);
// Explosion strength a little random with only a small radius.
return Explode(12 + Random(3));
return Explode(14 + Random(3));
}
// Callback on hit: explode on impact with landscape.
@ -28,8 +28,8 @@ public func Hit()
return;
}
// Determines the arrow strength: only 40% that of the normal arrow.
public func ArrowStrength() { return 4; }
// Determines the arrow strength: only 30% that of the normal arrow.
public func ArrowStrength() { return 3; }
/*-- Properties --*/

14
planet/Objects.ocd/Items.ocd/Weapons.ocd/Bow.ocd/FireArrow.ocd/Script.c
View File

@ -87,16 +87,18 @@ protected func Entrance()
// Callback from the hitcheck effect: incinerate target on impact.
public func HitObject(object obj)
{
// Incinerate object just to the amount where a clonk (ContactIncinerate = 10) won't fully burn.
// Hitting the same clonk twice with a fire arrow means it while burn indefinitely.
// Incinerate object to the amount where a clonk (ContactIncinerate = 10) won't fully burn.
// ContactIncinerate = 1 implies 100% incinaration.
// ContactIncinerate = 10 implies 37-43% incinaration.
// Hitting the same clonk twice with a fire arrow usually means it while burn indefinitely.
if (obj.ContactIncinerate)
obj->Incinerate(BoundBy(140 - 10 * obj.ContactIncinerate + Random(10), 0, 100), GetController());
// Additional damage from normal arrow hit.
obj->Incinerate(BoundBy(100 - 7 * (obj.ContactIncinerate - 1) + Random(7), 0, 100), GetController());
// Additional damage from normal arrow hit, however, reduced.
return _inherited(obj, ...);
}
// Determines the arrow strength: only 70% that of the normal arrow.
public func ArrowStrength() { return 7; }
// Determines the arrow strength: only 30% that of the normal arrow.
public func ArrowStrength() { return 3; }
/*-- Properties --*/