From 868a711f9ed46905dbc1de045c977b4aadebdf9a Mon Sep 17 00:00:00 2001 From: Nat Quayle Nelson Date: Tue, 28 Jan 2025 20:07:38 -0600 Subject: [PATCH 1/5] isolate just the cave wall for testing --- rsrc/graphics/ter1.png | Bin 23297 -> 43678 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/rsrc/graphics/ter1.png b/rsrc/graphics/ter1.png index c59f85f156b6f201ab63c98566158cf642581a10..8d825866e4165047448267120673468e90ecd388 100644 GIT binary patch literal 43678 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 z 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

t)QUf}^x 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 delta 23069 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 From 5f3300d191837665f1c161a5ce99ebd36eff53c0 Mon Sep 17 00:00:00 2001 From: Nat Quayle Nelson Date: Tue, 28 Jan 2025 20:09:33 -0600 Subject: [PATCH 2/5] ignore more vs junk files --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 2aa3a5c82..51221c526 100644 --- a/.gitignore +++ b/.gitignore @@ -55,6 +55,8 @@ proj/vs*/*/ipch/ proj/vs*/.vs proj/vs*/.vs proj/vs*/packages/ +proj/vs*/vcpkg_installed/ +proj/vs*/*.nupkg # SCons junk files .sconsign.dblite From 833c0d1c15438d2f1a6adcba2e5b902d6ae84f21 Mon Sep 17 00:00:00 2001 From: Nat Quayle Nelson Date: Wed, 29 Jan 2025 18:12:57 -0600 Subject: [PATCH 3/5] add one cave wall smart border --- rsrc/schemas/readme.md | 2 +- rsrc/schemas/terrain.xsd | 1 + rsrc/strings/trim-names.txt | 3 +- src/fileio/estreams.cpp | 2 +- src/fileio/fileio_scen.cpp | 24 +++++++++++++-- src/game/boe.graphics.cpp | 49 +++++++++++++++++++++++++++--- src/game/boe.graphutil.cpp | 8 ++--- src/game/boe.graphutil.hpp | 2 +- src/scenario/terrain_abilities.hpp | 1 + 9 files changed, 78 insertions(+), 14 deletions(-) diff --git a/rsrc/schemas/readme.md b/rsrc/schemas/readme.md index b2c5d4328..7087e5ec7 100644 --- a/rsrc/schemas/readme.md +++ b/rsrc/schemas/readme.md @@ -340,7 +340,7 @@ type. `crunch`, `squish`, `splash`, `none`. * `` - (required) The trim type of this terrain. Must be one of `none`, `wall`, `s`, `n`, `e`, `w`, `sw`, `ne`, `se`, `nw`, `sw-inner`, `ne-inner`, `se-inner`, `nw-inner`, -`frills`, `road`, `walkway`, `waterfall`, `city`. +`frills`, `road`, `walkway`, `waterfall`, `city`, `smart-border`. * `` - (required) The combat arena to use if outdoor combat is initiated while the party is on this space. * `` - The ground type of this terrain. diff --git a/rsrc/schemas/terrain.xsd b/rsrc/schemas/terrain.xsd index 5f225641a..69ca8c9b6 100644 --- a/rsrc/schemas/terrain.xsd +++ b/rsrc/schemas/terrain.xsd @@ -69,6 +69,7 @@ + diff --git a/rsrc/strings/trim-names.txt b/rsrc/strings/trim-names.txt index 25c6e81cb..ca45472db 100644 --- a/rsrc/strings/trim-names.txt +++ b/rsrc/strings/trim-names.txt @@ -16,4 +16,5 @@ Frills (draw edge frills) Road (connect with roads) Walkway (round off corners) Waterfall (both wall and water) -City trim (connect to roads) \ No newline at end of file +City trim (connect to roads) +Smart border (automatic transitions) \ No newline at end of file diff --git a/src/fileio/estreams.cpp b/src/fileio/estreams.cpp index bfb457cbf..f8156f0f8 100644 --- a/src/fileio/estreams.cpp +++ b/src/fileio/estreams.cpp @@ -580,7 +580,7 @@ std::istream& operator >> (std::istream& in, eTerSpec& e){ cEnumLookup ter_trims = { "none", "wall", "s", "se", "e", "ne", "n", "nw", "w", "sw", - "ne-inner", "se-inner", "sw-inner", "nw-inner", "frills", "road", "walkway", "waterfall", "city", + "ne-inner", "se-inner", "sw-inner", "nw-inner", "frills", "road", "walkway", "waterfall", "city", "smart-border" }; std::ostream& operator << (std::ostream& out, eTrimType e){ diff --git a/src/fileio/fileio_scen.cpp b/src/fileio/fileio_scen.cpp index b9751f0ed..3a8bfba88 100644 --- a/src/fileio/fileio_scen.cpp +++ b/src/fileio/fileio_scen.cpp @@ -1960,12 +1960,29 @@ void readDialogueFromXml(ticpp::Document&& data, cSpeech& talk, int town_num) { } } +std::map ter_swaps; + +static void init_ter_swaps() { + for (int i = 6; i <= 21; ++i){ + ter_swaps[i] = 5; + } +} + +static ter_num_t swap_ter(ter_num_t in) { + if(ter_swaps.find(in) != ter_swaps.end()) + return ter_swaps[in]; + return in; +} + void loadOutMapData(map_data&& data, location which, cScenario& scen) { + if(ter_swaps.empty()) + init_ter_swaps(); + cOutdoors& out = *scen.outdoors[which.x][which.y]; int num_towns = 0; for(int x = 0; x < 48; x++) { for(int y = 0; y < 48; y++) { - out.terrain[x][y] = data.get(x,y); + out.terrain[x][y] = swap_ter(data.get(x,y)); auto features = data.getFeatures(x,y); for(auto feat : features) { bool is_boat = false; @@ -2024,10 +2041,13 @@ void loadOutMapData(map_data&& data, location which, cScenario& scen) { } void loadTownMapData(map_data&& data, int which, cScenario& scen) { + if(ter_swaps.empty()) + init_ter_swaps(); + cTown& town = *scen.towns[which]; for(int x = 0; x < town.max_dim; x++) { for(int y = 0; y < town.max_dim; y++) { - town.terrain(x,y) = data.get(x,y); + town.terrain(x,y) = swap_ter(data.get(x,y)); auto features = data.getFeatures(x,y); for(auto feat : features) { bool is_boat = false; diff --git a/src/game/boe.graphics.cpp b/src/game/boe.graphics.cpp index a0f2b9e5e..f93092a60 100644 --- a/src/game/boe.graphics.cpp +++ b/src/game/boe.graphics.cpp @@ -23,6 +23,7 @@ #include "dialogxml/widgets/button.hpp" #include "tools/enum_map.hpp" #include "tools/drawable_manager.hpp" +#include "location.hpp" #include "boe.party.hpp" #include "boe.town.hpp" @@ -700,7 +701,7 @@ void refresh_text_bar() { mainPtr.setActive(); } -// this is used for determinign whether to round off walkway corners +// this is used for determining whether to round off walkway corners // right now, trying a restrictive rule (just cave floor and grass, mainly) bool is_nature(short x, short y, unsigned short ground_t) { ter_num_t ter_type; @@ -840,12 +841,12 @@ void draw_terrain(short mode) { spot_seen[q][r] = can_draw; if(fog_lifted) can_draw = true; - + + eTrimType trim = univ.scenario.ter_types[spec_terrain].trim_type; + if((can_draw != 0) && (overall_mode != MODE_RESTING)) { // if can see, not a pit, and not resting if(is_combat()) anim_ticks = 0; - eTrimType trim = univ.scenario.ter_types[spec_terrain].trim_type; - // Finally, draw this terrain spot if(trim == eTrimType::WALKWAY){ int trim = -1; @@ -880,6 +881,46 @@ void draw_terrain(short mode) { draw_one_terrain_spot(q,r,trim < 0 ? spec_terrain : ground_ter); if(trim >= 0) draw_trim(q,r,trim + 50,spec_terrain); + }else if(trim == eTrimType::SMART_BORDER) { + std::map neighbor_terrains; + std::map ground_candidates; + neighbor_terrains[DIR_N] = coord_to_ter(where_draw.x, where_draw.y - 1); + neighbor_terrains[DIR_E] = coord_to_ter(where_draw.x + 1, where_draw.y); + neighbor_terrains[DIR_S] = coord_to_ter(where_draw.x, where_draw.y + 1); + neighbor_terrains[DIR_W] = coord_to_ter(where_draw.x - 1, where_draw.y); + + auto only_match = [&neighbor_terrains, &ground_candidates, spec_terrain](std::vector directions){ + bool count_candidates = ground_candidates.empty(); + for(auto dir_ter_pair : neighbor_terrains){ + if(dir_ter_pair.second == spec_terrain){ + if(std::find(directions.begin(), directions.end(), dir_ter_pair.first) == directions.end()){ + return false; + } + }else{ + // This is not the border terrain, so it could be what we transition to + if(count_candidates){ + if(ground_candidates.find(dir_ter_pair.second) == ground_candidates.end()){ + ground_candidates[dir_ter_pair.second] = 0; + } + ground_candidates[dir_ter_pair.second]++; + } + if(std::find(directions.begin(), directions.end(), dir_ter_pair.first) != directions.end()){ + return false; + } + } + } + return true; + }; + + int offset = 0; + if(only_match({DIR_N, DIR_S, DIR_W})){ + offset = 3; + } + if(!ground_candidates.empty()){ + current_ground = univ.scenario.get_ground_from_ter(ground_candidates.begin()->first); + draw_one_terrain_spot(q,r,current_ground); + } + draw_one_terrain_spot(q,r,spec_terrain, offset); }else if(spec_terrain == 65535) { draw_one_terrain_spot(q,r,-1); }else{ diff --git a/src/game/boe.graphutil.cpp b/src/game/boe.graphutil.cpp index aec88f1be..640bfc6fa 100644 --- a/src/game/boe.graphutil.cpp +++ b/src/game/boe.graphutil.cpp @@ -58,7 +58,7 @@ bool gave_no_g_error = false; //short dest; // 0 - terrain gworld 1 - screen // if terrain_to_draw is -1, do black // if terrain_to_draw >= 10000, force to draw graphic which is terrain_to_draw - 10000 -void draw_one_terrain_spot (short i,short j,short terrain_to_draw) { +void draw_one_terrain_spot (short i,short j,short terrain_to_draw, int graphic_offset) { rectangle where_draw; rectangle source_rect; std::shared_ptr source_gworld; @@ -86,7 +86,7 @@ void draw_one_terrain_spot (short i,short j,short terrain_to_draw) { graf_pos_ref(source_gworld, source_rect) = spec_scen_g.find_graphic(univ.scenario.ter_types[terrain_to_draw].picture - 2000 + (anim_ticks % 4)); } else if(univ.scenario.ter_types[terrain_to_draw].picture >= 1000) { // custom - graf_pos_ref(source_gworld, source_rect) = spec_scen_g.find_graphic(univ.scenario.ter_types[terrain_to_draw].picture - 1000); + graf_pos_ref(source_gworld, source_rect) = spec_scen_g.find_graphic(univ.scenario.ter_types[terrain_to_draw].picture + graphic_offset - 1000); } else if(univ.scenario.ter_types[terrain_to_draw].picture >= 960) { // animated source_gworld = &ResMgr::graphics.get("teranim"); @@ -94,14 +94,14 @@ void draw_one_terrain_spot (short i,short j,short terrain_to_draw) { source_rect = calc_rect(4 * ((terrain_to_draw - 960) / 5) + (anim_ticks % 4),(terrain_to_draw - 960) % 5); } else { - terrain_to_draw = univ.scenario.ter_types[terrain_to_draw].picture; + terrain_to_draw = univ.scenario.ter_types[terrain_to_draw].picture + graphic_offset; int which_sheet = terrain_to_draw / 50; source_gworld = &ResMgr::graphics.get("ter" + std::to_string(1 + which_sheet)); terrain_to_draw %= 50; source_rect = calc_rect(terrain_to_draw % 10, terrain_to_draw / 10); } - rect_draw_some_item(*source_gworld, source_rect, terrain_screen_gworld, where_draw); + rect_draw_some_item(*source_gworld, source_rect, terrain_screen_gworld, where_draw, sf::BlendAlpha); } void draw_monsters() { diff --git a/src/game/boe.graphutil.hpp b/src/game/boe.graphutil.hpp index e0ae08ae2..53b67039d 100644 --- a/src/game/boe.graphutil.hpp +++ b/src/game/boe.graphutil.hpp @@ -6,7 +6,7 @@ #include "location.hpp" #include "gfx/gfxsheets.hpp" -void draw_one_terrain_spot (short i,short j,short terrain_to_draw); +void draw_one_terrain_spot (short i,short j,short terrain_to_draw, int graphic_offset=0); void draw_monsters(); void play_see_monster_str(unsigned short m, location monst_loc); void draw_combat_pc(class cPlayer& who, location center, bool attacking); diff --git a/src/scenario/terrain_abilities.hpp b/src/scenario/terrain_abilities.hpp index 93e501c63..bab8d80f9 100644 --- a/src/scenario/terrain_abilities.hpp +++ b/src/scenario/terrain_abilities.hpp @@ -68,6 +68,7 @@ enum class eTrimType { WALKWAY = 16, // the game will draw walkway corners; trim_ter is base terrain to draw on WATERFALL = 17, // special case for waterfalls CITY = 18, // the game will join roads up to this space but not draw roads on the space + SMART_BORDER = 19 // the game will automatically transition this against adjacent terrains }; enum class eTerObstruct { From ede82863e3d46885e8ab7a4ddb4f02621ac1346a Mon Sep 17 00:00:00 2001 From: Nat Quayle Nelson Date: Wed, 29 Jan 2025 18:38:24 -0600 Subject: [PATCH 4/5] stage valleydy changes which add smart cave wall --- rsrc/scenarios/valleydy/out/out0~2.map | 96 ++++++++--------- rsrc/scenarios/valleydy/out/out1~2.map | 86 +++++++-------- rsrc/scenarios/valleydy/scenario.xml | 2 +- rsrc/scenarios/valleydy/terrain.xml | 2 +- rsrc/scenarios/valleydy/towns/town10.map | 32 +++--- rsrc/scenarios/valleydy/towns/town11.map | 14 +-- rsrc/scenarios/valleydy/towns/town13.map | 4 +- rsrc/scenarios/valleydy/towns/town14.map | 14 +-- rsrc/scenarios/valleydy/towns/town15.map | 84 +++++++-------- rsrc/scenarios/valleydy/towns/town16.map | 60 +++++------ rsrc/scenarios/valleydy/towns/town17.map | 96 ++++++++--------- rsrc/scenarios/valleydy/towns/town18.map | 96 ++++++++--------- rsrc/scenarios/valleydy/towns/town19.map | 46 ++++---- rsrc/scenarios/valleydy/towns/town20.map | 64 ++++++------ rsrc/scenarios/valleydy/towns/town6.map | 34 +++--- rsrc/scenarios/valleydy/towns/town9.map | 128 +++++++++++------------ 16 files changed, 429 insertions(+), 429 deletions(-) diff --git a/rsrc/scenarios/valleydy/out/out0~2.map b/rsrc/scenarios/valleydy/out/out0~2.map index de0fed0c0..c8a64995e 100644 --- a/rsrc/scenarios/valleydy/out/out0~2.map +++ b/rsrc/scenarios/valleydy/out/out0~2.map @@ -1,48 +1,48 @@ -5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,71,71,71,15,5,5,5,5,5,5,5 -5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,71,71,71,15,5,5,5,5,5,5,5 -5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,20,77,77,77,19,5,5,5,5,5,5,5 -5,5,5,5,5,5,5,5,5,5,5,21,245@9,18,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,21,8,71,71,71,15,5,5,5,5,5,5,5 -5,5,5,5,5,5,5,5,5,5,5,9,0&25,17,18,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,71,71,71,71,15,5,5,5,5,5,5,5 -5,5,5,5,5,5,5,5,5,5,5,9,0&25,0&25,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,20,77,77,77,12,19,5,5,5,5,5,5,5 -5,5,5,5,5,5,5,5,5,5,5,20,11,0&25,15,5,5,21,6,6,6,6,6,6,18,5,5,5,5,5,5,5,5,5,21,8,71,71,71,17,18,5,5,5,5,5,5,5 -5,5,5,5,5,5,21,6,18,21,6,18,9,0&25,15,5,5,9,0,0,0,0,0,98,17,18,5,5,5,5,5,21,6,6,8,0,71,71,71,0,15,5,5,5,5,5,5,5 -5,5,5,5,5,5,9,71,17,8,96,15,9,0&25:0,17,6,18,9,0,0,0,0,0,0,93,17,6,6,6,6,6,8,0,0,0,74,71,71,71,1,17,18,5,5,5,5,5,5 -5,5,5,5,5,5,9,71,96,96,96,15,9,0&25,0,1,17,8,0,98,93,92,98,94,0,0,93,0,92,93,0,93,0,0,71,71,71,71,71,0,0,15,5,5,5,5,5,5 -5,5,5,5,5,5,20,11,96,96,0,17,8,0&25,0,0,0,1,0,0,97,97,94,98,93,0,92,0,93,0,93,0,71,71,71,71,71,71,92,91,0,15,5,5,5,5,5,5 -5,5,5,5,5,5,5,9,96,0,0,0,0,0&25,0&25,0,0,0,0,94,97,0,93,92,93,0,71,71,71,71,74,71,71,71,71,71,71,71,91,1,91,17,18,5,5,5,5,5 -5,5,5,5,5,5,5,20,11,0,97,0,98,0,0&25,1,0,0,93,0,0,0,0,91,91,71,71,71,71,71,71,71,71,74,71,71,1,93,0,0,0,92,15,5,5,5,5,5 -5,5,5,5,5,5,5,5,9,0,0,0,0,97,0&25,0&25,0,0,0,98,98,93,92,0,71,71,71,71,71,71,71,71,71,71,71,92,1,92,0,98,0,91,15,5,5,5,5,5 -5,5,5,5,5,5,5,5,9,0,1,0,0,0*3,0,0&25,0,0,98,0,0,0,0,0,71,71,71,71,1,1,91,92,1,0,0,91,91,91,91,91,91,98,15,5,5,5,5,5 -5,5,5,5,5,5,5,21,8,0,0,0,97,0,0,0&25,0,0,0,0,1,93,92,0,71,71,71,93,0,93,91,91,1,0,91,91,94:5,98,98,0:4,92,93,15,5,5,5,5,5 -5,5,5,5,5,5,5,9,0,0,0,0,0,0,0,0&25,106!0,0,0,0,98,0,92,93,74,71,71,0,94,91,91,92,91,0,91,91,91,93,91,97,93*0,0,15,5,5,5,5,5 -5,5,5,5,5,5,21,8,0,0,0,85,86,0,0&25,0&25,0&25,0&25,0&25,0&25,0,0,93,92,71,71,71,71,94,91,94,93,0,92,1,93,91,91,91,0,94,94,15,5,5,5,5,5 -5,5,5,5,5,5,9,0,98,1,0,0,0,0,0,0,0,0,0,0&25,0,0,1,0,71,71,71,71,94,0,91,91,91,92,93,91,92,0,98,0,91,91,15,5,5,5,5,5 -5,5,5,5,5,5,9,0,0,97,0,0,85,86,0,96,0,1,0,0&25,0&25,1,0,0,0,71,74,71,71,71,71,71,93,92,93,98,0,91,92,91,91,0,15,5,5,5,5,5 -5,5,5,5,5,5,9,0,0,0,0,0&25,0,0,0,0,96,96,96,0,0&25,0,0*2,0,0,71,71,71,71,71,71,71,71,71,92,1,91,92,92,92,0,0,15,5,5,5,5,5 -5,5,5,5,5,5,9,0,0,0,0,0&25,0&25,0,1,93,0,96,96,0,0&25,0&25,0,0,0,0,71,71,71,71,71,71,71,71,0,0,91,0,0,0,97,0,15,5,5,5,5,5 -5,5,5,5,5,5,20,11,0,0,0,0,0&25,0,0,0,96,0,96,0,0,0&25,0&25,0,0,0,91,0,0,93,71,71,71,71,0,0,0,0:9,91,91,0:9,14,19,5,5,5,5,5 -5,5,5,5,5,5,5,20,11,0,0,0,0&25,96,96,96,96,96,96,84,96,0,0&25,0&25,0,0,93,0,0,0,1,71,71,71,0,92,91,91,0,0,1,15,5,5,5,5,5,5 -5,5,5,5,5,5,5,5,20,11,96,93,0&25,84,96,96,84,0,0,96,0,1,91,0&25,96,0,93,1,92,0,0,71,71,71,71,0:9,91,0,0,14,12,19,5,5,5,5,5,5 -5,5,5,5,5,5,5,5,5,227@19,0&25,0&25,0&25,96,0,71,71,71,71,71,0,96,1,0&25,0,0,93,0,93,93,93,71,71,71,71,0,0,0,0,15,5,5,5,5,5,5,5,5 -5,5,5,5,5,5,5,21,6,8,0,0,0,71,71,71,74,71,71,71,96,0,1,0&25,1,0,96,0,96,0,0,0,71,71,71,0,0,0,0,17,18,5,5,5,5,5,5,5 -5,5,5,5,5,5,21,8,93,98,0,96,71,71,71,71,71,71,71,71,0,0,1,0&25,96,0,93,0,0,0,0,74,71,71,71,0,0,1,0,0,15,5,5,5,5,5,5,5 -5,5,5,5,5,5,9,93,0,96,71,71,71,71,71,71,71,71,71,71,71,96,96,0&25,91,0,93,91,0,0,71,71,71,71,0,0,0,0,0,14,19,5,5,5,5,5,5,5 -5,5,5,5,5,5,9,93,96,71,71,71,71,71,71,71,96,84,71,71,71,71,0,0&25,1,0,93,0,93,71,71,71,71,71,0,0,0,0,14,19,5,5,5,5,5,5,5,5 -5,5,5,5,5,5,20,11,96,71,71,71,71,71,84,1,96,84,71,71,71,71,0,0&25,0,0,0,0,0,71,71,71,71,0,0,0,14,12,19,5,5,5,5,5,5,5,5,5 -5,5,5,5,5,21,6,8,0,71,71,71,1,96,96,0,93,0,96,71,71,71,71,72:2,71,71,96,0,71,71,71,71,71,0,0,14,19,5,5,5,5,5,5,5,5,5,5,5 -5,5,5,5,5,9,96,96,96,71,74,71,0,96,96,0,96,98,96,0,71,71,71,72:3,71,71,71,71,71,71,71,71,244,0,0,17,18,21,6,245@10,6,18,5,5,5,5,5,5 -5,5,5,5,5,9,0,0,0,71,71,71,71,96,84,0,96,96,0,93,0,0,0,0&25,71,71,71,71,74,71,0,93,244,244,0,0,17,8,244,244,0,15,5,5,5,5,5,5 -5,5,5,5,5,20,11,0,97,71,71,71,71,0,0,0,96,93,0,0,0,98,0,0&25,244,0,93,1,0,1,93,0,1,244,244,244,244,244:1,244:1,0&25:1,1:1,15,5,5,5,5,5,5 -5,5,5,5,5,5,20,12,11,71,71,74,71,96,96,0,0,0,0,0,0,0,0,0&25,244,244,93,93,0,0,0,0,0,0,98,244,0,244,106!2,0&25,0,15,5,5,5,5,5,5 -5,5,5,5,5,5,5,5,9,71,71,71,71,96,0,96,0,96,96,0,0,0&25,0&25,0&25,96,244,244,0,0,0,0,0,244,244,244,244,1,244,0&25,0&25,1,15,5,5,5,5,5,5 -5,5,5,5,5,5,5,5,9,71,71,71,1,0,98,98,0,98,0,0&25,0&25,0&25,106!1,0&25,0&25,0&25,244,244,244,244,244,244,244,244,0,0,0&25,244,0&25,0,0,15,5,5,5,5,5,5 -5,5,5,5,5,5,5,5,9,71,71,71,71,96,0,98,0,0,0&25,0&25,97,0,0,0,0,0&25,0&25,0&25*1,0&25,0&25,0&25,0&25,0&25,0&25,0&25,0&25,0&25,244,0,0,14,19,5,5,5,5,5,5 -5,5,5,5,5,5,5,5,9,71,71,71,14,12,11,0,0,98,0&25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,244,244,244,244,0,14,19,5,5,5,5,5,5,5 -5,5,5,5,5,5,5,5,20,77,77,77,19,5,20,12,12,12,243@11,12,12,12,12,12,11,0,0,0,0,0,0,0,0,244,244,244,244,244,14,19,5,5,5,5,5,5,5,5 -5,5,5,5,5,21,6,6,8,71,71,71,15,5,5,5,5,5,5,5,5,5,5,5,20,12,12,12,12,12,12,12,12,11,244,244,244,14,19,5,5,5,5,5,5,5,5,5 -5,5,5,5,21,8,71,71,71,71,71,14,19,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,20,12,12,13,19,5,5,5,5,5,5,5,5,5,5 -5,5,5,5,9,71,71,71,71,71,71,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,21,7,18,5,5,5,5,5,5,5,5,5,5 -5,5,5,5,9,71,71,71,71,14,12,19,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,0&9:10,15,5,5,5,5,5,5,5,5,5,5 -5,5,5,5,9,71,71,71,14,19,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,20,12,19,5,5,5,5,5,5,5,5,5,5 -5,5,5,5,9,71,71,71,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 -5,5,5,5,9,71,71,71,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,71,71,71,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,71,71,71,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,77,77,77,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,245@9,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,71,71,71,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,0&25,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,71,71,71,71,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,0&25,0&25,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,77,77,77,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,5,0&25,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,71,71,71,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,5,0&25,5,5,5,5,0,0,0,0,0,98,5,5,5,5,5,5,5,5,5,5,5,0,71,71,71,0,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,71,5,5,96,5,5,0&25:0,5,5,5,5,0,0,0,0,0,0,93,5,5,5,5,5,5,5,0,0,0,74,71,71,71,1,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,71,96,96,96,5,5,0&25,0,1,5,5,0,98,93,92,98,94,0,0,93,0,92,93,0,93,0,0,71,71,71,71,71,0,0,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,96,96,0,5,5,0&25,0,0,0,1,0,0,97,97,94,98,93,0,92,0,93,0,93,0,71,71,71,71,71,71,92,91,0,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,96,0,0,0,0,0&25,0&25,0,0,0,0,94,97,0,93,92,93,0,71,71,71,71,74,71,71,71,71,71,71,71,91,1,91,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,0,97,0,98,0,0&25,1,0,0,93,0,0,0,0,91,91,71,71,71,71,71,71,71,71,74,71,71,1,93,0,0,0,92,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,0,0,0,0,97,0&25,0&25,0,0,0,98,98,93,92,0,71,71,71,71,71,71,71,71,71,71,71,92,1,92,0,98,0,91,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,0,1,0,0,0*3,0,0&25,0,0,98,0,0,0,0,0,71,71,71,71,1,1,91,92,1,0,0,91,91,91,91,91,91,98,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,0,0,0,97,0,0,0&25,0,0,0,0,1,93,92,0,71,71,71,93,0,93,91,91,1,0,91,91,94:5,98,98,0:4,92,93,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,0,0,0,0,0,0,0,0&25,106!0,0,0,0,98,0,92,93,74,71,71,0,94,91,91,92,91,0,91,91,91,93,91,97,93*0,0,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,0,0,0,85,86,0,0&25,0&25,0&25,0&25,0&25,0&25,0,0,93,92,71,71,71,71,94,91,94,93,0,92,1,93,91,91,91,0,94,94,5,5,5,5,5,5 +5,5,5,5,5,5,5,0,98,1,0,0,0,0,0,0,0,0,0,0&25,0,0,1,0,71,71,71,71,94,0,91,91,91,92,93,91,92,0,98,0,91,91,5,5,5,5,5,5 +5,5,5,5,5,5,5,0,0,97,0,0,85,86,0,96,0,1,0,0&25,0&25,1,0,0,0,71,74,71,71,71,71,71,93,92,93,98,0,91,92,91,91,0,5,5,5,5,5,5 +5,5,5,5,5,5,5,0,0,0,0,0&25,0,0,0,0,96,96,96,0,0&25,0,0*2,0,0,71,71,71,71,71,71,71,71,71,92,1,91,92,92,92,0,0,5,5,5,5,5,5 +5,5,5,5,5,5,5,0,0,0,0,0&25,0&25,0,1,93,0,96,96,0,0&25,0&25,0,0,0,0,71,71,71,71,71,71,71,71,0,0,91,0,0,0,97,0,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,0,0,0,0,0&25,0,0,0,96,0,96,0,0,0&25,0&25,0,0,0,91,0,0,93,71,71,71,71,0,0,0,0:9,91,91,0:9,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,0,0,0,0&25,96,96,96,96,96,96,84,96,0,0&25,0&25,0,0,93,0,0,0,1,71,71,71,0,92,91,91,0,0,1,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,96,93,0&25,84,96,96,84,0,0,96,0,1,91,0&25,96,0,93,1,92,0,0,71,71,71,71,0:9,91,0,0,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,227@19,0&25,0&25,0&25,96,0,71,71,71,71,71,0,96,1,0&25,0,0,93,0,93,93,93,71,71,71,71,0,0,0,0,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,0,0,0,71,71,71,74,71,71,71,96,0,1,0&25,1,0,96,0,96,0,0,0,71,71,71,0,0,0,0,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,93,98,0,96,71,71,71,71,71,71,71,71,0,0,1,0&25,96,0,93,0,0,0,0,74,71,71,71,0,0,1,0,0,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,93,0,96,71,71,71,71,71,71,71,71,71,71,71,96,96,0&25,91,0,93,91,0,0,71,71,71,71,0,0,0,0,0,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,93,96,71,71,71,71,71,71,71,96,84,71,71,71,71,0,0&25,1,0,93,0,93,71,71,71,71,71,0,0,0,0,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,96,71,71,71,71,71,84,1,96,84,71,71,71,71,0,0&25,0,0,0,0,0,71,71,71,71,0,0,0,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,0,71,71,71,1,96,96,0,93,0,96,71,71,71,71,72:2,71,71,96,0,71,71,71,71,71,0,0,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,96,96,96,71,74,71,0,96,96,0,96,98,96,0,71,71,71,72:3,71,71,71,71,71,71,71,71,244,0,0,5,5,5,5,245@10,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,0,0,0,71,71,71,71,96,84,0,96,96,0,93,0,0,0,0&25,71,71,71,71,74,71,0,93,244,244,0,0,5,5,244,244,0,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,0,97,71,71,71,71,0,0,0,96,93,0,0,0,98,0,0&25,244,0,93,1,0,1,93,0,1,244,244,244,244,244:1,244:1,0&25:1,1:1,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,71,71,74,71,96,96,0,0,0,0,0,0,0,0,0&25,244,244,93,93,0,0,0,0,0,0,98,244,0,244,106!2,0&25,0,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,71,71,71,71,96,0,96,0,96,96,0,0,0&25,0&25,0&25,96,244,244,0,0,0,0,0,244,244,244,244,1,244,0&25,0&25,1,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,71,71,71,1,0,98,98,0,98,0,0&25,0&25,0&25,106!1,0&25,0&25,0&25,244,244,244,244,244,244,244,244,0,0,0&25,244,0&25,0,0,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,71,71,71,71,96,0,98,0,0,0&25,0&25,97,0,0,0,0,0&25,0&25,0&25*1,0&25,0&25,0&25,0&25,0&25,0&25,0&25,0&25,0&25,244,0,0,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,71,71,71,5,5,5,0,0,98,0&25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,244,244,244,244,0,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,77,77,77,5,5,5,5,5,5,243@11,5,5,5,5,5,5,0,0,0,0,0,0,0,0,244,244,244,244,244,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,71,71,71,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,244,244,244,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,71,71,71,71,71,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,71,71,71,71,71,71,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,71,71,71,71,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0&9:10,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,71,71,71,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,71,71,71,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,71,71,71,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 diff --git a/rsrc/scenarios/valleydy/out/out1~2.map b/rsrc/scenarios/valleydy/out/out1~2.map index a36117c6e..9aa4035a0 100644 --- a/rsrc/scenarios/valleydy/out/out1~2.map +++ b/rsrc/scenarios/valleydy/out/out1~2.map @@ -1,48 +1,48 @@ 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 -5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,21,245@14,18,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 -5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,0&25,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,21,6,6,6,18,5,5,5 -5,5,5,5,5,5,5,5,5,5,5,5,5,5,21,8,0&25:1,17,6,18,5,5,5,5,5,5,5,5,21,6,6,6,6,6,6,6,18,5,5,21,8,94,0,71,15,5,5,5 -5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,0,0&25,0&25,1,15,5,5,5,5,5,5,5,21,8,0,0,0,98,0,0,0,17,18,5,9,0,94,71,71,15,5,5,5 -5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,0,0,0&25,0,15,5,5,5,5,5,5,21,8,0,0,0&25,0&25,0&25,0&25,0&25,0,0,17,6,8,0,14,11,71,15,5,5,5 -5,5,5,5,5,5,5,5,5,5,5,5,5,5,20,11,106!0,0&25,0,15,5,5,5,5,5,21,8,84,0&25,0&25,0&25,0,0,1,0&25,0&25,1,0,94,0,0,15,20,12,19,5,5,5 -5,5,5,5,5,5,5,5,5,5,5,5,5,21,6,8,0,0&25,0,17,18,5,5,5,5,9,0,0&25,0&25,0,0,14,11,0,0,0&25*1,0,14,12,12,12,19,5,5,5,5,5,5 -5,5,5,5,5,5,5,5,5,5,5,21,6,8,0,0,0,0&25*3,0,0,15,5,5,5,5,9,93,0&25,93,0,0,15,9,0,0,0&25,0,17,18,5,5,5,5,5,5,5,5,5 -5,5,5,5,5,5,5,5,5,21,6,8,0,0,94,93,0,0&25,0&25,97,15,5,5,5,5,9,97,0&25,0,14,12,19,20,11,0,0&25,0,0,15,5,5,5,5,5,5,5,5,5 -5,5,5,5,5,5,5,5,5,9,0,0,1,94,93,93,94,0,0&25,0,17,6,18,5,5,9,0,0&25,0,15,5,5,5,9,0,0&25,0&25,0,17,18,5,5,5,5,5,5,5,5 -5,5,5,5,5,5,5,5,21,8,0,93,93,71,71,14,11,0,0&25,0,84,97,15,5,21,8,0,0&25,0,15,5,5,5,20,11,0,0&25,0,0,15,5,5,5,5,5,5,5,5 -5,5,5,5,5,5,5,5,9,94,93,93,71,71,14,19,9,0,0&25,0&25,0,0,17,18,9,0,0,0&25,0,15,5,5,5,5,20,11,0&25,0&25,94,15,5,21,6,18,5,5,5,5 -5,5,5,5,5,5,5,21,8,0,94,71,71,71,15,5,20,11,0,0&25,0,0,0,15,9,0,0,0&25,0,15,5,5,5,5,5,9,0,0&25,0,15,5,9,90,15,5,5,5,5 -5,5,5,5,5,5,21,8,0:10,94:10,71,71,14,12,19,5,5,9,0,0&25,98,0,98,15,9,0,94,0&25,0,15,5,5,5,5,21,8,0,0&25,0,17,6,8,90,15,5,5,5,5 -5,5,5,5,5,5,9,0,93,71,71,71,15,5,5,5,5,9,97,0&25:3,0:3,97,97,15,20,11,0,0&25,93,15,5,5,5,5,9,0,0,0&25,0,90,90,90,90,15,5,5,5,5 -5,5,5,5,5,5,9,0,93,93,71,14,19,5,5,5,5,9,98,0&25,0,0,97,15,5,9,0,0&25,0&25,17,18,5,5,5,9,0,0&25,0&25,0,90,90,90,90,15,5,5,5,5 -5,5,5,5,5,5,9,0,1,93,14,19,5,5,5,5,5,9,0,0&25,0,98,14,19,5,9,0,93,0&25,0,15,5,5,21,8,0,0&25,0,90,90,90,90,0,15,5,5,5,5 -5,5,5,5,5,5,9,98,0,0,15,5,5,5,5,21,6,8,0,0&25,0,14,19,5,5,9,0,0,0&25,0,17,6,18,9,90,90,0&25,90,90,90,90,0,14,19,5,5,5,5 -5,5,5,5,5,21,8,0,0,0,15,21,6,6,6,8,97,0,0&25,0&25,1,15,5,5,5,20,11,0,0&25,0,84,90,17,8,90,90,0&25:9,90,90,90,0,0,15,5,5,5,5,5 -5,21,6,6,6,8,90,90,90,0,17,8,0,1,0,0&25,0&25,0&25,0&25,0,1,15,5,5,5,5,9,0&25,0&25,0,0,90,90,90,90,90,0&25,90,90,90,0,14,19,5,5,5,5,5 -5,8,90,90,90,90,90,0,0,0,0,0,0&25,0&25,0&25,0&25,0,0,0,94,14,19,5,5,5,21,8,0&25,0,0,90,90,90,90,90,90,0&25,0,0,0,0,15,5,5,5,5,5,5 -6,90,90,14,12,11,1,0,0,0&25,0&25,0&25,0&25,0,1,0,14,12,12,12,19,5,5,5,21,8,0,0&25,94,0,90,90,90,90,90,0,0&25,0,14,12,12,19,5,5,5,5,5,5 -90,90,14,19,21,8,0,0&25,0&25,0&25,0,0,0,94,14,12,19,5,5,5,5,5,5,21,8,0,0&25,0&25,0,93,90,90,90,14,11,0&25,0&25,0,15,21,6,18,5,21,6,18,5,5 -12,12,19,5,9,0,0,0&25,0,1,14,12,12,12,19,5,5,5,5,5,5,5,5,9,0,0,0&25,0,0,90,90,90,90,17,8,0&25,0,0,16,10,0,17,6,8,0&9:8,15,5,5 -5,5,5,5,9,0,0&25,0&25,1,14,19,5,5,5,5,5,5,5,5,5,5,21,6,8,0&25,0&25,0&25,90,90,90,90,90,0,0,0&25,0&25,0,14,19,9,0,1,0,0,0,15,5,5 -5,5,5,5,9,97,0&25:4,97,0:4,17,18,5,5,5,5,5,5,5,5,5,21,8,0,0&25,0&25,0,90,90,90,90,90,90,0,0&25,0&25,0,14,19,5,20,12,12,12,12,12,19,5,5 -5,5,5,5,9,93,0&25,0,0,84,15,5,5,5,5,5,5,5,21,6,8,0,0&25,0&25,0,90,90,90,90,90,0,0,0,0&25,1,0,15,5,5,5,5,5,5,5,5,5,5,5 -5,5,5,5,9,0,0&25,0&25,0,14,19,5,5,5,5,5,5,5,9,97,0,0&25,0&25,90,90,90,90,14,12,11,0,0,0&25,0&25,0,0,15,5,5,5,5,5,5,5,5,5,5,5 -5,5,5,5,9,0,0,0&25,0,17,6,6,6,6,18,5,21,6,8,84,0,0&25,90,90,0,0,14,19,21,8,1,0&25,0&25,0,94,14,19,5,21,6,6,6,6,6,6,18,5,5 -5,5,5,5,20,11,93,0&25,0&25,1,0,97,0,0,17,6,8,93,0,0&25,0&25,0&25,0,93,97,14,19,5,9,0,0&25,0&25,0,14,12,19,5,21,8,0,93,0,90,90,90,15,5,5 -5,5,5,5,5,9,0,0,0&25,0&25,0&25,0&25,0&25,0&25,0,0,0,0,0&25,0&25,94,0,0,0,0,15,5,21,8,94,0&25,0,0,15,5,5,21,8,0,84,0,0&25,0&25,0&25,0&25,228@16,5,5 -5,5,5,5,5,20,11,0,97,84,0,93,93,0&25,0&25,0&25*2,0&25,0&25,0&25,0,84,0,14,12,12,19,21,8,0,0&25,0&25,0,14,19,5,5,9,0,84,0&25,0&25,0&25,90,90,90,15,5,5 -5,5,5,5,5,5,20,12,11,0,14,12,11,0,0,0,0,84,0,14,12,12,19,5,5,5,9,98,0,0&25,0,94,15,5,21,6,8,0,0&25,0&25,1,0,14,12,12,19,5,5 -5,5,5,5,5,5,5,5,9,98,17,18,20,12,12,12,13,12,12,19,5,5,5,5,5,5,9,93,98,0&25,0,14,19,5,9,0,0,0&25,0&25,0,0,14,19,5,5,5,5,5 -5,5,5,5,5,5,5,5,9,0,0,15,5,5,5,21,7,18,5,5,5,5,5,5,5,5,9,94,94,0&25,93,15,5,5,9,0,0&25,0&25,0,84,14,19,5,5,5,5,5,5 -5,5,5,5,5,5,5,5,20,11,0,15,5,5,5,9,0,17,18,5,5,5,5,5,5,5,9,1,0,0&25,1,15,5,21,8,0,0&25,0,1,14,19,5,5,5,5,5,5,5 -5,5,5,5,5,5,5,21,6,8,98,15,5,5,5,9,0,0,17,6,6,6,18,5,5,5,9,0,94,0&25,0,15,5,9,94,0&25,0&25,84,14,19,5,5,5,5,5,5,5,5 -5,5,5,5,5,5,21,8,0,0,0,15,5,5,5,20,11,0,0,0,0,0&9:6,15,5,5,5,20,11,98,0&25,84,15,5,9,0,0&25,94,14,19,5,5,5,5,5,5,5,5,5 -5,5,5,5,5,5,9,0,0,71,71,15,5,5,5,5,20,12,12,12,12,12,19,5,5,5,5,9,0,0&25,0,17,6,8,0,0&25,94,15,5,5,5,5,5,5,5,5,5,5 -5,5,5,5,5,5,9,98,71,71,71,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,0,0&25,0&25,0,0,0,0&25,0&25,0,15,5,5,5,5,5,5,5,5,5,5 -5,5,5,5,5,5,20,12,12,12,12,19,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,0,0,0&25,0&25,0&25*0,0&25,0&25,1,0,15,5,5,5,5,5,5,5,5,5,5 -5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,20,12,11,0,0,0,0,0,0,14,19,5,5,5,5,5,5,5,5,5,5 -5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,20,12,12,12,12,12,12,19,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,245@14,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0&25,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0&25:1,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,94,0,71,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,0&25,0&25,1,5,5,5,5,5,5,5,5,5,5,0,0,0,98,0,0,0,5,5,5,5,0,94,71,71,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,0,0&25,0,5,5,5,5,5,5,5,5,5,0,0,0&25,0&25,0&25,0&25,0&25,0,0,5,5,5,0,5,5,71,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,106!0,0&25,0,5,5,5,5,5,5,5,5,84,0&25,0&25,0&25,0,0,1,0&25,0&25,1,0,94,0,0,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,0&25,0,5,5,5,5,5,5,5,0,0&25,0&25,0,0,5,5,0,0,0&25*1,0,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,0,0,0&25*3,0,0,5,5,5,5,5,5,93,0&25,93,0,0,5,5,0,0,0&25,0,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,0,0,94,93,0,0&25,0&25,97,5,5,5,5,5,5,97,0&25,0,5,5,5,5,5,0,0&25,0,0,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,0,0,1,94,93,93,94,0,0&25,0,5,5,5,5,5,5,0,0&25,0,5,5,5,5,5,0,0&25,0&25,0,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,0,93,93,71,71,5,5,0,0&25,0,84,97,5,5,5,5,0,0&25,0,5,5,5,5,5,5,0,0&25,0,0,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,94,93,93,71,71,5,5,5,0,0&25,0&25,0,0,5,5,5,0,0,0&25,0,5,5,5,5,5,5,5,0&25,0&25,94,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,0,94,71,71,71,5,5,5,5,0,0&25,0,0,0,5,5,0,0,0&25,0,5,5,5,5,5,5,5,0,0&25,0,5,5,5,90,5,5,5,5,5 +5,5,5,5,5,5,5,5,0:10,94:10,71,71,5,5,5,5,5,5,0,0&25,98,0,98,5,5,0,94,0&25,0,5,5,5,5,5,5,5,0,0&25,0,5,5,5,90,5,5,5,5,5 +5,5,5,5,5,5,5,0,93,71,71,71,5,5,5,5,5,5,97,0&25:3,0:3,97,97,5,5,5,0,0&25,93,5,5,5,5,5,5,0,0,0&25,0,90,90,90,90,5,5,5,5,5 +5,5,5,5,5,5,5,0,93,93,71,5,5,5,5,5,5,5,98,0&25,0,0,97,5,5,5,0,0&25,0&25,5,5,5,5,5,5,0,0&25,0&25,0,90,90,90,90,5,5,5,5,5 +5,5,5,5,5,5,5,0,1,93,5,5,5,5,5,5,5,5,0,0&25,0,98,5,5,5,5,0,93,0&25,0,5,5,5,5,5,0,0&25,0,90,90,90,90,0,5,5,5,5,5 +5,5,5,5,5,5,5,98,0,0,5,5,5,5,5,5,5,5,0,0&25,0,5,5,5,5,5,0,0,0&25,0,5,5,5,5,90,90,0&25,90,90,90,90,0,5,5,5,5,5,5 +5,5,5,5,5,5,5,0,0,0,5,5,5,5,5,5,97,0,0&25,0&25,1,5,5,5,5,5,5,0,0&25,0,84,90,5,5,90,90,0&25:9,90,90,90,0,0,5,5,5,5,5,5 +5,5,5,5,5,5,90,90,90,0,5,5,0,1,0,0&25,0&25,0&25,0&25,0,1,5,5,5,5,5,5,0&25,0&25,0,0,90,90,90,90,90,0&25,90,90,90,0,5,5,5,5,5,5,5 +5,5,90,90,90,90,90,0,0,0,0,0,0&25,0&25,0&25,0&25,0,0,0,94,5,5,5,5,5,5,5,0&25,0,0,90,90,90,90,90,90,0&25,0,0,0,0,5,5,5,5,5,5,5 +5,90,90,5,5,5,1,0,0,0&25,0&25,0&25,0&25,0,1,0,5,5,5,5,5,5,5,5,5,5,0,0&25,94,0,90,90,90,90,90,0,0&25,0,5,5,5,5,5,5,5,5,5,5 +90,90,5,5,5,5,0,0&25,0&25,0&25,0,0,0,94,5,5,5,5,5,5,5,5,5,5,5,0,0&25,0&25,0,93,90,90,90,5,5,0&25,0&25,0,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,0,0,0&25,0,1,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,0,0&25,0,0,90,90,90,90,5,5,0&25,0,0,5,5,0,5,5,5,0&9:8,5,5,5 +5,5,5,5,5,0,0&25,0&25,1,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0&25,0&25,0&25,90,90,90,90,90,0,0,0&25,0&25,0,5,5,5,0,1,0,0,0,5,5,5 +5,5,5,5,5,97,0&25:4,97,0:4,5,5,5,5,5,5,5,5,5,5,5,5,5,0,0&25,0&25,0,90,90,90,90,90,90,0,0&25,0&25,0,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,93,0&25,0,0,84,5,5,5,5,5,5,5,5,5,5,5,0,0&25,0&25,0,90,90,90,90,90,0,0,0,0&25,1,0,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,0,0&25,0&25,0,5,5,5,5,5,5,5,5,5,5,97,0,0&25,0&25,90,90,90,90,5,5,5,0,0,0&25,0&25,0,0,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,0,0,0&25,0,5,5,5,5,5,5,5,5,5,5,84,0,0&25,90,90,0,0,5,5,5,5,1,0&25,0&25,0,94,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,93,0&25,0&25,1,0,97,0,0,5,5,5,93,0,0&25,0&25,0&25,0,93,97,5,5,5,5,0,0&25,0&25,0,5,5,5,5,5,5,0,93,0,90,90,90,5,5,5 +5,5,5,5,5,5,0,0,0&25,0&25,0&25,0&25,0&25,0&25,0,0,0,0,0&25,0&25,94,0,0,0,0,5,5,5,5,94,0&25,0,0,5,5,5,5,5,0,84,0,0&25,0&25,0&25,0&25,228@16,5,5 +5,5,5,5,5,5,5,0,97,84,0,93,93,0&25,0&25,0&25*2,0&25,0&25,0&25,0,84,0,5,5,5,5,5,5,0,0&25,0&25,0,5,5,5,5,5,0,84,0&25,0&25,0&25,90,90,90,5,5,5 +5,5,5,5,5,5,5,5,5,0,5,5,5,0,0,0,0,84,0,5,5,5,5,5,5,5,5,98,0,0&25,0,94,5,5,5,5,5,0,0&25,0&25,1,0,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,98,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,93,98,0&25,0,5,5,5,5,0,0,0&25,0&25,0,0,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,0,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,94,94,0&25,93,5,5,5,5,0,0&25,0&25,0,84,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,0,5,5,5,5,5,0,5,5,5,5,5,5,5,5,5,5,1,0,0&25,1,5,5,5,5,0,0&25,0,1,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,98,5,5,5,5,5,0,0,5,5,5,5,5,5,5,5,5,0,94,0&25,0,5,5,5,94,0&25,0&25,84,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,0,0,0,5,5,5,5,5,5,0,0,0,0,0&9:6,5,5,5,5,5,5,98,0&25,84,5,5,5,0,0&25,94,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,0,0,71,71,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,0&25,0,5,5,5,0,0&25,94,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,98,71,71,71,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,0&25,0&25,0,0,0,0&25,0&25,0,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,0,0&25,0&25,0&25*0,0&25,0&25,1,0,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,0,0,0,0,0,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 diff --git a/rsrc/scenarios/valleydy/scenario.xml b/rsrc/scenarios/valleydy/scenario.xml index beca22e1d..4b8ff0511 100644 --- a/rsrc/scenarios/valleydy/scenario.xml +++ b/rsrc/scenarios/valleydy/scenario.xml @@ -40,7 +40,7 @@ oboe 2.0.0 - Apple Mac OS X Version 10.7.5 (Build 11G63) + Apple Mac OS X Version 14.5 (Build 23F79) 21 diff --git a/rsrc/scenarios/valleydy/terrain.xml b/rsrc/scenarios/valleydy/terrain.xml index 5b5d4029f..ce6351a7e 100644 --- a/rsrc/scenarios/valleydy/terrain.xml +++ b/rsrc/scenarios/valleydy/terrain.xml @@ -145,7 +145,7 @@ true 0 step - none + smart-border 2 0 1 diff --git a/rsrc/scenarios/valleydy/towns/town10.map b/rsrc/scenarios/valleydy/towns/town10.map index 2d77870f0..0c2ea99b2 100644 --- a/rsrc/scenarios/valleydy/towns/town10.map +++ b/rsrc/scenarios/valleydy/towns/town10.map @@ -30,19 +30,19 @@ 5,5,5,5,5,139,139,139,139,139,139,226,226,226,226,150,139,148,139,170,170,139,170,170,170,170,139,170&15,170,139,148,139,139,139,139,139,139,139,139,139,139,139,139,5,5,5,5,5 5,5,5,5,5,139,170,170,170,170,170,226,226,226,226,226,170,170,141,170&15,170,139,170,170,170,170,139,170,170,141,170,170,170,170,170,170,230,170,170,170,230,170,139,5,5,5,5,5 5,5,5,5,5,139,230,230,229,170,229,226,226,226,226,170,170,170,149!3,141,139,139,226,170,170,170,139,139,141,149!5,170,170,170,170,229,170,230,170,230,170,230,170,139,5,5,5,5,5 -5,5,5,5,5,139,170,170,170,170,170,170,226,226,226,226,226,226,226,226,226,139,226,226,226,226,226,226,226,226,226,226,170,170,230,170,170,170,230,170,170,170,150,18,5,5,5,5 -5,5,5,5,5,139,139,230,230,229,170,229,229,229,226,226,226,229,170,244,226,226,226,170,170,170,139,170,226,226,226,226,226,170,170,170,170,170,170,170,170,85,86,15,5,5,5,5 -5,5,5,5,5,5,139,139,170,170,170,170,170,226,226,226,226,226,229,244,170,139,170,170,170,170,139,170,170,226,226,226,226,170,170,230,170,170,229,170,150,150,12,19,5,5,5,5 -5,5,5,5,5,5,5,139,139,230,229,170,229,226,226,170,226,226,226,244,244,244,244,244,170,170,139,170,170,170,226,226,170,170,170,230,170,170,170,85,86,0,15,5,5,5,5,5 -5,5,5,5,5,5,5,5,139,139,170,170,170,229,229,170,226,170,226,170,170,139,170,244,244,170,139,230,170,170,170,170,170,230,170,229,170,170,150,150,11,0:1,15,5,5,5,5,5 -5,5,5,5,5,5,5,5,5,139,139,170,230,229,170,226,226,170,170,170,170,139,170,170,170,170,139,230,170,230,170,230,170,230,170,230,170,139,139,5,9,0,15,5,5,5,5,5 -5,5,5,5,5,5,5,21,6,6,139,139,139,139,139,150,226,226,226,150,150,149!1,148,148,148,148,149!2,139,139,139,139,139,139,139,139,139,150,139,18,21,8,0,15,5,5,5,5,5 -5,5,5,5,5,5,5,9,0,0,0,0,1,0,0,0,226,226,226,226,0,1,226,82,82,82,0,0,0,0,0,0,0,0,0,1,0,0,16,10,0,0,15,5,5,5,5,5 -5,5,5,5,5,5,5,20,11,0,0,0,0,1,0,226,226,226,226,226,226,0,226,82,82,82,0,0,0,0,0,0,0,0,0,0,1,14,19,20,12,12,19,5,5,5,5,5 -5,5,5,5,5,5,5,5,20,12,11,0,0,0,226,226,0,226,226,0,226,226,226,82,82,82,0,0,0,0,0,0,0,0,0,0,0,15,5,5,5,5,5,5,5,5,5,5 -5,5,5,5,5,5,5,5,5,5,20,11,0,0,226,226,0,0,226,0,226,226,82,82,82,82,0,0,0,0,0,0,0,0,0,14,12,19,5,5,5,5,5,5,5,5,5,5 -5,5,5,5,5,5,5,5,5,5,5,9,0,226,226,0,0,0,226,0,226,0,82,82,82v<^>,82,0,0,0,0,0,0,1,0,0,15,5,5,5,5,5,5,5,5,5,5,5,5 -5,5,5,5,5,5,5,5,5,5,5,9,0,226,1,0,0,0,226,0,226,226,226,82,82,82,0,0,0,0,0,0,0,0,14,19,5,5,5,5,5,5,5,5,5,5,5,5 -5,5,5,5,5,5,5,5,5,5,5,9,0,226,226,0,0,226,226,0,226,0,226,82,82,82,0,0,0,0,0,0,0,14,19,5,5,5,5,5,5,5,5,5,5,5,5,5 -5,5,5,5,5,5,5,5,5,5,5,9,0,0,226,0,0,226,0,0,226,0,226,226,82,82,0,0,0,0,0,0,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5 -5,5,5,5,5,5,5,5,5,5,5,9,0,0,226,0,0,226,0,0,226,0,226,82,82,82,0,0,0,0,0,0,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,139,170,170,170,170,170,170,226,226,226,226,226,226,226,226,226,139,226,226,226,226,226,226,226,226,226,226,170,170,230,170,170,170,230,170,170,170,150,5,5,5,5,5 +5,5,5,5,5,139,139,230,230,229,170,229,229,229,226,226,226,229,170,244,226,226,226,170,170,170,139,170,226,226,226,226,226,170,170,170,170,170,170,170,170,85,86,5,5,5,5,5 +5,5,5,5,5,5,139,139,170,170,170,170,170,226,226,226,226,226,229,244,170,139,170,170,170,170,139,170,170,226,226,226,226,170,170,230,170,170,229,170,150,150,5,5,5,5,5,5 +5,5,5,5,5,5,5,139,139,230,229,170,229,226,226,170,226,226,226,244,244,244,244,244,170,170,139,170,170,170,226,226,170,170,170,230,170,170,170,85,86,0,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,139,139,170,170,170,229,229,170,226,170,226,170,170,139,170,244,244,170,139,230,170,170,170,170,170,230,170,229,170,170,150,150,5,0:1,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,139,139,170,230,229,170,226,226,170,170,170,170,139,170,170,170,170,139,230,170,230,170,230,170,230,170,230,170,139,139,5,5,0,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,139,139,139,139,139,150,226,226,226,150,150,149!1,148,148,148,148,149!2,139,139,139,139,139,139,139,139,139,150,139,5,5,5,0,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,0,0,0,0,1,0,0,0,226,226,226,226,0,1,226,82,82,82,0,0,0,0,0,0,0,0,0,1,0,0,5,5,0,0,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,0,0,0,0,1,0,226,226,226,226,226,226,0,226,82,82,82,0,0,0,0,0,0,0,0,0,0,1,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,0,0,0,226,226,0,226,226,0,226,226,226,82,82,82,0,0,0,0,0,0,0,0,0,0,0,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,0,0,226,226,0,0,226,0,226,226,82,82,82,82,0,0,0,0,0,0,0,0,0,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,0,226,226,0,0,0,226,0,226,0,82,82,82v<^>,82,0,0,0,0,0,0,1,0,0,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,0,226,1,0,0,0,226,0,226,226,226,82,82,82,0,0,0,0,0,0,0,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,0,226,226,0,0,226,226,0,226,0,226,82,82,82,0,0,0,0,0,0,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,0,0,226,0,0,226,0,0,226,0,226,226,82,82,0,0,0,0,0,0,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,0,0,226,0,0,226,0,0,226,0,226,82,82,82,0,0,0,0,0,0,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 diff --git a/rsrc/scenarios/valleydy/towns/town11.map b/rsrc/scenarios/valleydy/towns/town11.map index cde865f40..21efe77e4 100644 --- a/rsrc/scenarios/valleydy/towns/town11.map +++ b/rsrc/scenarios/valleydy/towns/town11.map @@ -1,10 +1,10 @@ -5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,0,82,82,82,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 -5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,0,82,82,82,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 -5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,0,82,82,82,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 -122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,5,5,5,5,9,0,82,82,82,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 -122,177@0,177,176@2,170,127,170,170,170,170,170$39,123,170,172,172,172,170,170,122,5,5,5,5,9,0,82,82v<>,82,0,17,18,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 -122,170,170,170,170,122,170,170,170,170,170,122,122,122,122,122,122,170,122,5,5,5,21,8,0,82,82,82,0,0,17,18,5,122,122,122,5,5,5,5,5,5,5,5,5,5,5,5 -122,170,178@1,177,177,122,177@3,177@4,177@6,177@5,177@7,122,170:5&9,172,172,172,170,170,122,5,5,5,9,0,0,82,82,82,0,0,0,15,5,122,194@27,122,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,82,82,82,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,82,82,82,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,82,82,82,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,5,5,5,5,5,0,82,82,82,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +122,177@0,177,176@2,170,127,170,170,170,170,170$39,123,170,172,172,172,170,170,122,5,5,5,5,5,0,82,82v<>,82,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +122,170,170,170,170,122,170,170,170,170,170,122,122,122,122,122,122,170,122,5,5,5,5,5,0,82,82,82,0,0,5,5,5,122,122,122,5,5,5,5,5,5,5,5,5,5,5,5 +122,170,178@1,177,177,122,177@3,177@4,177@6,177@5,177@7,122,170:5&9,172,172,172,170,170,122,5,5,5,5,0,0,82,82,82,0,0,0,5,5,122,194@27,122,5,5,5,5,5,5,5,5,5,5,5,5 122,123,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,5,122,122,122,122,122,131:0,132!1,131:0,122,122,122,122,122,122,123,122,122,122,122,122,122,122,122,122,122,122,122,122 122,170,170,170,170,126,170,170,170,170,170,126,170,170$8,170:7,186,122,5,5,122,122,170,170,170,170,170,170,170,170,170,170,170,122,122,170,170&22,170,170,170$7,122,177,122,177,122,177@32,122,194@30,122 122,199,199,170,184,122,199&16,199,199,170,185,122,170,170,170,170:7,122,122,122,122,170&10,170,187,170,170,170,170,170,170&22,170,187,170,170,122,196,170,170,170,170,122,170,170,170,170,170,170&13,170,122 diff --git a/rsrc/scenarios/valleydy/towns/town13.map b/rsrc/scenarios/valleydy/towns/town13.map index 076c79909..2139abcfc 100644 --- a/rsrc/scenarios/valleydy/towns/town13.map +++ b/rsrc/scenarios/valleydy/towns/town13.map @@ -30,8 +30,8 @@ 139,170,195,195,195,170,170,170,139,170,139,170,170,170,170,170,170,170,170,170,139,170,170,170,170,170,170,139,170,170,170,170,170,170,170,170,170,139,170,170,170,170,170,170,170,170,170,139 139,170,170,170,170,170,170,170,170:8,170,139,191,191,191,191,191,191,191,191,191,139,170,170,170,170,170,170,139,191,191,191,191,191,191,191,191,191,139,191,191,191:11,191,191,191,191,191,191,139 139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,170:19,170:19,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139 -122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,252,252,122,122,122,122,122,122,122,122,122,122,122,122,122,133,122,134,133,122,18,5,5,5,5 -122,170:6&9,170:6&9,122,170@3@4@5&11,170&12,170&22,170,170&10,170@6@7@8&11&10,122,170:5@2&22,170&14,170,170,175,122,71,71,71,71,71,71,170$10,170,71,71,71,71,71,71,122,170,170,170,122,170,170,170,133,170,170,170,17,6,6,6,6 +122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,252,252,122,122,122,122,122,122,122,122,122,122,122,122,122,133,122,134,133,122,5,5,5,5,5 +122,170:6&9,170:6&9,122,170@3@4@5&11,170&12,170&22,170,170&10,170@6@7@8&11&10,122,170:5@2&22,170&14,170,170,175,122,71,71,71,71,71,71,170$10,170,71,71,71,71,71,71,122,170,170,170,122,170,170,170,133,170,170,170,5,5,5,5,5 122,170,170,122,170,170&22,170,170$4,170,170&10,122,170&14,170&14,170,170,195,122,71,71,71,71,170,170$8,170,170,170,170,71,71,71,71,122,170,170,170,122,170,170,85,86,170,170,170,0:45&9,85,86,85,86 122,170,170,122,170&12,170,170$3,170,170,170&22,122,170,170,170,170,170,122,71,71,170,170$6,170,189,170$9,170,189,170,170,170,71,71,122,170,170,170,122,170,170,170,85,86,170,170,0:45&9,0,85,86,0 122,170,170,122,170&10,170,170&22,170$2,170,170,122,170,192,170,170,170,122,71,71,170,189,170$7,170,170,170,170,170,189,170,71,71,122,122,122,125,122,122,134,129,134,133,133,129,122,122,122,122,122 diff --git a/rsrc/scenarios/valleydy/towns/town14.map b/rsrc/scenarios/valleydy/towns/town14.map index 9eef8c711..ab8067874 100644 --- a/rsrc/scenarios/valleydy/towns/town14.map +++ b/rsrc/scenarios/valleydy/towns/town14.map @@ -10,9 +10,9 @@ 122,122,122,127,122,125,122,122,125,122,122,122,170,170,122,122,122,122,122,122,122,122,170,170,170,122,122,122,122,122,122,122,122,170,170,122,125,132!1,122,122,122,122,170,170,132!6,122,122,122 122,180,170,170,122,170,170,122,170,170,170,122,170,170,122,170,170,170,170,170,170,170$23,170,170,170,170,170,170,170,170,170,170,122,170,170,122,172,172,172,172,172,122,170,170,122,0,0,1 122,180@1,170,170,122,170&13,170&13,122,170,170,170,122,170,170,122,170,187,170,170$21,170$19,187,170,170,170,187,170,170,170,187,170,170,170,122,170,170,122,122,126,122,122,126,122,170,170,122,1,0,0 -122,180@3,170,170,122,170,170,122,170,170,170,122,170,170,122,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,71,122,170,170,122,170,170,122,170,170,122,170:24,170:24,122,0,1,14 -122,180@2,170,170,122,170&13,170&13,122,170,170,170&10,122,170,170,122,170,170,170$20,170,170,170$18,170,170*3,170,170,170,170,170,170,170,71,71,122,170,170,122,170,170,122,170,170,122,0,0<,0:25&9,0,1,15 -122,180@0,170,170,122,170@51,170&23,122,170,170&10,170&10,122,170,170,122,170,170,170,170$17,170,170,170,170,170,170,170,170,170,170,170,170,71,122,170,170,122,170&16,170,122,170@41@42&18&22$4,170,122,0,1,0:25&9,0,1,15 +122,180@3,170,170,122,170,170,122,170,170,170,122,170,170,122,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,71,122,170,170,122,170,170,122,170,170,122,170:24,170:24,122,0,1,5 +122,180@2,170,170,122,170&13,170&13,122,170,170,170&10,122,170,170,122,170,170,170$20,170,170,170$18,170,170*3,170,170,170,170,170,170,170,71,71,122,170,170,122,170,170,122,170,170,122,0,0<,0:25&9,0,1,5 +122,180@0,170,170,122,170@51,170&23,122,170,170&10,170&10,122,170,170,122,170,170,170,170$17,170,170,170,170,170,170,170,170,170,170,170,170,71,122,170,170,122,170&16,170,122,170@41@42&18&22$4,170,122,0,1,0:25&9,0,1,5 122,122,122,122,122,122,122,122,122,122,122,122,130,130,122,170,187,170,170,170$22,187,170,170,170,187,170,170,170,187,170,170,170,122,130,131,122,122,122,122,122,122,122,122,122,122,122,122,122 122,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,122 122,170,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,122 @@ -42,7 +42,7 @@ 122,170,122,122,122,122,122,122,122,122,122,122,133,85:15,86,133,170,122,122,122,122,122,170,122,170,170,122,170,149!3,170,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,170,139 122,170,170,170,170,170,170,170,170,170,170,170,170:15,170,170,170,170,170:15,170,170,170,170,170,122,170:17,170:17,122,170,170:23,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,139 122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,132!8,122,122,122,122,122,122,0^,0,122,122,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139 -5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,0,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 -5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,0,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 -5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,0,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 -5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,0,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 diff --git a/rsrc/scenarios/valleydy/towns/town15.map b/rsrc/scenarios/valleydy/towns/town15.map index 68489e5fc..bdd721214 100644 --- a/rsrc/scenarios/valleydy/towns/town15.map +++ b/rsrc/scenarios/valleydy/towns/town15.map @@ -1,45 +1,45 @@ -5,5,5,5,5,5,5,5,5,9,71,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,21,6,6,6,6,6,6,6,18,5,5,5 -5,5,5,5,5,5,5,5,5,20,77,19,5,21,6,6,18,5,5,5,5,5,5,5,21,6,6,6,18,5,5,5,5,5,21,6,8,0@10,84,0,0,0,0,0,15,5,5,5 -5,5,5,5,5,21,6,6,6,8,71,15,5,9,0,102@11@12@13@14@15,15,5,5,5,5,5,5,5,9,90,90,1,17,18,5,5,5,5,9,85@9,86,0,0,0,97,14,12,13,19,5,5,5 -5,5,5,5,5,9,71,71,71,71,71,15,5,9,0,14,19,5,5,5,5,5,5,5,9,90,90,93,0@5,15,5,5,5,5,9,0,84,0,0,14,12,19,21,7,6,18,5,5 -5,5,5,5,5,9,71,71,71,71,71,17,6,8,0,15,5,5,5,5,5,21,6,6,8v,1,98,0,94,17,6,18,5,5,20,11,85@8,86@7,14,19,5,21,8,93,0,15,5,5 -5,5,5,5,5,9,71,71,71,93$2,93$3,93,98,0,0,15,5,5,5,5,21,8,93,93,0,0,0,0,0,94,0,17,18,5,5,20,12,12,19,5,5,9,0,93,0,15,5,5 -5,5,5,21,6,8,71,71,93,93,91,93,0$1,98,14,19,5,5,5,5,9,0,0,14,11,98,0,1,98,0,0,0,17,18,5,5,5,5,5,5,21,8,0,0,0,15,5,5 -5,5,21,8,71,71,71,14,12,11,93,0$0,0,0,15,5,5,5,21,6,8,93,14,19,20,11,0@6,0,0,0,0,0,0,15,5,5,5,5,5,21,8,93,0,0,0,15,5,5 -5,21,8,71,71,14,12,19,5,9,93,0,0,1,15,5,5,21,8,94,0,0,15,5,5,9,0,93,0,0,0,98,0,17,18,21,6,18,21,8,98,0,0,0,0,15,5,5 -6,8,71,71,14,19,5,5,5,20,12,11,0,94,15,5,21,8,0,0,0,0,17,18,5,20,12,12,11,98,98,0,98,0,17,8,0,17,8,94,94,0,0,0,14,19,5,5 -71,71,71,14,19,5,5,5,21,6,6,8,1,14,19,21,8,94,0,94,0,0,0,15,5,5,5,5,20,12,12,12,11,0,0,0,0,0,1,0,98,0,0,14,19,5,5,5 -12,12,12,19,5,5,5,21,8,0,0,0,0,15,5,9,98,0,1,94,98,0,0,15,21,6,6,6,6,6,6,18,20,12,11,0,0,14,11,0,0,0,0,15,5,5,5,5 -5,5,5,5,5,21,6,8,0,14,12,12,12,19,5,20,11,0,14,11,0,93,0,17,8,0,0,0,0,0,0,17,6,18,20,12,12,19,9,0,1,98,14,19,5,5,5,5 -5,5,5,5,5,9,0,98,0,15,21,6,6,6,6,18,9,0,17,8,0,1,0,0,0,0,14,12,12,11,1,1,94,15,5,5,5,21,8,0,98,14,19,5,5,5,5,5 -5,5,5,5,5,9,0,98,0,15,9,0,0,98,0,15,9,0,0,0,0,0,0,14,12,12,19,5,5,20,12,11,0,17,6,18,5,9,0,0,14,19,5,5,5,5,5,5 -5,5,5,5,21,8,0,0$8,0,15,9,0,14,11,0,15,20,11,0,0,14,12,12,19,5,5,5,5,5,5,5,9,0,0,0,15,5,9,0,14,19,5,5,5,5,5,5,5 -5,5,5,5,9,0,98$6,0$7,0,15,9,94,15,9,0,15,5,20,11,0,17,18,21,6,6,18,5,5,5,5,5,9,0,14,12,19,5,9,0,15,5,5,5,5,5,5,5,5 -5,5,5,5,9,1$5,1,1,14,19,20,12,19,9,0,17,6,6,8,0,0,15,9,90,90,15,5,5,21,6,6,8,0,15,21,6,6,8,0,17,6,6,6,6,6,18,5,5 -5,5,5,5,9,94,0$4,0,15,5,5,21,6,8,0,93,0,0,0,0,93,15,9,90,90,15,5,21,8,0,0,0,0,15,9,93,0,0,0,93,0,0,0,98,0,15,5,5 -5,5,5,5,9,0,0,98,15,5,5,9,0,0,0,14,12,12,12,11,0,15,20,11,93,15,5,9,1,93,14,12,12,19,9,0,14,12,12,12,11,0,0,0,98,15,5,5 -5,5,5,5,20,11,0,14,19,5,5,9,0,14,12,19,5,5,21,8,0,17,18,9,0,15,5,9,0,14,19,21,6,6,8,98,15,5,5,21,8,94,0,0,14,19,5,5 -5,5,5,5,5,9,1,15,5,5,21,8,0,15,21,6,6,6,8,0,0,98$12,15,9,0,17,6,8,0,15,21,8,0,0,0,0,15,5,5,9,101@0@1@2@3@4,0,93,0,17,6,18,5 -5,5,5,5,5,9,0,15,5,21,8,0,0,15,9,92,0,0,92,0,0,92$13,15,9,0,93:3,0,0,0,15,9,0,0,14,12,12,19,5,5,9,1,0,94,93,0,0,15,5 -5,5,5,5,5,9,0,15,5,9,0,0,14,19,20,12,12,11,0$11,0,0$10,92,15,20,12,12,12,12,12,19,9,0,14,19,5,5,5,5,5,9,98,0,105$16,0,105$15,0,15,5 -5,5,5,5,5>,9,0,17,6,8,0,14,19,21,6,18,5,9,0$9,92,0,0,15,5,5,5,5,5,5,21,8,0,15,5,5,5,5,5,5,20,11,0,0,104<,0,0,15,5 -5,5,5,5,5,9,0,0,0,1,0,15,21,8,0,15,5,9,92,0,0,14,19,21,6,6,6,6,18,9,0,1,15,5,21,6,6,6,18,21,8,0,105$17,0,0,14,19,5 -5,5,5,5,5,20,12,11,0,14,12,19,9,94,14,19,5,20,11,0,0,17,6,8,0,0,98,1,15,9,0,14,19,5,9,90,90,90,17,8,0,0,0,1,14,19,5,5 -5,5,5,21,6,6,6,8,0,17,6,6,8,0,15,21,6,18,20,11,0,0,1,98,0,0,0,1,17,8,0,15,5,5,9,90,90,90,90,1,0,98,0,93,15,5,5,5 -5,5,5,9,90,94,0,0,98,1,0,93,0,98,15,9,0,17,6,8,0,14,12,11,0,0,0,0,0,0,0,15,5,5,20,11,90,90,90,93,90,90,90,90,15,5,5,5 -5,5,5,9,90,90,90,90,14,12,12,12,12,12,19,9,0,98,0,0,1,15,5,9,93,0,0,0,0,0,1,15,5,5,5,9,90,90,90,0,90,90,0,90,15,5,5,5 -5,5,5,20,12,12,12,12,19,5,5,5,5,5,5,20,12,12,12,12,12,19,5,9,0,0,94,0,0,0,14,19,5,5,5,20,11,90,90,0,90,90,90,90,15,5,5,5 -5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,20,11,93,94,0,0,14,19,5,5,5,5,5,9,0,0,0,90,90,14,12,19,5,5,5 -5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,20,12,12,12,12,19,5,5,5,5,5,5,9,0,14,12,12,12,19,5,5,5,5,5 -5,5,5,5,5,5,5,5,5,21,6,6,6,6,6,6,6,18,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,21,6,8,0,17,6,18,5,5,5,5,5,5,5 -5,5,5,5,5,5,5,5,21,8,94,97,97,93,95,1,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,21,6,6,8,0,0,1,93,0,15,5,5,5,5,5,5,5 -5,5,5,5,5,5,21,6,8,98,0,0,0,98,0,98,0,17,6,18,5,5,5,5,21,6,6,6,6,6,6,8,93,0,0,0,0,0,0,0,15,5,5,5,5,5,5,5 -5,5,5,5,5,21,8,0,0,98,97,0,93,97,98,98,97,97,0,15,5,5,5,21,8,0,1,93,0,93,0:5,93,0,0,0,0,93,0,105$14,94,17,18,5,5,5,5,5,5 -5,5,5,5,21,8,0,97,97,93,97,93,95,97,0,0,0,98,0,17,6,18,21,8,0,93,0,0,0,14,11,0,0,93,0,0,0,104,0,71,71,15,5,5,5,5,5,5 -6,6,6,6,8,0,0,84,93,0,0,0,0,93,0,97,95,0,97,0,0,17,8,1,0,94,14,12,12,19,20,11,0,0,0,93,0,0,0,71,71,15,5,5,5,5,5,5 -84,85,86,84,0:4&9,0,98,0,0,0,97,97,98,98,98,97,93,94,97,97,94,0:0&9,0,0,98,93,15,5,5,5,5,9,0,0,98,0,0,14,12,12,12,19,5,5,5,5,5,5 -85,86,85,86,0:4&9,84,94,1,14,12,12,12,12,12,11,0,0,98,1,94,0,14,12,12,12,12,19,5,5,5,5,20,12,12,12,12,12,19,5,5,5,5,5,5,5,5,5,5 -12,12,12,12,12,12,12,12,19,5,5,5,5,5,20,12,12,12,12,12,12,19,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,71,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,77,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0@10,84,0,0,0,0,0,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,71,5,5,5,0,102@11@12@13@14@15,5,5,5,5,5,5,5,5,5,90,90,1,5,5,5,5,5,5,5,85@9,86,0,0,0,97,5,5,5,5,5,5,5 +5,5,5,5,5,5,71,71,71,71,71,5,5,5,0,5,5,5,5,5,5,5,5,5,5,90,90,93,0@5,5,5,5,5,5,5,0,84,0,0,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,71,71,71,71,71,5,5,5,0,5,5,5,5,5,5,5,5,5,5v,1,98,0,94,5,5,5,5,5,5,5,85@8,86@7,5,5,5,5,5,93,0,5,5,5 +5,5,5,5,5,5,71,71,71,93$2,93$3,93,98,0,0,5,5,5,5,5,5,5,93,93,0,0,0,0,0,94,0,5,5,5,5,5,5,5,5,5,5,5,0,93,0,5,5,5 +5,5,5,5,5,5,71,71,93,93,91,93,0$1,98,5,5,5,5,5,5,5,0,0,5,5,98,0,1,98,0,0,0,5,5,5,5,5,5,5,5,5,5,0,0,0,5,5,5 +5,5,5,5,71,71,71,5,5,5,93,0$0,0,0,5,5,5,5,5,5,5,93,5,5,5,5,0@6,0,0,0,0,0,0,5,5,5,5,5,5,5,5,93,0,0,0,5,5,5 +5,5,5,71,71,5,5,5,5,5,93,0,0,1,5,5,5,5,5,94,0,0,5,5,5,5,0,93,0,0,0,98,0,5,5,5,5,5,5,5,98,0,0,0,0,5,5,5 +5,5,71,71,5,5,5,5,5,5,5,5,0,94,5,5,5,5,0,0,0,0,5,5,5,5,5,5,5,98,98,0,98,0,5,5,0,5,5,94,94,0,0,0,5,5,5,5 +71,71,71,5,5,5,5,5,5,5,5,5,1,5,5,5,5,94,0,94,0,0,0,5,5,5,5,5,5,5,5,5,5,0,0,0,0,0,1,0,98,0,0,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,0,0,0,0,5,5,5,98,0,1,94,98,0,0,5,5,5,5,5,5,5,5,5,5,5,5,0,0,5,5,0,0,0,0,5,5,5,5,5 +5,5,5,5,5,5,5,5,0,5,5,5,5,5,5,5,5,0,5,5,0,93,0,5,5,0,0,0,0,0,0,5,5,5,5,5,5,5,5,0,1,98,5,5,5,5,5,5 +5,5,5,5,5,5,0,98,0,5,5,5,5,5,5,5,5,0,5,5,0,1,0,0,0,0,5,5,5,5,1,1,94,5,5,5,5,5,5,0,98,5,5,5,5,5,5,5 +5,5,5,5,5,5,0,98,0,5,5,0,0,98,0,5,5,0,0,0,0,0,0,5,5,5,5,5,5,5,5,5,0,5,5,5,5,5,0,0,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,0,0$8,0,5,5,0,5,5,0,5,5,5,0,0,5,5,5,5,5,5,5,5,5,5,5,5,0,0,0,5,5,5,0,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,0,98$6,0$7,0,5,5,94,5,5,0,5,5,5,5,0,5,5,5,5,5,5,5,5,5,5,5,5,0,5,5,5,5,5,0,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,1$5,1,1,5,5,5,5,5,5,0,5,5,5,5,0,0,5,5,90,90,5,5,5,5,5,5,5,0,5,5,5,5,5,0,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,94,0$4,0,5,5,5,5,5,5,0,93,0,0,0,0,93,5,5,90,90,5,5,5,5,0,0,0,0,5,5,93,0,0,0,93,0,0,0,98,0,5,5,5 +5,5,5,5,5,0,0,98,5,5,5,5,0,0,0,5,5,5,5,5,0,5,5,5,93,5,5,5,1,93,5,5,5,5,5,0,5,5,5,5,5,0,0,0,98,5,5,5 +5,5,5,5,5,5,0,5,5,5,5,5,0,5,5,5,5,5,5,5,0,5,5,5,0,5,5,5,0,5,5,5,5,5,5,98,5,5,5,5,5,94,0,0,5,5,5,5 +5,5,5,5,5,5,1,5,5,5,5,5,0,5,5,5,5,5,5,0,0,98$12,5,5,0,5,5,5,0,5,5,5,0,0,0,0,5,5,5,5,101@0@1@2@3@4,0,93,0,5,5,5,5 +5,5,5,5,5,5,0,5,5,5,5,0,0,5,5,92,0,0,92,0,0,92$13,5,5,0,93:3,0,0,0,5,5,0,0,5,5,5,5,5,5,5,1,0,94,93,0,0,5,5 +5,5,5,5,5,5,0,5,5,5,0,0,5,5,5,5,5,5,0$11,0,0$10,92,5,5,5,5,5,5,5,5,5,0,5,5,5,5,5,5,5,5,98,0,105$16,0,105$15,0,5,5 +5,5,5,5,5>,5,0,5,5,5,0,5,5,5,5,5,5,5,0$9,92,0,0,5,5,5,5,5,5,5,5,5,0,5,5,5,5,5,5,5,5,5,0,0,104<,0,0,5,5 +5,5,5,5,5,5,0,0,0,1,0,5,5,5,0,5,5,5,92,0,0,5,5,5,5,5,5,5,5,5,0,1,5,5,5,5,5,5,5,5,5,0,105$17,0,0,5,5,5 +5,5,5,5,5,5,5,5,0,5,5,5,5,94,5,5,5,5,5,0,0,5,5,5,0,0,98,1,5,5,0,5,5,5,5,90,90,90,5,5,0,0,0,1,5,5,5,5 +5,5,5,5,5,5,5,5,0,5,5,5,5,0,5,5,5,5,5,5,0,0,1,98,0,0,0,1,5,5,0,5,5,5,5,90,90,90,90,1,0,98,0,93,5,5,5,5 +5,5,5,5,90,94,0,0,98,1,0,93,0,98,5,5,0,5,5,5,0,5,5,5,0,0,0,0,0,0,0,5,5,5,5,5,90,90,90,93,90,90,90,90,5,5,5,5 +5,5,5,5,90,90,90,90,5,5,5,5,5,5,5,5,0,98,0,0,1,5,5,5,93,0,0,0,0,0,1,5,5,5,5,5,90,90,90,0,90,90,0,90,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,0,94,0,0,0,5,5,5,5,5,5,5,90,90,0,90,90,90,90,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,93,94,0,0,5,5,5,5,5,5,5,5,0,0,0,90,90,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,94,97,97,93,95,1,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,0,1,93,0,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,98,0,0,0,98,0,98,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,93,0,0,0,0,0,0,0,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,0,0,98,97,0,93,97,98,98,97,97,0,5,5,5,5,5,5,0,1,93,0,93,0:5,93,0,0,0,0,93,0,105$14,94,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,0,97,97,93,97,93,95,97,0,0,0,98,0,5,5,5,5,5,0,93,0,0,0,5,5,0,0,93,0,0,0,104,0,71,71,5,5,5,5,5,5,5 +5,5,5,5,5,0,0,84,93,0,0,0,0,93,0,97,95,0,97,0,0,5,5,1,0,94,5,5,5,5,5,5,0,0,0,93,0,0,0,71,71,5,5,5,5,5,5,5 +84,85,86,84,0:4&9,0,98,0,0,0,97,97,98,98,98,97,93,94,97,97,94,0:0&9,0,0,98,93,5,5,5,5,5,5,0,0,98,0,0,5,5,5,5,5,5,5,5,5,5,5 +85,86,85,86,0:4&9,84,94,1,5,5,5,5,5,5,5,0,0,98,1,94,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5^,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 diff --git a/rsrc/scenarios/valleydy/towns/town16.map b/rsrc/scenarios/valleydy/towns/town16.map index a27736d55..89fff3415 100644 --- a/rsrc/scenarios/valleydy/towns/town16.map +++ b/rsrc/scenarios/valleydy/towns/town16.map @@ -1,18 +1,18 @@ -90,90,90,90,90,90,90,90,15,5,5,5,21,6,6,18,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 -90,90,90,90,90,90,90,90,17,18,5,5,9,0&16,102@3&17,17,18,5,5,5,5,5,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,5,5,5,5,5 -90,90,90,90,90,90,90,90,90,15,5,5,9,102@1,0,102@2,15,5,5,5,5,139,139,210,210,210,254,210,210,210,139,139,139,210,210,210,210,210,210,210,210,210,139,139,5,5,5,5 -90,90,90,90,90,90,90,90,90,15,5,5,9,102@0&16,0&18,0,15,5,5,5,139,139,210,210,210,210,254,210,210,210,210,210,210,210,254,254,254,254,210,254,210,210,210,139,139,5,5,5 -90,90,90,90,90,90,90,90,90,17,18,5,20,12,11,0:22,15,5,5,139,139,210,210,254,254v,254,254,254,210,254,210,139,254,254,254,210,210,210,210,254,210,254,210,210,139,139,5,5 -90,90,90,90,90,90,90,90,90,90,15,5,5,5,9,0,17,18,139,139,210,210,210,210,210,210,210:7&9,254,210,254,210,139,210,210,210,210,210,254,254,254,210,254,210,210,210,139,139,5 -90,90,90,90,90,90,90,90,90,90,15,5,5,5,9,0,0,15:0,150,210,210,254,254,254,254,254,254,254,210,254,210,139,210,254,254,254,210,254,210,210,210,254,210,254,210,210,139,5 -90,90,90,90,90,90,90,90,90,90,15,5,5,5,20,12,12,19,139,210,210,210,210,254,254,210,210,210,210,210,210,139,210,210,210,210,210,254,254,254,254,254,254,254,254,210,139,5 -90,90,90,90,90,90,90,90,90,90,15,5,5,5,5,5,5,5,139,210,254,254,254,254,254,254,210,254,254,254,254,139,210,254,210,254,210,210,210,210,210,210,210,210,210,210,139,5 -90,90,90,90,90,90,90,90,90,90,17,6,6,6,18,5,5,5,139,210,254,210,210,254,254,254,210,210,210,210,210,139,210,254,210,254,210,254,254,254,210,254,254,254,254,210,139,5 -90,90,90,90,90,90,90,90,90,90,90,90,90,90,17,18,5,5,139,210,254,210,254,254,254,254,210,254,210,254,210,139,210,254,210,254,210,254,210:10&9,254:2,210,210,210,210,254,210,139,5 -90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,15,5,5,139,210,254,210,210,210,254,254,210,254,254,254,210,139,210,254,254,254,210,254,254,254,254,254,254,254,254,210,139,5 -90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,15,21,6,139,210,210,210,210,210,210,254,210,254,210,210,210,139,210,210,210,210,210,254,210,254,210,210,210,210,210,210,139,5 -90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,15,9,0,139,210,254,254,254,254,210,254,210,254,254,254,210,139,210,254,254,254,254,254,210,254,254,254,254,254,210,210,139,5 -90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,17,8,0,139,210,210,210,210,254,210,210,210,254,210,210,210,139,210,210,210,210,210,210,210,254,210,210,210,254,254,210,139,5 +90,90,90,90,90,90,90,90,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +90,90,90,90,90,90,90,90,5,5,5,5,5,0&16,102@3&17,5,5,5,5,5,5,5,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,5,5,5,5,5 +90,90,90,90,90,90,90,90,90,5,5,5,5,102@1,0,102@2,5,5,5,5,5,139,139,210,210,210,254,210,210,210,139,139,139,210,210,210,210,210,210,210,210,210,139,139,5,5,5,5 +90,90,90,90,90,90,90,90,90,5,5,5,5,102@0&16,0&18,0,5,5,5,5,139,139,210,210,210,210,254,210,210,210,210,210,210,210,254,254,254,254,210,254,210,210,210,139,139,5,5,5 +90,90,90,90,90,90,90,90,90,5,5,5,5,5,5,0:22,5,5,5,139,139,210,210,254,254v,254,254,254,210,254,210,139,254,254,254,210,210,210,210,254,210,254,210,210,139,139,5,5 +90,90,90,90,90,90,90,90,90,90,5,5,5,5,5,0,5,5,139,139,210,210,210,210,210,210,210:7&9,254,210,254,210,139,210,210,210,210,210,254,254,254,210,254,210,210,210,139,139,5 +90,90,90,90,90,90,90,90,90,90,5,5,5,5,5,0,0,5:0,150,210,210,254,254,254,254,254,254,254,210,254,210,139,210,254,254,254,210,254,210,210,210,254,210,254,210,210,139,5 +90,90,90,90,90,90,90,90,90,90,5,5,5,5,5,5,5,5,139,210,210,210,210,254,254,210,210,210,210,210,210,139,210,210,210,210,210,254,254,254,254,254,254,254,254,210,139,5 +90,90,90,90,90,90,90,90,90,90,5,5,5,5,5,5,5,5,139,210,254,254,254,254,254,254,210,254,254,254,254,139,210,254,210,254,210,210,210,210,210,210,210,210,210,210,139,5 +90,90,90,90,90,90,90,90,90,90,5,5,5,5,5,5,5,5,139,210,254,210,210,254,254,254,210,210,210,210,210,139,210,254,210,254,210,254,254,254,210,254,254,254,254,210,139,5 +90,90,90,90,90,90,90,90,90,90,90,90,90,90,5,5,5,5,139,210,254,210,254,254,254,254,210,254,210,254,210,139,210,254,210,254,210,254,210:10&9,254:2,210,210,210,210,254,210,139,5 +90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,5,5,5,139,210,254,210,210,210,254,254,210,254,254,254,210,139,210,254,254,254,210,254,254,254,254,254,254,254,254,210,139,5 +90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,5,5,5,139,210,210,210,210,210,210,254,210,254,210,210,210,139,210,210,210,210,210,254,210,254,210,210,210,210,210,210,139,5 +90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,5,5,0,139,210,254,254,254,254,210,254,210,254,254,254,210,139,210,254,254,254,254,254,210,254,254,254,254,254,210,210,139,5 +90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,5,5,0,139,210,210,210,210,254,210,210,210,254,210,210,210,139,210,210,210,210,210,210,210,254,210,210,210,254,254,210,139,5 90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,0,97,0,139,210,210,254,210,254,210,254,254,254,254,254,210,139,210,254,254,210,254,210,254,254,254,254,210,210,210,210,139,5 90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,0,0,139,210,254,254,254,254,210,254,210,210,210,210,210,139,210,210,254,254,254,254,254,254,210,210$4,210$5,139,210,210,139,5 90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,0,0,0,139,210,210,210,210,210,210,210,210,210,210,210,139,139,139,210,210,210,210,210$1,210,210$2,210$3,210,139,139,210,210,139,5 @@ -31,18 +31,18 @@ 90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,0,0,0,139,210,210,210,210,210,210,139,139,139,254,210,139,210,210,210,210,139,210,210,254,139,210,254,139,139,210,210,139,5 90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,0,0,0,139,210:4,210:4,139,139,139,139,139,139,139,139,210,139,139,139,139,139,139,139,139,139,139,139,139,139,139,210,210,139,5 90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,0,1,0,139,210,210,210,210,210,210,210,210,210,210,210,139,139,139,210,210,210,210$6,210,210,210,210$7,210,139,139,210,210,139,5 -90,90,90,90,90,90,90,90,90,90,90,90,90,90,14,11,98,0,139,210,254,254,254,254,254,254,254,210,254,210,210,139,210,210,254,254,254,254,254,254,254,210,210,139,210,210,139,5 -90,90,90,90,90,90,90,90,90,90,90,90,90,90,15,20,11,0,139,210,210,210,210,254,210,210,210,210,254,210,210,139,210,254,254,210,210,210,210,210,210,210,210,210,210,210,139,5 -90,90,90,90,90,90,90,90,90,90,90,90,90,90,15,5,9,97,139,210,254,254,254,254,210,254,254,254,254,254,210,139,210,254,210,210,254,254,254,254,210,254,254,254,254,210,139,5 -90,90,90,90,90,90,90,90,90,90,90,90,90,90,15,5,20,12,139,210,210,210,254,210,210,254,254,210,210,210,210,139,210,254,210,254,254,210,210,210,210,210,210,210,210,210,139,5 -90,90,90,90,90,90,90,90,90,90,90,90,90,14,19,5,5,5,139,210,254,254,254,210,210,254,210,210,254,210,210,139,210,254,210,254,210:9&9,210,254,210,254,254,254,210,254,210,139,5 -90,90,90,90,90,90,90,90,90,90,90,90,90,15,5,5,5,5,139,210,210,254,210,210,254,254,254,254,254,254,254,139,210,254,210,254,254,254,254,210,254,210,210,210,254,210,139,5 -90,90,90,90,90,90,90,90,90,90,90,90,14,19,5,5,5,5,139,210,254,254,210,254,254,210:5&9,254,210,254:1,210,210,139,210,254,210,254,210,210,210,210,210,210,254,254,254,210,139,5 -90,90,90,90,90,90,90,90,90,90,90,14,19,139,139,139,139,139,139,210,210,210,210,210,254,210,254,210,254,210,210,139,210,254,210,210,210,254,254,254,254,210,254,210,210,210,139,5 -90,90,90,90,90,90,90,90,90,90,14,139,139,139,170,170&10,170&10,170,140,210,210,210,254,210,254,210,210,210,254,210,210,139,210,254,210,254,254,254,210,254,210,210,254,254,210,210,139,5 -90,90,90,90,90,90,90,90,90,90,15,139,199&17,139,170,139,139,139,139,139,210,210,254,254,254,254,254,254,254,254,210$0,139,210,254,210,210,254,210,210,210,210,254,254,210,210,139,139,5 -90,90,90,90,90,90,90,90,90,14,19,139,170,142,170,142,170,199@4,139,139,139,210,210,210,210^,254,210,210,210,210,210,139,210,254,254,210,210,210,254,210,254,254,210,210,139,139,5,5 -90,90,90,90,90,90,90,90,90,15,139,139,139,139,170,139,139,139,139,5,139,139,210,210,254,254,254,254,254,210,210,210,210,210,254,254,254,254,254,254,254,210,210,139,139,5,5,5 -90,90,90,90,90,90,90,90,90,15,139,199&16,170,142,170,142,170,199&16,139,5,5,139,139,210,210,210,210,210,210,210,139,139,139,210,210,210,210,210,210,210,210,210,139,139,5,5,5,5 -90,90,90,90,90,90,90,90,90,15,139,139,139,139,139,139,139,139,139,5,5,5,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,5,5,5,5,5 -90,90,90,90,90,90,90,90,90,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +90,90,90,90,90,90,90,90,90,90,90,90,90,90,5,5,98,0,139,210,254,254,254,254,254,254,254,210,254,210,210,139,210,210,254,254,254,254,254,254,254,210,210,139,210,210,139,5 +90,90,90,90,90,90,90,90,90,90,90,90,90,90,5,5,5,0,139,210,210,210,210,254,210,210,210,210,254,210,210,139,210,254,254,210,210,210,210,210,210,210,210,210,210,210,139,5 +90,90,90,90,90,90,90,90,90,90,90,90,90,90,5,5,5,97,139,210,254,254,254,254,210,254,254,254,254,254,210,139,210,254,210,210,254,254,254,254,210,254,254,254,254,210,139,5 +90,90,90,90,90,90,90,90,90,90,90,90,90,90,5,5,5,5,139,210,210,210,254,210,210,254,254,210,210,210,210,139,210,254,210,254,254,210,210,210,210,210,210,210,210,210,139,5 +90,90,90,90,90,90,90,90,90,90,90,90,90,5,5,5,5,5,139,210,254,254,254,210,210,254,210,210,254,210,210,139,210,254,210,254,210:9&9,210,254,210,254,254,254,210,254,210,139,5 +90,90,90,90,90,90,90,90,90,90,90,90,90,5,5,5,5,5,139,210,210,254,210,210,254,254,254,254,254,254,254,139,210,254,210,254,254,254,254,210,254,210,210,210,254,210,139,5 +90,90,90,90,90,90,90,90,90,90,90,90,5,5,5,5,5,5,139,210,254,254,210,254,254,210:5&9,254,210,254:1,210,210,139,210,254,210,254,210,210,210,210,210,210,254,254,254,210,139,5 +90,90,90,90,90,90,90,90,90,90,90,5,5,139,139,139,139,139,139,210,210,210,210,210,254,210,254,210,254,210,210,139,210,254,210,210,210,254,254,254,254,210,254,210,210,210,139,5 +90,90,90,90,90,90,90,90,90,90,5,139,139,139,170,170&10,170&10,170,140,210,210,210,254,210,254,210,210,210,254,210,210,139,210,254,210,254,254,254,210,254,210,210,254,254,210,210,139,5 +90,90,90,90,90,90,90,90,90,90,5,139,199&17,139,170,139,139,139,139,139,210,210,254,254,254,254,254,254,254,254,210$0,139,210,254,210,210,254,210,210,210,210,254,254,210,210,139,139,5 +90,90,90,90,90,90,90,90,90,5,5,139,170,142,170,142,170,199@4,139,139,139,210,210,210,210^,254,210,210,210,210,210,139,210,254,254,210,210,210,254,210,254,254,210,210,139,139,5,5 +90,90,90,90,90,90,90,90,90,5,139,139,139,139,170,139,139,139,139,5,139,139,210,210,254,254,254,254,254,210,210,210,210,210,254,254,254,254,254,254,254,210,210,139,139,5,5,5 +90,90,90,90,90,90,90,90,90,5,139,199&16,170,142,170,142,170,199&16,139,5,5,139,139,210,210,210,210,210,210,210,139,139,139,210,210,210,210,210,210,210,210,210,139,139,5,5,5,5 +90,90,90,90,90,90,90,90,90,5,139,139,139,139,139,139,139,139,139,5,5,5,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,5,5,5,5,5 +90,90,90,90,90,90,90,90,90,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 diff --git a/rsrc/scenarios/valleydy/towns/town17.map b/rsrc/scenarios/valleydy/towns/town17.map index a4f7e4526..59b44df17 100644 --- a/rsrc/scenarios/valleydy/towns/town17.map +++ b/rsrc/scenarios/valleydy/towns/town17.map @@ -1,48 +1,48 @@ -5,5,5,5,5,5,5,5,5,5,9,0,15,5,5,5,5,5,9,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,30,22,22,26,36,36,36,36,37,37 -5,5,5,5,5,5,5,5,5,5,9,0,15,5,5,5,5,5,9,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,21,8,30,35,24,25,37,37,37,36,36,36 -5,5,5,5,5,5,5,5,5,21,8,0,15,5,5,5,5,21,8,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,21,8,29,33,25,36,36,36,36,36,36,36,36 -5,5,5,5,5,5,5,5,5,9,0,0,15,5,5,5,5,9,0,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,29,33,25,36,36,36,36,36,36,36,36,37 -5,21,6,6,6,6,6,6,18,9,0,14,19,5,5,5,5,9,0,14,19,5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,30,26,36,36,36,36,37,36v<^>,37,36,29,28 -21,8,71,71,71,71,93,94,15,9,0,15,5,21,6,6,18,9,0,15,5,21,6,18,5,5,5,5,5,5,5,5,5,5,21,8,30,26,36,36,36,36,37,36,36,36,30,22 -9,71,71,71,71,93,0@27,98,15,9,0,17,6,8,0,0,16,10,0,17,6,8,0,17,6,6,6,18,5,5,5,5,5,5,9,29,33,26,37,36,36,37,36,36,36,37,30,22 -9,71,71,94,93,93,94,14,19,9,98,98,0,0,0,14,19,9,0,0,0,0,0,0,0,0,97,15,5,5,5,5,5,21,8,30,35,25,36,36,36,36,36,36,36,36,30,22 -9,71,93,94,93,0,0,17,18,20,12,12,12,122,123,122,122,122,122,122,122,122,122,122,0,1,0,17,18,5,5,5,5,9,29,33,26,36,37,36,36,36,36,37,37,36,30,22 -9,93,0@28,98,98,0,0,98,17,6,6,6,18,122,170,170,170,170,170,170,170,170,198$8,138,0,93,0,98,15,5,5,5,21,8,30,35,25,36,36,37,36,36,37,36,29,28,33,24 -9,93,0,94,14,12,11,1,0,0,0,0,15,122,122,122,122,122,170,170,170,170,170,122,1,0,0,0,17,18,5,21,8,29,33,26,37,36,36,37,36,37,36,29,33,35,25,14 -9,97,94,0,15,5,20,12,12,12,11,0,17,122,191:4,191:4,191:4,170,197$16,197$15,170,170,207,122,0,0,0,0,97,15,21,8,29,33,24,25,37,36,36,36,37,36,29,33,35,25,14,19 -9,0@29,98,14,19,5,21,6,6,6,8,0,0,122,170,170,170,170,185,185,170,170,198$7,138,0,0,93,0,14,19,9,29,33,26,36,36,37,37,37,36,36,29,33,35,25,14,19,5 -20,12,12,19,5,21,8,0,0,98,0,0,0,122,170,170,170,170,195$14,195,170,170,170,122,0,0,93,0,15,5,9,30,35,25,36,36,37,36,36,37,36,30,35,25,14,19,5,5 -5,5,5,5,21,8,97,0,0,0$18,93,0,0,125,170,170,170,170,170,170,170,170,170,122,12,11,0,0,15,5,9,30,26,37,36,37,36,36,29,28,28:0,33,26,14,19,5,5,5 -5,5,5,21,8,98,0,1$19,0,0,0,0,0,122,122,122,122,126,122,126,122,122,122,122,5,9,0,0,15,5,9,30,34,27,36,36,36,29,33,35,24:0,24,25,15,5,5,5,5 -5,5,5,9,0,0,0,0,104,0,0,0,0,122,170,170,170,170,122,170,170,170,170@23&12,122,5,9,0,1,17,18,9,31,32,34,28,28,28,33,35,25,0,0,0,15,5,5,5,5 -5,5,5,9,97,0,98,0$17,93,1$20,98,0,14,122,170,170,170,170,122,170,170,170,170,122,5,20,11,0,0,17,18,11,31,32,22,22,22,35,25,14,12,11,0:2,15,5,5,5,5 -5,5,5,20,11,0,0,0,0,0,14,12,19,122,177@24,177,177@25,177@26,122,170@19&11,170@20&11,170@21&11,170@22&12,122,21,6,8,0,0,0,17,18,11,31,24,24,24,25,14,19,21,8,0,17,18,5,5,5 -5,21,6,18,20,11,0,0,0,14,19,5,5,122,122,122,122,122,122,122,122,122,122,122,9,0,0,0,94,0,0,17,18,12,12,12,12,12,19,21,8,0,0,0,15,5,5,5 -21,8,101@30,17,18,9,0,0,0,15,5,5,21,6,18,5,5,21,6,6,6,18,5,21,8,98,0,0,0,0,0,0,15,5,5,5,5,5,21,8,0,0,0,0,15,5,5,5 -9,0,0,101@31@32,15,9,0,0,97,17,18,5,9,98,15,5,5,9,93,71,71,17,6,8,0,0,0,0,104,0,0,0,15,5,5,5,21,6,8,0,1,0,0,14,19,5,5,5 -9,0,0,0,15,9,0,0,1,0,17,6,8,0,17,6,6,8,93,71,71,93,0,0,0,0,0,0,0,0,0,97,15,5,5,21,8,0,0,0,0,0,0,15,5,5,5,5 -9,0,0,101@33@34@35,15,9,0,1,0,0,1,0,0,0,0,0,0,93,0,71,71,14,12,12,11,1,0,94,0,0,0,14,19,21,6,8,1,0,0,104,0,0,14,19,5,5,5,5 -9,0:5,14,12,19,20,11,0,0,0,0,0,14,12,12,12,12,12,12,12,12,19,5,5,20,12,12,11,0,0,0,15,21,8,0,0,0,0,0,0,0,0,15,5,5,5,5,5 -9,0:5,17,18,5,5,9,0,98,0,0,0,17,6,18,5,5,5,122,122,136,122,122,122,136,122,122,8,0,0,0,15,9,0,1,0,0,0,0,0,0,0,15,5,5,5,5,5 -9,0,1,15,5,5,20,11,97,0,0,0,0,98,17,18,5,5,122,170,170,198,184,196,170,170,122,0,0,0,14,19,9,1,0,122,122,138,122,122,122,138,122,122,5,5,5,5 -20,11,0,15,5,5,5,20,12,12,11,0,0,0,0,17,6,18,122,170,170,198,184@16,196$13,170,198$4,138,0,0,0,15,21,8,0,14,122,170,195$6,170,170,170,195$0,170,122,5,5,5,5 -5,9,0,15,122,122,122,122,122,122,9,1,0,0,0,98,0,17,122,170,170,198$12,184,196,170,207,122,0,0,0,15,9,0,0,15,122,170,197,197,197$11,197,170,170,122,5,5,5,5 -5,9,0,15,122,170,199,199,170,122,8,1,0,0,0,0,0,98,122,170,170,170,170,170,170,170,122,0,0,0,15,9,0,0,17,122,170,185@12,185@13,185@14,185@15,170,207,122,5,5,5,5 -5,9,0,17,122,170,170,170,170,122,1,0,0,0,0,1$24,0,0,138,196$5,170,170,170,170,170,198$3,138,1,0,1,15,9,0,0,0,138,196$1,195,195$10,195,195,170,170,122,5,5,5,5 -5,9,0,0,123,170,170,170,204,127,0,14,11,98,0$23,0,0,0,122,170,170,170,170,170,170,170,122,0,0,0,15,9,104,0,0,122,170,170,170,170,170,170,202,122,5,5,5,5 -21,8,0,14,122,201@18,170,170,188,122,12,19,9,104,0,0,0$22,0,122,170,170,199,199,199,199,201@0@17,122,12,11,0,15,20,11,0,0,122,170,170,170,122,122,122,122,122,5,5,5,5 -9,0,0,15,122,122,122,122,122,122,5,5,20,12,11,93,0,0,122,170,170,170,170,170,170,170,122,5,9,0,17,18,9,0,0,138,196$2,170,170,125,170,170,199,122,5,5,5,5 -9,0,14,19,21,6,6,6,6,6,18,21,6,18,20,11,0,0,125,170,170,199,199,199,199,201@1@2@3@4,122,5,9,0,0,15,20,11,0,122,170,170,170,122,170,170,170,122,5,5,5,5 -9,0,15,5,9,0,0,0,0,0,17,8,0,17,6,8,0,14,122,122,122,122,122,122,122,122,122,5,20,11,0,17,6,8,0,122,170,170,170,122,201@9@10@11,170,199,122,5,5,5,5 -9,0,17,18,9,0,14,12,11,0,1,0,0,0,0,0,0,15,5,5,5,5,21,6,6,6,6,6,18,9,1,1,0:3,1,0,122,170,122,125,122,122,122,122,122,5,5,5,5 -9,0,0,15,9,0,15,21,8,1,14,12,11,0,14,12,12,19,5,5,5,5,9,0,0,0,0,0,15,20,12,12,12,12,12,122,170,122,170$9,170,175@8,170,201@5@6@7,122,5,5,5,5 -20,11,0,15,9,0,15,9,0,0,17,18,9,0,17,6,6,6,6,6,6,18,9,0,14,12,12,12,19,5,5,21,6,18,5,122,170,122,170,170,195,170,170,122,5,5,5,5 -5,9,0,15,9,0,15,9,0,0,0,15,9,0,0,0,0,0,0,0,98,17,8,0,17,6,6,6,6,6,18,9,0,15,5,122,170,122,170,170,170,170,199,122,5,5,5,5 -5,9,1,15,9,0,15,9,0,14,12,19,20,12,12,12,12,12,12,11,0,0,0,0,0,0,0,0,0,0,17,8,0,17,6,122,126,122,122,122,122,123,122,122,5,5,5,5 -5,9,0:6,15,9,0:8,15,9,0,17,6,6,6,6,6,6,6,6,18,20,12,11,0,14,12,12,12,12,11,0,0,0,0,0,0,0$21,0,15,5,5,122,170,170,122,5,5,5,5 -21,8,0,15,9,0,15,9,0,0,0,98,0,0,0,0,0,0,15,5,5,9,0,15,5,5,5,5,20,12,12,12,12,12,12,12,12,19,5,5,122,122,170:10,122,5,5,5,5 -9,0,0,15,9,0,15,20,12,12,12,12,12,12,12,12,11,0,15,5,5,20,12,19,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,122,194@36@37@38@39,170,122,5,5,5,5 -9,0,14,19,9,0,15,5,5,5,5,5,5,5,5,5,9,0,17,18,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,122,122,122,122,5,5,5,5 -9,0,15,5,9,0,15,5,5,5,5,5,5,5,5,5,9,0,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 -9,0,15,5,9,1,15,5,5,5,5,5,5,5,5,5,20,11,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 -9,0,15,5,9,0,15,5,5,5,5,5,5,5,5,5,5,9,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,0,5,5,5,5,5,5,5,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,30,22,22,26,36,36,36,36,37,37 +5,5,5,5,5,5,5,5,5,5,5,0,5,5,5,5,5,5,5,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,30,35,24,25,37,37,37,36,36,36 +5,5,5,5,5,5,5,5,5,5,5,0,5,5,5,5,5,5,5,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,29,33,25,36,36,36,36,36,36,36,36 +5,5,5,5,5,5,5,5,5,5,0,0,5,5,5,5,5,5,0,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,29,33,25,36,36,36,36,36,36,36,36,37 +5,5,5,5,5,5,5,5,5,5,0,5,5,5,5,5,5,5,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,30,26,36,36,36,36,37,36v<^>,37,36,29,28 +5,5,71,71,71,71,93,94,5,5,0,5,5,5,5,5,5,5,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,30,26,36,36,36,36,37,36,36,36,30,22 +5,71,71,71,71,93,0@27,98,5,5,0,5,5,5,0,0,5,5,0,5,5,5,0,5,5,5,5,5,5,5,5,5,5,5,5,29,33,26,37,36,36,37,36,36,36,37,30,22 +5,71,71,94,93,93,94,5,5,5,98,98,0,0,0,5,5,5,0,0,0,0,0,0,0,0,97,5,5,5,5,5,5,5,5,30,35,25,36,36,36,36,36,36,36,36,30,22 +5,71,93,94,93,0,0,5,5,5,5,5,5,122,123,122,122,122,122,122,122,122,122,122,0,1,0,5,5,5,5,5,5,5,29,33,26,36,37,36,36,36,36,37,37,36,30,22 +5,93,0@28,98,98,0,0,98,5,5,5,5,5,122,170,170,170,170,170,170,170,170,198$8,138,0,93,0,98,5,5,5,5,5,5,30,35,25,36,36,37,36,36,37,36,29,28,33,24 +5,93,0,94,5,5,5,1,0,0,0,0,5,122,122,122,122,122,170,170,170,170,170,122,1,0,0,0,5,5,5,5,5,29,33,26,37,36,36,37,36,37,36,29,33,35,25,5 +5,97,94,0,5,5,5,5,5,5,5,0,5,122,191:4,191:4,191:4,170,197$16,197$15,170,170,207,122,0,0,0,0,97,5,5,5,29,33,24,25,37,36,36,36,37,36,29,33,35,25,5,5 +5,0@29,98,5,5,5,5,5,5,5,5,0,0,122,170,170,170,170,185,185,170,170,198$7,138,0,0,93,0,5,5,5,29,33,26,36,36,37,37,37,36,36,29,33,35,25,5,5,5 +5,5,5,5,5,5,5,0,0,98,0,0,0,122,170,170,170,170,195$14,195,170,170,170,122,0,0,93,0,5,5,5,30,35,25,36,36,37,36,36,37,36,30,35,25,5,5,5,5 +5,5,5,5,5,5,97,0,0,0$18,93,0,0,125,170,170,170,170,170,170,170,170,170,122,5,5,0,0,5,5,5,30,26,37,36,37,36,36,29,28,28:0,33,26,5,5,5,5,5 +5,5,5,5,5,98,0,1$19,0,0,0,0,0,122,122,122,122,126,122,126,122,122,122,122,5,5,0,0,5,5,5,30,34,27,36,36,36,29,33,35,24:0,24,25,5,5,5,5,5 +5,5,5,5,0,0,0,0,104,0,0,0,0,122,170,170,170,170,122,170,170,170,170@23&12,122,5,5,0,1,5,5,5,31,32,34,28,28,28,33,35,25,0,0,0,5,5,5,5,5 +5,5,5,5,97,0,98,0$17,93,1$20,98,0,5,122,170,170,170,170,122,170,170,170,170,122,5,5,5,0,0,5,5,5,31,32,22,22,22,35,25,5,5,5,0:2,5,5,5,5,5 +5,5,5,5,5,0,0,0,0,0,5,5,5,122,177@24,177,177@25,177@26,122,170@19&11,170@20&11,170@21&11,170@22&12,122,5,5,5,0,0,0,5,5,5,31,24,24,24,25,5,5,5,5,0,5,5,5,5,5 +5,5,5,5,5,5,0,0,0,5,5,5,5,122,122,122,122,122,122,122,122,122,122,122,5,0,0,0,94,0,0,5,5,5,5,5,5,5,5,5,5,0,0,0,5,5,5,5 +5,5,101@30,5,5,5,0,0,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,98,0,0,0,0,0,0,5,5,5,5,5,5,5,5,0,0,0,0,5,5,5,5 +5,0,0,101@31@32,5,5,0,0,97,5,5,5,5,98,5,5,5,5,93,71,71,5,5,5,0,0,0,0,104,0,0,0,5,5,5,5,5,5,5,0,1,0,0,5,5,5,5,5 +5,0,0,0,5,5,0,0,1,0,5,5,5,0,5,5,5,5,93,71,71,93,0,0,0,0,0,0,0,0,0,97,5,5,5,5,5,0,0,0,0,0,0,5,5,5,5,5 +5,0,0,101@33@34@35,5,5,0,1,0,0,1,0,0,0,0,0,0,93,0,71,71,5,5,5,5,1,0,94,0,0,0,5,5,5,5,5,1,0,0,104,0,0,5,5,5,5,5,5 +5,0:5,5,5,5,5,5,0,0,0,0,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,0,0,5,5,5,0,0,0,0,0,0,0,0,5,5,5,5,5,5 +5,0:5,5,5,5,5,5,0,98,0,0,0,5,5,5,5,5,5,122,122,136,122,122,122,136,122,122,5,0,0,0,5,5,0,1,0,0,0,0,0,0,0,5,5,5,5,5,5 +5,0,1,5,5,5,5,5,97,0,0,0,0,98,5,5,5,5,122,170,170,198,184,196,170,170,122,0,0,0,5,5,5,1,0,122,122,138,122,122,122,138,122,122,5,5,5,5 +5,5,0,5,5,5,5,5,5,5,5,0,0,0,0,5,5,5,122,170,170,198,184@16,196$13,170,198$4,138,0,0,0,5,5,5,0,5,122,170,195$6,170,170,170,195$0,170,122,5,5,5,5 +5,5,0,5,122,122,122,122,122,122,5,1,0,0,0,98,0,5,122,170,170,198$12,184,196,170,207,122,0,0,0,5,5,0,0,5,122,170,197,197,197$11,197,170,170,122,5,5,5,5 +5,5,0,5,122,170,199,199,170,122,5,1,0,0,0,0,0,98,122,170,170,170,170,170,170,170,122,0,0,0,5,5,0,0,5,122,170,185@12,185@13,185@14,185@15,170,207,122,5,5,5,5 +5,5,0,5,122,170,170,170,170,122,1,0,0,0,0,1$24,0,0,138,196$5,170,170,170,170,170,198$3,138,1,0,1,5,5,0,0,0,138,196$1,195,195$10,195,195,170,170,122,5,5,5,5 +5,5,0,0,123,170,170,170,204,127,0,5,5,98,0$23,0,0,0,122,170,170,170,170,170,170,170,122,0,0,0,5,5,104,0,0,122,170,170,170,170,170,170,202,122,5,5,5,5 +5,5,0,5,122,201@18,170,170,188,122,5,5,5,104,0,0,0$22,0,122,170,170,199,199,199,199,201@0@17,122,5,5,0,5,5,5,0,0,122,170,170,170,122,122,122,122,122,5,5,5,5 +5,0,0,5,122,122,122,122,122,122,5,5,5,5,5,93,0,0,122,170,170,170,170,170,170,170,122,5,5,0,5,5,5,0,0,138,196$2,170,170,125,170,170,199,122,5,5,5,5 +5,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,0,125,170,170,199,199,199,199,201@1@2@3@4,122,5,5,0,0,5,5,5,0,122,170,170,170,122,170,170,170,122,5,5,5,5 +5,0,5,5,5,0,0,0,0,0,5,5,0,5,5,5,0,5,122,122,122,122,122,122,122,122,122,5,5,5,0,5,5,5,0,122,170,170,170,122,201@9@10@11,170,199,122,5,5,5,5 +5,0,5,5,5,0,5,5,5,0,1,0,0,0,0,0,0,5,5,5,5,5,5,5,5,5,5,5,5,5,1,1,0:3,1,0,122,170,122,125,122,122,122,122,122,5,5,5,5 +5,0,0,5,5,0,5,5,5,1,5,5,5,0,5,5,5,5,5,5,5,5,5,0,0,0,0,0,5,5,5,5,5,5,5,122,170,122,170$9,170,175@8,170,201@5@6@7,122,5,5,5,5 +5,5,0,5,5,0,5,5,0,0,5,5,5,0,5,5,5,5,5,5,5,5,5,0,5,5,5,5,5,5,5,5,5,5,5,122,170,122,170,170,195,170,170,122,5,5,5,5 +5,5,0,5,5,0,5,5,0,0,0,5,5,0,0,0,0,0,0,0,98,5,5,0,5,5,5,5,5,5,5,5,0,5,5,122,170,122,170,170,170,170,199,122,5,5,5,5 +5,5,1,5,5,0,5,5,0,5,5,5,5,5,5,5,5,5,5,5,0,0,0,0,0,0,0,0,0,0,5,5,0,5,5,122,126,122,122,122,122,123,122,122,5,5,5,5 +5,5,0:6,5,5,0:8,5,5,0,5,5,5,5,5,5,5,5,5,5,5,5,5,0,5,5,5,5,5,5,0,0,0,0,0,0,0$21,0,5,5,5,122,170,170,122,5,5,5,5 +5,5,0,5,5,0,5,5,0,0,0,98,0,0,0,0,0,0,5,5,5,5,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,122,122,170:10,122,5,5,5,5 +5,0,0,5,5,0,5,5,5,5,5,5,5,5,5,5,5,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,122,194@36@37@38@39,170,122,5,5,5,5 +5,0,5,5,5,0,5,5,5,5,5,5,5,5,5,5,5,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,122,122,122,122,5,5,5,5 +5,0,5,5,5,0,5,5,5,5,5,5,5,5,5,5,5,0,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,0,5,5,5,1,5,5,5,5,5,5,5,5,5,5,5,5,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,0,5,5,5,0,5,5,5,5,5,5,5,5,5,5,5,5,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 diff --git a/rsrc/scenarios/valleydy/towns/town18.map b/rsrc/scenarios/valleydy/towns/town18.map index 0281ff715..308019e06 100644 --- a/rsrc/scenarios/valleydy/towns/town18.map +++ b/rsrc/scenarios/valleydy/towns/town18.map @@ -1,48 +1,48 @@ -5,5,5,5,5,5,5,5,21,6,6,6,6,6,6,18,5,5,5,5,5,5,5,5,21,6,6,6,18,5,5,21,6,6,6,6,6,6,18,5,5,5,5,5,5,5,5,5 -5,5,5,5,5,21,6,6,8,71,71,71,0@1,92,1,15,5,21,6,6,6,6,18,21,8,0,0,92,17,6,6,8,0,96,0,93,1,0,17,6,6,6,18,5,5,5,5,5 -5,5,21,6,6,8,1,92,0,0,71,1,1,0,0,17,6,8,1,1,0,93,17,8,0,93@12,93,0,92,0,0,93,1,14,12,12,11,0,0,93,1,0,17,6,6,18,5,5 -5,21,8,0,0,1,96,93,0,1,96,92,0,1,1,0,94,1,93,14,11,0,0,93,0,92,1,92,92,96,1,93,93,15,5,5,20,12,11,71,1,0,0,93,93,17,18,5 -21,8,1,0,92,1,92,0,1,94,93,0,0,0,14,11,96,0,93,15,20,12,11,0,94v,96,93,91,96,92,0,1,0,15,5,5,5,5,9,71,0,0*1,0,92,0,94,15,5 -9,0,93,0,0,0,94,92,1,0,0,0,92,0,15,20,12,12,12,19,5,5,20,12,11,0,92,71,71,0,0,14,12,19,5,5,21,6,8,0,92,96,1,0,0,0,17,18 -9,0,0,1@11,0,71,71,14,12,12,12,11,0,14,19,21,6,6,6,6,6,6,6,18,20,11,71,71,71,0,14,19,5,5,5,21,8,1,1,1,93,0,71,71,0,93,0,15 -9,96,1,0,0@2,71,71,15,5,5,5,20,12,19,5,9,0,0,93,0@13,1,96,0,17,18,20,12,12,12,12,19,5,5,21,6,8,0,0,0,92,0,14,11,71,71,94,0,15 -9,94,0,0,0,71,71,15,5,5,5,5,5,5,21,8,92,14,12,12,12,11,0,93,15,5,5,5,5,21,6,6,6,8,0,0,0,14,12,12,12,19,20,11,71,92,1,15 -20,11,0,0,0,93,1,17,18,5,5,5,5,5,9,0,93,17,6,18,5,9,93,14,19,5,5,5,21,8,93,0,0,93,1,14,12,19,21,6,6,6,18,20,12,11,0,15 -5,9,0,0,1,0,92,0,17,6,18,5,5,5,9,0,1,93,1,17,18,20,12,19,21,6,6,6,8,0,0,14,12,12,12,19,21,6,8,0,93,0,17,18,5,9,0,15 -5,20,12,11,1,1,0,93,0,96,15,5,5,21,8,0,14,11,94,93,17,18,5,5,9,93,0,0,0,92,14,19,5,5,5,5,9,71,0,0,0@16,93,1,15,21,8,93,15 -5,5,5,20,11,0,1,0,93,0,15,21,6,8,1,0,15,20,11,0,0,17,18,21,8,93,14,12,12,12,19,5,5,5,5,5,9,0,0,0,93,0,1,15,9,0,1,15 -5,5,5,5,20,12,11,93,0,0,15,9,0,93,92,1,15,5,20,11,0,92,15,8,93,93,15,5,5,5,21,6,6,6,6,18,9,0,96,92,0,93,14,19,9,92,14,19 -5,5,5,5,5,5,20,11,0,14,19,9,71,71,1,93,17,18,5,20,11,0,17,0,0,0,15,5,21,6,8,93,93,1,0,15,20,11,93,93,14,12,19,21,8,93,15,5 -5,5,21,6,6,6,6,8,92,15,5,9,71,93,0@20,0,93,15,5,5,9,0,93,0,0,93,17,6,8,0,0,0,14,11,1,17,18,20,11,1,17,6,18,9,0,93,17,18 -5,21,8,94,0,0,1,0,94,15,21,8,71,1,0,0,0,15,5,5,9,1,93,0,93*0,92,0,0,1,0,14,12,19,9,0,1,17,18,9,93@15,0,0,15,9,1,1,0,15 -5,9,71,0,14,12,12,12,12,19,9,71,71,0@3,91,0,1,15,5,5,9,93,0,0,0,1,93,14,12,12,19,21,6,8,0,92,0,17,8,96,14,12,19,9,0,93,93@14,15 -21,8,71,0,17,6,6,18,5,5,20,12,11,0,0,0,93,17,18,5,9,93,0,93,1,93,14,19,5,5,21,8,0,0,1,0,1,96,0,1,15,5,21,8,71,1,0,15 -9,71,71,0,0,0,0,17,6,18,5,5,20,11,0,0,0,0,17,18,9,71,71,0,1,14,19,5,21,6,8,0,91,0,93,96,0,0,0,92,15,5,9,71,71,0,0,15 -9,71,71,93,0,92,93,93,1,17,6,18,5,9,92,0,0,93,93,15,9,71,71,0@4,14,19,5,21,8,93,0,93,94,94,93,71,71,71,0,14,19,21,8,71,93,93,94,15 -9,71,71,1,0,0,0,0,92,0,0,17,6,18,12,11,92,93,0,15,20,11,71,14,19,21,6,8,0,93,0,0,93,0,71,71,14,12,12,19,5,9,71,71,71,0,96,15 -9,71,71,71,1,93,91,1,0,93,1,92,0,15,5,20,11,0,93,17,18,20,12,19,21,8,93,93,92,14,12,12,12,12,12,12,19,5,5,5,5,9,71,1,71,1,0,15 -20,11,71,71,93,92,0,0,92,0,1,1,0,17,18,5,20,11,0,1,15,5,5,21,8,93,93,14,12,19,5,5,5,5,5,5,5,5,5,5,5,9,71,0,91,0,92,15 -5,20,11,1,0,0,92,0,1,1,96,93,0@19,0,17,6,18,20,11,1,15,5,21,8,93,93,14,19,5,5,139,139,139,139,139,139,139,139,139,139,139,9,71,0,0,0,0,15 -5,5,20,12,12,11,94,93,1,0,0,1,0,0,0,96,15,5,9,93,15,21,8,0,94,14,19,5,5,5,139,210&22,210,210&22,210,210$3,210@26,210,210,214:4,139,9,93,1,93,1,0,15 -5,5,5,5,5,20,12,11,1,0,92,0,0,0,93,0,15,5,9,1,17,8,93,0,14,19,5,5,21,6,139,210,210@22,216,210$2,216,210$5,210$4,210,210@30,139,9,1,1,96,0,0,15 -5,5,5,5,5,5,5,9,94,14,11,96,1,0,14,12,19,21,8,93,94,93,1,14,19,21,6,6,8,0&22,149!0,139,210:2&22,210&21,210,210,210,210,218@27,210,139,20,11,0,0,94,14,19 -5,5,5,5,5,21,6,8,92,15,20,12,12,12,19,5,21,8,1,0,93,14,12,19,21,8,0$0,0@21,0,93,1:1,140,210:2,210,210&22,210,210,210,218@31$9,210:5,139,5,20,11,94,0,15,5 -5,5,5,5,5,9,93,0,93,15,5,5,21,6,6,6,8,0,0,96,93,17,6,6,8,93,0,14,11,92,139,139,210:2,210&22,210,210@25,210,210,218@28,210,139,5,5,9,92,1,17,18 -5,5,5,21,6,8,0,14,12,19,21,6,8,0@5,0,0,92,0@8,0,92*3,0,93,1,0,93$1,1&22,14,19,20,12,139,210,210@23,216,210$6,216,210$8,210,210@29,210@32,139,5,5,9,1,1,96,15 -5,5,5,9,92,0,1,17,18,5,9,1,0,1,96,0,1,0,1,0,91,1,93,93,14,12,19,5,5,5,139,210&22,210,210@24,210&23,210$7,210,210,210,214,139,5,5,20,12,11,0,15 -5,5,21,8,71,0,0@17,92,15,5,20,12,11,93,1,0@6,93,93,0,0,93,0,1,92,15,5,5,5,5,5,139,139,139,139,139,139,139,139,139,139,139,5,5,5,21,8,0,15 -5,21,8,71,71,93,1,0,17,6,18,5,20,12,12,12,12,11,0@7,71,71,71,93,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,21,6,6,6,8,1,0,15 -5,9,71,71,71,93,92,1,0,0,17,18,5,5,5,5,5,9,71,71,71,71,14,12,19,5,5,5,21,6,6,6,6,6,18,5,5,21,6,6,8,0,93,0,0,0,14,19 -5,9,71,71,71,91,92,0,1,93,0,17,6,18,5,5,5,20,12,12,12,12,19,5,5,21,6,6,8,0,0,93,0,0,17,6,18,9,0,0,0,0,14,12,12,12,19,5 -5,9,71,71,1,0,0,0,0*2,92,92,0,0,17,6,18,21,6,6,6,18,5,5,5,5,9,92,0,94,93,93,0,96,0,92,0,17,8,0,14,12,12,19,5,5,5,5,5 -5,20,11,71,71,1,0,92,0,93@9,0,94,0,1,92,17,8,0,0@18,0,17,18,5,21,6,8,93,93,0,1,0,0,0,0,0,0,0,93,0,17,18,5,5,5,21,6,18,5 -5,5,20,11,0,0,0,0,93,1,1,92,1,1,1,0,0,0,0,0,0,17,6,8,1,93,0,93,0,0,94,0,0@10,1,91,0,94,91,0,96,17,6,6,18,9,0@33,15,5 -5,5,5,20,12,12,11,0,96,0,0,0,1,92,93,14,12,12,12,11,1,0,93,0,0,0,0,92,96,0,0,0,91,0,1,0,1,1,91,92,0,93,71:99,16,10,0@34,15,5 -5,5,5,5,5,21,8,94:0,14,11,0,0,0,93,1,15,5,5,5,20,12,12,11,0,0,0,0,0,14,11,0,1,1,0,91,0,0,1,92,93,1,96,71,15,20,12,19,5 -5,5,5,5,21,8,0,92,15,9,0,92,0@0,14,12,19,5,5,5,5,5,5,9,71,0,1,14,12,19,20,11,0,91,0,0,0,91,1,94,94,71,71,71,15,5,5,5,5 -5,5,5,5,9,0,0,14,19,20,12,12,12,19,5,5,5,5,5,5,5,5,9,71,71,71,15,5,5,5,20,12,12,11,0,1,0,71,71,71,71,71,71,15,5,5,5,5 -5,5,5,5,9,93<^>,14,19,5,5,5,5,5,5,5,5,5,5,5,5,5,5,20,12,12,12,19,5,5,5,5,5,5,20,12,12,12,12,12,12,12,12,12,19,5,5,5,5 -5,5,5,5,9,92,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 -5,5,5,5,9,93,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 -5,5,5,5,9,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 -5,5,5,5,9,1,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,71,71,71,0@1,92,1,5,5,5,5,5,5,5,5,5,5,0,0,92,5,5,5,5,0,96,0,93,1,0,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,1,92,0,0,71,1,1,0,0,5,5,5,1,1,0,93,5,5,0,93@12,93,0,92,0,0,93,1,5,5,5,5,0,0,93,1,0,5,5,5,5,5,5 +5,5,5,0,0,1,96,93,0,1,96,92,0,1,1,0,94,1,93,5,5,0,0,93,0,92,1,92,92,96,1,93,93,5,5,5,5,5,5,71,1,0,0,93,93,5,5,5 +5,5,1,0,92,1,92,0,1,94,93,0,0,0,5,5,96,0,93,5,5,5,5,0,94v,96,93,91,96,92,0,1,0,5,5,5,5,5,5,71,0,0*1,0,92,0,94,5,5 +5,0,93,0,0,0,94,92,1,0,0,0,92,0,5,5,5,5,5,5,5,5,5,5,5,0,92,71,71,0,0,5,5,5,5,5,5,5,5,0,92,96,1,0,0,0,5,5 +5,0,0,1@11,0,71,71,5,5,5,5,5,0,5,5,5,5,5,5,5,5,5,5,5,5,5,71,71,71,0,5,5,5,5,5,5,5,1,1,1,93,0,71,71,0,93,0,5 +5,96,1,0,0@2,71,71,5,5,5,5,5,5,5,5,5,0,0,93,0@13,1,96,0,5,5,5,5,5,5,5,5,5,5,5,5,5,0,0,0,92,0,5,5,71,71,94,0,5 +5,94,0,0,0,71,71,5,5,5,5,5,5,5,5,5,92,5,5,5,5,5,0,93,5,5,5,5,5,5,5,5,5,5,0,0,0,5,5,5,5,5,5,5,71,92,1,5 +5,5,0,0,0,93,1,5,5,5,5,5,5,5,5,0,93,5,5,5,5,5,93,5,5,5,5,5,5,5,93,0,0,93,1,5,5,5,5,5,5,5,5,5,5,5,0,5 +5,5,0,0,1,0,92,0,5,5,5,5,5,5,5,0,1,93,1,5,5,5,5,5,5,5,5,5,5,0,0,5,5,5,5,5,5,5,5,0,93,0,5,5,5,5,0,5 +5,5,5,5,1,1,0,93,0,96,5,5,5,5,5,0,5,5,94,93,5,5,5,5,5,93,0,0,0,92,5,5,5,5,5,5,5,71,0,0,0@16,93,1,5,5,5,93,5 +5,5,5,5,5,0,1,0,93,0,5,5,5,5,1,0,5,5,5,0,0,5,5,5,5,93,5,5,5,5,5,5,5,5,5,5,5,0,0,0,93,0,1,5,5,0,1,5 +5,5,5,5,5,5,5,93,0,0,5,5,0,93,92,1,5,5,5,5,0,92,5,5,93,93,5,5,5,5,5,5,5,5,5,5,5,0,96,92,0,93,5,5,5,92,5,5 +5,5,5,5,5,5,5,5,0,5,5,5,71,71,1,93,5,5,5,5,5,0,5,0,0,0,5,5,5,5,5,93,93,1,0,5,5,5,93,93,5,5,5,5,5,93,5,5 +5,5,5,5,5,5,5,5,92,5,5,5,71,93,0@20,0,93,5,5,5,5,0,93,0,0,93,5,5,5,0,0,0,5,5,1,5,5,5,5,1,5,5,5,5,0,93,5,5 +5,5,5,94,0,0,1,0,94,5,5,5,71,1,0,0,0,5,5,5,5,1,93,0,93*0,92,0,0,1,0,5,5,5,5,0,1,5,5,5,93@15,0,0,5,5,1,1,0,5 +5,5,71,0,5,5,5,5,5,5,5,71,71,0@3,91,0,1,5,5,5,5,93,0,0,0,1,93,5,5,5,5,5,5,5,0,92,0,5,5,96,5,5,5,5,0,93,93@14,5 +5,5,71,0,5,5,5,5,5,5,5,5,5,0,0,0,93,5,5,5,5,93,0,93,1,93,5,5,5,5,5,5,0,0,1,0,1,96,0,1,5,5,5,5,71,1,0,5 +5,71,71,0,0,0,0,5,5,5,5,5,5,5,0,0,0,0,5,5,5,71,71,0,1,5,5,5,5,5,5,0,91,0,93,96,0,0,0,92,5,5,5,71,71,0,0,5 +5,71,71,93,0,92,93,93,1,5,5,5,5,5,92,0,0,93,93,5,5,71,71,0@4,5,5,5,5,5,93,0,93,94,94,93,71,71,71,0,5,5,5,5,71,93,93,94,5 +5,71,71,1,0,0,0,0,92,0,0,5,5,5,5,5,92,93,0,5,5,5,71,5,5,5,5,5,0,93,0,0,93,0,71,71,5,5,5,5,5,5,71,71,71,0,96,5 +5,71,71,71,1,93,91,1,0,93,1,92,0,5,5,5,5,0,93,5,5,5,5,5,5,5,93,93,92,5,5,5,5,5,5,5,5,5,5,5,5,5,71,1,71,1,0,5 +5,5,71,71,93,92,0,0,92,0,1,1,0,5,5,5,5,5,0,1,5,5,5,5,5,93,93,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,71,0,91,0,92,5 +5,5,5,1,0,0,92,0,1,1,96,93,0@19,0,5,5,5,5,5,1,5,5,5,5,93,93,5,5,5,5,139,139,139,139,139,139,139,139,139,139,139,5,71,0,0,0,0,5 +5,5,5,5,5,5,94,93,1,0,0,1,0,0,0,96,5,5,5,93,5,5,5,0,94,5,5,5,5,5,139,210&22,210,210&22,210,210$3,210@26,210,210,214:4,139,5,93,1,93,1,0,5 +5,5,5,5,5,5,5,5,1,0,92,0,0,0,93,0,5,5,5,1,5,5,93,0,5,5,5,5,5,5,139,210,210@22,216,210$2,216,210$5,210$4,210,210@30,139,5,1,1,96,0,0,5 +5,5,5,5,5,5,5,5,94,5,5,96,1,0,5,5,5,5,5,93,94,93,1,5,5,5,5,5,5,0&22,149!0,139,210:2&22,210&21,210,210,210,210,218@27,210,139,5,5,0,0,94,5,5 +5,5,5,5,5,5,5,5,92,5,5,5,5,5,5,5,5,5,1,0,93,5,5,5,5,5,0$0,0@21,0,93,1:1,140,210:2,210,210&22,210,210,210,218@31$9,210:5,139,5,5,5,94,0,5,5 +5,5,5,5,5,5,93,0,93,5,5,5,5,5,5,5,5,0,0,96,93,5,5,5,5,93,0,5,5,92,139,139,210:2,210&22,210,210@25,210,210,218@28,210,139,5,5,5,92,1,5,5 +5,5,5,5,5,5,0,5,5,5,5,5,5,0@5,0,0,92,0@8,0,92*3,0,93,1,0,93$1,1&22,5,5,5,5,139,210,210@23,216,210$6,216,210$8,210,210@29,210@32,139,5,5,5,1,1,96,5 +5,5,5,5,92,0,1,5,5,5,5,1,0,1,96,0,1,0,1,0,91,1,93,93,5,5,5,5,5,5,139,210&22,210,210@24,210&23,210$7,210,210,210,214,139,5,5,5,5,5,0,5 +5,5,5,5,71,0,0@17,92,5,5,5,5,5,93,1,0@6,93,93,0,0,93,0,1,92,5,5,5,5,5,5,139,139,139,139,139,139,139,139,139,139,139,5,5,5,5,5,0,5 +5,5,5,71,71,93,1,0,5,5,5,5,5,5,5,5,5,5,0@7,71,71,71,93,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,1,0,5 +5,5,71,71,71,93,92,1,0,0,5,5,5,5,5,5,5,5,71,71,71,71,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,93,0,0,0,5,5 +5,5,71,71,71,91,92,0,1,93,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,0,93,0,0,5,5,5,5,0,0,0,0,5,5,5,5,5,5 +5,5,71,71,1,0,0,0,0*2,92,92,0,0,5,5,5,5,5,5,5,5,5,5,5,5,5,92,0,94,93,93,0,96,0,92,0,5,5,0,5,5,5,5,5,5,5,5,5 +5,5,5,71,71,1,0,92,0,93@9,0,94,0,1,92,5,5,0,0@18,0,5,5,5,5,5,5,93,93,0,1,0,0,0,0,0,0,0,93,0,5,5,5,5,5,5,5,5,5 +5,5,5,5,0,0,0,0,93,1,1,92,1,1,1,0,0,0,0,0,0,5,5,5,1,93,0,93,0,0,94,0,0@10,1,91,0,94,91,0,96,5,5,5,5,5,0@33,5,5 +5,5,5,5,5,5,5,0,96,0,0,0,1,92,93,5,5,5,5,5,1,0,93,0,0,0,0,92,96,0,0,0,91,0,1,0,1,1,91,92,0,93,71:99,5,5,0@34,5,5 +5,5,5,5,5,5,5,94:0,5,5,0,0,0,93,1,5,5,5,5,5,5,5,5,0,0,0,0,0,5,5,0,1,1,0,91,0,0,1,92,93,1,96,71,5,5,5,5,5 +5,5,5,5,5,5,0,92,5,5,0,92,0@0,5,5,5,5,5,5,5,5,5,5,71,0,1,5,5,5,5,5,0,91,0,0,0,91,1,94,94,71,71,71,5,5,5,5,5 +5,5,5,5,5,0,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,71,71,71,5,5,5,5,5,5,5,5,0,1,0,71,71,71,71,71,71,5,5,5,5,5 +5,5,5,5,5,93<^>,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,92,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,93,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,1,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 diff --git a/rsrc/scenarios/valleydy/towns/town19.map b/rsrc/scenarios/valleydy/towns/town19.map index 8b57a874d..9edac45cd 100644 --- a/rsrc/scenarios/valleydy/towns/town19.map +++ b/rsrc/scenarios/valleydy/towns/town19.map @@ -2,29 +2,29 @@ 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 -5,5,5,5,5,21,6,6,6,18,21,6,6,6,6,6,18v,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 -5,5,5,5,5,9,101:0@5@6@7@8@9,0,0,16,10,93,0,0,0,101@10@11@12@13@14,17,18,5,5,5,5,5,5,5,5,5,5,5,5,5,5 -5,5,5,5,5,20,12,12,12,19,9,0,0@15,105$1,0,0,0,17,18,5,5,5,5,5,5,5,5,5,5,5,5,5 -5,5,5,5,5,5,5,5,5,21,8,0@20,0@18,0,0,0@19,0,0,17,18,5,5,5,5,5,5,5,5,5,5,21,6 -5,5,5,5,21,6,6,18,5,9,0,105$0,1,104,0@16,0,0,95,0,15,5,5,5,5,5,5,21,6,6,6,8,0 -5,5,5,21,8,103@3@4,103&22,15,5,9,0,0,0@17,0,0,105@21$2,1,0,0,17,6,18,5,21,6,6,8,97,82,82,82,82 -5,5,5,9,103&22,103&22,14,19,5,9,84,0,0,0,0,0,0,0,0,0,0,17,6,8,0,82:2,82,82<,82,82,82,82 -5,5,5,9,103@0,103@2,15,5,5,20,11,85,86,0,0,0,82,82,82,82,82,82,82:4,82:3,82,82:2,82,82,82,82,0,14 -5,5,5,9,103&22,103@1,17,6,18,5,9,84,0,0,0,82,82,82,82,82,82,82,82:4,82:3,82,82:2,0,0,1,0,0,15 -5,5,5,20,11,0,0,0,15,5,20,11,0,0,82,82,82,0,0,0,0,0,0:4,0:3,0,97,0,14,12,12,12,19 -5,5,5,5,20,12,11,0,15,5,5,9,84,0,82,82,0,0,93,14,11,0,14,12,12,12,12,19,5,5,5,5 -5,5,5,5,5,5,9,0,17,6,18,20,11,0,82,82,0,14,12,19,9,0,17,6,6,18,5,5,5,5,5,5 -5,5,5,5,5,5,9,0,0,0,17,6,8,0,82,82,97,15,5,5,9,0,0,0,97,15,5,5,5,5,5,5 -5,5,5,5,5,5,20,12,11,0,0,0,0,0,82,82,14,19,5,5,20,11,0,0,14,19,5,5,5,5,5,5 -5,5,5,5,5,5,5,5,20,12,12,11,0,82,82,82,17,6,18,5,5,20,11,0,17,6,18,5,5,5,5,5 -5,5,5,5,5,5,5,21,6,18,21,8,82,82,82,0,0,98,17,18,5,5,9,0,0,0,15,5,5,5,5,5 -6,6,6,18,5,5,21,8,98,16,10:1,82,82,82,14,12,11,0,0,17,6,18,20,12,11,0,15,5,5,5,5,5 -0,0,0,17,6,6,8,97,0,16,10:1,82,82,0,15,21,6,11,0,98,98,17,6,18,9,94,17,6,18,5,5,5 -0,0,1,0,0,98,0,0,98,16,10:1,0,14,12,19,9,0,15,12,11,0,98,0,15,9,0,94,94,15,5,5,5 -0,0,0,0,0>,0,85,86,0,15,20,12,19,5,5,20,12,19,5,20,12,11,0,17,8,98,14,12,19,5,5,5 -0,0,0,0,0,0,0,0,98,15,5,5,5,5,21,6,6,6,6,6,6,8,0,0,0,0,15,5,5,5,5,5 -12,12,12,11,0,97,98,84,14,19,5,5,5,5,9,0,0,97,0,0,0,0,0,14,12,12,19,5,5,5,5,5 -5,5,5,20,12,12,12,12,19,5,5,5,5,5,20,12,12,12,12,12,12,12,12,19,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5v,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,101:0@5@6@7@8@9,0,0,5,5,93,0,0,0,101@10@11@12@13@14,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,0,0@15,105$1,0,0,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,0@20,0@18,0,0,0@19,0,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,0,105$0,1,104,0@16,0,0,95,0,5,5,5,5,5,5,5,5,5,5,5,5,0 +5,5,5,5,5,103@3@4,103&22,5,5,5,0,0,0@17,0,0,105@21$2,1,0,0,5,5,5,5,5,5,5,5,97,82,82,82,82 +5,5,5,5,103&22,103&22,5,5,5,5,84,0,0,0,0,0,0,0,0,0,0,5,5,5,0,82:2,82,82<,82,82,82,82 +5,5,5,5,103@0,103@2,5,5,5,5,5,85,86,0,0,0,82,82,82,82,82,82,82:4,82:3,82,82:2,82,82,82,82,0,5 +5,5,5,5,103&22,103@1,5,5,5,5,5,84,0,0,0,82,82,82,82,82,82,82,82:4,82:3,82,82:2,0,0,1,0,0,5 +5,5,5,5,5,0,0,0,5,5,5,5,0,0,82,82,82,0,0,0,0,0,0:4,0:3,0,97,0,5,5,5,5,5 +5,5,5,5,5,5,5,0,5,5,5,5,84,0,82,82,0,0,93,5,5,0,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,0,5,5,5,5,5,0,82,82,0,5,5,5,5,0,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,0,0,0,5,5,5,0,82,82,97,5,5,5,5,0,0,0,97,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,0,0,0,0,0,82,82,5,5,5,5,5,5,0,0,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,0,82,82,82,5,5,5,5,5,5,5,0,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,82,82,82,0,0,98,5,5,5,5,5,0,0,0,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,98,5,5:1,82,82,82,5,5,5,0,0,5,5,5,5,5,5,0,5,5,5,5,5,5 +0,0,0,5,5,5,5,97,0,5,5:1,82,82,0,5,5,5,5,0,98,98,5,5,5,5,94,5,5,5,5,5,5 +0,0,1,0,0,98,0,0,98,5,5:1,0,5,5,5,5,0,5,5,5,0,98,0,5,5,0,94,94,5,5,5,5 +0,0,0,0,0>,0,85,86,0,5,5,5,5,5,5,5,5,5,5,5,5,5,0,5,5,98,5,5,5,5,5,5 +0,0,0,0,0,0,0,0,98,5,5,5,5,5,5,5,5,5,5,5,5,5,0,0,0,0,5,5,5,5,5,5 +5,5,5,5,0,97,98,84,5,5,5,5,5,5,5,0,0,97,0,0,0,0,0,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5^,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 diff --git a/rsrc/scenarios/valleydy/towns/town20.map b/rsrc/scenarios/valleydy/towns/town20.map index d31e70a39..ca69b13d4 100644 --- a/rsrc/scenarios/valleydy/towns/town20.map +++ b/rsrc/scenarios/valleydy/towns/town20.map @@ -1,32 +1,32 @@ -5,21,6,6,6,6,6,18,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 -21,8,1,84,84,0,0,15,5,21,6,6,6,18,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 -9,84,14,12,12,12,12,19,21,8,0,0,84,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 -9,84,17,18,5,5,5,21,8,0,14,12,12,19,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 -9,0,0,15,5,5,21,8,0,0,15,5,5,5,5,5,5v,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 -20,11,0,17,6,6,8,1,0,14,19,5,5,5,5,5,5,21,6,6,6,6,6,18,5,5,5,5,5,5,5,5 -5,9,0,0,0,1,0,84,0,15,5,5,21,6,6,6,6,8,0,85,86,0,0,17,6,18,5,5,5,5,5,5 -5,20,12,12,12,12,11,84,14,19,21,6,8,0,84,0,0,0,84,0,84,84,1,85,86,17,6,6,18,5,5,5 -6,6,6,18,5,5,9,84,15,21,8,0,0,0,0,0,0,84,85,86,84,84,0,0,84,0,0,75,15,5,5,5 -0,0,0,15,5,5,9,1,17,8,0,84,0,84,0,0,0,85,86,0,14,11,84,0,0,0,84,0,15,5,5,5 -12,11,0,17,6,6,8,0,84,84,0,0,84,0,84,14,12,12,12,12,19,9,85,86,84,84,0,0,17,18,5,5 -5,9,84,0,0:0&9,0:1,0,0,0,0,84,0,1,14,12,19,21,6,6,6,6,8,0,14,11,0,84,84,0,15,5,5 -5,20,12,12,12>,11,0,84,84,85,86,14,12,19,5,5,9,84,1,85,86,0,84,15,9,75,0,0,0,15,5,5 -5,5,5,5,5,20,11,0,85,86,14,19,5,5,21,6,8,0,14,12,12,11,0,15,20,11,85,86,0,15,5,5 -5,5,5,5,5,5,20,12,12,12,19,5,21,6,8,84,0,0,17,6,18,9,0,15,5,9,0,85,86,15,5,5 -5,5,5,5,21,6,18,5,5,5,5,21,8,84,85,86,75,75,75,75,15,9,84,15,21,8,0,0,0,15,5,5 -5,5,5,5,9,0,15,5,21,6,6,8,85,86,75,75,75,75,0$0,75,17,8,0,15,9,75,0,84<,0,15,5,5 -5,5,5,5,9,84,17,6,8,0,0,84,0,75,75,75,75,75,75,75,84,0,84,15,9,84,0,84,75,15,5,5 -5,21,6,18,9,84,0,85,86,84,75,75,75,75,75,75,0$2,75,75,75,84,14,12,19,9,0,0,84,14,19,5,5 -5,9,0,16,10,84,14,11,0,0,75,75,75,75,75,75,75,75,75,0,0,15,5,5,9,0,0,84,15,5,5,5 -21,8,75,15,9,0,15,9,0,84,75,75,75,84$1,75,75,75,75,84,84,14,19,5,5,9,84,0,84,15,5,5,5 -9,0@0,0@1,15,9,0,17,8,0,14,12,11,1,0,75,75,75,75,0,14,19,5,5,5,9,85,86,0,15,5,5,5 -9,0@3,0@4,15,9,85$3,86,0,84,17,18,9,75,75,75,75,75,0,84,15,5,5,5,5,9,0,84,0,15,5,5,5 -9,0@2,84@8,15,9,0,14,11,84,0,17,8,75,75,75,75,75,0,14,19,5,5,5,5,9,0,85,86,15,5,5,5 -9,84@7,0@6,15,9,0,15,20,11,0,84,84,75,75,75,75,84,84,15,5,5,5,5,21,8,0:2,0:2,84:2,15,5,5,5 -9,0@5,14,19,9,0,17,18,9,0,0,84,0,14,11,0,84,14,19,5,5,5,5,9,85,86,84,0,15,5,5,5 -20,12,19,5,9,0,84,17,8,1,14,11,0,17,8,0,0,15,5,5,5,5,21,8,0,0,84,0,15,5,5,5 -5,5,5,5,20,11,0,84,85,86,15,9,84,0,0,84,14,19,5,5,5,5,9,84,84,0^,0,14,19,5,5,5 -5,5,5,5,5,20,12,12,12,12,19,20,12,12,12,12,19,5,5,5,5,5,9,84,84,84,0,15,5,5,5,5 -5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,0,0,84,14,19,5,5,5,5 -5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,0,1,0,15,5,5,5,5,5 -5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,0,0,0,15,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,1,84,84,0,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,84,5,5,5,5,5,5,5,5,0,0,84,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,84,5,5,5,5,5,5,5,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,0,0,5,5,5,5,5,0,0,5,5,5,5,5,5,5v,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,0,5,5,5,5,1,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,0,0,0,1,0,84,0,5,5,5,5,5,5,5,5,5,0,85,86,0,0,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,84,5,5,5,5,5,0,84,0,0,0,84,0,84,84,1,85,86,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,84,5,5,5,0,0,0,0,0,0,84,85,86,84,84,0,0,84,0,0,75,5,5,5,5 +0,0,0,5,5,5,5,1,5,5,0,84,0,84,0,0,0,85,86,0,5,5,84,0,0,0,84,0,5,5,5,5 +5,5,0,5,5,5,5,0,84,84,0,0,84,0,84,5,5,5,5,5,5,5,85,86,84,84,0,0,5,5,5,5 +5,5,84,0,0:0&9,0:1,0,0,0,0,84,0,1,5,5,5,5,5,5,5,5,5,0,5,5,0,84,84,0,5,5,5 +5,5,5,5,5>,5,0,84,84,85,86,5,5,5,5,5,5,84,1,85,86,0,84,5,5,75,0,0,0,5,5,5 +5,5,5,5,5,5,5,0,85,86,5,5,5,5,5,5,5,0,5,5,5,5,0,5,5,5,85,86,0,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,84,0,0,5,5,5,5,0,5,5,5,0,85,86,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,5,84,85,86,75,75,75,75,5,5,84,5,5,5,0,0,0,5,5,5 +5,5,5,5,5,0,5,5,5,5,5,5,85,86,75,75,75,75,0$0,75,5,5,0,5,5,75,0,84<,0,5,5,5 +5,5,5,5,5,84,5,5,5,0,0,84,0,75,75,75,75,75,75,75,84,0,84,5,5,84,0,84,75,5,5,5 +5,5,5,5,5,84,0,85,86,84,75,75,75,75,75,75,0$2,75,75,75,84,5,5,5,5,0,0,84,5,5,5,5 +5,5,0,5,5,84,5,5,0,0,75,75,75,75,75,75,75,75,75,0,0,5,5,5,5,0,0,84,5,5,5,5 +5,5,75,5,5,0,5,5,0,84,75,75,75,84$1,75,75,75,75,84,84,5,5,5,5,5,84,0,84,5,5,5,5 +5,0@0,0@1,5,5,0,5,5,0,5,5,5,1,0,75,75,75,75,0,5,5,5,5,5,5,85,86,0,5,5,5,5 +5,0@3,0@4,5,5,85$3,86,0,84,5,5,5,75,75,75,75,75,0,84,5,5,5,5,5,5,0,84,0,5,5,5,5 +5,0@2,84@8,5,5,0,5,5,84,0,5,5,75,75,75,75,75,0,5,5,5,5,5,5,5,0,85,86,5,5,5,5 +5,84@7,0@6,5,5,0,5,5,5,0,84,84,75,75,75,75,84,84,5,5,5,5,5,5,5,0:2,0:2,84:2,5,5,5,5 +5,0@5,5,5,5,0,5,5,5,0,0,84,0,5,5,0,84,5,5,5,5,5,5,5,85,86,84,0,5,5,5,5 +5,5,5,5,5,0,84,5,5,1,5,5,0,5,5,0,0,5,5,5,5,5,5,5,0,0,84,0,5,5,5,5 +5,5,5,5,5,5,0,84,85,86,5,5,84,0,0,84,5,5,5,5,5,5,5,84,84,0^,0,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,84,84,84,0,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,0,84,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,1,0,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,0,0,5,5,5,5,5,5 diff --git a/rsrc/scenarios/valleydy/towns/town6.map b/rsrc/scenarios/valleydy/towns/town6.map index d01dda962..8cf2a7010 100644 --- a/rsrc/scenarios/valleydy/towns/town6.map +++ b/rsrc/scenarios/valleydy/towns/town6.map @@ -1,20 +1,20 @@ -122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,6,6,18,5 -122,170@35,170,199,122,71,71,122,170,170,170,170,122,170,170,170,199,199,201@38,122,170&22,170,170,122,170&22,170,170,122,170,170,170&22,122,199,170,201:0,122,199@13,170,201@11,122,199,170,201@44,122,0@7&22,1&17,17,18 -122,170,170,199,122,170,170,122,185@36,185,196,170,122,199,199@23$31,170,170,170,199$32,122,170&22,170,170,122,170&22,170,170,122,170,170,170&22,123,170,170,170,122,170,170,170,122,170,170,170,122,0@9,0&16,0,15 -122,170,199,170,125,170,170,122,195,195,195,170,122,170,199,170,170,170,199,122,122,133,0,122,122,133,0,122,0,133,122,122,170@10,170,170,122,170,170,170,122,170,170,170,122,0@8&22,0,1,15 -122,122,122,122,122,170,170,122,170,170,170,198,122,170,170,170,199@24$30,170,170,122,108,1,0,108,0v,0,0,108,0,0,0,122,170,170,204,122,170,170,204,122,204,170,170@12,122,0&16,0,0,15 -122,199,170,170@34,125,170,170,125,170,198,185,185@37,122,170,170,170,170,199,170,122,12,11,0,0,0$38,0,0,0,84,14,12,122,122,132!6,125,122,122,132!8,125,122,125,132!7,122,122,122,122,123:1,19 -122,199,170,199,122,170,170,122,122,122,122,122,122,125,122,122,122,122,122,122,5,9,108,1$36,108,0$1,0*3,0,14,19,5,122,170,170,170,170,170,170,170,170,170,170,170,170,233,122,84,15 -122,199,170,170,122,170,170,125,196,170,198,198,122,170,170,170,170,170,170,122,21,8,108$39,0,104,0$37,108,0,17,6,6,122,170,170,170,170,170,170,170,170,170,170,170,170,170,122,0,15 -122,122,122,122,122,170,170,122,170,170,170,170,122,170,187,170,170,187,170,122,8,0&23,0,0$35,0,0,0$33,0,0,108,0,122,170,170,122,170,170,122,122,122,122,122,122,170,170,122,0,15 -122,199@33$24,170,170,122,170,170,122,170,198,196,170,122,170,170,170,170$27,170,170,122,108,0,108,0,0$34,107!3,108,0,0,0,0,122,170,170,122,170,170,122,170,170,170&11,170,122,170,170,122,0,15 -122,170,170,199$23,122,170,170,122,122,122,122,122,122,170,170,170,170,170$29,170,122,1,0,107!2,14,12,12,12,12,11,0,108,122,170,170,122,170,170@6,122,170&11,170,170,170,122,170,170,122,84,15 -122,170,170$25,170,125,170,170,170,170,170,170,170,170,170,170,170$26,192,170,170,125:10,0,0,1,15,5,21,6,6,8,107!4,0,127,170,170,122,170,170,122,170,170,170,170,122,170,170,122,0,15 -122,123,122,122,122,170,170,170,170,170,170,170,170,170,170,170,170,170$28,170,125:10,0,0,0,15,21,8,0,0,0,0,0,127,170,170,122,170:17&9,170:17&9,122,170,170,170&23,170,125,170,170,122,0,15 -122,172,172,191@26,122,170,170,122,122,122,122,122,122,170,170,170,170,170,170,122,0,0,108,15,9,0,0,108,104,108,107!1,122,170,170,122,122,122,122,122,122,122,122,122,170,170,122,0,15 -122,122,122,122,122,170,170,122,199$10,199,199,199,122,170,170,170,170,170,170,122,1,0,14,19,8,1,0,0,14,11,1,134,170,170,122,177,177,177,177,176,170,170,122,170,170,122,0,15 -122,170,170,170,125,170,170,122,170,170,170&22,170,122,170,187,170,170,187,170,122,108,108,15,9,108,1,1,107!0!5,15,9,0,122,170,170,122,170,170,170,170,170,170,170,133,170,170,122,0,15 -122,199,170,170,122,170,170,122,201@25,170,170,170,132!9,170,170,170,170,170,170,122,122,122,122,122,122,85:11,86:11,122,122,122,122,122,170,170,122,170,170,170,170,170,170,170,133,170,170,122,0,15 +122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,5,5,5,5 +122,170@35,170,199,122,71,71,122,170,170,170,170,122,170,170,170,199,199,201@38,122,170&22,170,170,122,170&22,170,170,122,170,170,170&22,122,199,170,201:0,122,199@13,170,201@11,122,199,170,201@44,122,0@7&22,1&17,5,5 +122,170,170,199,122,170,170,122,185@36,185,196,170,122,199,199@23$31,170,170,170,199$32,122,170&22,170,170,122,170&22,170,170,122,170,170,170&22,123,170,170,170,122,170,170,170,122,170,170,170,122,0@9,0&16,0,5 +122,170,199,170,125,170,170,122,195,195,195,170,122,170,199,170,170,170,199,122,122,133,0,122,122,133,0,122,0,133,122,122,170@10,170,170,122,170,170,170,122,170,170,170,122,0@8&22,0,1,5 +122,122,122,122,122,170,170,122,170,170,170,198,122,170,170,170,199@24$30,170,170,122,108,1,0,108,0v,0,0,108,0,0,0,122,170,170,204,122,170,170,204,122,204,170,170@12,122,0&16,0,0,5 +122,199,170,170@34,125,170,170,125,170,198,185,185@37,122,170,170,170,170,199,170,122,5,5,0,0,0$38,0,0,0,84,5,5,122,122,132!6,125,122,122,132!8,125,122,125,132!7,122,122,122,122,123:1,5 +122,199,170,199,122,170,170,122,122,122,122,122,122,125,122,122,122,122,122,122,5,5,108,1$36,108,0$1,0*3,0,5,5,5,122,170,170,170,170,170,170,170,170,170,170,170,170,233,122,84,5 +122,199,170,170,122,170,170,125,196,170,198,198,122,170,170,170,170,170,170,122,5,5,108$39,0,104,0$37,108,0,5,5,5,122,170,170,170,170,170,170,170,170,170,170,170,170,170,122,0,5 +122,122,122,122,122,170,170,122,170,170,170,170,122,170,187,170,170,187,170,122,5,0&23,0,0$35,0,0,0$33,0,0,108,0,122,170,170,122,170,170,122,122,122,122,122,122,170,170,122,0,5 +122,199@33$24,170,170,122,170,170,122,170,198,196,170,122,170,170,170,170$27,170,170,122,108,0,108,0,0$34,107!3,108,0,0,0,0,122,170,170,122,170,170,122,170,170,170&11,170,122,170,170,122,0,5 +122,170,170,199$23,122,170,170,122,122,122,122,122,122,170,170,170,170,170$29,170,122,1,0,107!2,5,5,5,5,5,5,0,108,122,170,170,122,170,170@6,122,170&11,170,170,170,122,170,170,122,84,5 +122,170,170$25,170,125,170,170,170,170,170,170,170,170,170,170,170$26,192,170,170,125:10,0,0,1,5,5,5,5,5,5,107!4,0,127,170,170,122,170,170,122,170,170,170,170,122,170,170,122,0,5 +122,123,122,122,122,170,170,170,170,170,170,170,170,170,170,170,170,170$28,170,125:10,0,0,0,5,5,5,0,0,0,0,0,127,170,170,122,170:17&9,170:17&9,122,170,170,170&23,170,125,170,170,122,0,5 +122,172,172,191@26,122,170,170,122,122,122,122,122,122,170,170,170,170,170,170,122,0,0,108,5,5,0,0,108,104,108,107!1,122,170,170,122,122,122,122,122,122,122,122,122,170,170,122,0,5 +122,122,122,122,122,170,170,122,199$10,199,199,199,122,170,170,170,170,170,170,122,1,0,5,5,5,1,0,0,5,5,1,134,170,170,122,177,177,177,177,176,170,170,122,170,170,122,0,5 +122,170,170,170,125,170,170,122,170,170,170&22,170,122,170,187,170,170,187,170,122,108,108,5,5,108,1,1,107!0!5,5,5,0,122,170,170,122,170,170,170,170,170,170,170,133,170,170,122,0,5 +122,199,170,170,122,170,170,122,201@25,170,170,170,132!9,170,170,170,170,170,170,122,122,122,122,122,122,85:11,86:11,122,122,122,122,122,170,170,122,170,170,170,170,170,170,170,133,170,170,122,0,5 122,170,170,170@31,122,170,170@32,122,170,170,170,170,126,170,170,170,170,170,170,122,170,170,170,170,85,86,0,170,1,170,170,134,170,170,125,170,170,170,170,170,85,86,0,84,0,122,170,122 122,170,199,170,122,170,170,122,201,170,170,170,122,170,187,170,170,187,170,122,170,170,170,0,0,0,0,84,170,170,170,134,170,170,122,122,122,122,133,133,0,0,85,86,84,122,170,122 122,122,122,122,122,170,170,122,170,170&22,170,170,122,170,170,170,170*1,170,170,122,170@1,170&22,170,0,170,84,170,170,0,170&22,170@2,122,170,170,122,191:3,170,191:3,170,0,84,1,0,85,86,122,170,122 diff --git a/rsrc/scenarios/valleydy/towns/town9.map b/rsrc/scenarios/valleydy/towns/town9.map index 66f85fe1c..46be26ae2 100644 --- a/rsrc/scenarios/valleydy/towns/town9.map +++ b/rsrc/scenarios/valleydy/towns/town9.map @@ -1,64 +1,64 @@ -5,122,122,122,122,5,5,5,5,5,5,5,5,5,122,122,122,122,5,5,5,5,5,5,5,21,6,6,6,6,18,5,5,5,5,5,5,5,5,21,6,6,6,6,6,18,5,5,5,21,6,6,6,18,5,5,5,5,5,5,5,5,5,5 -5,122,170:8&9,170:8&9,122,5,5,5,5,5,5,5,5,5,122,170:10&9,170:10&9,122,5,5,5,5,5,5,21,8,255,255,255,255,17,6,6,18,21,6,6,18,5,9,0,0,97,0,0,17,6,6,6,8,0,84,71,15,5,5,5,5,5,5,5,5,5,5 -5,122,170,170,122,5,5,5,5,5,5,5,5,5,122,170,170,122,5,5,21,6,18,5,9,255,255,14,11,255,255,255,255,15,9,0,0,17,6,8,0,93,0,94,98,0,93,93,0,93,0,71,71,15,5,122,6,6,6,6,6,18,5,5 -5,122,170,170,122,5,5,5,5,5,5,5,5,5,122,170,170,122,5,5,9,98,15,5,9,255:29,1,17,8,0,93,0,255,15,9,0,0,0,0,0,0,0,0,93,1,14,12,11,97,0,0$17,0,0,15,5,122,71,71,71,71,71,17,6,18 -5,122,170:19,170:19,132!0,18,5,5,5,5,5,5,5,5,132!1,170:19,170:19,122,133,18,9,98,15,5,9,255,0,98$18,255,255,255,0,93v,15,20,11,0,14,12,12,12,12,12,12,12,19,5,20,11,0,93,0,93,15,5,122,71,96,71,0:26&9,71,71,71,15 -5,133,170,170,170,17,18,5,5,5,5,5,5,5,9,170,170,170,0,17,8,98,15,5,9,255,255,0$19,255,94,1,0&22,0,17,18,9,1,15,21,6,6,6,6,6,6,6,6,18,20,12,11,0,14,19,5,133,96,96$14,96,96$16,96,96,71,15 -21,133,170,170,170,170,15,5,5,5,5,5,5,5,133,170,170,170,170,0,0,0,17,18,20,11,255,0,0,0,255,255,255,0,15,9,0,17,8,0,0,0,0$28,0,0,0,93,17,6,6,8,0,15,5,5,122,0$13,96,0$15,96,96,71,71,15 -9,0,0,170,0,14,19,5,5,5,5,5,5,5,122,0,0,0,170,0,0,0,0,15,5,9,255,255,255,0,0,85,86,98,15,9,0,0,0,98,14,11,0,14,12,11,0,0,0,0,1$30,0,15,5,5,9,96,0,93,93,14,12,12,19 -20,11,0,0,0,17,18,5,122,122,122,133,133,18,20,11,0,0,0,0,0,97,14,19,5,20,12,12,11,0,85,86,0,14,19,20,11,0,1,0,15,9,0$29,15,5,20,12,12,12,11,94,14,19,5,5,20,11,93,0,14,19,122,122,122 -5,9,97,0,93,98,17,18,122,170,170,170,0,17,18,20,11,94,84,0,0,14,19,21,6,6,6,18,9,0,14,11,0:28,17,6,18,9,0,0,0,15,9,1:31,17,6,6,6,18,5,9,0,17,18,5,21,6,8,0,14,19,5,122,194:27@0@1,122 -21,8,0,0,0,0,0,17,122,170,170$47,0,0,0,17,18,20,11,93,0,0,17,6,8,0,71,71,15,9,0,15,9,0,85,86,17,8,84,0,14,19,8,170,170,170,170,170,17,18,20,11,0,15,21,8,0,0,0,15,122,122,122,123,122 -9,97,97,0,98,0,0,0,122,170,0,0,0$46,93,0,17,18,20,12,11,0,0,0,0,98,0,71,15,20,12,19,20,12,11,0,0,0,0,14,122,8,170,170$3,170,170,170,170,170,17,18,9,0,17,8,0,93,14,12,19,133,170$12,170,170,122 -20,12,12,11,0,93,0,98,0,170,93,0$48,93,0,1,0,17,6,6,8,0,0,97,0,0,0,0,15,5,5,5,5,5,20,12,12,11,0,17,122,170,170,170,170,71,170,170,170,170,15,9,0,0,1,0,14,19,21,6,8,0,170$11,170,122 -5,5,5,20,11,0,93,98,0,1,71,71,92,133,84,93,0,1$49,0,1,170,170$44,0,0&19,0,1,14,19,5,5,5,21,6,6,6,18,9,93,0,133,170,170,170,71,71,71,170,170$2,170,122,20,11,0,14,12,19,21,8,93,0,0,0,170$10,122 -5,5,5,5,20,12,11,1,0,92,71,71,133,122,0,0,14,12,12,11,170,170,0,0$43,0,14,19,5,5,5,21,8,84,0,0,15,9,0,0,122,170,170,71,71,189,71,71,170,170,122,21,8,0,15,21,6,8,0,1,0,0,0,170,122 -5,5,5,5,5,21,8,0,0,93,0,93,0,122,84,14,19,5,5,9,94,98,0,0,1,15,5,5,5,5,9,0,98,0,14,19,9,0,14,122,170,170,170,71,71,71,170,170,170,122,9,0,0,15,9,0,0,170,170,0,0,122,122,122 -5,5,5,5,5,9,0,1,98,14,11,93,14,122,12,19,21,6,18,20,12,12,11,0,14,19,5,5,5,5,9,93,0,0,17,6,8,93,15,122,170,170,170,170,71,170$1,170,170,170,15,9,0,0,15,20,11,93,170,170,0,14,19,5,5 -5,5,5,5,5,9,0,14,12,19,9,0,17,18,5,21,8,0,15,5,122,122,122,0,17,134,134,133,134,18,9,93,93,93,0,93,0,0,17,18,11,170,170,170,170,170,170,170,14,19,8,0,94,15,21,8,0,0,93,14,19,5,5,5 -5,5,5,21,6,8,0,15,5,5,9,0,98,15,21,8,0,84,133,122,122,5,9,170,170,170,170,170,170,15,9,97,97,0$22,98,14,11,0,0,17,18,11,170,170,170,170,170,14,19,9,0,0,14,19,9,0,0,14,12,19,5,5,5,5 -5,21,6,8,170,0@18,0,17,6,18,20,12,12,19,9,0,98,0,170,170,132!2,6,8,0,0,0,170,170,170,15,9,0@17,93,98,93,15,20,11,0,0,15,20,12,12,12,11,0:31,15,21,8,0,1,17,6,8,0,14,19,21,6,6,6,18,5 -5,9,170,84,170,170,0,0,0,17,6,18,5,21,8,0,0$42,170,170,170,129,170,170,170,170,0,84,170,170,15,9,0,0,98,93$21,15,5,20,11,0,17,6,18,21,6,8,0,17,8,170,0,0,0,0,0,0,15,21,8,94,0,0,15,5 -5,9,196,170,170,170,170,0,0,0,98,15,5,9,0,0,0,170,170,170,122,11,170,170,85,86,0,0,0@16,15,122,0,93,0,0,17,18,5,9,0,0,0,17,8,0,0,170$27,170,170,170,14,11,98,14,12,12,19,9,0,0,0$9,0,17,18 -5,9,170,170,84,170,170,85,86,0,0,17,6,8,0,98,85,86,170$41,170,133,9,170,1,0,0,85,86,14,19,122,0,0,84,0,84,15,5,9,0,0,0,0,0,0,14,122,122,122,122,19,20,12,19,5,5,21,8,0,0,0,98,0,15 -5,20,11,0,14,11,85,86,0,0,0,0,0,0,0,98,0,98,133,122,122,122,170,0,133,134,12,12,19,5,122,12,11,1,0,0,15,21,8,0,14,12,12,12,12,19,21,6,6,6,6,18,5,21,6,6,8,98,0,0,0,0,98,15 -5,5,9,0,15,20,11,0,0,97,14,12,12,11,0,93,0,98,15,5,21,8,0,14,19,5,5,5,5,5,122,5,20,12,12,12,19,9,0,0,15,5,5,5,5,21,8,0,94$6,93,0,17,6,8,0,0,0,0,0,97,0,93,93$8,15 -5,5,9,0,15,5,20,12,12,12,19,5,5,20,12,12,11,0,15,21,8,0,0,15,5,5,21,122,122,122,122,122,5,21,6,6,6,8,0,14,19,5,5,5,21,8,0,1$5,1,98,0,0,0,0,0,14,12,11,0,0,0,0,14,19 -5,21,8,0,17,6,18,5,5,21,6,6,122,21,6,18,9,0,15,9,0,0,14,19,5,21,8,0,0,170$55,170,122,21,8,0,97,0,0,0,17,6,18,5,5,9,93,93$4,0,0,0,0,1,14,12,12,19,5,20,11,0,0$7,93,15,5 -122,8,84,98,0,98,15,5,5,9,0,0,133,9,170$50,15,20,12,19,9,0,14,19,21,6,8,0,0$53,170,170,170,122,9,0,0$25,0,0,0,84,0,0,17,6,6,8,93,93,93,0,0,0,0,17,18,5,5,5,5,9,93,0,0,15,5 -122,170,170,170,170,0,17,6,6,8,1,14,122,9,170,15,5,5,21,8,0,15,21,8,85,86,170,170&22,170,0$54,170,122,9,0,0,85$24,86,0,0,93,0,0,0,98,0,0,0,94,0,14,11,0,0,17,6,122,122,122,20,12,12,13,19,5 -122,170,170,170,0,84,0,97,0,0,0,15,133,122,134,122,122,6,8,94,0,15,9,0,0,0,170,0,0&19,0,14,19,9,97,0$26,0,97,93,1,0,98,0,0,14,12,12,12,12,12,19,20,11,93,0,171,170,170,122,5,5,21,7,18,5 -122,122,129,122,84,0,98$39,98,98,1,1,15,122,170,170,170,0,98,92,0,0,17,8,170,170,0,0,0,0,84,15,5,20,11,0,0,85,86,98,14,11,0,14,19,5,5,5,5,5,5,5,9,0,97,171,187,171:25,122,5,5,9,0,17,18 -122,9,170,170,85,86$40,0,0,0$38,14,12,19,122,170,170,170,85,86,71,91,1,0,170,0,170,0,0,0,14,12,19,5,5,20,12,12,13,12,12,19,20,12,19,5,5,5,5,5,5,5,5,20,12,11,170,171:25,171,17,18,5,9,0&22&17,0&22,15 -122,9,170,170,170>,0&20,0,98,98,17,18,21,122,84,170,85,86,92,1,0,0@15,14,11,0,170,170,0,14,19,5,5,122,122,122,122,122,133,122,122,122,5,5,122,133,122,122,122,122,122,122,122,122,122,20,12,11,0,0,17,18<,20,11,0&22&17,15 -122,20,11,85,86,98,0$37,0,93,93,15,9,0,0,0,0,0,0,0,0,0,15,9,170,170,0,0,15,122,5,5,122,71,170,170,170,170,170,192,122,122,122,122,170,170,197,170,197,170,197,170$56,191:33,122,5,5,20,11,0,0,15,5,20,12,19 -5,5,20,11,0,0@19,0,0,0,0,17,8,0,0,0,98,0,98,1,14,12,19,20,11,0,0,171,17,122,5,5,122,71,71,170,170,170,170,170,125,170,170,125,170,170,185@2,170,185@3,170,185@4,170,191:32,122,5,5,5,9,0,0,15,5,5,5,5 -5,5,5,20,11,0,14,11,93,0,0,0,0,0,0,0@14,14,12,12,19,5,5,5,20,122,0,171:24,171:24,122,18,5,122,71,170,170,170,170,170,192,122,122,122,122,170,170,195,170,195,170,195,170$57,191:32,122,5,5,21,8,0$0,14,19,5,5,5,5 -5,122,122,18,9,0,15,20,11,0,0,0,93,0,0,0,15,5,5,5,5,5,5,5,122,122,122,0,0,15,5,122,122,122,122,127,122,122,122,122,5,5,122,122,122,122,122,122,122,122,122,122,122,5,5,9,0,0,17,6,6,18,5,5 -5,122,170,17,8,0,17,18,9,97,0,133,122,122,122,122,122,122,122,5,5,5,5,5,5,5,20,11,0&10,17,6,6,18,5,9,170,15,5,5,21,6,6,6,18,21,6,6,6,6,18,5,5,5,21,6,8,0,0,0,1&10,1,15,5,5 -5,122,170,0,0,0,170,15,9,0,0,0,122,175@5@6@7,170,175:23,170,175:23,122,122,122,122,122,122,5,5,5,9,0,0,0,0,15,5,20,12,19,5,5,9,0,1,0,17,8,0,0&10,94,0,17,18,5,5,9,0&10,0,1,0,0&10,97,0&10,15,5,5 -5,122,170,0,0,0,170,122,9,98,0,0,122,195,170,195,170,195,122,186,170$33,170,170,122,5,5,21,8,0,14,11,0,17,6,6,6,6,6,18,20,11,0,94,93,0,1,97,94,0,0,15,5,21,8,0,0,0,0,0,0,1,15,5,5 -5,122,0,170$36,170,0$35,170,122,9,0,0,0,122,170,170,170,170,204,122,195:20,170,170,170,122,5,21,8,0,0,15,9,0,0,0,0,0&10,0&10,0,17,18,9,94,93,0$23,94,93,93&10,94,0,14,19,21,8,170,0,84,0,0$20,0,0,14,19,5,5 -5,20,11,0,0,0,14,122,20,11,170,170,122,122,122,122,122,252,122,122,170,170,170,122,5,9,0,0,14,19,9,0,0,0,0,97,0&10,0,0,17,8,0,93,1,0,0,0,14,12,19,21,8,170,170,84,0,0,1,0,14,19,5,5,5 -5,5,20,12,12,13,19,5,5,9,170,170,125,170,170,170,170,170@13,170,252,204,170,170,122,5,9,0&10,14,19,5,20,11,0,0,0,0,0,0,0,0,0,0,0,14,11,0,14,19,21,6,8,0,0,85,86,0,14,11,0,17,18,5,5,5 -5,5,21,6,6,7,6,6,6,133,170,170,122,122,122,125,122,122,125,122,122,122,122,122,5,9,0,17,6,6,18,9,0&10,97,0,0,0,0,0,14,11,0,14,19,9,0,17,6,8,85,86,0,0,0,1&10,14,19,9,0,0,15,5,5,5 -5,122,8,170,170,170,170,187,170,122,170,170,122,170,170,170,170,122,170,0,0&19,103,103$32,133,18,9,85,86,85&10,86&10,15,9,0,0&10,0,1,1,14,12,19,20,12,19,5,9,0,0,0,0&10,97,85,86,0,0,14,19,5,20,11,0,15,5,5,5 -5,122,170,193,170:12&9,170,170,170,170,122,170,170,122,170&21,170,170,170,122,170,170,84,103$31,103,84,15,20,12,12,12,12,19,20,12,11,0,14,12,19,21,6,6,6,6,18,9,0,0,0,0,0&10,0,0,85,86,15,5,5,21,8,0,17,18,5,5 -5,122,170,0,0,84,170,187,170,133,170,170,122,170,170,170@12,170&21,122,170,84,0,85,86,133,19,5,21,6,6,6,18,5,21,8,0,15,5,5,9,0,0&10,0,0,15,20,12,12,12,12,12,12,12,12,12,19,5,122,133,0,0,0&10,17,18,5 -5,122,85,86,84,170,170,170,170,122,170,170,122,173,170,170,170,122,170&19,170,0,84,85,86,15,21,8,0,94,0&10,15,21,8,0,0,15,21,6,8,0&10,97,0,0,15,5,5,122,122,122,122,122,133,122,5,5,5,122,0&10,0,0,0,0,15,5 -5,122,123,122,122,122,122,122,122,122,125:2,125:2,122,122,122,122,122,122,122,122,122,122,122,122,19,9,0,0,0,0,17,8,0,0,14,19,9,96,0,0,0,0,14,19,5,5,122,8,170,170&10,170,170,122,122,122,122,133,0,0,98,93,0,15,5 -5,122,170,194@20,122,170,170,170,170,170,170,170,170,170,122,5,5,5,5,5,5,5,5,5,5,9,0&10,97,0,84,0,93,0,14,19,21,8,96,0,0,0,0,17,6,18,21,122,170,170,187,170&10,170,0,15,5,5,9,98,93,0,71,71,15,5 -5,122,122,122,122,170,187,170,187,170,187,170,187,170,122,5,5,5,21,6,6,6,18,5,5,9,0,84,0,0$34,85,86,0,15,5,9,96,0,0,0,0,0,0,0,17,8,0,0,0$59,0,0,170,0,17,6,6,8,0,0,93,93,71,15,5 -5,5,5,5,122,170@11,170,170,170,170,170,170,170,170@9,122,5,5,21,8,103,0,0&10,17,18,5,20,12,11,84,1,0$45,85,86,15,5,9,0,0,0,1,14,12,11,0,0,0,0$58,0,170,0,0,0,0,0,0,0,0,0,0,0,0,93,15,5 -5,5,5,5,122,170,170,170,170,170,170,170,170@10,170,122,5,5,9,103,103,0,0,0,17,6,6,18,20,12,11,0,14,12,19,5,20,11,0,0,0&10,15,5,20,11,0,0,0,0,170&10,187,170,0,0,14,12,11,0,0,98,97,0,14,19,5 -5,5,5,5,122,170,187,170$51,187,170,187,170$52,187,170,122,5,5,9,103,0,1,0,0,0:36,0,0,17,6,6,8,0,17,6,6,6,6,8,0,0,14,19,5,5,20,11,0,0,1,170,170,170,0&10,14,19,5,20,12,11,0,0,0,15,5,5 -5,5,5,5,122,170,170,170,170,170,170,170,170,170@8,122,5,5,9,0&10,0,103,1,14,12,11,1,0,1,0,0,0,0,0,0,0,0&10,0,1,14,19,5,5,5,5,20,12,122,122,122,122,133,122,19,5,5,5,5,20,12,12,12,19,5,5 -5,122,122,122,122,122,122,122,149!3,149!4,149!5,122,122,122,122,5,5,20,12,12,12,12,19,5,20,12,12,11,0,14,12,12,12,11,0,14,12,12,19,5,21,6,6,18,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,122,5,5,5,5 -5,5,5,5,5,5,9,0,82,82,82,0,17,18,5,5,5,5,5,5,5,5,5,5,5,5,5,20,12,19,5,5,5,20,12,19,5,5,5,5,9,0,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,122,5,5,5,5 -5,5,5,5,5,5,9,0,82,82,82,0,0,17,18,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,0,14,19,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,122,5,5,5,5 -5,5,5,5,5,5,20,11,0,82,82^,82,0,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,20,12,19,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,122,5,5,5,5 -5,5,5,5,5,5,5,20,11,0,82,82,82,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,122,122,122,122,122 -5,5,5,5,5,5,5,5,9,0,82,82,82,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 -5,5,5,5,5,5,5,5,9,0,82,82,82,14,19,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 -5,5,5,5,5,5,5,5,9,0,82,82,82,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 -5,5,5,5,5,5,5,5,9,0,82,82,82,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,122,122,122,122,5,5,5,5,5,5,5,5,5,122,122,122,122,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,122,170:8&9,170:8&9,122,5,5,5,5,5,5,5,5,5,122,170:10&9,170:10&9,122,5,5,5,5,5,5,5,5,255,255,255,255,5,5,5,5,5,5,5,5,5,5,0,0,97,0,0,5,5,5,5,5,0,84,71,5,5,5,5,5,5,5,5,5,5,5 +5,122,170,170,122,5,5,5,5,5,5,5,5,5,122,170,170,122,5,5,5,5,5,5,5,255,255,5,5,255,255,255,255,5,5,0,0,5,5,5,0,93,0,94,98,0,93,93,0,93,0,71,71,5,5,122,5,5,5,5,5,5,5,5 +5,122,170,170,122,5,5,5,5,5,5,5,5,5,122,170,170,122,5,5,5,98,5,5,5,255:29,1,5,5,0,93,0,255,5,5,0,0,0,0,0,0,0,0,93,1,5,5,5,97,0,0$17,0,0,5,5,122,71,71,71,71,71,5,5,5 +5,122,170:19,170:19,132!0,5,5,5,5,5,5,5,5,5,132!1,170:19,170:19,122,133,5,5,98,5,5,5,255,0,98$18,255,255,255,0,93v,5,5,5,0,5,5,5,5,5,5,5,5,5,5,5,5,0,93,0,93,5,5,122,71,96,71,0:26&9,71,71,71,5 +5,133,170,170,170,5,5,5,5,5,5,5,5,5,5,170,170,170,0,5,5,98,5,5,5,255,255,0$19,255,94,1,0&22,0,5,5,5,1,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,5,5,5,133,96,96$14,96,96$16,96,96,71,5 +5,133,170,170,170,170,5,5,5,5,5,5,5,5,133,170,170,170,170,0,0,0,5,5,5,5,255,0,0,0,255,255,255,0,5,5,0,5,5,0,0,0,0$28,0,0,0,93,5,5,5,5,0,5,5,5,122,0$13,96,0$15,96,96,71,71,5 +5,0,0,170,0,5,5,5,5,5,5,5,5,5,122,0,0,0,170,0,0,0,0,5,5,5,255,255,255,0,0,85,86,98,5,5,0,0,0,98,5,5,0,5,5,5,0,0,0,0,1$30,0,5,5,5,5,96,0,93,93,5,5,5,5 +5,5,0,0,0,5,5,5,122,122,122,133,133,5,5,5,0,0,0,0,0,97,5,5,5,5,5,5,5,0,85,86,0,5,5,5,5,0,1,0,5,5,0$29,5,5,5,5,5,5,5,94,5,5,5,5,5,5,93,0,5,5,122,122,122 +5,5,97,0,93,98,5,5,122,170,170,170,0,5,5,5,5,94,84,0,0,5,5,5,5,5,5,5,5,0,5,5,0:28,5,5,5,5,0,0,0,5,5,1:31,5,5,5,5,5,5,5,0,5,5,5,5,5,5,0,5,5,5,122,194:27@0@1,122 +5,5,0,0,0,0,0,5,122,170,170$47,0,0,0,5,5,5,5,93,0,0,5,5,5,0,71,71,5,5,0,5,5,0,85,86,5,5,84,0,5,5,5,170,170,170,170,170,5,5,5,5,0,5,5,5,0,0,0,5,122,122,122,123,122 +5,97,97,0,98,0,0,0,122,170,0,0,0$46,93,0,5,5,5,5,5,0,0,0,0,98,0,71,5,5,5,5,5,5,5,0,0,0,0,5,122,5,170,170$3,170,170,170,170,170,5,5,5,0,5,5,0,93,5,5,5,133,170$12,170,170,122 +5,5,5,5,0,93,0,98,0,170,93,0$48,93,0,1,0,5,5,5,5,0,0,97,0,0,0,0,5,5,5,5,5,5,5,5,5,5,0,5,122,170,170,170,170,71,170,170,170,170,5,5,0,0,1,0,5,5,5,5,5,0,170$11,170,122 +5,5,5,5,5,0,93,98,0,1,71,71,92,133,84,93,0,1$49,0,1,170,170$44,0,0&19,0,1,5,5,5,5,5,5,5,5,5,5,5,93,0,133,170,170,170,71,71,71,170,170$2,170,122,5,5,0,5,5,5,5,5,93,0,0,0,170$10,122 +5,5,5,5,5,5,5,1,0,92,71,71,133,122,0,0,5,5,5,5,170,170,0,0$43,0,5,5,5,5,5,5,5,84,0,0,5,5,0,0,122,170,170,71,71,189,71,71,170,170,122,5,5,0,5,5,5,5,0,1,0,0,0,170,122 +5,5,5,5,5,5,5,0,0,93,0,93,0,122,84,5,5,5,5,5,94,98,0,0,1,5,5,5,5,5,5,0,98,0,5,5,5,0,5,122,170,170,170,71,71,71,170,170,170,122,5,0,0,5,5,0,0,170,170,0,0,122,122,122 +5,5,5,5,5,5,0,1,98,5,5,93,5,122,5,5,5,5,5,5,5,5,5,0,5,5,5,5,5,5,5,93,0,0,5,5,5,93,5,122,170,170,170,170,71,170$1,170,170,170,5,5,0,0,5,5,5,93,170,170,0,5,5,5,5 +5,5,5,5,5,5,0,5,5,5,5,0,5,5,5,5,5,0,5,5,122,122,122,0,5,134,134,133,134,5,5,93,93,93,0,93,0,0,5,5,5,170,170,170,170,170,170,170,5,5,5,0,94,5,5,5,0,0,93,5,5,5,5,5 +5,5,5,5,5,5,0,5,5,5,5,0,98,5,5,5,0,84,133,122,122,5,5,170,170,170,170,170,170,5,5,97,97,0$22,98,5,5,0,0,5,5,5,170,170,170,170,170,5,5,5,0,0,5,5,5,0,0,5,5,5,5,5,5,5 +5,5,5,5,170,0@18,0,5,5,5,5,5,5,5,5,0,98,0,170,170,132!2,5,5,0,0,0,170,170,170,5,5,0@17,93,98,93,5,5,5,0,0,5,5,5,5,5,5,0:31,5,5,5,0,1,5,5,5,0,5,5,5,5,5,5,5,5 +5,5,170,84,170,170,0,0,0,5,5,5,5,5,5,0,0$42,170,170,170,129,170,170,170,170,0,84,170,170,5,5,0,0,98,93$21,5,5,5,5,0,5,5,5,5,5,5,0,5,5,170,0,0,0,0,0,0,5,5,5,94,0,0,5,5 +5,5,196,170,170,170,170,0,0,0,98,5,5,5,0,0,0,170,170,170,122,5,170,170,85,86,0,0,0@16,5,122,0,93,0,0,5,5,5,5,0,0,0,5,5,0,0,170$27,170,170,170,5,5,98,5,5,5,5,5,0,0,0$9,0,5,5 +5,5,170,170,84,170,170,85,86,0,0,5,5,5,0,98,85,86,170$41,170,133,5,170,1,0,0,85,86,5,5,122,0,0,84,0,84,5,5,5,0,0,0,0,0,0,5,122,122,122,122,5,5,5,5,5,5,5,5,0,0,0,98,0,5 +5,5,5,0,5,5,85,86,0,0,0,0,0,0,0,98,0,98,133,122,122,122,170,0,133,134,5,5,5,5,122,5,5,1,0,0,5,5,5,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,98,0,0,0,0,98,5 +5,5,5,0,5,5,5,0,0,97,5,5,5,5,0,93,0,98,5,5,5,5,0,5,5,5,5,5,5,5,122,5,5,5,5,5,5,5,0,0,5,5,5,5,5,5,5,0,94$6,93,0,5,5,5,0,0,0,0,0,97,0,93,93$8,5 +5,5,5,0,5,5,5,5,5,5,5,5,5,5,5,5,5,0,5,5,5,0,0,5,5,5,5,122,122,122,122,122,5,5,5,5,5,5,0,5,5,5,5,5,5,5,0,1$5,1,98,0,0,0,0,0,5,5,5,0,0,0,0,5,5 +5,5,5,0,5,5,5,5,5,5,5,5,122,5,5,5,5,0,5,5,0,0,5,5,5,5,5,0,0,170$55,170,122,5,5,0,97,0,0,0,5,5,5,5,5,5,93,93$4,0,0,0,0,1,5,5,5,5,5,5,5,0,0$7,93,5,5 +122,5,84,98,0,98,5,5,5,5,0,0,133,5,170$50,5,5,5,5,5,0,5,5,5,5,5,0,0$53,170,170,170,122,5,0,0$25,0,0,0,84,0,0,5,5,5,5,93,93,93,0,0,0,0,5,5,5,5,5,5,5,93,0,0,5,5 +122,170,170,170,170,0,5,5,5,5,1,5,122,5,170,5,5,5,5,5,0,5,5,5,85,86,170,170&22,170,0$54,170,122,5,0,0,85$24,86,0,0,93,0,0,0,98,0,0,0,94,0,5,5,0,0,5,5,122,122,122,5,5,5,5,5,5 +122,170,170,170,0,84,0,97,0,0,0,5,133,122,134,122,122,5,5,94,0,5,5,0,0,0,170,0,0&19,0,5,5,5,97,0$26,0,97,93,1,0,98,0,0,5,5,5,5,5,5,5,5,5,93,0,171,170,170,122,5,5,5,5,5,5 +122,122,129,122,84,0,98$39,98,98,1,1,5,122,170,170,170,0,98,92,0,0,5,5,170,170,0,0,0,0,84,5,5,5,5,0,0,85,86,98,5,5,0,5,5,5,5,5,5,5,5,5,5,0,97,171,187,171:25,122,5,5,5,0,5,5 +122,5,170,170,85,86$40,0,0,0$38,5,5,5,122,170,170,170,85,86,71,91,1,0,170,0,170,0,0,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,170,171:25,171,5,5,5,5,0&22&17,0&22,5 +122,5,170,170,170>,0&20,0,98,98,5,5,5,122,84,170,85,86,92,1,0,0@15,5,5,0,170,170,0,5,5,5,5,122,122,122,122,122,133,122,122,122,5,5,122,133,122,122,122,122,122,122,122,122,122,5,5,5,0,0,5,5<,5,5,0&22&17,5 +122,5,5,85,86,98,0$37,0,93,93,5,5,0,0,0,0,0,0,0,0,0,5,5,170,170,0,0,5,122,5,5,122,71,170,170,170,170,170,192,122,122,122,122,170,170,197,170,197,170,197,170$56,191:33,122,5,5,5,5,0,0,5,5,5,5,5 +5,5,5,5,0,0@19,0,0,0,0,5,5,0,0,0,98,0,98,1,5,5,5,5,5,0,0,171,5,122,5,5,122,71,71,170,170,170,170,170,125,170,170,125,170,170,185@2,170,185@3,170,185@4,170,191:32,122,5,5,5,5,0,0,5,5,5,5,5 +5,5,5,5,5,0,5,5,93,0,0,0,0,0,0,0@14,5,5,5,5,5,5,5,5,122,0,171:24,171:24,122,5,5,122,71,170,170,170,170,170,192,122,122,122,122,170,170,195,170,195,170,195,170$57,191:32,122,5,5,5,5,0$0,5,5,5,5,5,5 +5,122,122,5,5,0,5,5,5,0,0,0,93,0,0,0,5,5,5,5,5,5,5,5,122,122,122,0,0,5,5,122,122,122,122,127,122,122,122,122,5,5,122,122,122,122,122,122,122,122,122,122,122,5,5,5,0,0,5,5,5,5,5,5 +5,122,170,5,5,0,5,5,5,97,0,133,122,122,122,122,122,122,122,5,5,5,5,5,5,5,5,5,0&10,5,5,5,5,5,5,170,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,0,0,1&10,1,5,5,5 +5,122,170,0,0,0,170,5,5,0,0,0,122,175@5@6@7,170,175:23,170,175:23,122,122,122,122,122,122,5,5,5,5,0,0,0,0,5,5,5,5,5,5,5,5,0,1,0,5,5,0,0&10,94,0,5,5,5,5,5,0&10,0,1,0,0&10,97,0&10,5,5,5 +5,122,170,0,0,0,170,122,5,98,0,0,122,195,170,195,170,195,122,186,170$33,170,170,122,5,5,5,5,0,5,5,0,5,5,5,5,5,5,5,5,5,0,94,93,0,1,97,94,0,0,5,5,5,5,0,0,0,0,0,0,1,5,5,5 +5,122,0,170$36,170,0$35,170,122,5,0,0,0,122,170,170,170,170,204,122,195:20,170,170,170,122,5,5,5,0,0,5,5,0,0,0,0,0&10,0&10,0,5,5,5,94,93,0$23,94,93,93&10,94,0,5,5,5,5,170,0,84,0,0$20,0,0,5,5,5,5 +5,5,5,0,0,0,5,122,5,5,170,170,122,122,122,122,122,252,122,122,170,170,170,122,5,5,0,0,5,5,5,0,0,0,0,97,0&10,0,0,5,5,0,93,1,0,0,0,5,5,5,5,5,170,170,84,0,0,1,0,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,170,170,125,170,170,170,170,170@13,170,252,204,170,170,122,5,5,0&10,5,5,5,5,5,0,0,0,0,0,0,0,0,0,0,0,5,5,0,5,5,5,5,5,0,0,85,86,0,5,5,0,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,133,170,170,122,122,122,125,122,122,125,122,122,122,122,122,5,5,0,5,5,5,5,5,0&10,97,0,0,0,0,0,5,5,0,5,5,5,0,5,5,5,85,86,0,0,0,1&10,5,5,5,0,0,5,5,5,5 +5,122,5,170,170,170,170,187,170,122,170,170,122,170,170,170,170,122,170,0,0&19,103,103$32,133,5,5,85,86,85&10,86&10,5,5,0,0&10,0,1,1,5,5,5,5,5,5,5,5,0,0,0,0&10,97,85,86,0,0,5,5,5,5,5,0,5,5,5,5 +5,122,170,193,170:12&9,170,170,170,170,122,170,170,122,170&21,170,170,170,122,170,170,84,103$31,103,84,5,5,5,5,5,5,5,5,5,5,0,5,5,5,5,5,5,5,5,5,5,0,0,0,0,0&10,0,0,85,86,5,5,5,5,5,0,5,5,5,5 +5,122,170,0,0,84,170,187,170,133,170,170,122,170,170,170@12,170&21,122,170,84,0,85,86,133,5,5,5,5,5,5,5,5,5,5,0,5,5,5,5,0,0&10,0,0,5,5,5,5,5,5,5,5,5,5,5,5,5,122,133,0,0,0&10,5,5,5 +5,122,85,86,84,170,170,170,170,122,170,170,122,173,170,170,170,122,170&19,170,0,84,85,86,5,5,5,0,94,0&10,5,5,5,0,0,5,5,5,5,0&10,97,0,0,5,5,5,122,122,122,122,122,133,122,5,5,5,122,0&10,0,0,0,0,5,5 +5,122,123,122,122,122,122,122,122,122,125:2,125:2,122,122,122,122,122,122,122,122,122,122,122,122,5,5,0,0,0,0,5,5,0,0,5,5,5,96,0,0,0,0,5,5,5,5,122,5,170,170&10,170,170,122,122,122,122,133,0,0,98,93,0,5,5 +5,122,170,194@20,122,170,170,170,170,170,170,170,170,170,122,5,5,5,5,5,5,5,5,5,5,5,0&10,97,0,84,0,93,0,5,5,5,5,96,0,0,0,0,5,5,5,5,122,170,170,187,170&10,170,0,5,5,5,5,98,93,0,71,71,5,5 +5,122,122,122,122,170,187,170,187,170,187,170,187,170,122,5,5,5,5,5,5,5,5,5,5,5,0,84,0,0$34,85,86,0,5,5,5,96,0,0,0,0,0,0,0,5,5,0,0,0$59,0,0,170,0,5,5,5,5,0,0,93,93,71,5,5 +5,5,5,5,122,170@11,170,170,170,170,170,170,170,170@9,122,5,5,5,5,103,0,0&10,5,5,5,5,5,5,84,1,0$45,85,86,5,5,5,0,0,0,1,5,5,5,0,0,0,0$58,0,170,0,0,0,0,0,0,0,0,0,0,0,0,93,5,5 +5,5,5,5,122,170,170,170,170,170,170,170,170@10,170,122,5,5,5,103,103,0,0,0,5,5,5,5,5,5,5,0,5,5,5,5,5,5,0,0,0&10,5,5,5,5,0,0,0,0,170&10,187,170,0,0,5,5,5,0,0,98,97,0,5,5,5 +5,5,5,5,122,170,187,170$51,187,170,187,170$52,187,170,122,5,5,5,103,0,1,0,0,0:36,0,0,5,5,5,5,0,5,5,5,5,5,5,0,0,5,5,5,5,5,5,0,0,1,170,170,170,0&10,5,5,5,5,5,5,0,0,0,5,5,5 +5,5,5,5,122,170,170,170,170,170,170,170,170,170@8,122,5,5,5,0&10,0,103,1,5,5,5,1,0,1,0,0,0,0,0,0,0,0&10,0,1,5,5,5,5,5,5,5,5,122,122,122,122,133,122,5,5,5,5,5,5,5,5,5,5,5,5 +5,122,122,122,122,122,122,122,149!3,149!4,149!5,122,122,122,122,5,5,5,5,5,5,5,5,5,5,5,5,5,0,5,5,5,5,5,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,122,5,5,5,5 +5,5,5,5,5,5,5,0,82,82,82,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,122,5,5,5,5 +5,5,5,5,5,5,5,0,82,82,82,0,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,122,5,5,5,5 +5,5,5,5,5,5,5,5,0,82,82^,82,0,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,122,5,5,5,5 +5,5,5,5,5,5,5,5,5,0,82,82,82,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,122,122,122,122,122 +5,5,5,5,5,5,5,5,5,0,82,82,82,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,0,82,82,82,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,0,82,82,82,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,0,82,82,82,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 From 245d91808e1365b7d638b881baa8ff70813f4615 Mon Sep 17 00:00:00 2001 From: Nat Quayle Nelson Date: Wed, 29 Jan 2025 19:57:19 -0600 Subject: [PATCH 5/5] implement the rest of smart border sides --- src/game/boe.graphics.cpp | 76 +++++++++++++++++++++++++++++++++------ src/game/boe.locutils.cpp | 6 ++-- src/game/boe.locutils.hpp | 2 +- 3 files changed, 70 insertions(+), 14 deletions(-) diff --git a/src/game/boe.graphics.cpp b/src/game/boe.graphics.cpp index f93092a60..3ef5f0c31 100644 --- a/src/game/boe.graphics.cpp +++ b/src/game/boe.graphics.cpp @@ -883,13 +883,26 @@ void draw_terrain(short mode) { draw_trim(q,r,trim + 50,spec_terrain); }else if(trim == eTrimType::SMART_BORDER) { std::map neighbor_terrains; + std::map diag_neighbor_terrains; std::map ground_candidates; - neighbor_terrains[DIR_N] = coord_to_ter(where_draw.x, where_draw.y - 1); - neighbor_terrains[DIR_E] = coord_to_ter(where_draw.x + 1, where_draw.y); - neighbor_terrains[DIR_S] = coord_to_ter(where_draw.x, where_draw.y + 1); - neighbor_terrains[DIR_W] = coord_to_ter(where_draw.x - 1, where_draw.y); + auto count_ground_candidate = [&ground_candidates](ter_num_t ter) { + if(ground_candidates.find(ter) == ground_candidates.end()){ + ground_candidates[ter] = 0; + } + ground_candidates[ter]++; + }; + + neighbor_terrains[DIR_N] = coord_to_ter(where_draw.x, where_draw.y - 1, spec_terrain); + diag_neighbor_terrains[DIR_NE] = coord_to_ter(where_draw.x + 1, where_draw.y - 1, spec_terrain); + neighbor_terrains[DIR_E] = coord_to_ter(where_draw.x + 1, where_draw.y, spec_terrain); + diag_neighbor_terrains[DIR_SE] = coord_to_ter(where_draw.x + 1, where_draw.y + 1, spec_terrain); + neighbor_terrains[DIR_S] = coord_to_ter(where_draw.x, where_draw.y + 1, spec_terrain); + diag_neighbor_terrains[DIR_SW] = coord_to_ter(where_draw.x - 1, where_draw.y + 1, spec_terrain); + neighbor_terrains[DIR_W] = coord_to_ter(where_draw.x - 1, where_draw.y, spec_terrain); + diag_neighbor_terrains[DIR_NW] = coord_to_ter(where_draw.x - 1, where_draw.y - 1, spec_terrain); - auto only_match = [&neighbor_terrains, &ground_candidates, spec_terrain](std::vector directions){ + // Check that the given directions all match, and are the only cardinal directions that do + auto only_match = [&neighbor_terrains, &ground_candidates, &count_ground_candidate, spec_terrain](std::vector directions){ bool count_candidates = ground_candidates.empty(); for(auto dir_ter_pair : neighbor_terrains){ if(dir_ter_pair.second == spec_terrain){ @@ -899,22 +912,65 @@ void draw_terrain(short mode) { }else{ // This is not the border terrain, so it could be what we transition to if(count_candidates){ - if(ground_candidates.find(dir_ter_pair.second) == ground_candidates.end()){ - ground_candidates[dir_ter_pair.second] = 0; - } - ground_candidates[dir_ter_pair.second]++; + count_ground_candidate(dir_ter_pair.second); } if(std::find(directions.begin(), directions.end(), dir_ter_pair.first) != directions.end()){ return false; } } } + + return true; + }; + // Check that only one corner does not match (making this an inner corner) + auto corner_no_match = [&diag_neighbor_terrains, &ground_candidates, &count_ground_candidate, spec_terrain](eDirection corner) { + bool count_candidates = ground_candidates.empty(); + std::map copy_diag_neighbors = diag_neighbor_terrains; + auto ter = copy_diag_neighbors[corner]; + copy_diag_neighbors.erase(corner); + if(ter == spec_terrain){ + return false; + } + if(count_candidates) + count_ground_candidate(ter); + for(auto dir_ter_pair : copy_diag_neighbors){ + if(dir_ter_pair.second != spec_terrain){ + return false; + } + } return true; }; int offset = 0; - if(only_match({DIR_N, DIR_S, DIR_W})){ + // 4 cardinal walls + if(only_match({DIR_N, DIR_W, DIR_S})){ offset = 3; + }else if(only_match({DIR_N, DIR_W, DIR_E})){ + offset = 1; + }else if(only_match({DIR_S, DIR_W, DIR_E})){ + offset = 5; + }else if(only_match({DIR_N, DIR_E, DIR_S})){ + offset = 7; + } + // Outer corners + else if(only_match({DIR_N, DIR_W})){ + offset = 2; + }else if(only_match({DIR_N, DIR_E})){ + offset = 8; + }else if(only_match({DIR_S, DIR_W})){ + offset = 4; + }else if(only_match({DIR_S, DIR_E})){ + offset = 6; + } + // Inner corners + else if(corner_no_match(DIR_SE)){ + offset = 12; + }else if(corner_no_match(DIR_NW)){ + offset = 10; + }else if(corner_no_match(DIR_NE)){ + offset = 11; + }else if(corner_no_match(DIR_SW)){ + offset = 9; } if(!ground_candidates.empty()){ current_ground = univ.scenario.get_ground_from_ter(ground_candidates.begin()->first); diff --git a/src/game/boe.locutils.cpp b/src/game/boe.locutils.cpp index f338f97ac..4fa8a11b7 100644 --- a/src/game/boe.locutils.cpp +++ b/src/game/boe.locutils.cpp @@ -212,12 +212,12 @@ short combat_obscurity(short x, short y) { return sight_obscurity(x,y); } -ter_num_t coord_to_ter(short x,short y) { +ter_num_t coord_to_ter(short x,short y,ter_num_t out_of_bounds) { if(is_out()) { - if(!univ.out.is_on_map(x, y)) return 0; + if(!univ.out.is_on_map(x, y)) return out_of_bounds; return univ.out[x][y]; } - if(!univ.town.is_on_map(x, y)) return 0; + if(!univ.town.is_on_map(x, y)) return out_of_bounds; return univ.town->terrain(x,y); } diff --git a/src/game/boe.locutils.hpp b/src/game/boe.locutils.hpp index ecf6e0c5d..8ecce1657 100644 --- a/src/game/boe.locutils.hpp +++ b/src/game/boe.locutils.hpp @@ -20,7 +20,7 @@ bool is_lava(short x,short y); short sight_obscurity(short x,short y); short can_see_light(location p1, location p2, std::function get_obscurity); short combat_obscurity(short x,short y); -ter_num_t coord_to_ter(short x,short y); +ter_num_t coord_to_ter(short x,short y,ter_num_t out_of_bounds=0); bool is_container(location loc); void update_explored(location dest); bool is_blocked(location to_check);