From 3aad4d8e30cb8caeb479e682dbb6365ff205ff30 Mon Sep 17 00:00:00 2001 From: Itms Date: Wed, 6 May 2015 20:43:49 +0000 Subject: [PATCH] Revert 2b7ba4ff0b by adding a way to specify globally disabled templates. Refs #3174 This was SVN commit r16632. --- .../data/mods/public/maps/random/belgian_uplands.json | 6 +++--- .../data/mods/public/maps/scenarios/Belgian_Bog_night.xml | 4 ++-- .../mods/public/maps/scripts/disable_ptol_lighthouse.js | 8 -------- .../data/mods/public/maps/skirmishes/Belgian Bog (2).xml | 4 ++-- binaries/data/mods/public/simulation/helpers/Player.js | 7 ++++++- 5 files changed, 13 insertions(+), 16 deletions(-) delete mode 100644 binaries/data/mods/public/maps/scripts/disable_ptol_lighthouse.js diff --git a/binaries/data/mods/public/maps/random/belgian_uplands.json b/binaries/data/mods/public/maps/random/belgian_uplands.json index 65585d8ad1..07b749d2d3 100644 --- a/binaries/data/mods/public/maps/random/belgian_uplands.json +++ b/binaries/data/mods/public/maps/random/belgian_uplands.json @@ -3,13 +3,13 @@ "Name" : "Belgian Uplands", "Script" : "belgian_uplands.js", "Description" : "An experimental map with its heightmap generated by erosion to look more natural. Not all seeds will be fair though! Tiny maps with 8 players may take a while to generate.", + "DisabledTemplates": [ + "structures/ptol_lighthouse" + ], "CircularMap" : false, "BaseTerrain" : ["temp_grass", "temp_grass_b", "temp_grass_c", "temp_grass_d", "temp_grass_long_b", "temp_grass_clovers_2", "temp_grass_mossy", "temp_grass_plants"], "BaseHeight" : 0, "Preview" : "belgian_uplands.png", - "TriggerScripts": [ - "scripts/disable_ptol_lighthouse.js" - ], "XXXXXX" : "Optionally define other things here, like we would for a scenario" } } diff --git a/binaries/data/mods/public/maps/scenarios/Belgian_Bog_night.xml b/binaries/data/mods/public/maps/scenarios/Belgian_Bog_night.xml index 76ba0f14ce..5b8fc9541c 100644 --- a/binaries/data/mods/public/maps/scenarios/Belgian_Bog_night.xml +++ b/binaries/data/mods/public/maps/scenarios/Belgian_Bog_night.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3ee9fb136f5bf14adbd1ee868a06e468447cbf1478bc460c1cff1132ebeecf6a -size 703760 +oid sha256:349f6b578d19f69895b619d4a32eda3fc66464cfcfd2798ba33677ce00a7fcc2 +size 703755 diff --git a/binaries/data/mods/public/maps/scripts/disable_ptol_lighthouse.js b/binaries/data/mods/public/maps/scripts/disable_ptol_lighthouse.js deleted file mode 100644 index 3f97dfbd5a..0000000000 --- a/binaries/data/mods/public/maps/scripts/disable_ptol_lighthouse.js +++ /dev/null @@ -1,8 +0,0 @@ -let cmpPlayerManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager); - -for (let i = 1; i < cmpPlayerManager.GetNumPlayers(); ++i) -{ - let cmpPlayer = Engine.QueryInterface(cmpPlayerManager.GetPlayerByID(i), IID_Player); - if (cmpPlayer) - cmpPlayer.AddDisabledTemplate("structures/ptol_lighthouse"); -} diff --git a/binaries/data/mods/public/maps/skirmishes/Belgian Bog (2).xml b/binaries/data/mods/public/maps/skirmishes/Belgian Bog (2).xml index 1ecae93929..85a60b7bf8 100644 --- a/binaries/data/mods/public/maps/skirmishes/Belgian Bog (2).xml +++ b/binaries/data/mods/public/maps/skirmishes/Belgian Bog (2).xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:13e2a176a168b9c9d89c50e3c08ead3fe9746ecf72f5718fb08ebb0753ceca91 -size 753858 +oid sha256:fcb88a1d064ab2f781918e7155ece3f62491fd21dd4b51515d66a5411f651ed8 +size 753853 diff --git a/binaries/data/mods/public/simulation/helpers/Player.js b/binaries/data/mods/public/simulation/helpers/Player.js index ae1ffc20fa..55593aad56 100644 --- a/binaries/data/mods/public/simulation/helpers/Player.js +++ b/binaries/data/mods/public/simulation/helpers/Player.js @@ -115,8 +115,13 @@ function LoadPlayerSettings(settings, newPlayers) if (getSetting(playerData, playerDefaults, i, "DisabledTechnologies") !== undefined) cmpPlayer.SetDisabledTechnologies(getSetting(playerData, playerDefaults, i, "DisabledTechnologies")); + let disabledTemplates = []; + if (settings.DisabledTemplates !== undefined) + disabledTemplates = settings.DisabledTemplates; if (getSetting(playerData, playerDefaults, i, "DisabledTemplates") !== undefined) - cmpPlayer.SetDisabledTemplates(getSetting(playerData, playerDefaults, i, "DisabledTemplates")); + disabledTemplates = disabledTemplates.concat(getSetting(playerData, playerDefaults, i, "DisabledTemplates")); + if (disabledTemplates.length) + cmpPlayer.SetDisabledTemplates(disabledTemplates); // If diplomacy explicitly defined, use that; otherwise use teams if (getSetting(playerData, playerDefaults, i, "Diplomacy") !== undefined)