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

Add ambience editor props, user actions and scenario saving

alut-include-path
Sven Eberhardt 2017-03-09 21:42:39 -05:00
parent 3b90a0bf10
commit 10ab981b6f
3 changed files with 120 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
planet/Objects.ocd/Environment.ocd/Ambience.ocd/Script.c
View File

@ -9,13 +9,16 @@ local exec_counter; // counter to distribute execution of players across frames
local player_environments; // array indexed by player number: array of derived environments with per-player data
local all_environments; // array of available environments for which it is checked if the player is in. sorted by priority.
local fixed_environment; // May be set to a string to fix the environment
local fixed_player_environments; // Per-player setting for environment
local EditorProps;
// Initialization
protected func Initialize()
{
// Register default environments (overloadable)
this->InitializeEnvironments();
// Initial player data
player_environments = [];
fixed_player_environments = [];
for (var i=0; i<GetPlayerCount(C4PT_User); ++i)
InitializePlayer(GetPlayerByIndex(i, C4PT_User));
// Periodic execution of ambience events
@ -23,9 +26,46 @@ protected func Initialize()
return true;
}
public func SetEnvironment(string new_env, int plr)
{
// Switch to a fixed environment
if (new_env && !GetLength(new_env)) new_env = nil;
// Update active flag(s)
var set_envs;
if (GetType(plr))
{
// Update for one player
fixed_player_environments[plr] = new_env;
set_envs = [player_environments[plr]];
}
else
{
// Update for all players
fixed_environment = new_env;
set_envs = player_environments;
fixed_player_environments = [];
}
for (var envs in set_envs)
{
if (envs)
{
for (var env in envs)
{
env.is_active = (env.Name == new_env);
env.change_delay = 999;
}
}
}
// Force the change now
for (var i = 0; i < 3; ++i)
{
Execute();
}
}
func InitializeEnvironments()
{
// Register all standard environments
// Definition() call: Register all standard environments
all_environments = [];
// Underwater: Clonk is swimming in water
@ -135,24 +175,27 @@ private func ExecutePlayer(int plr, array environments)
// Update active state of all player environments
if (cursor)
{
var x = cursor->GetX(), y = cursor->GetY();
for (var env in environments)
if (!(fixed_player_environments[plr] ?? fixed_environment))
{
var was_active = env.is_active;
var is_active = env->CheckPlayer(cursor, x, y, was_active);
if (is_active == was_active)
var x = cursor->GetX(), y = cursor->GetY();
for (var env in environments)
{
// No change. Reset change delays.
env.change_delay = 0;
}
else
{
// Environment change. The change must persist for a while to become active.
if (++env.change_delay > env.min_change_delays[!is_active])
var was_active = env.is_active;
var is_active = env->CheckPlayer(cursor, x, y, was_active);
if (is_active == was_active)
{
// Waited long enough. Activate or deactivate this environment.
env.is_active = is_active;
//Log("%s environment: %s set to %v", GetPlayerName(plr), env.Name, is_active);
// No change. Reset change delays.
env.change_delay = 0;
}
else
{
// Environment change. The change must persist for a while to become active.
if (++env.change_delay > env.min_change_delays[!is_active])
{
// Waited long enough. Activate or deactivate this environment.
env.is_active = is_active;
//Log("%s environment: %s set to %v", GetPlayerName(plr), env.Name, is_active);
}
}
}
}
@ -194,7 +237,7 @@ func InitializePlayer(int plr)
var n = GetLength(all_environments);
var envs = CreateArray(n);
for (var i=0; i < n; ++i)
envs[i] = new all_environments[i] { change_delay = 999, is_active = false };
envs[i] = new all_environments[i] { change_delay = 999, is_active = (all_environments[i].Name == fixed_environment) };
player_environments[plr] = envs;
// Newly joining players should have set playlist immediately (so they don't start playing a random song just to switch it immediately)
// However, this only works with a cursor
@ -337,10 +380,10 @@ private func EnvCheck_Day(object cursor, int x, int y, bool is_current)
public func SaveScenarioObject(proplist props, ...)
{
// Only save ambience if it has modifications set for this scenario
// However, modifications aren't possible for now so never save it
return false;
return !!fixed_environment;
}
/*-- Proplist --*/
local SoundModifier, CaveModifier, UnderwaterModifier;
@ -372,6 +415,29 @@ public func Definition(def)
Reverb_Decay_HFRatio = 800,
};
UnderwaterModifier = nil; // not supported yet
// Register default environments
def->InitializeEnvironments();
// Initialize environment switching in editor
if (!def.EditorProps) def.EditorProps = {};
def.EditorProps.fixed_environment = { Name="$FixedEnv$", EditorHelp="$FixedEnvHelp$", Type="enum", Set="SetEnvironment", Options = [
{ Name="$Automatic$", EditorHelp="$AutomaticEnvHelp$" }
] };
var n = 0;
for (var env in all_environments)
{
EditorProps.fixed_environment.Options[++n] = { Name=env.Name, Value=env.Name };
}
// User actions
var env_options = [{ Name="$Automatic$", EditorHelp="$AutomaticEnvHelp$", Value="" }];
n = 0;
for (var env in all_environments)
{
env_options[++n] = { Name=env.Name, Value=env.Name };
}
UserAction->AddEvaluator("Action", "$Ambience$", "$SetEnvironment$", "$SetEnvironmentHelp$", "ambience_environment", [def, def.EvalAct_SetEnvironment], { Players={Function="all_players"}, Environment="" }, { Type="proplist", Display="{{Environment}} ({{Players}})", EditorProps = {
Environment = { Name="$Environment$", Type="enum", Editable=true, Options = env_options },
Players = UserAction.Evaluator.PlayerList
} } );
// Shader
UserAction->AddEvaluator("Action", "$Ambience$", "$SetShader$", "$SetShaderHelp$", "ambience_shader", [def, def.EvalAct_SetShader], { ShaderName="Grayscale", Status = { Function="bool_constant", Value=true } }, { Type="proplist", Display="{{ShaderName}} ({{Status}})", EditorProps = {
ShaderName = { Name="$Shader$", Type="enum", Options = [
@ -559,3 +625,20 @@ private func EvalAct_SetShader(proplist props, proplist context)
var status = UserAction->EvaluateValue("Boolean", props.Status, context);
return SetShaderStatus(shader_name, status);
}
private func EvalAct_SetEnvironment(proplist props, proplist context)
{
var new_environment = props.Environment;
var is_all_players = (props.Players.Function == "all_players"); // special handling for "all players"
var ambience = FindObject(Find_ID(Ambience));
if (!ambience) return;
if (is_all_players)
{
ambience->SetEnvironment(new_environment);
}
else
{
var players = UserAction->EvaluateValue("PlayerList", props.Players, context) ?? [];
for (var plr in players) ambience->SetEnvironment(new_environment, plr);
}
}

9
planet/Objects.ocd/Environment.ocd/Ambience.ocd/StringTblDE.txt
View File

@ -1,10 +1,17 @@
Name=Ambiente
Description=Regelt die Geraeuschkulisse.
Ambience=Ambiente
FixedEnv=Ambiente
FixedEnvHelp=Setzt ein Ambiente fuer die Geraeuschkulisse.
Automatic=Automatisch
AutomaticEnvHelp=Wechselt die Geraeuschkulisse automatisch pro Spieler je nach Umgebung des kontrollierten Clonks.
SetShader=Shader setzen
SetShaderHelp=Schaltet einen globalen Shader an oder aus.
Shader=Shader
None=Keiner
Grayscale=Graustufen
Psycho=Psycho
Status=Status
Status=Status
SetEnvironment=Ambiente setzen
SetEnvironmentHelp=Setzt ein Ambiente fuer die Geraeuschkulisse.
Environment=Umgebung

9
planet/Objects.ocd/Environment.ocd/Ambience.ocd/StringTblUS.txt
View File

@ -1,10 +1,17 @@
Name=Ambience
Description=Controls environmental sounds and music.
Ambience=Ambience
FixedEnv=Ambience
FixedEnvHelp=Sets an ambience controlling the acoustic environment.
Automatic=Automatic
AutomaticEnvHelp=Changes the ambience automatically per player depending on the surroundings of the controlled clonk.
SetShader=Set shader
SetShaderHelp=Turns a global shader on or off.
Shader=Shader
None=None
Grayscale=Grayscale
Psycho=Psycho
Status=Status
Status=Status
SetEnvironment=Set ambience
SetEnvironmentHelp=Sets an ambience controlling the acoustic environment.
Environment=Environment