From 1cb4ee163473d25c98b6d347b1c363fd45ac7977 Mon Sep 17 00:00:00 2001 From: vladislavbelov Date: Sun, 17 Jan 2021 13:10:00 +0000 Subject: [PATCH] Combines terrain and units ambient colors into the single color. Tested By: Stan Differential Revision: https://code.wildfiregames.com/D3237 This was SVN commit r24661. --- .../mods/public/maps/random/arctic_summer.js | 3 +-- .../public/maps/random/ardennes_forest.js | 3 +-- .../data/mods/public/maps/random/bahrain.js | 2 +- .../data/mods/public/maps/random/corsica.js | 3 +-- .../data/mods/public/maps/random/danubius.js | 3 +-- .../mods/public/maps/random/elephantine.js | 3 +-- .../data/mods/public/maps/random/india.js | 3 +-- .../mods/public/maps/random/jebel_barkal.js | 2 +- .../mods/public/maps/random/lower_nubia.js | 2 +- .../data/mods/public/maps/random/marmara.js | 2 +- .../mods/public/maps/random/mediterranean.js | 2 +- .../mods/public/maps/random/ngorongoro.js | 2 +- .../data/mods/public/maps/random/oasis.js | 3 +-- .../public/maps/random/phoenician_levant.js | 3 +-- .../data/mods/public/maps/random/polar_sea.js | 3 +-- .../data/mods/public/maps/random/pompeii.js | 3 +-- .../public/maps/random/pyrenean_sierra.js | 3 +-- .../data/mods/public/maps/random/ratumacos.js | 2 +- .../data/mods/public/maps/random/red_sea.js | 2 +- .../maps/random/rmbiome/defaultbiome.json | 3 +-- .../rmbiome/persian_highlands/spring.json | 2 +- .../rmbiome/persian_highlands/summer.json | 2 +- .../public/maps/random/rmgen/environment.js | 12 +++------- .../data/mods/public/maps/random/sahel.js | 3 +-- .../mods/public/maps/scenarios/_default.xml | 4 ++-- .../mods/public/maps/scenarios/arcadia.xml | 4 ++-- .../public/maps/scenarios/azure_coast_2p.xml | 4 ++-- .../public/maps/scenarios/azure_coast_4p.xml | 4 ++-- .../public/maps/scenarios/azure_coast_8p.xml | 4 ++-- .../maps/scenarios/battle_for_the_tiber.xml | 4 ++-- .../maps/scenarios/belgian_bog_night.xml | 4 ++-- .../public/maps/scenarios/bridge_demo.xml | 4 ++-- .../maps/scenarios/campaign_test_map.xml | 4 ++-- .../campaign_test_map_2_heightmap.xml | 4 ++-- .../public/maps/scenarios/cinema_demo.xml | 4 ++-- .../public/maps/scenarios/combat_demo.xml | 4 ++-- .../maps/scenarios/combat_demo_huge.xml | 4 ++-- .../scenarios/death_canyon_invasion_force.xml | 4 ++-- .../public/maps/scenarios/demo_trading.xml | 4 ++-- .../public/maps/scenarios/eire_and_albion.xml | 4 ++-- .../mods/public/maps/scenarios/fast_oasis.xml | 4 ++-- .../public/maps/scenarios/fishing_demo.xml | 4 ++-- .../public/maps/scenarios/flight_demo.xml | 4 ++-- .../mods/public/maps/scenarios/gold_rush.xml | 4 ++-- .../data/mods/public/maps/scenarios/gorge.xml | 4 ++-- .../mods/public/maps/scenarios/laconia.xml | 4 ++-- .../mods/public/maps/scenarios/migration.xml | 4 ++-- .../mods/public/maps/scenarios/miletus.xml | 4 ++-- .../maps/scenarios/multiplayer_demo.xml | 4 ++-- .../maps/scenarios/napata_reconstruction.xml | 4 ++-- .../mods/public/maps/scenarios/necropolis.xml | 4 ++-- .../maps/scenarios/pathfinding_demo.xml | 4 ++-- .../scenarios/pathfinding_terrain_demo.xml | 4 ++-- .../public/maps/scenarios/peloponnese.xml | 4 ++-- .../public/maps/scenarios/pickup_test_map.xml | 4 ++-- .../mods/public/maps/scenarios/polynesia.xml | 4 ++-- .../mods/public/maps/scenarios/reservoir.xml | 4 ++-- .../public/maps/scenarios/resource_demo.xml | 4 ++-- .../mods/public/maps/scenarios/road_demo.xml | 4 ++-- .../public/maps/scenarios/saharan_oases.xml | 4 ++-- .../data/mods/public/maps/scenarios/sahel.xml | 4 ++-- .../maps/scenarios/sandbox_athenians.xml | 4 ++-- .../public/maps/scenarios/sandbox_britons.xml | 4 ++-- .../maps/scenarios/sandbox_carthaginians.xml | 4 ++-- .../public/maps/scenarios/sandbox_gauls.xml | 4 ++-- .../maps/scenarios/sandbox_iberians.xml | 4 ++-- .../maps/scenarios/sandbox_kushites.xml | 4 ++-- .../maps/scenarios/sandbox_macedonians.xml | 4 ++-- .../public/maps/scenarios/sandbox_mauryas.xml | 4 ++-- .../maps/scenarios/sandbox_persians.xml | 4 ++-- .../maps/scenarios/sandbox_ptolemies.xml | 4 ++-- .../maps/scenarios/sandbox_ptolemies_02.xml | 4 ++-- .../public/maps/scenarios/sandbox_romans.xml | 4 ++-- .../maps/scenarios/sandbox_seleucids.xml | 4 ++-- .../maps/scenarios/sandbox_spartans.xml | 4 ++-- .../public/maps/scenarios/savanna_ravine.xml | 4 ++-- .../mods/public/maps/scenarios/serengeti.xml | 4 ++-- .../public/maps/scenarios/ship_formations.xml | 4 ++-- .../public/maps/scenarios/shipattacks.xml | 4 ++-- .../mods/public/maps/scenarios/siwa_oasis.xml | 4 ++-- .../public/maps/scenarios/temperate_map.xml | 4 ++-- .../public/maps/scenarios/territory_demo.xml | 4 ++-- .../public/maps/scenarios/test_foundation.xml | 4 ++-- .../maps/scenarios/the_massacre_of_delphi.xml | 4 ++-- .../maps/scenarios/the_persian_gates.xml | 4 ++-- .../maps/scenarios/third_macedonian_war.xml | 4 ++-- .../maps/scenarios/treasure_islands.xml | 4 ++-- .../public/maps/scenarios/triggers_demo.xml | 4 ++-- .../public/maps/scenarios/tropical_island.xml | 4 ++-- .../maps/scenarios/unit_dancing_test.xml | 4 ++-- .../unit_motion_integration_test.xml | 4 ++-- .../mods/public/maps/scenarios/units_demo.xml | 4 ++-- .../data/mods/public/maps/scenarios/walls.xml | 4 ++-- .../mods/public/maps/scenarios/walltest.xml | 4 ++-- .../public/maps/scenarios/we_are_legion.xml | 4 ++-- .../maps/skirmishes/acropolis_bay_2p.xml | 4 ++-- .../maps/skirmishes/alpine_mountains_3p.xml | 4 ++-- .../maps/skirmishes/alpine_valleys_2p.xml | 4 ++-- .../maps/skirmishes/atlas_valleys_8p.xml | 4 ++-- .../public/maps/skirmishes/bactria_2p.xml | 4 ++-- .../public/maps/skirmishes/barcania_3p.xml | 4 ++-- .../public/maps/skirmishes/belgian_bog_2p.xml | 4 ++-- .../maps/skirmishes/butana_steppe_2p.xml | 4 ++-- .../maps/skirmishes/caspian_sea_2pv2p.xml | 4 ++-- .../maps/skirmishes/corinthian_isthmus_2p.xml | 4 ++-- .../maps/skirmishes/corinthian_isthmus_4p.xml | 4 ++-- .../skirmishes/corsica_and_sardinia_4p.xml | 4 ++-- .../skirmishes/cycladic_archipelago_2p.xml | 4 ++-- .../skirmishes/cycladic_archipelago_3p.xml | 4 ++-- .../maps/skirmishes/death_canyon_2p.xml | 4 ++-- .../maps/skirmishes/deccan_plateau_2p.xml | 4 ++-- .../maps/skirmishes/dueling_cliffs_3pv3p.xml | 4 ++-- .../public/maps/skirmishes/egypt_3pv3p.xml | 4 ++-- .../public/maps/skirmishes/farmland_2p.xml | 4 ++-- .../maps/skirmishes/forest_battle_4p.xml | 4 ++-- .../maps/skirmishes/gallic_fields_3p.xml | 4 ++-- .../maps/skirmishes/gambia_river_3p.xml | 4 ++-- .../maps/skirmishes/golden_island_2p.xml | 4 ++-- .../maps/skirmishes/golden_oasis_2p.xml | 4 ++-- .../maps/skirmishes/greek_acropolis_2p.xml | 4 ++-- .../maps/skirmishes/greek_acropolis_4p.xml | 4 ++-- .../skirmishes/greek_acropolis_night_2p.xml | 4 ++-- .../maps/skirmishes/libyan_oases_4p.xml | 4 ++-- .../maps/skirmishes/libyan_oasis_2p.xml | 4 ++-- .../maps/skirmishes/lorraine_plain_2p.xml | 4 ++-- .../maps/skirmishes/median_oasis_2p.xml | 4 ++-- .../maps/skirmishes/median_oasis_4p.xml | 4 ++-- .../maps/skirmishes/mediterranean_cove_2p.xml | 4 ++-- .../skirmishes/neareastern_badlands_2p.xml | 4 ++-- .../skirmishes/neareastern_badlands_4p.xml | 4 ++-- .../public/maps/skirmishes/nile_river_4p.xml | 4 ++-- .../maps/skirmishes/northern_island_2p.xml | 4 ++-- .../public/maps/skirmishes/obedska_bog_4p.xml | 4 ++-- .../maps/skirmishes/obedska_bog_night_4p.xml | 4 ++-- .../public/maps/skirmishes/oceanside_2p.xml | 4 ++-- .../maps/skirmishes/persian_highlands_4p.xml | 4 ++-- .../mods/public/maps/skirmishes/punjab_2p.xml | 4 ++-- .../maps/skirmishes/saharan_oases_4p.xml | 4 ++-- .../mods/public/maps/skirmishes/sahel_4p.xml | 4 ++-- .../maps/skirmishes/sahyadri_buttes_5.xml | 4 ++-- .../public/maps/skirmishes/savanna_river.xml | 4 ++-- .../public/maps/skirmishes/sicilia_2p.xml | 4 ++-- .../public/maps/skirmishes/sicilia_nomad.xml | 4 ++-- .../public/maps/skirmishes/skirmish_demo.xml | 4 ++-- .../maps/skirmishes/sporades_islands_2p.xml | 4 ++-- .../mods/public/maps/skirmishes/syria_2p.xml | 4 ++-- .../maps/skirmishes/team_oasis_2pv2p.xml | 4 ++-- .../maps/skirmishes/temperate_roadway_2p.xml | 4 ++-- .../maps/skirmishes/thessalian_plains_4p.xml | 4 ++-- .../maps/skirmishes/tuscan_acropolis_4p.xml | 4 ++-- .../public/maps/skirmishes/two_seas_6p.xml | 4 ++-- .../public/maps/skirmishes/vesuvius_6p.xml | 4 ++-- .../public/maps/skirmishes/via_augusta_4p.xml | 4 ++-- .../maps/skirmishes/watering_holes_4p.xml | 4 ++-- .../maps/skirmishes/zagros_mountains_2p.xml | 4 ++-- .../maps/tutorials/introductory_tutorial.xml | 4 ++-- .../starting_economy_walkthrough.xml | 4 ++-- source/graphics/LightEnv.cpp | 5 ++-- source/graphics/LightEnv.h | 10 ++++---- source/graphics/MapReader.cpp | 24 +++++-------------- source/graphics/MapWriter.cpp | 16 ++++--------- source/renderer/RenderModifiers.cpp | 4 ++-- source/renderer/TerrainRenderer.cpp | 4 ++-- .../Sections/Environment/Environment.cpp | 5 ++-- .../Handlers/EnvironmentHandlers.cpp | 8 +++---- source/tools/atlas/GameInterface/Messages.h | 5 ++-- 166 files changed, 320 insertions(+), 364 deletions(-) diff --git a/binaries/data/mods/public/maps/random/arctic_summer.js b/binaries/data/mods/public/maps/random/arctic_summer.js index b63b4c4d47..f104aca068 100644 --- a/binaries/data/mods/public/maps/random/arctic_summer.js +++ b/binaries/data/mods/public/maps/random/arctic_summer.js @@ -312,8 +312,7 @@ placePlayersNomad(clPlayer, avoidClasses(clForest, 1, clWater, 4, clMetal, 4, cl setSkySet("sunset 1"); setSunRotation(randomAngle()); setSunColor(0.8, 0.7, 0.6); -setTerrainAmbientColor(0.6, 0.5, 0.6); -setUnitsAmbientColor(0.6, 0.5, 0.6); +setAmbientColor(0.6, 0.5, 0.6); setSunElevation(Math.PI * randFloat(1/12, 1/7)); setWaterColor(0, 0.047, 0.286); setWaterTint(0.462, 0.756, 0.866); diff --git a/binaries/data/mods/public/maps/random/ardennes_forest.js b/binaries/data/mods/public/maps/random/ardennes_forest.js index 0b61cf75f1..d8d2bd5d29 100644 --- a/binaries/data/mods/public/maps/random/ardennes_forest.js +++ b/binaries/data/mods/public/maps/random/ardennes_forest.js @@ -466,7 +466,6 @@ createObjectGroupsByAreasDeprecated(group, 0, placePlayersNomad(clPlayer, avoidClasses(clForest, 1, clMetal, 4, clRock, 4, clHill, 4, clFood, 2)); -setTerrainAmbientColor(0.44,0.51,0.56); -setUnitsAmbientColor(0.44,0.51,0.56); +setAmbientColor(0.44,0.51,0.56); g_Map.ExportMap(); diff --git a/binaries/data/mods/public/maps/random/bahrain.js b/binaries/data/mods/public/maps/random/bahrain.js index 0e85ec7bb0..f828c8a5dd 100644 --- a/binaries/data/mods/public/maps/random/bahrain.js +++ b/binaries/data/mods/public/maps/random/bahrain.js @@ -462,7 +462,7 @@ setWaterWaviness(9); setWaterMurkiness(0.8); setWaterType("lake"); -setTerrainAmbientColor(0.521, 0.475, 0.322); +setAmbientColor(0.521, 0.475, 0.322); setSunRotation(Math.PI); setSunElevation(Math.PI / 6.25); diff --git a/binaries/data/mods/public/maps/random/corsica.js b/binaries/data/mods/public/maps/random/corsica.js index d909689f54..a4622f43be 100644 --- a/binaries/data/mods/public/maps/random/corsica.js +++ b/binaries/data/mods/public/maps/random/corsica.js @@ -509,8 +509,7 @@ setSunColor(0.8, 0.66, 0.48); setSunElevation(0.828932); setSunRotation((swapAngle ? 0.288 : 0.788) * Math.PI); -setTerrainAmbientColor(0.564706,0.543726,0.419608); -setUnitsAmbientColor(0.564706,0.543726,0.419608); +setAmbientColor(0.564706,0.543726,0.419608); setWaterColor(0.2,0.294,0.49); setWaterTint(0.208, 0.659, 0.925); setWaterMurkiness(0.72); diff --git a/binaries/data/mods/public/maps/random/danubius.js b/binaries/data/mods/public/maps/random/danubius.js index 0f0a6cc431..d6c3aa6f37 100644 --- a/binaries/data/mods/public/maps/random/danubius.js +++ b/binaries/data/mods/public/maps/random/danubius.js @@ -825,8 +825,7 @@ else setSunElevation(0.13499); setSunRotation(-2.5); - setTerrainAmbientColor(0.25, 0.3, 0.45); - setUnitsAmbientColor(0.25, 0.3, 0.45); + setAmbientColor(0.25, 0.3, 0.45); setFogFactor(0.004); setFogThickness(0.25); diff --git a/binaries/data/mods/public/maps/random/elephantine.js b/binaries/data/mods/public/maps/random/elephantine.js index a50960a45a..2475ce1f48 100644 --- a/binaries/data/mods/public/maps/random/elephantine.js +++ b/binaries/data/mods/public/maps/random/elephantine.js @@ -554,13 +554,12 @@ g_Environment = { }, "SunElevation": 0.908117, "SunRotation": -0.558369, - "TerrainAmbientColor": { + "AmbientColor": { "r": 0.54902, "g": 0.419608, "b": 0.352941, "a": 0 }, - "UnitsAmbientColor": { "r": 0.54902, "g": 0.419608, "b": 0.352941, "a": 0 }, "Fog": { "FogFactor": 0.00195313, "FogThickness": 0, diff --git a/binaries/data/mods/public/maps/random/india.js b/binaries/data/mods/public/maps/random/india.js index ec6d29b1cc..a371f1d745 100644 --- a/binaries/data/mods/public/maps/random/india.js +++ b/binaries/data/mods/public/maps/random/india.js @@ -258,8 +258,7 @@ setWaterWaviness(2.0); setWaterType("clap"); setWaterMurkiness(0.835938); -setUnitsAmbientColor(0.57, 0.58, 0.55); -setTerrainAmbientColor(0.57, 0.58, 0.55); +setAmbientColor(0.57, 0.58, 0.55); setFogFactor(0.25); setFogThickness(0.15); diff --git a/binaries/data/mods/public/maps/random/jebel_barkal.js b/binaries/data/mods/public/maps/random/jebel_barkal.js index 69fe08e11a..9fd4719e46 100644 --- a/binaries/data/mods/public/maps/random/jebel_barkal.js +++ b/binaries/data/mods/public/maps/random/jebel_barkal.js @@ -1487,7 +1487,7 @@ setWaterWaviness(8); setWaterMurkiness(0.87); setWaterType("lake"); -setTerrainAmbientColor(0.58, 0.443, 0.353); +setAmbientColor(0.58, 0.443, 0.353); setSunColor(0.733, 0.746, 0.574); setSunRotation(Math.PI / 2 * randFloat(-1, 1)); diff --git a/binaries/data/mods/public/maps/random/lower_nubia.js b/binaries/data/mods/public/maps/random/lower_nubia.js index 5a0976ab54..4d502e717d 100644 --- a/binaries/data/mods/public/maps/random/lower_nubia.js +++ b/binaries/data/mods/public/maps/random/lower_nubia.js @@ -401,7 +401,7 @@ setWaterWaviness(8); setWaterMurkiness(0.87); setWaterType("lake"); -setTerrainAmbientColor(0.58, 0.443, 0.353); +setAmbientColor(0.58, 0.443, 0.353); setSunColor(0.733, 0.746, 0.574); setSunRotation(Math.PI * 1.1); diff --git a/binaries/data/mods/public/maps/random/marmara.js b/binaries/data/mods/public/maps/random/marmara.js index 2bcc1d99f0..730a250074 100644 --- a/binaries/data/mods/public/maps/random/marmara.js +++ b/binaries/data/mods/public/maps/random/marmara.js @@ -352,7 +352,7 @@ setWaterWaviness(8); setWaterMurkiness(0.99); setWaterType("lake"); -setTerrainAmbientColor(0.521, 0.475, 0.322); +setAmbientColor(0.521, 0.475, 0.322); setSunRotation(Math.PI * 0.85); setSunElevation(Math.PI / 14); diff --git a/binaries/data/mods/public/maps/random/mediterranean.js b/binaries/data/mods/public/maps/random/mediterranean.js index 0ce90ae7cc..86db13f822 100644 --- a/binaries/data/mods/public/maps/random/mediterranean.js +++ b/binaries/data/mods/public/maps/random/mediterranean.js @@ -449,7 +449,7 @@ setWaterWaviness(8); setWaterMurkiness(0.87); setWaterType("ocean"); -setTerrainAmbientColor(0.72, 0.72, 0.82); +setAmbientColor(0.72, 0.72, 0.82); setSunColor(0.733, 0.746, 0.574); setSunRotation(Math.PI * 0.95); diff --git a/binaries/data/mods/public/maps/random/ngorongoro.js b/binaries/data/mods/public/maps/random/ngorongoro.js index 53dd395853..60fc7ffe64 100644 --- a/binaries/data/mods/public/maps/random/ngorongoro.js +++ b/binaries/data/mods/public/maps/random/ngorongoro.js @@ -556,7 +556,7 @@ placePlayersNomad( g_TileClasses.mountain, 2) ]); -setTerrainAmbientColor(0.521, 0.475, 0.322); +setAmbientColor(0.521, 0.475, 0.322); setSunColor(0.733, 0.746, 0.574); setSunRotation(Math.PI); diff --git a/binaries/data/mods/public/maps/random/oasis.js b/binaries/data/mods/public/maps/random/oasis.js index 5bb62a7767..8b43f86ce5 100644 --- a/binaries/data/mods/public/maps/random/oasis.js +++ b/binaries/data/mods/public/maps/random/oasis.js @@ -308,7 +308,6 @@ setWaterTint(0, 0.545, 0.859); setWaterWaviness(1.0); setWaterType("clap"); setWaterMurkiness(0.5); -setTerrainAmbientColor(0.501961, 0.501961, 0.501961); -setUnitsAmbientColor(0.501961, 0.501961, 0.501961); +setAmbientColor(0.501961, 0.501961, 0.501961); g_Map.ExportMap(); diff --git a/binaries/data/mods/public/maps/random/phoenician_levant.js b/binaries/data/mods/public/maps/random/phoenician_levant.js index 6a42589c14..b1e31619a0 100644 --- a/binaries/data/mods/public/maps/random/phoenician_levant.js +++ b/binaries/data/mods/public/maps/random/phoenician_levant.js @@ -313,8 +313,7 @@ setWaterWaviness(2.0); setWaterType("ocean"); setWaterMurkiness(0.8); -setTerrainAmbientColor(0.447059, 0.509804, 0.54902); -setUnitsAmbientColor(0.447059, 0.509804, 0.54902); +setAmbientColor(0.447059, 0.509804, 0.54902); setSunElevation(0.671884); setSunRotation(-0.582913); diff --git a/binaries/data/mods/public/maps/random/polar_sea.js b/binaries/data/mods/public/maps/random/polar_sea.js index 836227d9a2..37e3c67b2d 100644 --- a/binaries/data/mods/public/maps/random/polar_sea.js +++ b/binaries/data/mods/public/maps/random/polar_sea.js @@ -245,8 +245,7 @@ if (g_MapSettings.Daytime !== undefined ? g_MapSettings.Daytime == "dawn" : rand { setSkySet("sunset 1"); setSunColor(0.8, 0.7, 0.6); - setTerrainAmbientColor(0.7, 0.6, 0.7); - setUnitsAmbientColor(0.7, 0.6, 0.7); + setAmbientColor(0.7, 0.6, 0.7); setSunElevation(Math.PI * randFloat(1/24, 1/7)); } else diff --git a/binaries/data/mods/public/maps/random/pompeii.js b/binaries/data/mods/public/maps/random/pompeii.js index 48e0530e99..174ead24e0 100644 --- a/binaries/data/mods/public/maps/random/pompeii.js +++ b/binaries/data/mods/public/maps/random/pompeii.js @@ -442,8 +442,7 @@ setWaterWaviness(8); setWaterMurkiness(0.87); setWaterType("lake"); -setTerrainAmbientColor(0.3, 0.3, 0.3); -setUnitsAmbientColor(0.3, 0.3, 0.3); +setAmbientColor(0.3, 0.3, 0.3); setSunColor(0.8, 0.8, 0.8); setSunRotation(Math.PI); diff --git a/binaries/data/mods/public/maps/random/pyrenean_sierra.js b/binaries/data/mods/public/maps/random/pyrenean_sierra.js index 64560aafa8..667004050c 100644 --- a/binaries/data/mods/public/maps/random/pyrenean_sierra.js +++ b/binaries/data/mods/public/maps/random/pyrenean_sierra.js @@ -451,8 +451,7 @@ setSunRotation(randomAngle()); setSkySet("cumulus"); setSunColor(0.73,0.73,0.65); -setTerrainAmbientColor(0.45,0.45,0.50); -setUnitsAmbientColor(0.45,0.45,0.50); +setAmbientColor(0.45,0.45,0.50); setWaterColor(0.263, 0.353, 0.616); setWaterTint(0.104, 0.172, 0.563); setWaterWaviness(5.0); diff --git a/binaries/data/mods/public/maps/random/ratumacos.js b/binaries/data/mods/public/maps/random/ratumacos.js index ad71f73554..4efb2a3857 100644 --- a/binaries/data/mods/public/maps/random/ratumacos.js +++ b/binaries/data/mods/public/maps/random/ratumacos.js @@ -362,7 +362,7 @@ setWaterWaviness(8); setWaterMurkiness(0.87); setWaterType("clap"); -setTerrainAmbientColor(0.521, 0.475, 0.322); +setAmbientColor(0.521, 0.475, 0.322); setSunRotation(-Math.PI); setSunElevation(Math.PI / 6.25); diff --git a/binaries/data/mods/public/maps/random/red_sea.js b/binaries/data/mods/public/maps/random/red_sea.js index bb224c73fa..87f9f31381 100644 --- a/binaries/data/mods/public/maps/random/red_sea.js +++ b/binaries/data/mods/public/maps/random/red_sea.js @@ -370,7 +370,7 @@ setWaterWaviness(8); setWaterMurkiness(0.87); setWaterType("lake"); -setTerrainAmbientColor(0.58, 0.443, 0.353); +setAmbientColor(0.58, 0.443, 0.353); setSunColor(0.733, 0.746, 0.574); setSunRotation(Math.PI * 1.1); diff --git a/binaries/data/mods/public/maps/random/rmbiome/defaultbiome.json b/binaries/data/mods/public/maps/random/rmbiome/defaultbiome.json index b95b1c1bcd..e3c9ed26d5 100644 --- a/binaries/data/mods/public/maps/random/rmbiome/defaultbiome.json +++ b/binaries/data/mods/public/maps/random/rmbiome/defaultbiome.json @@ -1,7 +1,6 @@ { "Environment": { - "TerrainAmbientColor": { "r": 0.447059, "g": 0.509804, "b": 0.54902 }, - "UnitsAmbientColor": { "r": 0.447059, "g": 0.509804, "b": 0.54902 } + "AmbientColor": { "r": 0.447059, "g": 0.509804, "b": 0.54902 }, }, "Terrains": { "mainTerrain": [ diff --git a/binaries/data/mods/public/maps/random/rmbiome/persian_highlands/spring.json b/binaries/data/mods/public/maps/random/rmbiome/persian_highlands/spring.json index 558fda9996..51b7c330d0 100644 --- a/binaries/data/mods/public/maps/random/rmbiome/persian_highlands/spring.json +++ b/binaries/data/mods/public/maps/random/rmbiome/persian_highlands/spring.json @@ -7,7 +7,7 @@ "SunColor": { "r": 1, "g": 0.796, "b": 0.374, "a": 0 }, "SunElevation": 0.52359877559, "SunRotation": -1.86532, - "TerrainAmbientColor": { "r": 0.329412, "g": 0.419608, "b": 0.501961, "a": 0 }, + "AmbientColor": { "r": 0.329412, "g": 0.419608, "b": 0.501961, "a": 0 }, "Fog": { "FogThickness": 0, "FogFactor": 0.002, diff --git a/binaries/data/mods/public/maps/random/rmbiome/persian_highlands/summer.json b/binaries/data/mods/public/maps/random/rmbiome/persian_highlands/summer.json index 90d865286f..5bd9c3f629 100644 --- a/binaries/data/mods/public/maps/random/rmbiome/persian_highlands/summer.json +++ b/binaries/data/mods/public/maps/random/rmbiome/persian_highlands/summer.json @@ -7,7 +7,7 @@ "SunColor": { "r": 1, "g": 0.796, "b": 0.374, "a": 0 }, "SunElevation": 0.52359877559, "SunRotation": -1.86532, - "TerrainAmbientColor": { "r": 0.501961, "g": 0.501961, "b": 0.501961, "a": 0 }, + "AmbientColor": { "r": 0.501961, "g": 0.501961, "b": 0.501961, "a": 0 }, "Fog": { "FogThickness": 0, "FogFactor": 0.002, diff --git a/binaries/data/mods/public/maps/random/rmgen/environment.js b/binaries/data/mods/public/maps/random/rmgen/environment.js index 0a9e474828..0988d52a76 100644 --- a/binaries/data/mods/public/maps/random/rmgen/environment.js +++ b/binaries/data/mods/public/maps/random/rmgen/environment.js @@ -7,8 +7,7 @@ var g_Environment = { "SunColor": { "r": 0.749020, "g": 0.749020, "b": 0.749020, "a": 0 }, // all rgb from 0 to 1 "SunElevation": 0.785398, // 0 to 2pi "SunRotation": 5.49779, // 0 to 2pi - "TerrainAmbientColor": { "r": 0.501961, "g": 0.501961, "b": 0.501961, "a": 0 }, - "UnitsAmbientColor": { "r": 0.501961, "g": 0.501961, "b": 0.501961, "a": 0 }, + "AmbientColor": { "r": 0.501961, "g": 0.501961, "b": 0.501961, "a": 0 }, "Water": { "WaterBody": { "Type": "ocean", // Subdirectory name of art/textures/animated/water @@ -67,14 +66,9 @@ function setSunRotation(r) g_Environment.SunRotation = r; } -function setTerrainAmbientColor(r, g, b) +function setAmbientColor(r, g, b) { - g_Environment.TerrainAmbientColor = { "r" : r, "g" : g, "b" : b, "a" : 0 }; -} - -function setUnitsAmbientColor(r, g, b) -{ - g_Environment.UnitsAmbientColor = { "r" : r, "g" : g, "b" : b, "a" : 0 }; + g_Environment.AmbientColor = { "r" : r, "g" : g, "b" : b, "a" : 0 }; } //////////////////////////////////////////////////////////////////////////// diff --git a/binaries/data/mods/public/maps/random/sahel.js b/binaries/data/mods/public/maps/random/sahel.js index ee04ad7f8d..83fdf9d5ea 100644 --- a/binaries/data/mods/public/maps/random/sahel.js +++ b/binaries/data/mods/public/maps/random/sahel.js @@ -228,8 +228,7 @@ setWaterWaviness(2.0); setWaterType("clap"); setWaterMurkiness(0.835938); -setUnitsAmbientColor(0.447059, 0.509804, 0.54902); -setTerrainAmbientColor(0.447059, 0.509804, 0.54902); +setAmbientColor(0.447059, 0.509804, 0.54902); setFogFactor(0.25); setFogThickness(0.15); diff --git a/binaries/data/mods/public/maps/scenarios/_default.xml b/binaries/data/mods/public/maps/scenarios/_default.xml index 90803c06ba..d4ad22a0a1 100644 --- a/binaries/data/mods/public/maps/scenarios/_default.xml +++ b/binaries/data/mods/public/maps/scenarios/_default.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:777483052a3e3e692d4db66a98095863de0a1bb85f33c38629608b4e54044f36 -size 1279 +oid sha256:19469a50037420ed8dfffd6c6c41e10d3afb3cbab2f6df7121945b3bf145fd3e +size 1210 diff --git a/binaries/data/mods/public/maps/scenarios/arcadia.xml b/binaries/data/mods/public/maps/scenarios/arcadia.xml index 4c22ad8d61..4306eac53e 100644 --- a/binaries/data/mods/public/maps/scenarios/arcadia.xml +++ b/binaries/data/mods/public/maps/scenarios/arcadia.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:df24099bd1e4ba085b825224333c5a4fe459f8f19e9b5f7b6b0dde55dc611682 -size 724177 +oid sha256:2ed51a05e809139f73af99b27361a6419a5fbd86c30f5718b0152cd65b79c742 +size 724108 diff --git a/binaries/data/mods/public/maps/scenarios/azure_coast_2p.xml b/binaries/data/mods/public/maps/scenarios/azure_coast_2p.xml index 3fcf209413..816c229c08 100644 --- a/binaries/data/mods/public/maps/scenarios/azure_coast_2p.xml +++ b/binaries/data/mods/public/maps/scenarios/azure_coast_2p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3588a7f4267f35474787c9e6f449ffb68bb9423a477c2faffd7e390fece9f1d2 -size 1517365 +oid sha256:197dcb2dcdf36de655a3d1d2eb8e777065d414ebe349d1db3ad68d9791f7d760 +size 1517297 diff --git a/binaries/data/mods/public/maps/scenarios/azure_coast_4p.xml b/binaries/data/mods/public/maps/scenarios/azure_coast_4p.xml index 4699de7b7c..c9d10290ce 100644 --- a/binaries/data/mods/public/maps/scenarios/azure_coast_4p.xml +++ b/binaries/data/mods/public/maps/scenarios/azure_coast_4p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:266d4ade86ac9d82882a4d1a8a7f76bfa988645ce475f596d178870f331f35a5 -size 1517659 +oid sha256:7b8ba11ad62ecfb6b41beb7e5791f2bc294c94011678dc05378cefb7c9f95e41 +size 1517591 diff --git a/binaries/data/mods/public/maps/scenarios/azure_coast_8p.xml b/binaries/data/mods/public/maps/scenarios/azure_coast_8p.xml index 054feb4d6a..2c9c38550f 100644 --- a/binaries/data/mods/public/maps/scenarios/azure_coast_8p.xml +++ b/binaries/data/mods/public/maps/scenarios/azure_coast_8p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cbe3d3253d40f912a66326c9142b3ec155b177ae7439eadc8514e76c5cc1d03f -size 1520375 +oid sha256:95a7b29f7629543c4be4b65ece1548ec8511fd8b7cb4c98f5076eacd84d9855d +size 1520306 diff --git a/binaries/data/mods/public/maps/scenarios/battle_for_the_tiber.xml b/binaries/data/mods/public/maps/scenarios/battle_for_the_tiber.xml index fded3254a1..2efa41c651 100644 --- a/binaries/data/mods/public/maps/scenarios/battle_for_the_tiber.xml +++ b/binaries/data/mods/public/maps/scenarios/battle_for_the_tiber.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c090394435ea3f7fb435c942e6e56c0931f728063a07de752b5684bf828093df -size 1386592 +oid sha256:1d783ab62bd7447757a8b5d61ab63f37d39e9813f7e718f327d45cc072b28ed6 +size 1386528 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 ee6dfd3960..927361dfe0 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:076ec043aee15282c2fcf42f5b8ae3ba7de76d3d7bd41a81208791a94f39ee68 -size 690558 +oid sha256:af99dbdde01a140fc325e5bf546ab06284aa48f16a6e259c70ba36f3bef63387 +size 690489 diff --git a/binaries/data/mods/public/maps/scenarios/bridge_demo.xml b/binaries/data/mods/public/maps/scenarios/bridge_demo.xml index 503153c9f9..f73b5c9a8d 100644 --- a/binaries/data/mods/public/maps/scenarios/bridge_demo.xml +++ b/binaries/data/mods/public/maps/scenarios/bridge_demo.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a289445758b87e8d559afea4d964c4dbdf7d885a3dc818ab6b6298e8144d1dd7 -size 714667 +oid sha256:1a335b336a1ea24460e72b57c03c6760c826cb8b70bca4ca132b19c220c2134b +size 714599 diff --git a/binaries/data/mods/public/maps/scenarios/campaign_test_map.xml b/binaries/data/mods/public/maps/scenarios/campaign_test_map.xml index d624267236..fdce7b4994 100644 --- a/binaries/data/mods/public/maps/scenarios/campaign_test_map.xml +++ b/binaries/data/mods/public/maps/scenarios/campaign_test_map.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:628630ed5f8725c8990dd3dc36a9dc53dd10e96686f27eedbb7d24cf91ed5705 -size 190905 +oid sha256:9b8cb24b0b33e8bb81259dee1b3664db939441880b2aa9b2a4f3994e0f92bb60 +size 190837 diff --git a/binaries/data/mods/public/maps/scenarios/campaign_test_map_2_heightmap.xml b/binaries/data/mods/public/maps/scenarios/campaign_test_map_2_heightmap.xml index e68db89efc..f1bf083307 100644 --- a/binaries/data/mods/public/maps/scenarios/campaign_test_map_2_heightmap.xml +++ b/binaries/data/mods/public/maps/scenarios/campaign_test_map_2_heightmap.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:081739613382d69def7cc3c28a67d7631e9cb8d9a0c4bd68bec0a80e90fa57ff -size 175812 +oid sha256:d097554f864a5b358bd21142a9aab33a609e90feaa4782c44389852e2a6786ba +size 175743 diff --git a/binaries/data/mods/public/maps/scenarios/cinema_demo.xml b/binaries/data/mods/public/maps/scenarios/cinema_demo.xml index a523251f62..18ec388675 100644 --- a/binaries/data/mods/public/maps/scenarios/cinema_demo.xml +++ b/binaries/data/mods/public/maps/scenarios/cinema_demo.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:24f3bd1b24b2eacec69e992f430020fd3fe2e8a492c636fab5ae452094a27e74 -size 420764 +oid sha256:9fe548c60a628d1edf05042d8118b92af5d1da6e38696c0e3ac4a958d15399a8 +size 420695 diff --git a/binaries/data/mods/public/maps/scenarios/combat_demo.xml b/binaries/data/mods/public/maps/scenarios/combat_demo.xml index 24d605cf4d..2b2862b77e 100755 --- a/binaries/data/mods/public/maps/scenarios/combat_demo.xml +++ b/binaries/data/mods/public/maps/scenarios/combat_demo.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3a5dd3359f0f24ee87865bcaafdfbe8a01907797e5be12dd519dd7ff8b681eb9 -size 43640 +oid sha256:62b5507db566c1367890771bd290d8e0fa99ed0ad40981addbe11bf5bb950fb3 +size 43571 diff --git a/binaries/data/mods/public/maps/scenarios/combat_demo_huge.xml b/binaries/data/mods/public/maps/scenarios/combat_demo_huge.xml index f44bec7e4f..059ef7fd82 100755 --- a/binaries/data/mods/public/maps/scenarios/combat_demo_huge.xml +++ b/binaries/data/mods/public/maps/scenarios/combat_demo_huge.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:136b2b913bc2a1085a6956bcb5fb63d0ddfd1bd7787f22e7e4636a89de196308 -size 2669 +oid sha256:ac474d1ae9ba924896f7e0cf57c7dc60e5e61aecb06f01203ef8b75441a68784 +size 2600 diff --git a/binaries/data/mods/public/maps/scenarios/death_canyon_invasion_force.xml b/binaries/data/mods/public/maps/scenarios/death_canyon_invasion_force.xml index 1825d42866..a535cae168 100644 --- a/binaries/data/mods/public/maps/scenarios/death_canyon_invasion_force.xml +++ b/binaries/data/mods/public/maps/scenarios/death_canyon_invasion_force.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cef7f27fdf991aa93e62a4c1f79a734d85835112a6894e1d3a41d31f6f2dc936 -size 598964 +oid sha256:d253ebc14d3613572eac9d4e13fa711becfd8599808421f7f3468fc6acfc5147 +size 598895 diff --git a/binaries/data/mods/public/maps/scenarios/demo_trading.xml b/binaries/data/mods/public/maps/scenarios/demo_trading.xml index 2f6a8ecabb..00022a85b1 100644 --- a/binaries/data/mods/public/maps/scenarios/demo_trading.xml +++ b/binaries/data/mods/public/maps/scenarios/demo_trading.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2b07896208f8306aff5599fb008ba3a2e366219fd27cfa3767166c6276690467 -size 5926 +oid sha256:306d0fbffdd12dadb19a6048350909559cbd8a99b19646df85a50064db2aa2a8 +size 5857 diff --git a/binaries/data/mods/public/maps/scenarios/eire_and_albion.xml b/binaries/data/mods/public/maps/scenarios/eire_and_albion.xml index f1d494e83a..cfedad1dc0 100644 --- a/binaries/data/mods/public/maps/scenarios/eire_and_albion.xml +++ b/binaries/data/mods/public/maps/scenarios/eire_and_albion.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d87025f1379ae15ecc1af94ef53e94b0a6799fbd49843cf85e62fe59fa906412 -size 2245 +oid sha256:8e7530286b63a01d37fb38407d24cd964759afba70d337a8e879a791f4853153 +size 2177 diff --git a/binaries/data/mods/public/maps/scenarios/fast_oasis.xml b/binaries/data/mods/public/maps/scenarios/fast_oasis.xml index c39a2b9162..89238f9d9e 100644 --- a/binaries/data/mods/public/maps/scenarios/fast_oasis.xml +++ b/binaries/data/mods/public/maps/scenarios/fast_oasis.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:60d6dc606e868f97c29bca20743554a725e8d46adfe3d0b668c804e00057e1ee -size 220859 +oid sha256:b35c9397eb65bed0a5eb71abd56581a34be37b644288c9eaeafbf15a05079eb1 +size 220790 diff --git a/binaries/data/mods/public/maps/scenarios/fishing_demo.xml b/binaries/data/mods/public/maps/scenarios/fishing_demo.xml index 227012c819..c67d6cc9a6 100644 --- a/binaries/data/mods/public/maps/scenarios/fishing_demo.xml +++ b/binaries/data/mods/public/maps/scenarios/fishing_demo.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:81f0ab583f3222566e3bc1176aab1b7bcf6d81b794862c24344c9ad73e6a11eb -size 6473 +oid sha256:bafe39d270d0ccc69d64a01ac8754b124bc3fb42a3bea1b4da357f19919171db +size 6405 diff --git a/binaries/data/mods/public/maps/scenarios/flight_demo.xml b/binaries/data/mods/public/maps/scenarios/flight_demo.xml index fb9cf6aa31..a96e855d12 100644 --- a/binaries/data/mods/public/maps/scenarios/flight_demo.xml +++ b/binaries/data/mods/public/maps/scenarios/flight_demo.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bb75430f46de4044018845e6f727333e2facae164c48b88c06b7de8e91323b88 -size 20577 +oid sha256:a5cd625bca8b2eeed9d74a45e6f9be4a782cc7af4938e5c90809101e6e287758 +size 20508 diff --git a/binaries/data/mods/public/maps/scenarios/gold_rush.xml b/binaries/data/mods/public/maps/scenarios/gold_rush.xml index a579a1da37..2b2d4cb756 100644 --- a/binaries/data/mods/public/maps/scenarios/gold_rush.xml +++ b/binaries/data/mods/public/maps/scenarios/gold_rush.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4b51d293969e7967948edca9867f15844ac67a53631237c38f6589f7736b8c27 -size 177815 +oid sha256:53ef440f12fb61c76b62f006524a031569e2e2b423c2e1922f8c1f5cb79b9ab5 +size 177746 diff --git a/binaries/data/mods/public/maps/scenarios/gorge.xml b/binaries/data/mods/public/maps/scenarios/gorge.xml index abf1d4e6a2..f113dbf020 100644 --- a/binaries/data/mods/public/maps/scenarios/gorge.xml +++ b/binaries/data/mods/public/maps/scenarios/gorge.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e23d983f247b409ad15f36da6e51278fb609ba4f742849ae3f068b8bab0e542c -size 1556 +oid sha256:53486949b2a1d23b1000788d2f382fb62aedbcd2909e859f738cf7b9923d5a66 +size 1487 diff --git a/binaries/data/mods/public/maps/scenarios/laconia.xml b/binaries/data/mods/public/maps/scenarios/laconia.xml index a695b0ac4d..765494ad47 100644 --- a/binaries/data/mods/public/maps/scenarios/laconia.xml +++ b/binaries/data/mods/public/maps/scenarios/laconia.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:32feb40bcc3b9c57215d64aab9e684eeba316ee74b0dd812ae25aa9838ed4803 -size 191501 +oid sha256:0eb27e59360ee511a412522254e9f40cbb79d2de97579ffc7edfb1345bbcbb4c +size 191433 diff --git a/binaries/data/mods/public/maps/scenarios/migration.xml b/binaries/data/mods/public/maps/scenarios/migration.xml index 2b8225de10..209d0dced5 100644 --- a/binaries/data/mods/public/maps/scenarios/migration.xml +++ b/binaries/data/mods/public/maps/scenarios/migration.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:06927d474cc2ad2546248c0f9621079a88e2622a26a56907d6ac7f277591e99a -size 791541 +oid sha256:7a9ba77e06a1e7d823da5e5c0dc8658e828829af8525aa2c7b30fc69dd0fa2ab +size 791472 diff --git a/binaries/data/mods/public/maps/scenarios/miletus.xml b/binaries/data/mods/public/maps/scenarios/miletus.xml index 13b4d9d84a..9e9a465f95 100644 --- a/binaries/data/mods/public/maps/scenarios/miletus.xml +++ b/binaries/data/mods/public/maps/scenarios/miletus.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8a907d2973aa3d5c516c42057a1a1d157be5ccbc0d3666deb804e061754a9c69 -size 206197 +oid sha256:f6ab69e86c12fd4af807e8d7e143ce0bcf9d32de7d492bcee72684b3e6ec505c +size 206128 diff --git a/binaries/data/mods/public/maps/scenarios/multiplayer_demo.xml b/binaries/data/mods/public/maps/scenarios/multiplayer_demo.xml index 9d270db366..7f93aecef2 100644 --- a/binaries/data/mods/public/maps/scenarios/multiplayer_demo.xml +++ b/binaries/data/mods/public/maps/scenarios/multiplayer_demo.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e5aea18abd9486d22febd809f4f27bce506bddaa98361bd979746b15fde9d35d -size 104292 +oid sha256:b4e1dac73ac6600ab103d40bc09830703acbcbe62d860187cadc9aecb96caa99 +size 104224 diff --git a/binaries/data/mods/public/maps/scenarios/napata_reconstruction.xml b/binaries/data/mods/public/maps/scenarios/napata_reconstruction.xml index 563ff861e6..b71b677fed 100644 --- a/binaries/data/mods/public/maps/scenarios/napata_reconstruction.xml +++ b/binaries/data/mods/public/maps/scenarios/napata_reconstruction.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8650b777c81e0a588f530304ba957b29deaa9b43edbf70873ab7a2bf012c46b5 -size 2878825 +oid sha256:06fb37c6603749c5bf0ed27257f3c01fcd8831e79e7a23c3f81701f3e8f84c94 +size 2878756 diff --git a/binaries/data/mods/public/maps/scenarios/necropolis.xml b/binaries/data/mods/public/maps/scenarios/necropolis.xml index f94fabb07d..44ae429a91 100644 --- a/binaries/data/mods/public/maps/scenarios/necropolis.xml +++ b/binaries/data/mods/public/maps/scenarios/necropolis.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a99ffa23be15f59d08a0dac05605dca258f2ae3be5257647bcb28d4327465e8e -size 1583150 +oid sha256:98e1191072adc1d055c2c373a89d46da4e9b7b19ae3bb64a9500d50600a1ef65 +size 1583081 diff --git a/binaries/data/mods/public/maps/scenarios/pathfinding_demo.xml b/binaries/data/mods/public/maps/scenarios/pathfinding_demo.xml index 166c408ce3..683914ea63 100644 --- a/binaries/data/mods/public/maps/scenarios/pathfinding_demo.xml +++ b/binaries/data/mods/public/maps/scenarios/pathfinding_demo.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d0e971dedd2b51906f37569bd78e8fa6617a25265dfbf1f4a6ac2fc211e4097f -size 20681 +oid sha256:f38646c2cb997dcccebab6d191a7d117041342454901a8481c71a8a1031a8bbe +size 20612 diff --git a/binaries/data/mods/public/maps/scenarios/pathfinding_terrain_demo.xml b/binaries/data/mods/public/maps/scenarios/pathfinding_terrain_demo.xml index 078833d631..866b355f96 100644 --- a/binaries/data/mods/public/maps/scenarios/pathfinding_terrain_demo.xml +++ b/binaries/data/mods/public/maps/scenarios/pathfinding_terrain_demo.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ed7cd83f4ccf2c353a26f21eaae53442a63b93479977c1b613eb74dbf8018525 -size 7686 +oid sha256:451c190b7339b92b3d20b75b718b1b1c9f14f6b0c33de4736e79856303547540 +size 7617 diff --git a/binaries/data/mods/public/maps/scenarios/peloponnese.xml b/binaries/data/mods/public/maps/scenarios/peloponnese.xml index 01cc819760..6899fa4272 100644 --- a/binaries/data/mods/public/maps/scenarios/peloponnese.xml +++ b/binaries/data/mods/public/maps/scenarios/peloponnese.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9055beadbf2146b554935026f6ed9f65b4bab3536652544d335ee1cdea4cd0a5 -size 1054641 +oid sha256:5f662efbbe7c6081dbaecfab0cabedf16b2b58f0c010c8f6e3257c6bbf3cc443 +size 1054573 diff --git a/binaries/data/mods/public/maps/scenarios/pickup_test_map.xml b/binaries/data/mods/public/maps/scenarios/pickup_test_map.xml index c8fdd19f4b..931f7a5f50 100644 --- a/binaries/data/mods/public/maps/scenarios/pickup_test_map.xml +++ b/binaries/data/mods/public/maps/scenarios/pickup_test_map.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cd4bfab417f53d91c1cf519da65aec523b7a1726296dc2d72680c0824acf14df -size 4665 +oid sha256:ca36a4419d5a6394f63dbba0ce46302d95e2b6ba65a3d2ac8edf8272a27e77ba +size 4596 diff --git a/binaries/data/mods/public/maps/scenarios/polynesia.xml b/binaries/data/mods/public/maps/scenarios/polynesia.xml index 80a5787617..3360903265 100644 --- a/binaries/data/mods/public/maps/scenarios/polynesia.xml +++ b/binaries/data/mods/public/maps/scenarios/polynesia.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:14f637a6c72936f5baa25d7f90e90056231e3ac12af1d5b06bd8f463adc050c1 -size 76458 +oid sha256:04a0e4f407897695726eb9ba865f98498315122d502354a102eab57736ec31d0 +size 76389 diff --git a/binaries/data/mods/public/maps/scenarios/reservoir.xml b/binaries/data/mods/public/maps/scenarios/reservoir.xml index d09b67c883..8d4b6818e4 100644 --- a/binaries/data/mods/public/maps/scenarios/reservoir.xml +++ b/binaries/data/mods/public/maps/scenarios/reservoir.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b35339ec385505b73417ba10150ed148a078a29f55d499d56c7bf9ee0a273259 -size 12172 +oid sha256:005bdea27e093e44b4711a1b327d2e1d47261581991f6b5b1e835e2a42727328 +size 12103 diff --git a/binaries/data/mods/public/maps/scenarios/resource_demo.xml b/binaries/data/mods/public/maps/scenarios/resource_demo.xml index 132ce742cd..9ec5b740b8 100644 --- a/binaries/data/mods/public/maps/scenarios/resource_demo.xml +++ b/binaries/data/mods/public/maps/scenarios/resource_demo.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1f1037854a91e1554e9e9de1868fde82e261fe663885a4ef69152aca961022bc -size 42315 +oid sha256:8c7f2998c0d2a291c6a7ca45c5192eea4c47c130e7c5850a83daad9f54c60755 +size 42246 diff --git a/binaries/data/mods/public/maps/scenarios/road_demo.xml b/binaries/data/mods/public/maps/scenarios/road_demo.xml index 020cf9ddfc..cf05dda4b5 100644 --- a/binaries/data/mods/public/maps/scenarios/road_demo.xml +++ b/binaries/data/mods/public/maps/scenarios/road_demo.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:073f20bd1e7f341c86f4837995f9bf530f2eec6f7ac088c7f71fe1e34d02e5b1 -size 26507 +oid sha256:c43bd65d0bd5400ee9ea4ea8fff9f7783773fe8f885b4f7d9b5d870da08c49d6 +size 26439 diff --git a/binaries/data/mods/public/maps/scenarios/saharan_oases.xml b/binaries/data/mods/public/maps/scenarios/saharan_oases.xml index 082c3999d6..0d86e19445 100644 --- a/binaries/data/mods/public/maps/scenarios/saharan_oases.xml +++ b/binaries/data/mods/public/maps/scenarios/saharan_oases.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b34bce8588e4a717162218d5f41b528ec8e3f0d985d5ff093eb012e1877c842d -size 480871 +oid sha256:7551408ea2a43f3511f5ebf8c00def59f7c933f49dda366df7e7d286ef3b3e6f +size 480802 diff --git a/binaries/data/mods/public/maps/scenarios/sahel.xml b/binaries/data/mods/public/maps/scenarios/sahel.xml index d440636649..b489ffae82 100644 --- a/binaries/data/mods/public/maps/scenarios/sahel.xml +++ b/binaries/data/mods/public/maps/scenarios/sahel.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ba96b17103ca16f08bbdc8b118e0baf6d351af5574a2f1f1f4fe3ce0b02d430c -size 625134 +oid sha256:e0bb7ea070759427567dab19130193ee2aed15ea1b0ed8531aed1df043cace20 +size 625065 diff --git a/binaries/data/mods/public/maps/scenarios/sandbox_athenians.xml b/binaries/data/mods/public/maps/scenarios/sandbox_athenians.xml index 4a7cf0f980..c07eedbb52 100644 --- a/binaries/data/mods/public/maps/scenarios/sandbox_athenians.xml +++ b/binaries/data/mods/public/maps/scenarios/sandbox_athenians.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3be6e5dbf2b4ac56a31921a2d8cf72e5cc81b1ec84a14c3b593637a5cc4eebaa -size 269723 +oid sha256:392337d2abb5e0641cdb20bc82e958876e33b981a83aca61b8f073aa5c549ecc +size 269655 diff --git a/binaries/data/mods/public/maps/scenarios/sandbox_britons.xml b/binaries/data/mods/public/maps/scenarios/sandbox_britons.xml index 103da85183..ab4c2510ea 100644 --- a/binaries/data/mods/public/maps/scenarios/sandbox_britons.xml +++ b/binaries/data/mods/public/maps/scenarios/sandbox_britons.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cc22b54cab67f50fbedbd68618a8f8e5ff0e21f8785f6006adb3e8699a17adc8 -size 674953 +oid sha256:02792da702a9caca8054eba641de5465afc383841d4cdf39809fa016d4b2af13 +size 674885 diff --git a/binaries/data/mods/public/maps/scenarios/sandbox_carthaginians.xml b/binaries/data/mods/public/maps/scenarios/sandbox_carthaginians.xml index e38adad7ff..0dcc7f8168 100644 --- a/binaries/data/mods/public/maps/scenarios/sandbox_carthaginians.xml +++ b/binaries/data/mods/public/maps/scenarios/sandbox_carthaginians.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bb562308c9bfcf3dafedc9531efc7a12e4f49194639cced2e692d957eae51f26 -size 172903 +oid sha256:629579c24b250d8905d28eea9f86b358638e91d6b0d297e0e42a85453238852f +size 172834 diff --git a/binaries/data/mods/public/maps/scenarios/sandbox_gauls.xml b/binaries/data/mods/public/maps/scenarios/sandbox_gauls.xml index 27a62bb670..2b02c64499 100644 --- a/binaries/data/mods/public/maps/scenarios/sandbox_gauls.xml +++ b/binaries/data/mods/public/maps/scenarios/sandbox_gauls.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7745a8bc6db20fb390400fb6dc670d4ac1230c9abce20065af6b1344161d5168 -size 676562 +oid sha256:3b7ad7cbc4b8343df3ed6fd7118aecf5f03008327d815cf947b9f4e6d9343d52 +size 676494 diff --git a/binaries/data/mods/public/maps/scenarios/sandbox_iberians.xml b/binaries/data/mods/public/maps/scenarios/sandbox_iberians.xml index 54a99f038e..43732a35f6 100644 --- a/binaries/data/mods/public/maps/scenarios/sandbox_iberians.xml +++ b/binaries/data/mods/public/maps/scenarios/sandbox_iberians.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:77b55398f05b74702b0126ea17fdae9cd8fc083d458f803fe5e566bc0b84a49d -size 113803 +oid sha256:bbf0683ef6293054f9e3b1f2d8677628711075c32281b3ac2a4a3c5b7f3a2a0b +size 113734 diff --git a/binaries/data/mods/public/maps/scenarios/sandbox_kushites.xml b/binaries/data/mods/public/maps/scenarios/sandbox_kushites.xml index c4bd1e9a43..432f7adc8c 100644 --- a/binaries/data/mods/public/maps/scenarios/sandbox_kushites.xml +++ b/binaries/data/mods/public/maps/scenarios/sandbox_kushites.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:db80df096616aaf31e7fbe16d185316cd7d87175458979ec0fc12db5ad8d18f2 -size 418884 +oid sha256:b9d8aef1a2a01e92f889b332c9d08b41f96b6e80266d736f3953097eecbd5337 +size 418815 diff --git a/binaries/data/mods/public/maps/scenarios/sandbox_macedonians.xml b/binaries/data/mods/public/maps/scenarios/sandbox_macedonians.xml index cc74966831..5e78802691 100644 --- a/binaries/data/mods/public/maps/scenarios/sandbox_macedonians.xml +++ b/binaries/data/mods/public/maps/scenarios/sandbox_macedonians.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:35596d5fe8591853e677ed91e7e443ed7350e398118b42b0287888e507f6175d -size 315725 +oid sha256:06bcf62003e3c1dc382c5a7d84323cf590377724848ccc2f939cad84c5a79fcf +size 315657 diff --git a/binaries/data/mods/public/maps/scenarios/sandbox_mauryas.xml b/binaries/data/mods/public/maps/scenarios/sandbox_mauryas.xml index cac5e5044a..d9e5695d52 100644 --- a/binaries/data/mods/public/maps/scenarios/sandbox_mauryas.xml +++ b/binaries/data/mods/public/maps/scenarios/sandbox_mauryas.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d766c348efb8acb208daed2e8a1536b4915f574d6362b3ba3a595a5d54f7cd83 -size 930188 +oid sha256:386a3058b62bc3887c55f30c2fda4e3a605281049ff491790934f3687ad10a47 +size 930120 diff --git a/binaries/data/mods/public/maps/scenarios/sandbox_persians.xml b/binaries/data/mods/public/maps/scenarios/sandbox_persians.xml index b4cbeedac8..5b13d327d9 100644 --- a/binaries/data/mods/public/maps/scenarios/sandbox_persians.xml +++ b/binaries/data/mods/public/maps/scenarios/sandbox_persians.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f1e477f7d0d9ecf0a60f80665c83fa7942316ca047c9a359fcebc823f0b80544 -size 258407 +oid sha256:739cea28f4e48e292d0317cb8527f3fbaecd4ba447c0ad7eeef4fc47798c2f89 +size 258338 diff --git a/binaries/data/mods/public/maps/scenarios/sandbox_ptolemies.xml b/binaries/data/mods/public/maps/scenarios/sandbox_ptolemies.xml index e5a8d72e36..f1ce5458c7 100644 --- a/binaries/data/mods/public/maps/scenarios/sandbox_ptolemies.xml +++ b/binaries/data/mods/public/maps/scenarios/sandbox_ptolemies.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4e78382851cf4ffc132e773f1b79d19fb6da29d254a1d892d4732788a3616517 -size 354760 +oid sha256:e10d8692993ab37e5524a7749b842336f8e96717d59c7d84374e96be4921bc4f +size 354691 diff --git a/binaries/data/mods/public/maps/scenarios/sandbox_ptolemies_02.xml b/binaries/data/mods/public/maps/scenarios/sandbox_ptolemies_02.xml index 1be206eeed..991df032de 100644 --- a/binaries/data/mods/public/maps/scenarios/sandbox_ptolemies_02.xml +++ b/binaries/data/mods/public/maps/scenarios/sandbox_ptolemies_02.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bc17a8a0fbe4cef950939764308d7626f23ff8996e52204b678f01e922a98781 -size 471988 +oid sha256:7ae057581a7e08f51bec756e4accb6599f6e265e4642951306b65e5c79e14731 +size 471919 diff --git a/binaries/data/mods/public/maps/scenarios/sandbox_romans.xml b/binaries/data/mods/public/maps/scenarios/sandbox_romans.xml index d1c162fcc4..04ed66291f 100644 --- a/binaries/data/mods/public/maps/scenarios/sandbox_romans.xml +++ b/binaries/data/mods/public/maps/scenarios/sandbox_romans.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:82054413e1fcaa693c95b2ad2c424ba284f01d9d0f016c831bcdc8daf371196b -size 355559 +oid sha256:b2bccd21420c294832dbef5d70e6395abd10cd79d92a68f0d2695c9a79f224b5 +size 355496 diff --git a/binaries/data/mods/public/maps/scenarios/sandbox_seleucids.xml b/binaries/data/mods/public/maps/scenarios/sandbox_seleucids.xml index e5a4bb7260..07113ddc4a 100644 --- a/binaries/data/mods/public/maps/scenarios/sandbox_seleucids.xml +++ b/binaries/data/mods/public/maps/scenarios/sandbox_seleucids.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3b788c3ff2f8856554611ffdd20d0048b84fe426b22fcc4b50c071861239b0cf -size 377642 +oid sha256:6b556a47d1f5632f309d6e5adc0284a3843b347e3bab7f73941afc9d475a9848 +size 377579 diff --git a/binaries/data/mods/public/maps/scenarios/sandbox_spartans.xml b/binaries/data/mods/public/maps/scenarios/sandbox_spartans.xml index a52dce4920..6348db572c 100644 --- a/binaries/data/mods/public/maps/scenarios/sandbox_spartans.xml +++ b/binaries/data/mods/public/maps/scenarios/sandbox_spartans.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1ead25fffadb4d1982f2590a2f0651fad74c2b00c67826d5ff7fac83d66c0c78 -size 248220 +oid sha256:ac1457859182a9158444983427deb14f27525d13df499662cba22cba5f7feba6 +size 248151 diff --git a/binaries/data/mods/public/maps/scenarios/savanna_ravine.xml b/binaries/data/mods/public/maps/scenarios/savanna_ravine.xml index be0aaf8cd0..aaac07d903 100644 --- a/binaries/data/mods/public/maps/scenarios/savanna_ravine.xml +++ b/binaries/data/mods/public/maps/scenarios/savanna_ravine.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:127be287f65b6340d660c5d1754a3598a4aedc2eb6b44b1abb981217be071a55 -size 118085 +oid sha256:8b14420916739e879aa4fb3d016b33f370acdf022359487d91f1f508a61997ce +size 118016 diff --git a/binaries/data/mods/public/maps/scenarios/serengeti.xml b/binaries/data/mods/public/maps/scenarios/serengeti.xml index 90980b17e1..2a3927d2ea 100644 --- a/binaries/data/mods/public/maps/scenarios/serengeti.xml +++ b/binaries/data/mods/public/maps/scenarios/serengeti.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0976b26c084e7930576ae627e1c77975180f5e342127a5aadf0f25a5f21d4d0f -size 501783 +oid sha256:0e5f10e60f510373bf68b5e7b58e0b386535e63bd95f80e87e94de6526582b72 +size 501714 diff --git a/binaries/data/mods/public/maps/scenarios/ship_formations.xml b/binaries/data/mods/public/maps/scenarios/ship_formations.xml index 74a0e431c9..caf236998f 100644 --- a/binaries/data/mods/public/maps/scenarios/ship_formations.xml +++ b/binaries/data/mods/public/maps/scenarios/ship_formations.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3325a4159a610d47d0967ec7543c910ce7ab9c19053043ac2afbeeb7f4446dfa -size 8631 +oid sha256:157d9b3b911a69becb1e258b349da026541da64f99d8d024fde89e12c685cc29 +size 8562 diff --git a/binaries/data/mods/public/maps/scenarios/shipattacks.xml b/binaries/data/mods/public/maps/scenarios/shipattacks.xml index ef4a7b8458..85bd39e838 100644 --- a/binaries/data/mods/public/maps/scenarios/shipattacks.xml +++ b/binaries/data/mods/public/maps/scenarios/shipattacks.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f49382ba7dbc7db2ff6b3b6ecb509f9a6094b35f53ce277856814e816b9d6868 -size 6645 +oid sha256:184dccbe7453acf14c40444c1d2225dd27b22349864c9dc5ea4d7d7cc7f1462b +size 6577 diff --git a/binaries/data/mods/public/maps/scenarios/siwa_oasis.xml b/binaries/data/mods/public/maps/scenarios/siwa_oasis.xml index 8c2be65ec8..d1b0d3a3f9 100644 --- a/binaries/data/mods/public/maps/scenarios/siwa_oasis.xml +++ b/binaries/data/mods/public/maps/scenarios/siwa_oasis.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aa8135bcbe6fd57ec6ed8227d3fd7c82cac8d59771a2e6518d7ec5c44d0a2fab -size 489081 +oid sha256:c948852adc4107225a9a7e5485fc0a869eaed7064834fcb22c2637774dcef040 +size 489012 diff --git a/binaries/data/mods/public/maps/scenarios/temperate_map.xml b/binaries/data/mods/public/maps/scenarios/temperate_map.xml index d9cb6ac378..8348ebbfd9 100644 --- a/binaries/data/mods/public/maps/scenarios/temperate_map.xml +++ b/binaries/data/mods/public/maps/scenarios/temperate_map.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ea824799e82ca500020ba5e999a8621b3728f92173720cf6e005f33207aab216 -size 1147 +oid sha256:594b150f8c7f609be9cbfb231aee4f06e86993a703c680b1a5e52710b80d01bd +size 1078 diff --git a/binaries/data/mods/public/maps/scenarios/territory_demo.xml b/binaries/data/mods/public/maps/scenarios/territory_demo.xml index 5c1fadb03a..a74244d700 100644 --- a/binaries/data/mods/public/maps/scenarios/territory_demo.xml +++ b/binaries/data/mods/public/maps/scenarios/territory_demo.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:46d00da7f8f8be82fc153bc7263f2dda8a5e028db1326a5252aa6da1a562d620 -size 12892 +oid sha256:f2ecbd24c919b596a2da286ec0f75ad639a6b6fece4593a0480c3598eb9eda83 +size 12823 diff --git a/binaries/data/mods/public/maps/scenarios/test_foundation.xml b/binaries/data/mods/public/maps/scenarios/test_foundation.xml index 2ec5b02dbf..18c48b6e9c 100644 --- a/binaries/data/mods/public/maps/scenarios/test_foundation.xml +++ b/binaries/data/mods/public/maps/scenarios/test_foundation.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6b7c4d80aa90325947131beb2c96fcc61e76cd4732f60ff8fbbaf7f1a4f2d86e -size 15457 +oid sha256:1232772535db95ca79a4a9376b98783d3a9a4e2f0f94226fd029bac8acfcf6dd +size 15388 diff --git a/binaries/data/mods/public/maps/scenarios/the_massacre_of_delphi.xml b/binaries/data/mods/public/maps/scenarios/the_massacre_of_delphi.xml index 634f615aca..8cfa0cc098 100644 --- a/binaries/data/mods/public/maps/scenarios/the_massacre_of_delphi.xml +++ b/binaries/data/mods/public/maps/scenarios/the_massacre_of_delphi.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2bd5fba57c382b9e914fbde1a7a295404876e23ce033416095afafec1e25185d -size 519710 +oid sha256:75b565d1f3eb23179e33a65f431c238715317ebe9909c1ae70a31db52094fe5f +size 519642 diff --git a/binaries/data/mods/public/maps/scenarios/the_persian_gates.xml b/binaries/data/mods/public/maps/scenarios/the_persian_gates.xml index 83cc370e3e..e0efb8d89a 100644 --- a/binaries/data/mods/public/maps/scenarios/the_persian_gates.xml +++ b/binaries/data/mods/public/maps/scenarios/the_persian_gates.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:85badd9f30bd5cae396e438098160818cd7716c0b815a36f25e85f74d8ceb529 -size 205893 +oid sha256:2449946a3d4f52f9095e83e3564609e5087d480bb7bfd119ae1b7cae5ff5fb80 +size 205825 diff --git a/binaries/data/mods/public/maps/scenarios/third_macedonian_war.xml b/binaries/data/mods/public/maps/scenarios/third_macedonian_war.xml index 3f611b5aef..1355f55eb0 100644 --- a/binaries/data/mods/public/maps/scenarios/third_macedonian_war.xml +++ b/binaries/data/mods/public/maps/scenarios/third_macedonian_war.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9040f1dbbc5adc4661558a06ecfec20424cbf86142233397b5bb42b3c325e2ec -size 197383 +oid sha256:366e309b9009d0f332fffecfbc54fd1b95cef59ee5884a4ae2ed0a9278c67bc7 +size 197314 diff --git a/binaries/data/mods/public/maps/scenarios/treasure_islands.xml b/binaries/data/mods/public/maps/scenarios/treasure_islands.xml index 9774c8b6fa..e1332db7db 100644 --- a/binaries/data/mods/public/maps/scenarios/treasure_islands.xml +++ b/binaries/data/mods/public/maps/scenarios/treasure_islands.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3206537a4bed93b3ddddc8132ccd447e01578ec197a501deedda7d38a1df1b9b -size 489380 +oid sha256:5f31ee066094af5106d41e9e5f7771f5842329853bd8d8d54bbc9530c4096fbd +size 489311 diff --git a/binaries/data/mods/public/maps/scenarios/triggers_demo.xml b/binaries/data/mods/public/maps/scenarios/triggers_demo.xml index 0a9c9c3ba9..699aab8626 100644 --- a/binaries/data/mods/public/maps/scenarios/triggers_demo.xml +++ b/binaries/data/mods/public/maps/scenarios/triggers_demo.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0de83158747e49d1270b5fbf7b299deec23cac063e5c863fe8801a8e0b78c078 -size 437104 +oid sha256:69db4417eb41f89cfa99c5c2965cc47d52445e74b716b5ccb132340bb3ae95b0 +size 437050 diff --git a/binaries/data/mods/public/maps/scenarios/tropical_island.xml b/binaries/data/mods/public/maps/scenarios/tropical_island.xml index cf0ed1254e..6d3b22a465 100644 --- a/binaries/data/mods/public/maps/scenarios/tropical_island.xml +++ b/binaries/data/mods/public/maps/scenarios/tropical_island.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:313defa9cff63010fa06eb33ab58268d91fce5f076c1b0e9ef4070cd6e4ed928 -size 160512 +oid sha256:3444439cea116bd40ed927054f21c3f734fd6e019e2edf51d0099cd0daccfd08 +size 160443 diff --git a/binaries/data/mods/public/maps/scenarios/unit_dancing_test.xml b/binaries/data/mods/public/maps/scenarios/unit_dancing_test.xml index c1456b52d8..6ac386af9d 100644 --- a/binaries/data/mods/public/maps/scenarios/unit_dancing_test.xml +++ b/binaries/data/mods/public/maps/scenarios/unit_dancing_test.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:21f3351ec5a53734862b5697490b86660012ae6e6ce257028fa8fc2040c53ced -size 1740 +oid sha256:3f1e23363b8d36816fbed77ef937c08daa20c5f6f2ce8eca5bbfee3d6853a9d9 +size 1671 diff --git a/binaries/data/mods/public/maps/scenarios/unit_motion_integration_test.xml b/binaries/data/mods/public/maps/scenarios/unit_motion_integration_test.xml index 1ac296015a..4dbb376c76 100755 --- a/binaries/data/mods/public/maps/scenarios/unit_motion_integration_test.xml +++ b/binaries/data/mods/public/maps/scenarios/unit_motion_integration_test.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dc65d8459063ab0fb6a88488aaceddf2efdc06eb6ade65fd93ec85feeb6e708b -size 2006 +oid sha256:f14b360ab7f1f62ed7ea4cb9c8bf0869fc6a32b885b320391e26dbf4cd595df7 +size 1937 diff --git a/binaries/data/mods/public/maps/scenarios/units_demo.xml b/binaries/data/mods/public/maps/scenarios/units_demo.xml index 2c27a523b2..112e897bf3 100644 --- a/binaries/data/mods/public/maps/scenarios/units_demo.xml +++ b/binaries/data/mods/public/maps/scenarios/units_demo.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:199b820d0a2f01bbe04378876c9834ab0a7c3ef3e89b79424cd48f34e25fa083 -size 1159 +oid sha256:94e90a754c8ecf1761c5d2121b4d05c3506d9980ce9a7a655cf4c7898e80a1d0 +size 1090 diff --git a/binaries/data/mods/public/maps/scenarios/walls.xml b/binaries/data/mods/public/maps/scenarios/walls.xml index ed7c3c2ea8..6b4a081191 100644 --- a/binaries/data/mods/public/maps/scenarios/walls.xml +++ b/binaries/data/mods/public/maps/scenarios/walls.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4c821bcf164f810503751d5c3c489a187c51800019831a90f7aa599a9e4792f4 -size 214565 +oid sha256:6b52c1b5050276d86ca112f04d962fe311aa3bda66f627b32d52a383461a0ae6 +size 214496 diff --git a/binaries/data/mods/public/maps/scenarios/walltest.xml b/binaries/data/mods/public/maps/scenarios/walltest.xml index 74434691a4..a59115e55a 100644 --- a/binaries/data/mods/public/maps/scenarios/walltest.xml +++ b/binaries/data/mods/public/maps/scenarios/walltest.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dfce9c5c4c235c1d7c7c6edb432180754f6f465c25623936c325af1a612853d6 -size 4995 +oid sha256:505e0225f3e82436e95de220c824fe342ee99794d88ffa7a5637075517b5931d +size 4926 diff --git a/binaries/data/mods/public/maps/scenarios/we_are_legion.xml b/binaries/data/mods/public/maps/scenarios/we_are_legion.xml index 858f53bc08..a847fa52db 100644 --- a/binaries/data/mods/public/maps/scenarios/we_are_legion.xml +++ b/binaries/data/mods/public/maps/scenarios/we_are_legion.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6b8aa727438a742e2069e7eafc34f4e327c0dcfc3043fa456cba37c620ee87b6 -size 52621 +oid sha256:0dee77dc77dc0f102bbcde84549b578c092574c043677cb6ef2eb7c4faaa211e +size 52553 diff --git a/binaries/data/mods/public/maps/skirmishes/acropolis_bay_2p.xml b/binaries/data/mods/public/maps/skirmishes/acropolis_bay_2p.xml index fa02dea268..7a7f57cf63 100644 --- a/binaries/data/mods/public/maps/skirmishes/acropolis_bay_2p.xml +++ b/binaries/data/mods/public/maps/skirmishes/acropolis_bay_2p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:67595238dc12bea62602d01bdb1d327fb05ce61586a355f56bc3831fd121db24 -size 863660 +oid sha256:e8376c9f34f5a83fce131356ecd98852b6370bd66f7690ea287270599a6ee906 +size 863592 diff --git a/binaries/data/mods/public/maps/skirmishes/alpine_mountains_3p.xml b/binaries/data/mods/public/maps/skirmishes/alpine_mountains_3p.xml index 74ebb28056..6bc962cfb6 100644 --- a/binaries/data/mods/public/maps/skirmishes/alpine_mountains_3p.xml +++ b/binaries/data/mods/public/maps/skirmishes/alpine_mountains_3p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a563d3cb906b7021e1cf2256ef1f845e62520ad7ae5a8b7377ccddefb7e4923a -size 636847 +oid sha256:3f55ce5879b60bc25d4f72c93f9e47da0c9e9fd7c21285605cd3ffec87b7d48d +size 636778 diff --git a/binaries/data/mods/public/maps/skirmishes/alpine_valleys_2p.xml b/binaries/data/mods/public/maps/skirmishes/alpine_valleys_2p.xml index 0687f68e2e..150df5bb93 100644 --- a/binaries/data/mods/public/maps/skirmishes/alpine_valleys_2p.xml +++ b/binaries/data/mods/public/maps/skirmishes/alpine_valleys_2p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e2101d09fc0e830fd5b75984a345c62712f38516b3a02bc8b235e81287a769fc -size 436664 +oid sha256:466fed60677ff97a9eef1fbb4b236cdb586055bdb82ca8afd40cdabbb8fc9d64 +size 436595 diff --git a/binaries/data/mods/public/maps/skirmishes/atlas_valleys_8p.xml b/binaries/data/mods/public/maps/skirmishes/atlas_valleys_8p.xml index 6b1494cbaf..b734e57043 100644 --- a/binaries/data/mods/public/maps/skirmishes/atlas_valleys_8p.xml +++ b/binaries/data/mods/public/maps/skirmishes/atlas_valleys_8p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9c5a0ad4477ec799bde487adcc1ff644057fa014ab005b5b3fa18320c6e4e07d -size 1429426 +oid sha256:bbe4700c1d912eb864ae30e0770109bab06d5c1606cdcc54f178b72f622e52fc +size 1429357 diff --git a/binaries/data/mods/public/maps/skirmishes/bactria_2p.xml b/binaries/data/mods/public/maps/skirmishes/bactria_2p.xml index 66b3076cc6..18d9e2e7cd 100644 --- a/binaries/data/mods/public/maps/skirmishes/bactria_2p.xml +++ b/binaries/data/mods/public/maps/skirmishes/bactria_2p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:91cb1eefc7ac0d7be9df4ed9ea8f1480745592a7deed9e8c8258f5923066b5b9 -size 310123 +oid sha256:f31ee0e7aa09055c27d1c3eba0724c02f5649f5df5537b666862a0fb8bec5f55 +size 310055 diff --git a/binaries/data/mods/public/maps/skirmishes/barcania_3p.xml b/binaries/data/mods/public/maps/skirmishes/barcania_3p.xml index 69c1202ec8..dd5f19abca 100644 --- a/binaries/data/mods/public/maps/skirmishes/barcania_3p.xml +++ b/binaries/data/mods/public/maps/skirmishes/barcania_3p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1297d4adb0bccc508a6f5eb35f48e8326f0d7afc8febf3b3d8f253501020487f -size 168162 +oid sha256:7906687fe12f54627a28008aa4c3bc0157d48b3d387fa48b0ac616e5ec70c954 +size 168093 diff --git a/binaries/data/mods/public/maps/skirmishes/belgian_bog_2p.xml b/binaries/data/mods/public/maps/skirmishes/belgian_bog_2p.xml index e69739da0a..4b04c5b23e 100644 --- a/binaries/data/mods/public/maps/skirmishes/belgian_bog_2p.xml +++ b/binaries/data/mods/public/maps/skirmishes/belgian_bog_2p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:810e041271ccda06dfab5426dd3b263e96a22cf09b1b23a8fbbf4c22ab9e56f0 -size 740579 +oid sha256:7b740061101ef71e6899a9dad8a15c5dbd02818ebcdda56f7525b033048a9727 +size 740510 diff --git a/binaries/data/mods/public/maps/skirmishes/butana_steppe_2p.xml b/binaries/data/mods/public/maps/skirmishes/butana_steppe_2p.xml index 908694983a..d8e2c8f114 100644 --- a/binaries/data/mods/public/maps/skirmishes/butana_steppe_2p.xml +++ b/binaries/data/mods/public/maps/skirmishes/butana_steppe_2p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:15be910c8117fb806abef467ca75640950735d9c51b84b5e09be7aaf6f905d07 -size 453772 +oid sha256:4f6a8869ffb3ddbcb25d93c8e6914fb1a5dfbc3643bf2f8e71968089dcc3d038 +size 453703 diff --git a/binaries/data/mods/public/maps/skirmishes/caspian_sea_2pv2p.xml b/binaries/data/mods/public/maps/skirmishes/caspian_sea_2pv2p.xml index a7c67f9e58..7ae12dc8fc 100644 --- a/binaries/data/mods/public/maps/skirmishes/caspian_sea_2pv2p.xml +++ b/binaries/data/mods/public/maps/skirmishes/caspian_sea_2pv2p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:77ac16fd3f539e362b1ad3941a2dfdb4a8f1b7ea8137fbeb634eb937e8b32711 -size 875053 +oid sha256:509100aea4473cca4d9d6638bfef80cc00c8d27957e9e572d2184fe3b69137fd +size 874984 diff --git a/binaries/data/mods/public/maps/skirmishes/corinthian_isthmus_2p.xml b/binaries/data/mods/public/maps/skirmishes/corinthian_isthmus_2p.xml index 4842324e71..09898ba465 100644 --- a/binaries/data/mods/public/maps/skirmishes/corinthian_isthmus_2p.xml +++ b/binaries/data/mods/public/maps/skirmishes/corinthian_isthmus_2p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:42fe35df3461ad07b51c4b6fb307582ae5c14cb0c0bd9b28735591da93f90cfa -size 373849 +oid sha256:f48adce8262f048bb47c61128223952a98fbc35a6500d8aaf9e808b3c836cb88 +size 373780 diff --git a/binaries/data/mods/public/maps/skirmishes/corinthian_isthmus_4p.xml b/binaries/data/mods/public/maps/skirmishes/corinthian_isthmus_4p.xml index 2a80f3f614..5392b3532d 100644 --- a/binaries/data/mods/public/maps/skirmishes/corinthian_isthmus_4p.xml +++ b/binaries/data/mods/public/maps/skirmishes/corinthian_isthmus_4p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e4dd8292b5608add1691d74d3424d421f84931d72c777de13d1fc016944e1b19 -size 1747196 +oid sha256:285f5d6c64831b53c959ad115eb3a2777d6321e32cfda85856a652327448341b +size 1747127 diff --git a/binaries/data/mods/public/maps/skirmishes/corsica_and_sardinia_4p.xml b/binaries/data/mods/public/maps/skirmishes/corsica_and_sardinia_4p.xml index cacdef221f..594c7ca45a 100644 --- a/binaries/data/mods/public/maps/skirmishes/corsica_and_sardinia_4p.xml +++ b/binaries/data/mods/public/maps/skirmishes/corsica_and_sardinia_4p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3b770fba5916625b66e2bf07daee5cf457a2d6c0eadc40c534345b5bf3eb41ec -size 2254921 +oid sha256:729b9762607cae98d6e76071009d1bcb2404679f580a3b5684ecffb5552dc265 +size 2254853 diff --git a/binaries/data/mods/public/maps/skirmishes/cycladic_archipelago_2p.xml b/binaries/data/mods/public/maps/skirmishes/cycladic_archipelago_2p.xml index 0318830fcf..ec9c82625d 100644 --- a/binaries/data/mods/public/maps/skirmishes/cycladic_archipelago_2p.xml +++ b/binaries/data/mods/public/maps/skirmishes/cycladic_archipelago_2p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:325f8dd71882421efeda20e717829e8ca1a82de45381897fbf978354be481932 -size 488825 +oid sha256:b317ec8c40fdd2f71fe71689713ce06540c555c8f35af25d38ec68d1c2e89afb +size 488756 diff --git a/binaries/data/mods/public/maps/skirmishes/cycladic_archipelago_3p.xml b/binaries/data/mods/public/maps/skirmishes/cycladic_archipelago_3p.xml index 7e92657ade..5165a65df6 100644 --- a/binaries/data/mods/public/maps/skirmishes/cycladic_archipelago_3p.xml +++ b/binaries/data/mods/public/maps/skirmishes/cycladic_archipelago_3p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4ae4bdcd0fa4d0291116cdde07ab0047698a708ecc2ff96ce74a624c776ee8f6 -size 661665 +oid sha256:52a49a16d3ae8a6a0dca2c7731fe6cbce3470821358190231da957945fdae211 +size 661597 diff --git a/binaries/data/mods/public/maps/skirmishes/death_canyon_2p.xml b/binaries/data/mods/public/maps/skirmishes/death_canyon_2p.xml index 8d54799fa9..9faee6c6dd 100644 --- a/binaries/data/mods/public/maps/skirmishes/death_canyon_2p.xml +++ b/binaries/data/mods/public/maps/skirmishes/death_canyon_2p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c7dbd70cf47d4a61e13247b5da3939a1ed719f46d7faa9b26553fe93f71648c2 -size 594358 +oid sha256:878e5def1131b3336066f0ad7e2f85c7bd2bb1236239500013d4508d43d56bb6 +size 594289 diff --git a/binaries/data/mods/public/maps/skirmishes/deccan_plateau_2p.xml b/binaries/data/mods/public/maps/skirmishes/deccan_plateau_2p.xml index 157d2922b1..3c9acdc545 100644 --- a/binaries/data/mods/public/maps/skirmishes/deccan_plateau_2p.xml +++ b/binaries/data/mods/public/maps/skirmishes/deccan_plateau_2p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:80bcd8d282125edc99aa8683438480eed3684ab09b597dbf3ad6b6e62d6c5a9c -size 731375 +oid sha256:c5a72ffa63438b1d2249e9b883810ad3e0f49a50b1042dec4fde02a0f4e11349 +size 731306 diff --git a/binaries/data/mods/public/maps/skirmishes/dueling_cliffs_3pv3p.xml b/binaries/data/mods/public/maps/skirmishes/dueling_cliffs_3pv3p.xml index d08eed13f0..eb3eb2b20a 100644 --- a/binaries/data/mods/public/maps/skirmishes/dueling_cliffs_3pv3p.xml +++ b/binaries/data/mods/public/maps/skirmishes/dueling_cliffs_3pv3p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:656d0de0c9bc7d2484667018fd2b214946803c229cf9478e4036b20e0fc7da39 -size 670231 +oid sha256:f73203f0259b2c4c1063f8e6f7191f0da8796374ed9f5fc3624dc8e9136fc672 +size 670162 diff --git a/binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml b/binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml index bae7f05581..22de707fcb 100644 --- a/binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml +++ b/binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2c972ab38daeff9ca109b0c92c9b34fe1117ad179796cf8db8cc2d5f26e64f92 -size 3640033 +oid sha256:64f99cbaa458f36075e5bb97707824279e2edbb7a385a1b5b8036cddc6a4eb81 +size 3639964 diff --git a/binaries/data/mods/public/maps/skirmishes/farmland_2p.xml b/binaries/data/mods/public/maps/skirmishes/farmland_2p.xml index 9472413164..f8c2358da8 100644 --- a/binaries/data/mods/public/maps/skirmishes/farmland_2p.xml +++ b/binaries/data/mods/public/maps/skirmishes/farmland_2p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:312cde49d92c1c061dc84d15d68f11c117cab9ce992f301defae1cf6755d0895 -size 596974 +oid sha256:692973f68ca962ced2293b7422e89458c0059f34ffbfb68371709899c1223eaf +size 596906 diff --git a/binaries/data/mods/public/maps/skirmishes/forest_battle_4p.xml b/binaries/data/mods/public/maps/skirmishes/forest_battle_4p.xml index 7c37e64d43..b3beee02a6 100644 --- a/binaries/data/mods/public/maps/skirmishes/forest_battle_4p.xml +++ b/binaries/data/mods/public/maps/skirmishes/forest_battle_4p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9cb3d783c01872d6d23552381660e05b12df7ccd8f85c5acdbff6f37fb2c8183 -size 510630 +oid sha256:4210bbf0d109d86a2ae506d887959c343d9f1f9adfa24e6fac0b12dffd993af9 +size 510561 diff --git a/binaries/data/mods/public/maps/skirmishes/gallic_fields_3p.xml b/binaries/data/mods/public/maps/skirmishes/gallic_fields_3p.xml index 2d1e723c3a..20d2ae6f70 100644 --- a/binaries/data/mods/public/maps/skirmishes/gallic_fields_3p.xml +++ b/binaries/data/mods/public/maps/skirmishes/gallic_fields_3p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:934b3d97aee9c4a8cb2d67d0129034bb43650f2dcf3ad4ea1f0fc8682c28373c -size 649243 +oid sha256:024fa23f8fddddc7e0c80711c3dbaddfda931a0685def449d5fca8118cb0acc5 +size 649175 diff --git a/binaries/data/mods/public/maps/skirmishes/gambia_river_3p.xml b/binaries/data/mods/public/maps/skirmishes/gambia_river_3p.xml index 1780a616a5..03df3f737f 100644 --- a/binaries/data/mods/public/maps/skirmishes/gambia_river_3p.xml +++ b/binaries/data/mods/public/maps/skirmishes/gambia_river_3p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:72ee0821fa4ef6e50791b4c3cdb05d03ffd58c98810801b3c9579683766a57b0 -size 2056829 +oid sha256:225ae00016eb94e02df0474e4e52f5ca29c0c1f4481a19eedec988f6c7d044d1 +size 2056761 diff --git a/binaries/data/mods/public/maps/skirmishes/golden_island_2p.xml b/binaries/data/mods/public/maps/skirmishes/golden_island_2p.xml index 87066e32b0..e14d8af3ed 100644 --- a/binaries/data/mods/public/maps/skirmishes/golden_island_2p.xml +++ b/binaries/data/mods/public/maps/skirmishes/golden_island_2p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:825b2907b12852d3d8f7567b1f863901a66d5466041ba1243177a71744b605ca -size 311386 +oid sha256:6a05be8750f7754dc4bb6f15663cc190850631895bcc408ce4709715689ccfe7 +size 311317 diff --git a/binaries/data/mods/public/maps/skirmishes/golden_oasis_2p.xml b/binaries/data/mods/public/maps/skirmishes/golden_oasis_2p.xml index e93847bf80..8b2befec08 100644 --- a/binaries/data/mods/public/maps/skirmishes/golden_oasis_2p.xml +++ b/binaries/data/mods/public/maps/skirmishes/golden_oasis_2p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:25e10d67d09df794c4733cff79e373e2e607a2f48e85279f08e0236ee9e58385 -size 379273 +oid sha256:5765a05d8fea0e506917eb6a9f0e53318a4657e5f4133c9d807bded53548c6c5 +size 379204 diff --git a/binaries/data/mods/public/maps/skirmishes/greek_acropolis_2p.xml b/binaries/data/mods/public/maps/skirmishes/greek_acropolis_2p.xml index 87d5b96bd2..8809adb94f 100644 --- a/binaries/data/mods/public/maps/skirmishes/greek_acropolis_2p.xml +++ b/binaries/data/mods/public/maps/skirmishes/greek_acropolis_2p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:18eff86f51675f2c151ec847c0814093213c5bdbb75dcabe48c0cfff81201e6f -size 773995 +oid sha256:16139e83afac28ba4b0b9a5e3636664d3d5b1a5a51402ae19d2d94cf08aad9bf +size 773927 diff --git a/binaries/data/mods/public/maps/skirmishes/greek_acropolis_4p.xml b/binaries/data/mods/public/maps/skirmishes/greek_acropolis_4p.xml index 8e114bc3f9..ef53c303c4 100644 --- a/binaries/data/mods/public/maps/skirmishes/greek_acropolis_4p.xml +++ b/binaries/data/mods/public/maps/skirmishes/greek_acropolis_4p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:01dbe5c6285941c9f450fa9d0f433b66ffba90b586c480a07217d7c044d0e41f -size 1193160 +oid sha256:2a7e0fee589b38bafd2aa56bedcde28ca8936149ce9c123c06b8f48e26d6d0ac +size 1193092 diff --git a/binaries/data/mods/public/maps/skirmishes/greek_acropolis_night_2p.xml b/binaries/data/mods/public/maps/skirmishes/greek_acropolis_night_2p.xml index a4f0b31d27..8b2811e3cd 100644 --- a/binaries/data/mods/public/maps/skirmishes/greek_acropolis_night_2p.xml +++ b/binaries/data/mods/public/maps/skirmishes/greek_acropolis_night_2p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c9c2ae737c92ffbe3113c343631bde526e4f1ba3be3fea6308bf1e80f9918b52 -size 782917 +oid sha256:b0bf95c34c8f6c6a15799eec5fe7cd2b4d7a97185e5415a9457ed94ddcf1a4b0 +size 782848 diff --git a/binaries/data/mods/public/maps/skirmishes/libyan_oases_4p.xml b/binaries/data/mods/public/maps/skirmishes/libyan_oases_4p.xml index 40c55794a9..1859195465 100644 --- a/binaries/data/mods/public/maps/skirmishes/libyan_oases_4p.xml +++ b/binaries/data/mods/public/maps/skirmishes/libyan_oases_4p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d28e976fc7fcf9cc27aea1ce5edfc395a862016d476bac0d977927843b16c059 -size 525762 +oid sha256:27f97c60b56f50f0e7ca8c27e0a5cf02f512c961a21b5f6b6262bab305f56912 +size 525694 diff --git a/binaries/data/mods/public/maps/skirmishes/libyan_oasis_2p.xml b/binaries/data/mods/public/maps/skirmishes/libyan_oasis_2p.xml index ac62dffa32..b33fa395c7 100644 --- a/binaries/data/mods/public/maps/skirmishes/libyan_oasis_2p.xml +++ b/binaries/data/mods/public/maps/skirmishes/libyan_oasis_2p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9b1973afe98bffba7842306838a66af0b7f916d03aace7057a88d25b3f2c7b8c -size 273045 +oid sha256:c88c9275ae43d69e9242eaec3834f80831b0e4bd1387a1cf2016b86597e16095 +size 272977 diff --git a/binaries/data/mods/public/maps/skirmishes/lorraine_plain_2p.xml b/binaries/data/mods/public/maps/skirmishes/lorraine_plain_2p.xml index 8f56b44125..ed4a8e2292 100644 --- a/binaries/data/mods/public/maps/skirmishes/lorraine_plain_2p.xml +++ b/binaries/data/mods/public/maps/skirmishes/lorraine_plain_2p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:192264f31b0b69702e4dfc88b676a94b04d3d15ec8b052b187a1e83a160c2fc7 -size 539247 +oid sha256:8507d8967ad491dcb3129514da75af57b2115a666461cbc371c7acacee003eb1 +size 539179 diff --git a/binaries/data/mods/public/maps/skirmishes/median_oasis_2p.xml b/binaries/data/mods/public/maps/skirmishes/median_oasis_2p.xml index 1f6e8e2b24..0a6829c160 100644 --- a/binaries/data/mods/public/maps/skirmishes/median_oasis_2p.xml +++ b/binaries/data/mods/public/maps/skirmishes/median_oasis_2p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ae52a6df3e1746766f3fa7b9008241f8f8081cd4a14ed512434f660f60e483e7 -size 459720 +oid sha256:5a5c8ab604b95f57c753261ff709c92f682f13b6f16d2fd4fb02510bd1a8e814 +size 459651 diff --git a/binaries/data/mods/public/maps/skirmishes/median_oasis_4p.xml b/binaries/data/mods/public/maps/skirmishes/median_oasis_4p.xml index 0bb79901fd..ef83116199 100644 --- a/binaries/data/mods/public/maps/skirmishes/median_oasis_4p.xml +++ b/binaries/data/mods/public/maps/skirmishes/median_oasis_4p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:baf35fb9166e66757cbeeaff7b28d5478a2f784835a7c9448710e32e6597dfd3 -size 475276 +oid sha256:dae5906783abe54842f8b519fc6ad6ca7e85d7f96c093fa726a6e13647098693 +size 475207 diff --git a/binaries/data/mods/public/maps/skirmishes/mediterranean_cove_2p.xml b/binaries/data/mods/public/maps/skirmishes/mediterranean_cove_2p.xml index 4015a00f1f..95260d6d0a 100644 --- a/binaries/data/mods/public/maps/skirmishes/mediterranean_cove_2p.xml +++ b/binaries/data/mods/public/maps/skirmishes/mediterranean_cove_2p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:324d230aedeeeae0f86a86f3c0915f825c72c6936bce84501ca751c8325886f5 -size 412571 +oid sha256:3ec9b1c96e3602eea0468b6eb9e572d67e6877c90d9475e72307180285f45df1 +size 412502 diff --git a/binaries/data/mods/public/maps/skirmishes/neareastern_badlands_2p.xml b/binaries/data/mods/public/maps/skirmishes/neareastern_badlands_2p.xml index 9130fe48b0..a93db30bc4 100644 --- a/binaries/data/mods/public/maps/skirmishes/neareastern_badlands_2p.xml +++ b/binaries/data/mods/public/maps/skirmishes/neareastern_badlands_2p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:50a870c964984008b39c4fb7e4d22e88d47138124e15d3512cbbdc086f280241 -size 382943 +oid sha256:10d59fb9b82d214f0e5ce69de05e6e340e4b89173424c30a0b1d39b4c25fd86e +size 382874 diff --git a/binaries/data/mods/public/maps/skirmishes/neareastern_badlands_4p.xml b/binaries/data/mods/public/maps/skirmishes/neareastern_badlands_4p.xml index 61a222e7b2..469b856644 100644 --- a/binaries/data/mods/public/maps/skirmishes/neareastern_badlands_4p.xml +++ b/binaries/data/mods/public/maps/skirmishes/neareastern_badlands_4p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bf8cf6a0248947ebbf23d1c70b73f98a4b32c73d2eccc81b633aab6e6ffa66ca -size 484017 +oid sha256:4c32c6fad4d610f6aad08c26ff92bf4f7f93fdc7573f9450d78e519911940bfd +size 483948 diff --git a/binaries/data/mods/public/maps/skirmishes/nile_river_4p.xml b/binaries/data/mods/public/maps/skirmishes/nile_river_4p.xml index 2ae44a3c3b..6d32192b43 100644 --- a/binaries/data/mods/public/maps/skirmishes/nile_river_4p.xml +++ b/binaries/data/mods/public/maps/skirmishes/nile_river_4p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:81a2df8a708c096fb0b072663615ca0659d3d2669ef979402a5c3dc42ced2f91 -size 466721 +oid sha256:a292c6858d72bd41be91a5af43a42d04c45f38b7f70431110824046dc5047265 +size 466652 diff --git a/binaries/data/mods/public/maps/skirmishes/northern_island_2p.xml b/binaries/data/mods/public/maps/skirmishes/northern_island_2p.xml index 618f6d3d77..673da44592 100644 --- a/binaries/data/mods/public/maps/skirmishes/northern_island_2p.xml +++ b/binaries/data/mods/public/maps/skirmishes/northern_island_2p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f4600ccd45545088967770d9efebf6bc071f122ffa6eb1e6fbdd8bb051dda375 -size 186887 +oid sha256:ec3c11a5a03b578be30ccdefdf95864c153af1989cea12cac26a527a0250c04f +size 186818 diff --git a/binaries/data/mods/public/maps/skirmishes/obedska_bog_4p.xml b/binaries/data/mods/public/maps/skirmishes/obedska_bog_4p.xml index 4234126e7a..8cad33c4d0 100644 --- a/binaries/data/mods/public/maps/skirmishes/obedska_bog_4p.xml +++ b/binaries/data/mods/public/maps/skirmishes/obedska_bog_4p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d26f0dfba381d635a7aeb998c590934353bff7e53359e1d16402669ff2562b0c -size 3425190 +oid sha256:1a014b0c32b5221d832c9f152eb49568284e08dac9fd7b2050cd2d63374d612b +size 3425121 diff --git a/binaries/data/mods/public/maps/skirmishes/obedska_bog_night_4p.xml b/binaries/data/mods/public/maps/skirmishes/obedska_bog_night_4p.xml index ead2975e53..5e76bbd7c7 100644 --- a/binaries/data/mods/public/maps/skirmishes/obedska_bog_night_4p.xml +++ b/binaries/data/mods/public/maps/skirmishes/obedska_bog_night_4p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:67d699614b1543165d3322cdbc4b88ee6bf19b48d7e01e6fc5b55406697a0f2b -size 3476135 +oid sha256:b3f1d1fe01c7dac0d6bd07fdfec4c044517184d4cf2a693a59deded46922a5e6 +size 3476066 diff --git a/binaries/data/mods/public/maps/skirmishes/oceanside_2p.xml b/binaries/data/mods/public/maps/skirmishes/oceanside_2p.xml index 9dbed7aadf..3fad30fe86 100644 --- a/binaries/data/mods/public/maps/skirmishes/oceanside_2p.xml +++ b/binaries/data/mods/public/maps/skirmishes/oceanside_2p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:71fbdcdcf931ef1f713740dd588a8d99554b607effa233df7e5c868be611bce5 -size 314252 +oid sha256:3975105ee689a21670ad161aa207760faa9f20be0b51255489f706faf2a161b7 +size 314188 diff --git a/binaries/data/mods/public/maps/skirmishes/persian_highlands_4p.xml b/binaries/data/mods/public/maps/skirmishes/persian_highlands_4p.xml index cf843eaf2f..c5e6355a2c 100644 --- a/binaries/data/mods/public/maps/skirmishes/persian_highlands_4p.xml +++ b/binaries/data/mods/public/maps/skirmishes/persian_highlands_4p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b3300bd727939a0a84d9ee251da9197401a7e80af613dde1803766bef6102bec -size 434832 +oid sha256:8b0e29e507a4505b3a3a42c514167bffd3a6ea196d92bc49cdf1c03b2e9c6b11 +size 434763 diff --git a/binaries/data/mods/public/maps/skirmishes/punjab_2p.xml b/binaries/data/mods/public/maps/skirmishes/punjab_2p.xml index cbad73ae75..62efb3a21a 100644 --- a/binaries/data/mods/public/maps/skirmishes/punjab_2p.xml +++ b/binaries/data/mods/public/maps/skirmishes/punjab_2p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aac2a539eed46fa8e7bc4847df44a9f0cb8f4e13a9251abebe66ea16ff855618 -size 926980 +oid sha256:8617253a8e6dce0b86c59b2a1ce488dc075b3b7cd2b7f9b7308113d66b37ed27 +size 926911 diff --git a/binaries/data/mods/public/maps/skirmishes/saharan_oases_4p.xml b/binaries/data/mods/public/maps/skirmishes/saharan_oases_4p.xml index 19f0c07ca3..cc08f2d0d2 100644 --- a/binaries/data/mods/public/maps/skirmishes/saharan_oases_4p.xml +++ b/binaries/data/mods/public/maps/skirmishes/saharan_oases_4p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e6bb10f7539daaccd447e8449f04200a89511f68ce0ae0fcaf8cc02f143fcf6a -size 505367 +oid sha256:ab43462fe92f1a6b533f2ec3e0593f6539ef745d4cce4e9c9d328ebaf234ec92 +size 505299 diff --git a/binaries/data/mods/public/maps/skirmishes/sahel_4p.xml b/binaries/data/mods/public/maps/skirmishes/sahel_4p.xml index 1afb9509bf..c65a8af1ad 100644 --- a/binaries/data/mods/public/maps/skirmishes/sahel_4p.xml +++ b/binaries/data/mods/public/maps/skirmishes/sahel_4p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c4886ea80611e5e6123a0c1b145d6711088393e33d7c91c9a2765a560531c2c1 -size 677690 +oid sha256:76c54e5efc3939cf147a1956a0b48888321a66dd5c756f99121f989cbfc393ef +size 677622 diff --git a/binaries/data/mods/public/maps/skirmishes/sahyadri_buttes_5.xml b/binaries/data/mods/public/maps/skirmishes/sahyadri_buttes_5.xml index 5d99715db5..b8543e9fe0 100644 --- a/binaries/data/mods/public/maps/skirmishes/sahyadri_buttes_5.xml +++ b/binaries/data/mods/public/maps/skirmishes/sahyadri_buttes_5.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4dd0fb9dc36bc4d905f34df54efef1f948d40444ffb239ebf8b0e49c121187b5 -size 3213207 +oid sha256:4f30232af45e73d39cb8a59d7e0152e2d6469462741cd2fa6b270e06d04bb42e +size 3213139 diff --git a/binaries/data/mods/public/maps/skirmishes/savanna_river.xml b/binaries/data/mods/public/maps/skirmishes/savanna_river.xml index db38a7ab02..dae312d0a6 100644 --- a/binaries/data/mods/public/maps/skirmishes/savanna_river.xml +++ b/binaries/data/mods/public/maps/skirmishes/savanna_river.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:252ae1374010ae72437c0721406b9a4dd4a0eccc282ffce1541fa5ecd166f17e -size 879367 +oid sha256:f6dfb396d9b5a731a74233a9a1a144433e76091a5c28119c4e2f77881d1519a2 +size 879298 diff --git a/binaries/data/mods/public/maps/skirmishes/sicilia_2p.xml b/binaries/data/mods/public/maps/skirmishes/sicilia_2p.xml index 163c247f72..b18b60012b 100644 --- a/binaries/data/mods/public/maps/skirmishes/sicilia_2p.xml +++ b/binaries/data/mods/public/maps/skirmishes/sicilia_2p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:329e28b72ee992e755e7ec77c98ad87132aad4b913191a10600903d38c4d530a -size 514069 +oid sha256:1ced49a2c13c3749cb4b580235523404c89bf078e1ef9d3ccbf711a2b354f8e1 +size 514001 diff --git a/binaries/data/mods/public/maps/skirmishes/sicilia_nomad.xml b/binaries/data/mods/public/maps/skirmishes/sicilia_nomad.xml index 9a9375bbf8..63958a4614 100644 --- a/binaries/data/mods/public/maps/skirmishes/sicilia_nomad.xml +++ b/binaries/data/mods/public/maps/skirmishes/sicilia_nomad.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1259012767109410b824898c5da925896a6d70ca12349b69d15b34b9a3c19142 -size 515173 +oid sha256:7a8f37b10524174803a4e1eca676307b77bc3e6d0f4fe9720398c29f1712f3e9 +size 515105 diff --git a/binaries/data/mods/public/maps/skirmishes/skirmish_demo.xml b/binaries/data/mods/public/maps/skirmishes/skirmish_demo.xml index 3ba4b288f4..57b5b3d0cf 100644 --- a/binaries/data/mods/public/maps/skirmishes/skirmish_demo.xml +++ b/binaries/data/mods/public/maps/skirmishes/skirmish_demo.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:08ae5e16ff612801aabfcfeb2d6b07db2384e129516e23ae92084a7b998ca6bf -size 121972 +oid sha256:37bc48a1c2edccad556f31aefa8a2ffd654192512ce90b98fcc43edfc7922b2b +size 121903 diff --git a/binaries/data/mods/public/maps/skirmishes/sporades_islands_2p.xml b/binaries/data/mods/public/maps/skirmishes/sporades_islands_2p.xml index 87b6a40f7e..06e1f07edc 100644 --- a/binaries/data/mods/public/maps/skirmishes/sporades_islands_2p.xml +++ b/binaries/data/mods/public/maps/skirmishes/sporades_islands_2p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6a1f29334a8a20f0bc510d33687185765d87c849105765d08b2bcdb82ebf25ff -size 266086 +oid sha256:550e88e8166f3879b22687d1eda639b1686675f7e662decbb1a6e9540964089f +size 266017 diff --git a/binaries/data/mods/public/maps/skirmishes/syria_2p.xml b/binaries/data/mods/public/maps/skirmishes/syria_2p.xml index e3cffca185..98ebafacb2 100644 --- a/binaries/data/mods/public/maps/skirmishes/syria_2p.xml +++ b/binaries/data/mods/public/maps/skirmishes/syria_2p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a44532cf3310e5110d79bd07f67706844bf8c4ddc4daea1aec52ea65dc2edb62 -size 841814 +oid sha256:b78137e193cc6ec55465ec206eb92a325313bb4a4aa6e1fc279bf0de891f6f01 +size 841745 diff --git a/binaries/data/mods/public/maps/skirmishes/team_oasis_2pv2p.xml b/binaries/data/mods/public/maps/skirmishes/team_oasis_2pv2p.xml index f0e92433f0..b5d34f888b 100644 --- a/binaries/data/mods/public/maps/skirmishes/team_oasis_2pv2p.xml +++ b/binaries/data/mods/public/maps/skirmishes/team_oasis_2pv2p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bda3bc1e9e11cd86f4afd3dfaeee74216e1ce85af1ea7702c8924da14519adf0 -size 386585 +oid sha256:886f3ef47eb17ebc97ad3f47d9c8989cae4cf3c64ae65fac1950d612d9ad92fa +size 386517 diff --git a/binaries/data/mods/public/maps/skirmishes/temperate_roadway_2p.xml b/binaries/data/mods/public/maps/skirmishes/temperate_roadway_2p.xml index 9b1a6768c3..0644bcbc05 100644 --- a/binaries/data/mods/public/maps/skirmishes/temperate_roadway_2p.xml +++ b/binaries/data/mods/public/maps/skirmishes/temperate_roadway_2p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1f622ca2831081907408626fabf7b79e91f09d13311971b4c4a4aa6e97755d3c -size 319193 +oid sha256:479a38c8baf68b3342545f3fecf0750559ee017c1ab4468ecf2ac0789fdb4b64 +size 319124 diff --git a/binaries/data/mods/public/maps/skirmishes/thessalian_plains_4p.xml b/binaries/data/mods/public/maps/skirmishes/thessalian_plains_4p.xml index 8f9f01da46..2e1da3a740 100644 --- a/binaries/data/mods/public/maps/skirmishes/thessalian_plains_4p.xml +++ b/binaries/data/mods/public/maps/skirmishes/thessalian_plains_4p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cd99ba375df6a39de7c5fdb8447032628c90d15c7c87e7e4922497d853026bb1 -size 1390852 +oid sha256:fa96755da2d84e4c7040f5e8ed824f718791601749643cced096fa53719a7836 +size 1390783 diff --git a/binaries/data/mods/public/maps/skirmishes/tuscan_acropolis_4p.xml b/binaries/data/mods/public/maps/skirmishes/tuscan_acropolis_4p.xml index a905350ec3..7a060659fb 100644 --- a/binaries/data/mods/public/maps/skirmishes/tuscan_acropolis_4p.xml +++ b/binaries/data/mods/public/maps/skirmishes/tuscan_acropolis_4p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8e635fd4ea81d8eea56e3c4fde4cc1779d8b91bd6aa553e95edb423fe0dc8fdf -size 545765 +oid sha256:3ee690a054eec6dde69683315b77c4fe186320fd80f254f4b557c268b69cb3a6 +size 545696 diff --git a/binaries/data/mods/public/maps/skirmishes/two_seas_6p.xml b/binaries/data/mods/public/maps/skirmishes/two_seas_6p.xml index 040eba06ca..f173d872bd 100644 --- a/binaries/data/mods/public/maps/skirmishes/two_seas_6p.xml +++ b/binaries/data/mods/public/maps/skirmishes/two_seas_6p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0c4c0771b3d621faea61ffbaaeecd69adbb3beeeef3917a831babd60430a01bd -size 1806767 +oid sha256:295b98a2ea5b5b60f48735bfeba7c53da2340806bb6bd3821d008c0548360f01 +size 1806699 diff --git a/binaries/data/mods/public/maps/skirmishes/vesuvius_6p.xml b/binaries/data/mods/public/maps/skirmishes/vesuvius_6p.xml index f09a35a490..b5841443f8 100644 --- a/binaries/data/mods/public/maps/skirmishes/vesuvius_6p.xml +++ b/binaries/data/mods/public/maps/skirmishes/vesuvius_6p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5fb511da9f68e44db0ba4f4b8b2c72602eb1e0baa36b13e18880144954d3a978 -size 1115505 +oid sha256:205926dab6a64944822faa99ea6fe5795b0492d676548e684ef14acc272ccfcf +size 1115436 diff --git a/binaries/data/mods/public/maps/skirmishes/via_augusta_4p.xml b/binaries/data/mods/public/maps/skirmishes/via_augusta_4p.xml index 3f0d500c45..dfc3f77f98 100644 --- a/binaries/data/mods/public/maps/skirmishes/via_augusta_4p.xml +++ b/binaries/data/mods/public/maps/skirmishes/via_augusta_4p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d31efe54e7c34798ae5d580585fca34347ca07f9a91c153062cd0bfec5c2a360 -size 422728 +oid sha256:4b80ae0fa0af745013802ebc8f6f5844db3da6e7e6ebbed35ff1ef8ca8a98163 +size 422661 diff --git a/binaries/data/mods/public/maps/skirmishes/watering_holes_4p.xml b/binaries/data/mods/public/maps/skirmishes/watering_holes_4p.xml index 417f186eeb..36139ed50e 100644 --- a/binaries/data/mods/public/maps/skirmishes/watering_holes_4p.xml +++ b/binaries/data/mods/public/maps/skirmishes/watering_holes_4p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:958e72ad0e0ca57e274cd6ab32bebe0f383ffb7a13a39021b5c902bc86f103bd -size 491747 +oid sha256:83ea4287a12c90b2ee31e5a4a5919be58965b9f2f1633eee6c2c1ca8dbb6710c +size 491678 diff --git a/binaries/data/mods/public/maps/skirmishes/zagros_mountains_2p.xml b/binaries/data/mods/public/maps/skirmishes/zagros_mountains_2p.xml index 2bffa2a1d5..cbb5e10363 100644 --- a/binaries/data/mods/public/maps/skirmishes/zagros_mountains_2p.xml +++ b/binaries/data/mods/public/maps/skirmishes/zagros_mountains_2p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:29aaf68fdd42ed897999e4b54f4f46f13fd11d384ee0e5ca84de20f89a113f85 -size 705771 +oid sha256:07eb75882dc2e06d228d3b7e1237c784e913bb4d6c872b90be807404e61aa40c +size 705702 diff --git a/binaries/data/mods/public/maps/tutorials/introductory_tutorial.xml b/binaries/data/mods/public/maps/tutorials/introductory_tutorial.xml index 70edda64ac..fde7452095 100644 --- a/binaries/data/mods/public/maps/tutorials/introductory_tutorial.xml +++ b/binaries/data/mods/public/maps/tutorials/introductory_tutorial.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:88e57c0a40ccdba2beb1a0190dea6e9b96c3203284a1fc569acee07067ef2d4c -size 151132 +oid sha256:c769cbcbcd1a2ffad51e1c1ef5763c94d88b4264f080a09eb3e141056d0b07df +size 151063 diff --git a/binaries/data/mods/public/maps/tutorials/starting_economy_walkthrough.xml b/binaries/data/mods/public/maps/tutorials/starting_economy_walkthrough.xml index d92adf8108..5b316880e9 100644 --- a/binaries/data/mods/public/maps/tutorials/starting_economy_walkthrough.xml +++ b/binaries/data/mods/public/maps/tutorials/starting_economy_walkthrough.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cb25ed9c073c5a41d8f41be1851df488b4492496928dd55a93eb8d26d28e9a57 -size 229598 +oid sha256:354508809d57308e6f0dd42ecfb3a25a30ebb87699c1d3476f60925acabc3eca +size 229529 diff --git a/source/graphics/LightEnv.cpp b/source/graphics/LightEnv.cpp index 3567a6a1a1..8cba470130 100644 --- a/source/graphics/LightEnv.cpp +++ b/source/graphics/LightEnv.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2019 Wildfire Games. +/* Copyright (C) 2021 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -26,8 +26,7 @@ CLightEnv::CLightEnv() : m_Elevation(DEGTORAD(45)), m_Rotation(DEGTORAD(315)), m_SunColor(1.5, 1.5, 1.5), - m_TerrainAmbientColor(0x50/255.f, 0x60/255.f, 0x85/255.f), - m_UnitsAmbientColor(0x80/255.f, 0x80/255.f, 0x80/255.f), + m_AmbientColor(0x50/255.f, 0x60/255.f, 0x85/255.f), m_FogColor(0xCC/255.f, 0xCC/255.f, 0xE5/255.f), m_FogFactor(0.000f), m_FogMax(0.5f), diff --git a/source/graphics/LightEnv.h b/source/graphics/LightEnv.h index 570d123101..f40a1154e5 100644 --- a/source/graphics/LightEnv.h +++ b/source/graphics/LightEnv.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2020 Wildfire Games. +/* Copyright (C) 2021 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -37,8 +37,7 @@ class CLightEnv { public: RGBColor m_SunColor; - RGBColor m_TerrainAmbientColor; - RGBColor m_UnitsAmbientColor; + RGBColor m_AmbientColor; RGBColor m_FogColor; float m_FogFactor; @@ -67,7 +66,7 @@ public: { float dot = -normal.Dot(m_SunDir); - RGBColor color = m_UnitsAmbientColor; + RGBColor color = m_AmbientColor; if (dot > 0) color += m_SunColor * dot; @@ -80,8 +79,7 @@ public: return m_Elevation == o.m_Elevation && m_Rotation == o.m_Rotation && m_SunColor == o.m_SunColor && - m_TerrainAmbientColor == o.m_TerrainAmbientColor && - m_UnitsAmbientColor == o.m_UnitsAmbientColor && + m_AmbientColor == o.m_AmbientColor && m_FogColor == o.m_FogColor && m_FogFactor == o.m_FogFactor && m_FogMax == o.m_FogMax && diff --git a/source/graphics/MapReader.cpp b/source/graphics/MapReader.cpp index 8941877563..5c408309ea 100644 --- a/source/graphics/MapReader.cpp +++ b/source/graphics/MapReader.cpp @@ -594,8 +594,7 @@ void CXMLReader::ReadEnvironment(XMBElement parent) EL(suncolor); EL(sunelevation); EL(sunrotation); - EL(terrainambientcolor); - EL(unitsambientcolor); + EL(ambientcolor); EL(water); EL(waterbody); EL(type); @@ -644,16 +643,9 @@ void CXMLReader::ReadEnvironment(XMBElement parent) { m_MapReader.m_LightEnv.m_Rotation = attrs.GetNamedItem(at_angle).ToFloat(); } - else if (element_name == el_terrainambientcolor) + else if (element_name == el_ambientcolor) { - m_MapReader.m_LightEnv.m_TerrainAmbientColor = RGBColor( - attrs.GetNamedItem(at_r).ToFloat(), - attrs.GetNamedItem(at_g).ToFloat(), - attrs.GetNamedItem(at_b).ToFloat()); - } - else if (element_name == el_unitsambientcolor) - { - m_MapReader.m_LightEnv.m_UnitsAmbientColor = RGBColor( + m_MapReader.m_LightEnv.m_AmbientColor = RGBColor( attrs.GetNamedItem(at_r).ToFloat(), attrs.GetNamedItem(at_g).ToFloat(), attrs.GetNamedItem(at_b).ToFloat()); @@ -1502,13 +1494,9 @@ int CMapReader::ParseEnvironment() GET_ENVIRONMENT_PROPERTY(envObj, SunElevation, m_LightEnv.m_Elevation) GET_ENVIRONMENT_PROPERTY(envObj, SunRotation, m_LightEnv.m_Rotation) - CColor terrainAmbientColor; - GET_ENVIRONMENT_PROPERTY(envObj, TerrainAmbientColor, terrainAmbientColor) - m_LightEnv.m_TerrainAmbientColor = RGBColor(terrainAmbientColor.r, terrainAmbientColor.g, terrainAmbientColor.b); - - CColor unitsAmbientColor; - GET_ENVIRONMENT_PROPERTY(envObj, UnitsAmbientColor, unitsAmbientColor) - m_LightEnv.m_UnitsAmbientColor = RGBColor(unitsAmbientColor.r, unitsAmbientColor.g, unitsAmbientColor.b); + CColor ambientColor; + GET_ENVIRONMENT_PROPERTY(envObj, AmbientColor, ambientColor) + m_LightEnv.m_AmbientColor = RGBColor(ambientColor.r, ambientColor.g, ambientColor.b); // Water properties JS::RootedValue waterObj(rq.cx); diff --git a/source/graphics/MapWriter.cpp b/source/graphics/MapWriter.cpp index fbc0612ad1..9def9cb343 100644 --- a/source/graphics/MapWriter.cpp +++ b/source/graphics/MapWriter.cpp @@ -223,16 +223,10 @@ void CMapWriter::WriteXML(const VfsPath& filename, sunRotationTag.Attribute("angle", pLightEnv->m_Rotation); } { - XMLWriter_Element terrainAmbientColorTag(xmlMapFile, "TerrainAmbientColor"); - terrainAmbientColorTag.Attribute("r", pLightEnv->m_TerrainAmbientColor.X); - terrainAmbientColorTag.Attribute("g", pLightEnv->m_TerrainAmbientColor.Y); - terrainAmbientColorTag.Attribute("b", pLightEnv->m_TerrainAmbientColor.Z); - } - { - XMLWriter_Element unitsAmbientColorTag(xmlMapFile, "UnitsAmbientColor"); - unitsAmbientColorTag.Attribute("r", pLightEnv->m_UnitsAmbientColor.X); - unitsAmbientColorTag.Attribute("g", pLightEnv->m_UnitsAmbientColor.Y); - unitsAmbientColorTag.Attribute("b", pLightEnv->m_UnitsAmbientColor.Z); + XMLWriter_Element ambientColorTag(xmlMapFile, "AmbientColor"); + ambientColorTag.Attribute("r", pLightEnv->m_AmbientColor.X); + ambientColorTag.Attribute("g", pLightEnv->m_AmbientColor.Y); + ambientColorTag.Attribute("b", pLightEnv->m_AmbientColor.Z); } { XMLWriter_Element fogTag(xmlMapFile, "Fog"); @@ -361,7 +355,7 @@ void CMapWriter::WriteXML(const VfsPath& filename, CmpPtr cmpTurretHolder(sim, ent); if (cmpTurretHolder) { - std::vector> turrets = cmpTurretHolder->GetTurrets(); + std::vector > turrets = cmpTurretHolder->GetTurrets(); if (!turrets.empty()) { XMLWriter_Element turretTag(xmlMapFile, "Turrets"); diff --git a/source/renderer/RenderModifiers.cpp b/source/renderer/RenderModifiers.cpp index 430b921c73..1c14269b26 100644 --- a/source/renderer/RenderModifiers.cpp +++ b/source/renderer/RenderModifiers.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2012 Wildfire Games. +/* Copyright (C) 2021 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -87,7 +87,7 @@ void ShaderRenderModifier::BeginPass(const CShaderProgramPtr& shader) if (GetLightEnv()) { - shader->Uniform(str_ambient, GetLightEnv()->m_UnitsAmbientColor); + shader->Uniform(str_ambient, GetLightEnv()->m_AmbientColor); shader->Uniform(str_sunDir, GetLightEnv()->GetSunDir()); shader->Uniform(str_sunColor, GetLightEnv()->m_SunColor); diff --git a/source/renderer/TerrainRenderer.cpp b/source/renderer/TerrainRenderer.cpp index a69b38b989..48ee31476a 100644 --- a/source/renderer/TerrainRenderer.cpp +++ b/source/renderer/TerrainRenderer.cpp @@ -273,7 +273,7 @@ void TerrainRenderer::PrepareShader(const CShaderProgramPtr& shader, ShadowMap* shader->BindTexture(str_losTex, los.GetTextureSmooth()); shader->Uniform(str_losTransform, los.GetTextureMatrix()[0], los.GetTextureMatrix()[12], 0.f, 0.f); - shader->Uniform(str_ambient, lightEnv.m_TerrainAmbientColor); + shader->Uniform(str_ambient, lightEnv.m_AmbientColor); shader->Uniform(str_sunColor, lightEnv.m_SunColor); shader->Uniform(str_sunDir, lightEnv.GetSunDir()); @@ -564,7 +564,7 @@ bool TerrainRenderer::RenderFancyWater(const CShaderDefines& context, int cullGr if (WaterMgr->m_WaterReflection) m->fancyWaterShader->Uniform(str_reflectionMatrix, WaterMgr->m_ReflectionMatrix); } - m->fancyWaterShader->Uniform(str_ambient, lightEnv.m_TerrainAmbientColor); + m->fancyWaterShader->Uniform(str_ambient, lightEnv.m_AmbientColor); m->fancyWaterShader->Uniform(str_sunDir, lightEnv.GetSunDir()); m->fancyWaterShader->Uniform(str_sunColor, lightEnv.m_SunColor); m->fancyWaterShader->Uniform(str_color, WaterMgr->m_WaterColor); diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/Environment.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/Environment.cpp index 1eb78cda66..d4796ec1f2 100644 --- a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/Environment.cpp +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/Environment.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2019 Wildfire Games. +/* Copyright (C) 2021 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -244,8 +244,7 @@ EnvironmentSidebar::EnvironmentSidebar(ScenarioEditor& scenarioEditor, wxWindow* sunSizer->Add(new VariableSliderBox(scrolledWindow, _("Fog Factor"), g_EnvironmentSettings.fogfactor, 0.0f, 0.01f), wxSizerFlags().Expand()); sunSizer->Add(new VariableSliderBox(scrolledWindow, _("Fog Thickness"), g_EnvironmentSettings.fogmax, 0.5f, 0.0f), wxSizerFlags().Expand()); sunSizer->Add(new VariableColorBox(scrolledWindow, _("Fog color"), g_EnvironmentSettings.fogcolor), wxSizerFlags().Expand()); - sunSizer->Add(new VariableColorBox(scrolledWindow, _("Terrain ambient color"), g_EnvironmentSettings.terraincolor), wxSizerFlags().Expand()); - sunSizer->Add(new VariableColorBox(scrolledWindow, _("Object ambient color"), g_EnvironmentSettings.unitcolor), wxSizerFlags().Expand()); + sunSizer->Add(new VariableColorBox(scrolledWindow, _("Ambient color"), g_EnvironmentSettings.ambientcolor), wxSizerFlags().Expand()); wxSizer* postProcSizer = new wxStaticBoxSizer(wxVERTICAL, scrolledWindow, _T("Post-processing settings")); scrollSizer->Add(postProcSizer, wxSizerFlags().Expand().Border(wxTOP, 8)); diff --git a/source/tools/atlas/GameInterface/Handlers/EnvironmentHandlers.cpp b/source/tools/atlas/GameInterface/Handlers/EnvironmentHandlers.cpp index 252c70515b..1f04430e46 100644 --- a/source/tools/atlas/GameInterface/Handlers/EnvironmentHandlers.cpp +++ b/source/tools/atlas/GameInterface/Handlers/EnvironmentHandlers.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2019 Wildfire Games. +/* Copyright (C) 2021 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -85,8 +85,7 @@ sEnvironmentSettings GetSettings() else s.sunoverbrightness = 1.0f; COLOR(s.suncolor, g_LightEnv.m_SunColor); - COLOR(s.terraincolor, g_LightEnv.m_TerrainAmbientColor); - COLOR(s.unitcolor, g_LightEnv.m_UnitsAmbientColor); + COLOR(s.ambientcolor, g_LightEnv.m_AmbientColor); COLOR(s.fogcolor, g_LightEnv.m_FogColor); #undef COLOR @@ -139,8 +138,7 @@ void SetSettings(const sEnvironmentSettings& s) #define COLOR(A, B) B = RGBColor(A->r/255.f, A->g/255.f, A->b/255.f) COLOR(s.suncolor, g_LightEnv.m_SunColor); g_LightEnv.m_SunColor *= s.sunoverbrightness; - COLOR(s.terraincolor, g_LightEnv.m_TerrainAmbientColor); - COLOR(s.unitcolor, g_LightEnv.m_UnitsAmbientColor); + COLOR(s.ambientcolor, g_LightEnv.m_AmbientColor); COLOR(s.fogcolor, g_LightEnv.m_FogColor); #undef COLOR diff --git a/source/tools/atlas/GameInterface/Messages.h b/source/tools/atlas/GameInterface/Messages.h index e357678427..f20806d416 100644 --- a/source/tools/atlas/GameInterface/Messages.h +++ b/source/tools/atlas/GameInterface/Messages.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2020 Wildfire Games. +/* Copyright (C) 2021 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -501,8 +501,7 @@ struct sEnvironmentSettings Shareable skyset; Shareable suncolor; - Shareable terraincolor; - Shareable unitcolor; + Shareable ambientcolor; Shareable fogcolor; Shareable fogfactor;