From 2dc41277df0e96dfdc1bf28a7571d1c4e6ce16d0 Mon Sep 17 00:00:00 2001 From: mimo Date: Wed, 3 Jan 2018 15:27:02 +0000 Subject: [PATCH] cleanup 9daa7520ef following bb's comments This was SVN commit r20763. --- binaries/data/mods/public/simulation/components/Trigger.js | 5 +++-- .../simulation/data/settings/trigger_difficulties.json | 4 ++-- binaries/data/mods/public/simulation/helpers/Setup.js | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/binaries/data/mods/public/simulation/components/Trigger.js b/binaries/data/mods/public/simulation/components/Trigger.js index da733dadf2..8cb0bdff8e 100644 --- a/binaries/data/mods/public/simulation/components/Trigger.js +++ b/binaries/data/mods/public/simulation/components/Trigger.js @@ -31,7 +31,8 @@ Trigger.prototype.eventNames = Trigger.prototype.Init = function() { // Difficulty used by trigger scripts (as defined in data/settings/trigger_difficulties.json). - this.difficulty = 3; + this.difficulty = undefined; + this.triggerPoints = {}; // Each event has its own set of actions determined by the map maker. @@ -335,7 +336,7 @@ Trigger.prototype.DoAction = function(msg) /** * Level of difficulty used by trigger scripts. */ -Trigger.prototype.GetDifficulty = function(diff) +Trigger.prototype.GetDifficulty = function() { return this.difficulty; }; diff --git a/binaries/data/mods/public/simulation/data/settings/trigger_difficulties.json b/binaries/data/mods/public/simulation/data/settings/trigger_difficulties.json index 6321059846..b002abe3d4 100644 --- a/binaries/data/mods/public/simulation/data/settings/trigger_difficulties.json +++ b/binaries/data/mods/public/simulation/data/settings/trigger_difficulties.json @@ -5,7 +5,7 @@ { "Difficulty": 1, "Name": "Very Easy", - "Tooltip": "Choose this difficulty if you are discovering 0 A.D.." + "Tooltip": "Choose this difficulty if you are discovering 0 A.D." }, { "Difficulty": 2, @@ -15,7 +15,7 @@ { "Difficulty": 3, "Name": "Medium", - "Tooltip": "Choose this difficulty if you have already a good experience with 0 A.D.." + "Tooltip": "Choose this difficulty if you have already a good experience with 0 A.D." }, { "Difficulty": 4, diff --git a/binaries/data/mods/public/simulation/helpers/Setup.js b/binaries/data/mods/public/simulation/helpers/Setup.js index 544ef774e3..b9f72e38ef 100644 --- a/binaries/data/mods/public/simulation/helpers/Setup.js +++ b/binaries/data/mods/public/simulation/helpers/Setup.js @@ -43,7 +43,7 @@ function LoadMapSettings(settings) cmpObstructionManager.SetPassabilityCircular(true); } - if (settings.TriggerDifficulty) + if (settings.TriggerDifficulty != undefined) Engine.QueryInterface(SYSTEM_ENTITY, IID_Trigger).SetDifficulty(settings.TriggerDifficulty); else if (settings.SupportedTriggerDifficulties) // used by Atlas and autostart games {