From: Christian Heller Date: Wed, 11 Mar 2015 21:23:09 +0000 (+0100) Subject: 7DRL: Add '_' altar symbol to map, declare it walkable. X-Git-Url: https://plomlompom.com/repos/?p=plomrogue;a=commitdiff_plain;h=62997c25342a03e2bd62f297af643c7044b45ab0 7DRL: Add '_' altar symbol to map, declare it walkable. --- diff --git a/roguelike-server b/roguelike-server index 2f95b2c..887bf7e 100755 --- a/roguelike-server +++ b/roguelike-server @@ -672,8 +672,9 @@ def actor_move(t): t["T_POSY"], t["T_POSX"]) if 1 == move_result[0]: pos = (move_result[1] * world_db["MAP_LENGTH"]) + move_result[2] - passable = "." == chr(world_db["MAP"][pos]) or \ - ":" == chr(world_db["MAP"][pos]) # # + passable = ("." == chr(world_db["MAP"][pos]) or + ":" == chr(world_db["MAP"][pos]) or # # + "_" == chr(world_db["MAP"][pos])) # # hitted = [id for id in world_db["Things"] if world_db["Things"][id] != t if world_db["Things"][id]["T_LIFEPOINTS"] @@ -1336,6 +1337,9 @@ def command_makeworld(seed_string): return world_db["Things"] = {} make_map() + world_db["ALTAR"] = free_pos() # # + world_db["MAP"][world_db["ALTAR"][0] * world_db["MAP_LENGTH"] # # + + world_db["ALTAR"][1]] = ord("_") # # world_db["WORLD_ACTIVE"] = 1 world_db["TURN"] = 1 for i in range(world_db["ThingTypes"][playertype]["TT_START_NUMBER"]): @@ -1351,7 +1355,6 @@ def command_makeworld(seed_string): id = id_setter(-1, "Things") plantness = world_db["ThingTypes"][type]["TT_PROLIFERATE"] # # world_db["Things"][id] = new_Thing(type, free_pos(plantness)) - world_db["ALTAR"] = free_pos() # # strong_write(io_db["file_out"], "NEW_WORLD\n") @@ -1362,6 +1365,7 @@ def command_altar(str_y, str_x): # # if None != y and None != x: if y < world_db["MAP_LENGTH"] and x < world_db["MAP_LENGTH"]: world_db["ALTAR"] = (y, x) + world_db["MAP"][y * world_db["MAP_LENGTH"] + x] = ord("_") else: print("Ignoring: Position is outside of map.") diff --git a/src/client/draw_wins.c b/src/client/draw_wins.c index b636678..24fae13 100644 --- a/src/client/draw_wins.c +++ b/src/client/draw_wins.c @@ -408,14 +408,15 @@ extern void draw_win_map(struct Win * win) set_ch_on_yx(win, y, x * 2 + (y % 2) + 1, ' ' | a); } } - init_pair(4, COLOR_BLUE, COLOR_BLACK); - init_pair(5, COLOR_YELLOW, COLOR_BLACK); - init_pair(6, COLOR_RED, COLOR_WHITE); - init_pair(7, COLOR_WHITE, COLOR_RED); - init_pair(8, COLOR_GREEN, COLOR_BLACK); - init_pair(9, COLOR_MAGENTA, COLOR_BLACK); - init_pair(10, COLOR_CYAN, COLOR_BLACK); - init_pair(11, COLOR_BLACK, COLOR_GREEN); + init_pair(4, COLOR_BLUE, COLOR_BLACK); // + init_pair(5, COLOR_YELLOW, COLOR_BLACK); // + init_pair(6, COLOR_RED, COLOR_WHITE); // + init_pair(7, COLOR_WHITE, COLOR_RED); // + init_pair(8, COLOR_GREEN, COLOR_BLACK); // + init_pair(9, COLOR_MAGENTA, COLOR_BLACK); // + init_pair(10, COLOR_CYAN, COLOR_BLACK); // + init_pair(11, COLOR_BLACK, COLOR_GREEN); // + init_pair(12, COLOR_BLACK, COLOR_MAGENTA); // for (y = 0; y < world.map.length; y++) { for (x = 0; x < world.map.length; x++) @@ -453,6 +454,10 @@ extern void draw_win_map(struct Win * win) { // a = COLOR_PAIR(11); // } // + else if ('_' == c) // + { // + a = COLOR_PAIR(12); // + } // // char c = world.map.cells[y*world.map.length + x]; set_ch_on_yx(win, y, x * 2 + (y % 2), c | a); // set_ch_on_yx(win, y, x * 2 + (y % 2) + 1, ' ' | a); // diff --git a/src/server/libplomrogue.c b/src/server/libplomrogue.c index 8e4ee9b..e8ff9ae 100644 --- a/src/server/libplomrogue.c +++ b/src/server/libplomrogue.c @@ -611,7 +611,7 @@ extern uint8_t set_cells_passable_on_memmap_to_65534_on_scoremap(char * mem_map) for (pos = 0; pos < map_size; pos++) { char c = mem_map[pos]; // - if ('.' == c || ':' == c) // + if ('.' == c || ':' == c || '_' == c) // //if ('.' == mem_map[pos]) { score_map[pos] = 65534; diff --git a/testing/ref_end b/testing/ref_end index 971d69e..8fa6e03 100644 --- a/testing/ref_end +++ b/testing/ref_end @@ -30,7 +30,7 @@ MAP 23 "~~~~~~~~~~.~.~.......................XX.X...XXX.::.....XX...~~~~" MAP 24 "~~~~~~~~~~~.~..~.......................XXX..XX.::...........~.~~" MAP 25 "~~~~~~~...........~.......................:XX.X::.X.X::::.....~~" MAP 26 "~~~~~~~~..........................X.X..X..::.XX:.::XXX.:...~X.~~" -MAP 27 "~~~~~~~~........X.................XX......::::.:::::..::::XX~~~~" +MAP 27 "~~~~~~~~........X.................XX....._::::.:::::..::::XX~~~~" MAP 28 "~~~~~~~~~........XX.........XX..........::.::::::::....:::~~~~~~" MAP 29 "~~~~~~~:~.::.....XX..........X...X...::::..::::X::....:::~~~~~~~" MAP 30 "~~~~~~~::X~:.....................X:::..:..:::XX:XXX...:::~~~~~~~" @@ -545,7 +545,7 @@ T_MEMMAP 23 "~~~~~~~~~~.~.~.......................XX .. .. " T_MEMMAP 24 "~~~~~~~~~~~.~..~.......................XXX.. .. ~~" T_MEMMAP 25 "~~~~~~~...........~................ .. ..:XX :.X .... " T_MEMMAP 26 "~~~~~~~~..........................X ..X..::.XX:.::X :...~X " -T_MEMMAP 27 "~~~~~~~~........X.................XX......::::.:::::..::: ~~~" +T_MEMMAP 27 "~~~~~~~~........X.................XX....._::::.:::::..::: ~~~" T_MEMMAP 28 "~~~~~~~~~........XX.........XX..........::.:::::::: ~~~~~~" T_MEMMAP 29 "~~~~~~~:~.::.....XX..........X...X...::::..::::X ::~~~~~~~" T_MEMMAP 30 "~~~~~~~::X~:.....................X:::..:..:::X .:::~~~~~~~" @@ -754,7 +754,7 @@ T_MEMMAP 23 "~~~~~~~~~~.~.~.......................XX.X...XXX.::.....XX...~~~~" T_MEMMAP 24 "~~~~~~~~~~~.~..~...................... XXX..XX.::...........~.~~" T_MEMMAP 25 "~~~~~~~...........~.......................:XX.X::.X.X::::.....~~" T_MEMMAP 26 "~~~~~~~~.................. ...... X..X..::.XX:.::XXX.:...~X.~~" -T_MEMMAP 27 "~~~~~~~~ X.................XX......::::.:::::..::::XX~~~~" +T_MEMMAP 27 "~~~~~~~~ X.................XX....._::::.:::::..::::XX~~~~" T_MEMMAP 28 "~~~~~~~~~.. X......... X..........::.::::::::....:::~~~~~~" T_MEMMAP 29 " ~ ~~~:~.::... X..........X. X...::::..::::X::....:::~~~~~~~" T_MEMMAP 30 " ~ : X ..................X:::..:..:::XX:XXX...:::~~~~~~~" @@ -960,7 +960,7 @@ T_MEMMAP 23 " ~~~.~.~...... ....... ...X .. . .XX...~~~~" T_MEMMAP 24 " ~.~..~...... ...... ....XXX.. : ......~. ~" T_MEMMAP 25 " ......~.... ..... .. ...:X : :::... ~~" T_MEMMAP 26 " ......... .... X..X..::. . XXX.:... .~~" -T_MEMMAP 27 " ......... ...XX......:: : :..::::XX~~~~" +T_MEMMAP 27 " ......... ...XX....._:: : :..::::XX~~~~" T_MEMMAP 28 " X......... .......::.:: : ....:::~~~~~~" T_MEMMAP 29 " X..........X. X...::::..: X ...:::~~~~~~~" T_MEMMAP 30 "~~ ............X:::..:..:: XX: XX...:::~~~~~~~" @@ -1175,7 +1175,7 @@ T_MEMMAP 23 "~~~~~~~~~~.~.~.......................XX.X...XXX.::.....XX...~~~~" T_MEMMAP 24 "~~~~~~~~~~~.~..~.......................XXX..XX.::...........~.~~" T_MEMMAP 25 "~~~~~~~...........~.......................:XX.X::.X.X::::.....~~" T_MEMMAP 26 "~~~~~~~~..........................X.X..X..::.XX:.::XXX.:...~X ~~" -T_MEMMAP 27 "~~~~~~~~........X.................XX......::::.:::::..::::XX ~" +T_MEMMAP 27 "~~~~~~~~........X.................XX....._::::.:::::..::::XX ~" T_MEMMAP 28 "~~~~~~~~~...... XX.........XX..........::.::::::::....:::~~~~~~" T_MEMMAP 29 "~~~~~~~:~.::. X......... X...X...::::..::::X::....:::~~~~~~~" T_MEMMAP 30 "~~~~~~~: X~: ........... ....X:::..:..:::XX:XXX...:::~~~~~~~" @@ -1367,7 +1367,7 @@ T_MEMMAP 23 "~~~~~~~~~~.~.~.......................X .. XX.::.....XX...~~~~" T_MEMMAP 24 "~~~~~~~~~~~.~..~.......................XXX.. X.::...........~.~~" T_MEMMAP 25 "~~~~~~~...........~.............. .......:XX X::.X.X::::.....~~" T_MEMMAP 26 "~~ ~ ...................... X..X..::.XX:.::XXX.:...~X.~~" -T_MEMMAP 27 "~~~~~~ X.................XX......::::.:::::..::::XX~~~~" +T_MEMMAP 27 "~~~~~~ X.................XX....._::::.:::::..::::XX~~~~" T_MEMMAP 28 "~~~~~~~~~.. X......... X..........::.::::::::....:::~~~~~~" T_MEMMAP 29 " ~ ~~~:~.::... X..........X. X...::::..::::X::....:::~~~~~~~" T_MEMMAP 30 "~~ ~ : X~ ..................X:::..:..:::XX:XXX...:::~~~~~~~" @@ -1587,7 +1587,7 @@ T_MEMMAP 23 "~~~~~~~~~~.~.~.......................XX.X...XXX.::.....X .~~~~" T_MEMMAP 24 "~~~~~~~~~~~.~..~.......................XXX..XX.::...........~.~~" T_MEMMAP 25 "~~~~~~~...........~.......................:XX.X::.X.X::: ....~~" T_MEMMAP 26 "~~~~~~~~..........................X.X..X..::.XX:.::X :...~X " -T_MEMMAP 27 "~~~~~~~~........X.................XX......::::.:::::..::::X " +T_MEMMAP 27 "~~~~~~~~........X.................XX....._::::.:::::..::::X " T_MEMMAP 28 "~~~~~~~~~...... XX.........XX..........::.::::::::....:::~~~~~~" T_MEMMAP 29 "~~~~~~~:~.::. X........ X...X...::::..::::X::....:::~~~~~~~" T_MEMMAP 30 "~~~~~~~: X~: ......... ...X:::..:..:::XX:XXX...:::~~~~~~~" @@ -1779,7 +1779,7 @@ T_MEMMAP 23 "~~~~~~~~~~.~.~.......................XX.X...X ....X ..~~~~" T_MEMMAP 24 "~~~~~~~~~~~.~..~.......................XXX..X .... .~~" T_MEMMAP 25 "~~~~~~~...........~.......................:XX .X ::..... " T_MEMMAP 26 "~~~~~~~~..........................X.X..X..::.X .::X :...~X " -T_MEMMAP 27 "~~~~~~~~........X.................XX......::::.:::::..::::X " +T_MEMMAP 27 "~~~~~~~~........X.................XX....._::::.:::::..::::X " T_MEMMAP 28 "~~~~~~~~~...... XX.........XX..........::.::::::::....:::~~~~~~" T_MEMMAP 29 "~~~~~~~:~.::.... X..........X...X...::::..::::X :....: ~~" T_MEMMAP 30 "~~~~~~~: X~:.....................X:::..:..:::XX:X ..:::~~~~~~~" @@ -2003,7 +2003,7 @@ T_MEMMAP 23 "~~~~~~~~~~.~. ................. X.X...XXX.::.....XX...~~~~" T_MEMMAP 24 "~~~~~~~~~~~.~..~ ............ .. .... XXX..XX.::...........~.~~" T_MEMMAP 25 "~~~~~~ .......~............. ......:XX.X::.X.X::::.....~~" T_MEMMAP 26 "~~~~ .................... X..X..:: XX:.::XXX.:...~X ~~" -T_MEMMAP 27 "~~~~ ~ .....X............ ....XX......::::.:::::..::::XX ~~~" +T_MEMMAP 27 "~~~~ ~ .....X............ ....XX....._::::.:::::..::::XX ~~~" T_MEMMAP 28 "~~~~~~~~~...... XX.........XX..........::.::::::::....:::~~~~~~" T_MEMMAP 29 " ~~~:~.::... X......... . X...::::..::::X::....:::~~~~~~~" T_MEMMAP 30 " ~~: X~: .................. X:::..:..:::XX:XXX...:::~~~~~~~" @@ -2234,7 +2234,7 @@ T_MEMMAP 23 "~~~~~~~~~~.~.~. ................. X.X...XXX.::.....XX...~~~~" T_MEMMAP 24 "~~~~~~~~~~~.~..~...................... XXX..XX.::...........~.~~" T_MEMMAP 25 "~~~~~~~...........~............. ......:XX.X::.X.X::::.....~~" T_MEMMAP 26 "~~~~~~~~......................... X..X..::.XX:.::XXX.:...~X.~~" -T_MEMMAP 27 "~~~~~~~~.. .....X.................XX......::::.:::::..::::XX~~~~" +T_MEMMAP 27 "~~~~~~~~.. .....X.................XX....._::::.:::::..::::XX~~~~" T_MEMMAP 28 "~~~~~~~~~...... XX.........XX..........::.::::::::....:::~~~~~~" T_MEMMAP 29 "~~~~~~~:~.::... X......... X.. X...::::..::::X::....:::~~~~~~~" T_MEMMAP 30 "~~~~~~~: X~: ................. X:::..:..:::XX:XXX...:::~~~~~~~" @@ -2478,7 +2478,7 @@ T_MEMMAP 23 "~~~~~~~~~~.~.~.......................XX ... :... ..~~~~" T_MEMMAP 24 "~~~~~~~~~~~.~..~.......................XXX.. :... ...~.~ " T_MEMMAP 25 "~~~~~~~...........~................ ......:XX ::.X :.... " T_MEMMAP 26 "~~~~~~~~..........................X X..X..::.XX:.::X :...~ ~" -T_MEMMAP 27 "~~~~~~~~........X.................XX......::::.:::: ::::XX ~~~" +T_MEMMAP 27 "~~~~~~~~........X.................XX....._::::.:::: ::::XX ~~~" T_MEMMAP 28 "~~~~~~~~~........XX.........XX... ......::.:::::: ..:::~~~~~~" T_MEMMAP 29 "~~~~~~~:~.::.....XX..........X...X...::::..::: X ..:::~~~~~~~" T_MEMMAP 30 "~~~~~~~::X~:.....................X:::..:..:::X : ...:::~~~~~~~" @@ -2673,7 +2673,7 @@ T_MEMMAP 23 "~~~~~~~~~~.~.~.......................XX.X...XXX.::.....XX...~~~~" T_MEMMAP 24 "~~~~~~~~~~~.~..~.......................XXX..X ::....... ..~.~~" T_MEMMAP 25 "~~~~~~~...........~.......................:XX X::.X.X:::: ...~~" T_MEMMAP 26 "~~~~~~~~..........................X.X..X..::.X :.::XX .:...~X.~~" -T_MEMMAP 27 "~~~~~~~~....... X.................XX......::::.:::::..::::X ~~" +T_MEMMAP 27 "~~~~~~~~....... X.................XX....._::::.:::::..::::X ~~" T_MEMMAP 28 "~~~~~~~~~..... XX.........XX..........::.::::::::....:::~~~~~~" T_MEMMAP 29 "~~~~~~~:~.:: X........ X...X...::::..::::X::....:::~~~~~~~" T_MEMMAP 30 "~~~~~~~: X~ .......... ....X:::..:..:::XX XXX...:::~~~~~~~" @@ -2883,7 +2883,7 @@ T_MEMMAP 23 "~~~~~~~~~~.~.~.......................XX ... X.::.....XX...~~~~" T_MEMMAP 24 "~~~~~~~~~~~.~..~.......................XXX.. ::.. .......~.~~" T_MEMMAP 25 "~~~~~~~...........~............... ......:XX ::.X ::::.....~~" T_MEMMAP 26 "~~~~~~~~..... ............ ...... X..X..::.XX:.::XXX.:...~X.~~" -T_MEMMAP 27 "~~~~~~~~..... . .......... .....XX......::::.: :::..::::XX~~~~" +T_MEMMAP 27 "~~~~~~~~..... . .......... .....XX....._::::.: :::..::::XX~~~~" T_MEMMAP 28 "~~~~~~~~~...... . X.........XX..........::.::::: :....:::~~~~~~" T_MEMMAP 29 "~~~~~~~:~.::... . X..........X.. X...::::..:: X ....:::~~~~~~~" T_MEMMAP 30 "~~~~~~~::X~:...... .............X:::..:..:::XX: XX...:::~~~~~~~" @@ -3099,7 +3099,7 @@ T_MEMMAP 23 "~~~~~~~~~~.~.~.......................X X... .. " T_MEMMAP 24 "~~~~~~~~~~~.~..~.......................X ..X .. " T_MEMMAP 25 "~~~~~~~...........~.......................:XX :.X " T_MEMMAP 26 "~~~~~~~~..........................X.X..X..::.XX:.::X " -T_MEMMAP 27 "~~~~~~~~........X.................XX .....::::.:::: X ~~~" +T_MEMMAP 27 "~~~~~~~~........X.................XX ...._::::.:::: X ~~~" T_MEMMAP 28 "~~~~~~~~~........XX.........XX..........::.:::::: :~~~~~~" T_MEMMAP 29 "~~~~~~~:~.::.....XX..........X...X...::::..::::X : :::~~~~~~~" T_MEMMAP 30 "~~~~~~~::X~:.....................X ::..:..:::XX X ..:::~~~~~~~" @@ -3315,7 +3315,7 @@ T_MEMMAP 23 "~~~~~~~~~~.~.~.......................XX .. : .. .~~~~" T_MEMMAP 24 "~~~~~~~~~~~.~..~.......................XXX.. : . ..~.~ " T_MEMMAP 25 "~~~~~~~........... ......................:XX ::.X .... " T_MEMMAP 26 "~~~~~~~~......... .............X X..X..::.XX:.::X ...~ ~" -T_MEMMAP 27 "~~~~~~~~........X .............XX......::::.:::: ::::X ~~~" +T_MEMMAP 27 "~~~~~~~~........X .............XX....._::::.:::: ::::X ~~~" T_MEMMAP 28 "~~~~~~~~~........X .......XX... ......::.:::::: .:::~~~~~~" T_MEMMAP 29 "~~~~~~~:~.::.....XX..........X...X...::::..::: ..:::~~~~~~~" T_MEMMAP 30 "~~~~~~~::X~:.....................X:::..:..:::X ...:::~~~~~~~" @@ -3520,7 +3520,7 @@ T_MEMMAP 23 "~~~~~~~~~~.~.~.......................XX ... XX.::... XX...~~~~" T_MEMMAP 24 "~~~~~~~~~~~.~..~.......................XXX..X ::... .....~.~~" T_MEMMAP 25 "~~~~~~~...........~.......................:XX X::.X :::.....~~" T_MEMMAP 26 "~~~~~~~~..........................X X..X..::.XX:.::XXX.:...~X ~~" -T_MEMMAP 27 "~~~~~~~ ... X.................XX......::::.:::::..::::XX~~~~" +T_MEMMAP 27 "~~~~~~~ ... X.................XX....._::::.:::::..::::XX~~~~" T_MEMMAP 28 "~~~~~~~~~...... X.........XX..........::.::::::::....:::~~~~~~" T_MEMMAP 29 "~~~~~~~:~.::... X..........X...X...::::..::::X::....:::~~~~~~~" T_MEMMAP 30 " ~: X~:.....................X:::..:..:::XX:XXX...:::~~~~~~~" @@ -3740,7 +3740,7 @@ T_MEMMAP 23 "~~~~~~~~~~.~.~.......................XX.X...XXX.::.....XX...~~~~" T_MEMMAP 24 "~~~~~~~~~~~.~..~.......................XXX..XX.::...........~.~~" T_MEMMAP 25 "~~~~~~~...........~.......................:XX.X::.X.X:::: ....~~" T_MEMMAP 26 "~~~~~~~~..........................X.X..X..::.XX:.::XX .:.. X.~~" -T_MEMMAP 27 "~~~~~~~~........X................ XX......::::.:::::..::::X ~~" +T_MEMMAP 27 "~~~~~~~~........X................ XX....._::::.:::::..::::X ~~" T_MEMMAP 28 "~~~~~~~~~...... XX.........XX..........::.::::::::....:::~~~~~~" T_MEMMAP 29 "~~~~~~~:~.::. X........ X...X...::::..::::X::....:::~~~~~~~" T_MEMMAP 30 "~~~~~~~: X~: .......... ...X:::..:..:::XX:XXX...:::~~~~~~~" @@ -4127,7 +4127,7 @@ T_MEMMAP 23 "~~~~~~~~~~.~.~.......................XX.X...XXX.::.....XX...~~~~" T_MEMMAP 24 "~~~~~~~~~~~.~..~.......................XXX..XX.::...........~.~~" T_MEMMAP 25 "~~~~~~~...........~.......................:XX.X::.X.X::::.....~~" T_MEMMAP 26 "~~~~~~~~..........................X.X..X..::.XX:.::XXX.:...~X.~~" -T_MEMMAP 27 "~~~~~~~~........X.................XX......::::.:::::..::::XX ~~~" +T_MEMMAP 27 "~~~~~~~~........X.................XX....._::::.:::::..::::XX ~~~" T_MEMMAP 28 "~~~~~~~~~...... XX.........XX..........::.::::::::....:::~~~~~~" T_MEMMAP 29 "~~~~~~~:~.::. X........ X...X...::::..::::X::....:::~~~~~~~" T_MEMMAP 30 "~~~~~~~: X~: ......... ...X:::..:..:::XX:XXX...:::~~~~~~~" @@ -4332,7 +4332,7 @@ T_MEMMAP 23 "~~~~~~~~~~.~.~.......................XX.X...XXX.::.....XX...~~~~" T_MEMMAP 24 "~~~~~~~~~~~.~..~.......................XXX..XX.::...........~.~~" T_MEMMAP 25 "~~~~~~~...........~.......................:XX.X::.X.X::::.....~~" T_MEMMAP 26 "~~~~~~~~..........................X.X..X..::.XX:.::XXX.:...~X.~~" -T_MEMMAP 27 "~~~~~~~~........X.................XX......::::.:::::..::::XX~~~~" +T_MEMMAP 27 "~~~~~~~~........X.................XX....._::::.:::::..::::XX~~~~" T_MEMMAP 28 "~~~~~~~~~........XX.........XX..........::.::::::::....:::~~~~~~" T_MEMMAP 29 "~~~~~~~:~.::.... X..........X...X...::::..::::X::....:::~~~~~~~" T_MEMMAP 30 "~~~~~~~::X~:.....................X:::..:..:::XX:XXX...:::~~~~~~~" @@ -4551,7 +4551,7 @@ T_MEMMAP 23 "~~~~~~~~~~.~.~.......................XX.X...XXX.::.....X ..~~~~" T_MEMMAP 24 "~~~~~~~~~~~.~..~.......................XXX..XX.::...........~.~~" T_MEMMAP 25 "~~~~~~~...........~.......................:XX.X::.X.X::::.....~~" T_MEMMAP 26 "~~~~~~~~..........................X.X..X..::.XX:.::XX :...~X ~~" -T_MEMMAP 27 "~~~~~~~~........X.................XX......::::.::::: :::X " +T_MEMMAP 27 "~~~~~~~~........X.................XX....._::::.::::: :::X " T_MEMMAP 28 "~~~~~~~~~........XX.........XX..........::.::::::::... :~~ ~" T_MEMMAP 29 "~~~~~~~:~.::.....XX..........X...X...::::..::::X::....:::~~~~~~~" T_MEMMAP 30 "~~~~~~~::X~:.....................X:::..:..:::XX:XXX...:::~~~~~~~" @@ -4752,7 +4752,7 @@ T_MEMMAP 23 "~~~~~~~~~~.~.~.......................XX ... :... X...~~~~" T_MEMMAP 24 "~~~~~~~~~~~.~..~.......................XXX.. :... ....~.~ " T_MEMMAP 25 "~~~~~~~...........~.......................:XX ::.X ::.... " T_MEMMAP 26 "~~~~~~~~..........................X X..X..::.XX:.::X :...~ . ~" -T_MEMMAP 27 "~~~~~~~~........X.................XX......::::.:::: :::X ~~~~" +T_MEMMAP 27 "~~~~~~~~........X.................XX....._::::.:::: :::X ~~~~" T_MEMMAP 28 "~~~~~~~~~........XX.........XX..........::.:::::: .:::~~~~~~" T_MEMMAP 29 "~~~~~~~:~.::.....XX..........X...X...::::..::::X ..:::~~~~~~~" T_MEMMAP 30 "~~~~~~~::X~:.....................X:::..:..:::X ...:::~~~~~~~" @@ -4974,7 +4974,7 @@ T_MEMMAP 23 "~~ ~~~~~~~.~.~.......................XX ... XX.::... .XX...~~~~" T_MEMMAP 24 "~~~~ ~~~~~~.~..~.......................XXX.. ::... ......~.~~" T_MEMMAP 25 "~~~~~ ...........~............... ......:XX X::.X :::.... ~~" T_MEMMAP 26 "~~~~~~~ .........................X X..X..::.XX:.::XXX.:...~ .~~" -T_MEMMAP 27 "~~~~~~~~ ......X........... .....XX......::::.:::::..::::XX~~~~" +T_MEMMAP 27 "~~~~~~~~ ......X........... .....XX....._::::.:::::..::::XX~~~~" T_MEMMAP 28 "~~~~~~~~~.. ..... X.........XX..........::.::::::::....:::~~~~~~" T_MEMMAP 29 "~~~~~~~:~.::..... X..........X...X...::::..::: X::....:::~~~~~~~" T_MEMMAP 30 "~~~~~~~::X :.....................X:::..:..:::XX XX...:::~~~~~~~" @@ -5192,7 +5192,7 @@ T_MEMMAP 23 "~~~~~~~~~~.~.~.......................XX .. .. " T_MEMMAP 24 "~~~~~~~~~~~.~..~.......................XXX.. .. " T_MEMMAP 25 "~~~~~~~...........~.................... ..:XX :.X " T_MEMMAP 26 "~~~~~~~~..........................X X..X..::.XX:.::X " -T_MEMMAP 27 "~~~~~~~~........X.................XX......::::.:::: X ~~~" +T_MEMMAP 27 "~~~~~~~~........X.................XX....._::::.:::: X ~~~" T_MEMMAP 28 "~~~~~~~~~........XX.........XX..........::.:::::: ::~~~~~~" T_MEMMAP 29 "~~~~~~~:~.::.....XX..........X...X...::::..::::X :::~~~~~~~" T_MEMMAP 30 "~~~~~~~::X~:.....................X:::..:..:::X .:::~~~~~~~" @@ -5406,7 +5406,7 @@ T_MEMMAP 23 "~~~~~~~~~~.~.~.......................XX ... XX.::.....XX...~~~~" T_MEMMAP 24 "~~~~~~~~~~~.~..~.......................XXX.. .::..... .....~.~~" T_MEMMAP 25 "~~~~~~~...........~............... .......:XX X::.X :::.....~~" T_MEMMAP 26 "~~~~~~~~.......................... X..X..::.XX:.::XXX.:...~X.~~" -T_MEMMAP 27 "~~~~~~~~........X.................XX......::::.:::::..::::XX~~~~" +T_MEMMAP 27 "~~~~~~~~........X.................XX....._::::.:::::..::::XX~~~~" T_MEMMAP 28 "~~~~~~~~~........ X.........XX..........::.::::::::....:::~~~~~~" T_MEMMAP 29 "~~~~~~~:~.::... . X..........X...X...::::..::::X::....:::~~~~~~~" T_MEMMAP 30 "~~~~~~~::X~:.....................X:::..:..:::XX:XXX...:::~~~~~~~" @@ -5612,7 +5612,7 @@ T_MEMMAP 23 "~~~~~~~~~~.~.~.......................XX.X...XXX.::.....XX...~~~~" T_MEMMAP 24 "~~~~~~~~~~~.~..~.......................XXX..XX.::...........~.~~" T_MEMMAP 25 "~~~~~~~...........~.......................:XX.X::.X.X::::.....~~" T_MEMMAP 26 "~~~~~~~~..........................X.X..X..::.XX:.::XXX.:...~X ~~" -T_MEMMAP 27 "~~~~~~~~........X.................XX......::::.:::::..::::XX ~~~" +T_MEMMAP 27 "~~~~~~~~........X.................XX....._::::.:::::..::::XX ~~~" T_MEMMAP 28 "~~~~~~~~~...... XX.........XX..........::.::::::::....:::~~~~~~" T_MEMMAP 29 "~~~~~~~:~.::... X..........X...X...::::..::::X::....:::~~~~~~~" T_MEMMAP 30 "~~~~~~~: X~: ...................X:::..:..:::XX:XXX...:::~~~~~~~" @@ -5818,7 +5818,7 @@ T_MEMMAP 23 "~~~~~~~~~~.~.~.......................XX.X...XX .::.....XX...~~~~" T_MEMMAP 24 "~~~~~~~~~~~.~..~.......................XXX..X ::...........~.~~" T_MEMMAP 25 "~~~~~~~...........~.......................:XX X::.X.X::::.....~~" T_MEMMAP 26 "~~~~~~~~.................. ...... X..X..::.XX:.::XXX.:...~X.~~" -T_MEMMAP 27 "~~~~~~~~ .... X.................XX......::::.:::::..::::XX~~~~" +T_MEMMAP 27 "~~~~~~~~ .... X.................XX....._::::.:::::..::::XX~~~~" T_MEMMAP 28 "~~~~~~~~~..... XX......... X..........::.::::::::....:::~~~~~~" T_MEMMAP 29 " ~ ~~~:~.::... X..........X.. X...::::..::::X::....:::~~~~~~~" T_MEMMAP 30 "~~ ~~~: X~ ..................X:::..:..:::XX:XXX...:::~~~~~~~"