From c1da92578602dadc3d741bd0c6ae75e453e8df4e Mon Sep 17 00:00:00 2001 From: wraitii Date: Mon, 5 Nov 2012 17:31:28 +0000 Subject: [PATCH] Change some scenario water settings. Refs #1711. This was SVN commit r12825. --- binaries/data/mods/public/maps/random/deep_forest.js | 2 +- binaries/data/mods/public/maps/scenarios/Azure Coast(2).xml | 4 ++-- binaries/data/mods/public/maps/scenarios/Azure Coast(4).xml | 4 ++-- binaries/data/mods/public/maps/scenarios/Azure Coast.xml | 4 ++-- binaries/data/mods/public/maps/scenarios/Gambia River.xml | 4 ++-- binaries/data/mods/public/maps/scenarios/Hellenised_Egypt.xml | 4 ++-- binaries/data/mods/public/maps/scenarios/Nile River.xml | 4 ++-- binaries/data/mods/public/maps/scenarios/Oasis 01.xml | 4 ++-- binaries/data/mods/public/maps/scenarios/Oasis 02.xml | 4 ++-- binaries/data/mods/public/maps/scenarios/Oasis 03.xml | 4 ++-- binaries/data/mods/public/maps/scenarios/Oasis 04.xml | 4 ++-- binaries/data/mods/public/maps/scenarios/Oasis 05.xml | 4 ++-- binaries/data/mods/public/maps/scenarios/Oasis 06.xml | 4 ++-- binaries/data/mods/public/maps/scenarios/Oasis 07.xml | 4 ++-- binaries/data/mods/public/maps/scenarios/Oasis 08.xml | 4 ++-- binaries/data/mods/public/maps/scenarios/Oasis 09.xml | 4 ++-- binaries/data/mods/public/maps/scenarios/Oasis 10.xml | 4 ++-- binaries/data/mods/public/maps/scenarios/Oasis 11.xml | 4 ++-- .../data/mods/public/maps/scenarios/Sahel Watering Holes.xml | 4 ++-- binaries/data/mods/public/maps/scenarios/Savanna Ravine.xml | 4 ++-- 20 files changed, 39 insertions(+), 39 deletions(-) diff --git a/binaries/data/mods/public/maps/random/deep_forest.js b/binaries/data/mods/public/maps/random/deep_forest.js index 0dc34b41a3..ba2b7758ce 100644 --- a/binaries/data/mods/public/maps/random/deep_forest.js +++ b/binaries/data/mods/public/maps/random/deep_forest.js @@ -222,7 +222,7 @@ for (var x = 0; x < mapSize; x++) for (var z = 0;z < mapSize;z++) { // Some variables - var radius = Math.pow(Math.pow(mapCenterX - x, 2) + Math.pow(mapCenterZ - z, 2), 1/2); + var radius = Math.pow(Math.pow(mapCenterX - x - 0.5, 2) + Math.pow(mapCenterZ - z - 0.5, 2), 1/2); // The 0.5 is a correction for the entities placed on the center of tiles var minDistToSL = mapSize; for (var i=0; i < numPlayers; i++) minDistToSL = min(minDistToSL, getDistance(playerStartLocX[i], playerStartLocZ[i], x, z)) diff --git a/binaries/data/mods/public/maps/scenarios/Azure Coast(2).xml b/binaries/data/mods/public/maps/scenarios/Azure Coast(2).xml index 97e8c571e7..c54dd003a9 100644 --- a/binaries/data/mods/public/maps/scenarios/Azure Coast(2).xml +++ b/binaries/data/mods/public/maps/scenarios/Azure Coast(2).xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7b36516f3ad2a4ae4342fe7a2e20b90e145ad731197e91ad94d7b1fac8eb5df8 -size 1545373 +oid sha256:5d17ec9de932d8999c4653e0f981c3f3b0af76c2f9a10986768129d36e6194ef +size 1545380 diff --git a/binaries/data/mods/public/maps/scenarios/Azure Coast(4).xml b/binaries/data/mods/public/maps/scenarios/Azure Coast(4).xml index 1517be0cda..3822e927cf 100644 --- a/binaries/data/mods/public/maps/scenarios/Azure Coast(4).xml +++ b/binaries/data/mods/public/maps/scenarios/Azure Coast(4).xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ba02b81488307dff55c367642d89826152ab60ef3183d05987a0f40a6552afa4 -size 1545709 +oid sha256:a9951c6a8087940b49151259e312d9aecf3b88cd9790f051f824e998ba98848a +size 1545716 diff --git a/binaries/data/mods/public/maps/scenarios/Azure Coast.xml b/binaries/data/mods/public/maps/scenarios/Azure Coast.xml index de8fdd5bde..86a84d5a3a 100644 --- a/binaries/data/mods/public/maps/scenarios/Azure Coast.xml +++ b/binaries/data/mods/public/maps/scenarios/Azure Coast.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:401c9dc1a2a1b54efb560a01fb7213f15dd88740b4e64680fe181a21f1071235 -size 1546413 +oid sha256:2c05a26a07e05a0bc1ecd3cd6efae0418b2c753363cb6047990f5c8e83c105f7 +size 1546843 diff --git a/binaries/data/mods/public/maps/scenarios/Gambia River.xml b/binaries/data/mods/public/maps/scenarios/Gambia River.xml index 376a1eae06..1b9c456557 100644 --- a/binaries/data/mods/public/maps/scenarios/Gambia River.xml +++ b/binaries/data/mods/public/maps/scenarios/Gambia River.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9aceb1bb6d291187945901e2cbbe5084cb040ba2e4fdb672fab3cd916a231a68 -size 2135477 +oid sha256:2efe9d5b0f643323c8cfac81060719ff207fcebd1e7c74c0a77c0de1baee8109 +size 2135482 diff --git a/binaries/data/mods/public/maps/scenarios/Hellenised_Egypt.xml b/binaries/data/mods/public/maps/scenarios/Hellenised_Egypt.xml index 4ab84c50dc..ac9dd20c19 100644 --- a/binaries/data/mods/public/maps/scenarios/Hellenised_Egypt.xml +++ b/binaries/data/mods/public/maps/scenarios/Hellenised_Egypt.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:79de13fef7e23a681f0b825cd1bd6f73e002511c7c4f362b8697882047d5d90f -size 655246 +oid sha256:46691c9dc8fb3faa12cc436563361a2700dfd69bb0171a12593dc095fe9b7af7 +size 655245 diff --git a/binaries/data/mods/public/maps/scenarios/Nile River.xml b/binaries/data/mods/public/maps/scenarios/Nile River.xml index f1bd799f3c..7c6921ba4b 100644 --- a/binaries/data/mods/public/maps/scenarios/Nile River.xml +++ b/binaries/data/mods/public/maps/scenarios/Nile River.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6511f539cc7815468dc46750c36a35d719e614af0dbf5ac7fc5c92bf09c46cd1 -size 262541 +oid sha256:8ae986aff302ff38b7686d54133fd1f2b99b30df4ab6114ce8d0601f2e2c342b +size 262858 diff --git a/binaries/data/mods/public/maps/scenarios/Oasis 01.xml b/binaries/data/mods/public/maps/scenarios/Oasis 01.xml index 8a5f1a325b..56e00225d2 100644 --- a/binaries/data/mods/public/maps/scenarios/Oasis 01.xml +++ b/binaries/data/mods/public/maps/scenarios/Oasis 01.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6c5dc65d35dc629ae14b92ad5f4304c82c306b13b9be8cbf0ca38d141cfeb3d5 -size 288216 +oid sha256:211b3672d25855e783d719073b59b0b37c530bc13e1e20cdc3859cd1a723364b +size 288228 diff --git a/binaries/data/mods/public/maps/scenarios/Oasis 02.xml b/binaries/data/mods/public/maps/scenarios/Oasis 02.xml index c7030c3725..4253e47f5a 100644 --- a/binaries/data/mods/public/maps/scenarios/Oasis 02.xml +++ b/binaries/data/mods/public/maps/scenarios/Oasis 02.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e307cdd5adfd7e854ddc0962b748dec6fbf7a4904e6ae885c9ca516f40792cb4 -size 200360 +oid sha256:f6caf1d12b27ca3cfa0209ce0b89036fc04d16aa101fdac17cf8b31fb5c01192 +size 200365 diff --git a/binaries/data/mods/public/maps/scenarios/Oasis 03.xml b/binaries/data/mods/public/maps/scenarios/Oasis 03.xml index 6b8faf7366..17fc29b1a9 100644 --- a/binaries/data/mods/public/maps/scenarios/Oasis 03.xml +++ b/binaries/data/mods/public/maps/scenarios/Oasis 03.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:177def2534c95152dfdcfd3db2f96dfc3492cc60397d094ae8a3bbc6b6944472 -size 199906 +oid sha256:2b69b12f1cce32b2007c67871e478fe4b1f452bc826e9b59dbfb4279416a1407 +size 199911 diff --git a/binaries/data/mods/public/maps/scenarios/Oasis 04.xml b/binaries/data/mods/public/maps/scenarios/Oasis 04.xml index aaa4c0de9c..7b8ff7e6dc 100644 --- a/binaries/data/mods/public/maps/scenarios/Oasis 04.xml +++ b/binaries/data/mods/public/maps/scenarios/Oasis 04.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:097e8bd99d1c78115bb6420d61e0577674f18b7b341cdd603425ecfe9da34b5f -size 501234 +oid sha256:5267d45925805c6bf5e6fe4fa986e64d22792217739113ac94a27001875e3aec +size 501245 diff --git a/binaries/data/mods/public/maps/scenarios/Oasis 05.xml b/binaries/data/mods/public/maps/scenarios/Oasis 05.xml index adfa6fe77a..d09dc82438 100644 --- a/binaries/data/mods/public/maps/scenarios/Oasis 05.xml +++ b/binaries/data/mods/public/maps/scenarios/Oasis 05.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:46efbcc4739f4d7d998f53716b827a246e04ca8f4180d0846c146360acc88d4e -size 502242 +oid sha256:7c1260f0d280cf4c0daddbe600b9a68f5a668d4b531899754e91f5850225f293 +size 502247 diff --git a/binaries/data/mods/public/maps/scenarios/Oasis 06.xml b/binaries/data/mods/public/maps/scenarios/Oasis 06.xml index 0c289b9a43..c74bdec355 100644 --- a/binaries/data/mods/public/maps/scenarios/Oasis 06.xml +++ b/binaries/data/mods/public/maps/scenarios/Oasis 06.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:554ab79ba6b6a539a825e0aeaacdf5db8f93935605594052f394bbff0cadbd34 -size 202875 +oid sha256:07216d0d4a5c913c92f19ec584e67f86bfbbb8471aea4cd98e0c4b2dd4d1d0b3 +size 202881 diff --git a/binaries/data/mods/public/maps/scenarios/Oasis 07.xml b/binaries/data/mods/public/maps/scenarios/Oasis 07.xml index ad335fb560..22ea30aeb2 100644 --- a/binaries/data/mods/public/maps/scenarios/Oasis 07.xml +++ b/binaries/data/mods/public/maps/scenarios/Oasis 07.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:db8e9df71bd701304f4e583ea26139ce7104477bf516087bbd816f5d69a8229c -size 490075 +oid sha256:34e3aef48274da88baeb6a918f0dd714b52892bf335a89b8b15298233fbf34de +size 490080 diff --git a/binaries/data/mods/public/maps/scenarios/Oasis 08.xml b/binaries/data/mods/public/maps/scenarios/Oasis 08.xml index 0213e05ae9..b67404fefc 100644 --- a/binaries/data/mods/public/maps/scenarios/Oasis 08.xml +++ b/binaries/data/mods/public/maps/scenarios/Oasis 08.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d7a06b66aa84d9e23b4ee17d8cb96445697cd4bee5846c67c80bdd4b21448a96 -size 234142 +oid sha256:ed8a8d48937ed44db860aa5d2be4d48fce875c3cee78cfec686aa00f59ab917d +size 234148 diff --git a/binaries/data/mods/public/maps/scenarios/Oasis 09.xml b/binaries/data/mods/public/maps/scenarios/Oasis 09.xml index 1a0a58b0a4..31031b5614 100644 --- a/binaries/data/mods/public/maps/scenarios/Oasis 09.xml +++ b/binaries/data/mods/public/maps/scenarios/Oasis 09.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b56761c12e2b0e8fb4c087039f7d001ee491e8991c7a4666e8ee52389e679c1a -size 238154 +oid sha256:06c55cb597f5de1d966016d8d8c2270e6f0fc9133dab98a82e3653e1a9d4a58f +size 238167 diff --git a/binaries/data/mods/public/maps/scenarios/Oasis 10.xml b/binaries/data/mods/public/maps/scenarios/Oasis 10.xml index 1cedb44e2c..4dbfdac759 100644 --- a/binaries/data/mods/public/maps/scenarios/Oasis 10.xml +++ b/binaries/data/mods/public/maps/scenarios/Oasis 10.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f3ef6b34c9986051ec05252449fa2c3233e29367c400030841461eac86b5b62b -size 237867 +oid sha256:cccf7e063186ca9de9b438172410d57eaa674b33d333684ed09ee6ea065a883d +size 237873 diff --git a/binaries/data/mods/public/maps/scenarios/Oasis 11.xml b/binaries/data/mods/public/maps/scenarios/Oasis 11.xml index d447e0555e..185babbdbb 100644 --- a/binaries/data/mods/public/maps/scenarios/Oasis 11.xml +++ b/binaries/data/mods/public/maps/scenarios/Oasis 11.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:de39abbe9c1e5089ca02b5388fea114cd3854239b1ea1326f82c78691a6f24a0 -size 327414 +oid sha256:78b12dd7f01661f7b7cd84c97d79fa198b5e3de938657ccca8697477d0a05339 +size 327427 diff --git a/binaries/data/mods/public/maps/scenarios/Sahel Watering Holes.xml b/binaries/data/mods/public/maps/scenarios/Sahel Watering Holes.xml index fbadd16dce..2e9fb4a5e5 100644 --- a/binaries/data/mods/public/maps/scenarios/Sahel Watering Holes.xml +++ b/binaries/data/mods/public/maps/scenarios/Sahel Watering Holes.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b90595715050cda5581daa4927620753cdca0e37dfd3319fee938952457a524b -size 496843 +oid sha256:b72b6888f5fb692d39e3338507ee2c03ad45c6f40c302140b7b80d30d3d4a4e5 +size 497118 diff --git a/binaries/data/mods/public/maps/scenarios/Savanna Ravine.xml b/binaries/data/mods/public/maps/scenarios/Savanna Ravine.xml index 4accb9ae13..9da0df38e5 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:8836d73f3622906618a7e69f0f69b91192d2f092967231dccd8a011c2fee77b7 -size 119966 +oid sha256:ba0e462f38ec523b167b879a06ae2193781ccdb2b2ea72eb7d4663d8754009a3 +size 120241