Skip to content

Commit

Permalink
Explode: Damage override
Browse files Browse the repository at this point in the history 
Added damage override parameter to the explosion functions. Updated the documentation as well.
  • Loading branch information
@gitMarky
gitMarky committed Jul 11, 2015
1 parent d504b11 commit 59f802c
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 23 deletions.
7 changes: 7 additions & 0 deletions docs/sdk/script/fn/BlastObjects.xml
View file
Expand Up @@ -37,6 +37,12 @@
<optional />
<desc>Number of the player who has caused the damage. If not specified, the the controller of the calling object is considered to have caused the damage in local calls.</desc>
</param>
<param>
<type>int</type>
<name>damage_level</name>
<desc>If specified, then this value overrides the damage that is caused to objects.</desc>
<optional />
</param>
</params>
</syntax>
<desc>Applies explosion damage to all objects at the specified position. x and y are always global coordinates. If a container is specified, damage is only applied to objects contained in that container. Explosion damage can cause incineration or fling away living objects.</desc>
Expand All @@ -52,4 +58,5 @@
</func>
<author>jwk</author><date>2002-04</date>
<author>Clonkonaut</author><date>2008-04</date>
<author>Marky</author><date>2015-07</date>
</funcs>
13 changes: 7 additions & 6 deletions docs/sdk/script/fn/Explode.xml
View file
Expand Up @@ -17,15 +17,15 @@
<desc>Explosion level. This determines the amount of explosion damage caused and the type of explosion sound played. Up to level 29 the explosion is a Blast1, 30 to 39 is a Blast2, and above is a Blast3.</desc>
</param>
<param>
<type>id</type>
<name>effect</name>
<desc>If specified, an object of this type is created instead of a particle. It is assumed that the newly created object will perform the explosion effect.</desc>
<type>bool</type>
<name>silent</name>
<desc>If true, then no sound will be played for the explosion.</desc>
<optional />
</param>
<param>
<type>string</type>
<name>particle</name>
<desc>Type of particle to be created instead of the normal explosion particle.</desc>
<type>int</type>
<name>damage_level</name>
<desc>If specified, then this value overrides the damage that is caused to objects by the explosion.</desc>
<optional />
</param>
</params>
Expand All @@ -46,4 +46,5 @@
</func>
<author>Sven2</author><date>2001-11</date>
<author>Clonkonaut</author><date>2008-04</date>
<author>Marky</author><date>2015-07</date>
</funcs>
38 changes: 21 additions & 17 deletions planet/System.ocg/Explode.c
View file
Expand Up @@ -114,7 +114,7 @@ global func ExplosionParticles_Init()

/*-- Explosion --*/

global func Explode(int level, bool silent)
global func Explode(int level, bool silent, int damage_level)
{
if(!this) FatalError("Function Explode must be called from object context");

Expand All @@ -134,10 +134,10 @@ global func Explode(int level, bool silent)
// Execute the explosion in global context.
// There is no possibility to interact with the global context, apart from GameCall.
// So at least remove the object context.
exploding_id->DoExplosion(x, y, level, container, cause_plr, layer, silent);
exploding_id->DoExplosion(x, y, level, container, cause_plr, layer, silent, damage_level);
}

