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

Cloud: Mode without material insertion 

Added a mode where the cloud does not extract or insert any materials, so that the rain is just a decorative element of the game.
directional-lights
Mark 2016-10-11 21:19:21 +02:00
parent d9696d2f88
commit 7df951fb65
1 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
planet/Objects.ocd/Environment.ocd/Cloud.ocd/Script.c
View File

@ -22,6 +22,7 @@ local evap_x; // x coordinate for evaporation
local rain; // Number of liquid pixels the cloud holds. local rain; // Number of liquid pixels the cloud holds.
local rain_mat; // Precipitation type from scenario or other. Material name of nil for no rain. local rain_mat; // Precipitation type from scenario or other. Material name of nil for no rain.
local rain_inserts_mat; // Should the rain insert actual material pixels on impact?
local rain_amount; // Precipitation amount from scenario or other. local rain_amount; // Precipitation amount from scenario or other.
local rain_max; // Max rain the cloud can hold. local rain_max; // Max rain the cloud can hold.
local rain_mat_freeze_temp; // Freezing temperature of current rain material. local rain_mat_freeze_temp; // Freezing temperature of current rain material.
@ -45,6 +46,7 @@ protected func Initialize()
rain = 0; rain = 0;
rain_max = 960; rain_max = 960;
rain_visual_strength = 10; rain_visual_strength = 10;
rain_inserts_mat = true;
// Cloud defaults // Cloud defaults
lightning_chance = 0; lightning_chance = 0;
@ -180,6 +182,26 @@ public func SetCloudRGB(r, g, b)
} }
// Changes the behavior of this cloud:
// if the parameter is true, the cloud will create particles effects and insert material on impact.
// if the parameter is false, the could will create particle effects, but not insert material
// Also an id call: Changes all clouds to this settings.
public func SetInsertMaterial(bool should_insert)
{
// Called to proplist: change all clouds.
if (this == Cloud)
{
for (var cloud in FindObjects(Find_ID(Cloud)))
cloud->SetInsertMaterial(should_insert);
}
else // Otherwise change the clouds precipitation.
{
rain_inserts_mat = should_insert;
}
return;
}
/*-- Cloud processing --*/ /*-- Cloud processing --*/
protected func FxProcessCloudStart(object target, proplist effect, int temporary) protected func FxProcessCloudStart(object target, proplist effect, int temporary)
@ -376,7 +398,10 @@ private func DropHit(string material_name, int color, int x_orig, int y_orig)
var x = AbsX(x_orig), y = AbsY(y_orig); var x = AbsX(x_orig), y = AbsY(y_orig);
while (GBackSemiSolid(x, y - 1)) y--; while (GBackSemiSolid(x, y - 1)) y--;
InsertMaterial(Material(material_name), x, y - 1); if (rain_inserts_mat)
{
InsertMaterial(Material(material_name), x, y - 1);
}
// Some materials cast smoke when hitting water. // Some materials cast smoke when hitting water.
if (GetMaterial(x,y) == Material("Water") && SmokeyMaterial(material_name)) if (GetMaterial(x,y) == Material("Water") && SmokeyMaterial(material_name))
@ -469,7 +494,12 @@ protected func Evaporation()
// Try to extract the specified material. // Try to extract the specified material.
if (GetMaterial(evap_x, y) == Material(rain_mat)) if (GetMaterial(evap_x, y) == Material(rain_mat))
{ {
ExtractMaterialAmount(evap_x, y, Material("Water"), 3); // No idea why the value was originally increased by +3 regardless
// of the return value of ExtractMaterialAmount; just left it that way
if (rain_inserts_mat)
{
ExtractMaterialAmount(evap_x, y, Material("Water"), 3);
}
rain += 3; rain += 3;
} }