global func DoExplosion(int x, int y, int level, object inobj, int cause_plr, object layer, bool silent)
global func DoExplosion(int x, int y, int level, object inobj, int cause_plr, object layer, bool silent, int damage_level)
{
// If the object is contained, loop through all parent containers until the blast is contained or no container is found.
// Blast the containers it passes through and the objects inside them.
Expand All @@ -150,7 +150,7 @@ global func DoExplosion(int x, int y, int level, object inobj, int cause_plr, ob
var contains_blast = container.ContainBlast;
var parent_container = container->Contained();
// Blast the current container, but not the previous container.
BlastObjects(x + GetX(), y + GetY(), level, container, cause_plr, layer, prev_container);
BlastObjects(x + GetX(), y + GetY(), level, container, cause_plr, damage_level, layer, prev_container);
// Break the blasting if this container contains the blast.
if (contains_blast)
break;
Expand All @@ -163,14 +163,14 @@ global func DoExplosion(int x, int y, int level, object inobj, int cause_plr, ob
if (!container)
{
// Blast objects outside if there was no final container containing the blast.
BlastObjects(x + GetX(), y + GetY(), level, container, cause_plr, layer, prev_container);
BlastObjects(x + GetX(), y + GetY(), level, container, cause_plr, damage_level, layer, prev_container);
// Incinerate oil.
if (!IncinerateLandscape(x, y))
if (!IncinerateLandscape(x, y - 10))
if (!IncinerateLandscape(x - 5, y - 5))
IncinerateLandscape(x + 5, y - 5);
// Graphic effects.
Call("ExplosionEffect", level, x, y, 0, silent);
Call("ExplosionEffect", level, x, y, 0, silent, damage_level);
// Landscape destruction. Happens after BlastObjects, so that recently blown-free materials are not affected
BlastFree(x, y, level, cause_plr);
}
Expand All @@ -182,7 +182,7 @@ global func DoExplosion(int x, int y, int level, object inobj, int cause_plr, ob
Creates a visual explosion effect at a position.
smoothness (in percent) determines how round the effect will look like
*/
global func ExplosionEffect(int level, int x, int y, int smoothness, bool silent)
global func ExplosionEffect(int level, int x, int y, int smoothness, bool silent, int damage_level)
{
if(!silent) //Does object use it's own explosion sound effect?
{
Expand Down Expand Up @@ -251,37 +251,41 @@ global func ExplosionEffect(int level, int x, int y, int smoothness, bool silent
/*-- Blast objects & shockwaves --*/

// Damage and hurl objects away.
global func BlastObjects(int x, int y, int level, object container, int cause_plr, object layer, object no_blast)
global func BlastObjects(int x, int y, int level, object container, int cause_plr, int damage_level, object layer, object no_blast)
{
var obj;

// Coordinates are always supplied globally, convert to local coordinates.
var l_x = x - GetX(), l_y = y - GetY();

// caused by: if not specified, controller of calling object
if(cause_plr == nil)
if(this)
if (cause_plr == nil)
if (this)
cause_plr = GetController();


// damage: if not specified this is the same as the explosion radius
if (damage_level == nil)
damage_level = level;

// In a container?
if (container)
{
if (container->GetObjectLayer() == layer)
{
container->BlastObject(level, cause_plr);
container->BlastObject(damage_level, cause_plr);
if (!container)
return true; // Container could be removed in the meanwhile.
for (obj in FindObjects(Find_Container(container), Find_Layer(layer), Find_Exclude(no_blast)))
if (obj)
obj->BlastObject(level, cause_plr);
obj->BlastObject(damage_level, cause_plr);
}
}
else
{
// Object is outside.
// Damage objects at point of explosion.
for (var obj in FindObjects(Find_AtRect(l_x - 5, l_y - 5, 10,10), Find_NoContainer(), Find_Layer(layer), Find_Exclude(no_blast)))
if (obj) obj->BlastObject(level, cause_plr);
if (obj) obj->BlastObject(damage_level, cause_plr);

// TODO: -> Shockwave in own global func(?)

Expand All @@ -298,14 +302,14 @@ global func BlastObjects(int x, int y, int level, object container, int cause_pl
if (obj) // Test obj, cause OnShockwaveHit could have removed objects.
{
// Object has special reaction on shockwave?
if (obj->~OnShockwaveHit(level, x, y, cause_plr))
if (obj->~OnShockwaveHit(level, x, y, cause_plr, damage_level))
continue;
// Living beings are hurt more.
var cat = obj->GetCategory();
if (cat & C4D_Living)
{
obj->DoEnergy(level / -2, false, FX_Call_EngBlast, cause_plr);
obj->DoDamage(level / 2, FX_Call_DmgBlast, cause_plr);
obj->DoEnergy(damage_level / -2, false, FX_Call_EngBlast, cause_plr);
obj->DoDamage(damage_level / 2, FX_Call_DmgBlast, cause_plr);
}
// Killtracing for projectiles.
if (cat & C4D_Object)
Expand Down

0 comments on commit 59f802c

Please sign in to comment.