From: Christian Heller Date: Mon, 22 Feb 2016 22:16:13 +0000 (+0100) Subject: Server: Make map generator selectable. X-Git-Tag: tce~182 X-Git-Url: https://plomlompom.com/repos/%7B%7B%20web_path%20%7D%7D/decks/%7B%7Bdb.prefix%7D%7D/static/condition?a=commitdiff_plain;h=1c3d2bf4aefbdb73b4932c1d158a77ada9643b4d;p=plomrogue Server: Make map generator selectable. --- diff --git a/server/config/misc.py b/server/config/misc.py new file mode 100644 index 0000000..5a3ce21 --- /dev/null +++ b/server/config/misc.py @@ -0,0 +1,7 @@ +# This file is part of PlomRogue. PlomRogue is licensed under the GPL version 3 +# or any later version. For details on its copyright, license, and warranties, +# see the file NOTICE in the root directory of the PlomRogue source package. + +from server.make_map import make_map + +make_map_func = make_map diff --git a/server/make_map.py b/server/make_map.py new file mode 100644 index 0000000..9792383 --- /dev/null +++ b/server/make_map.py @@ -0,0 +1,64 @@ +# This file is part of PlomRogue. PlomRogue is licensed under the GPL version 3 +# or any later version. For details on its copyright, license, and warranties, +# see the file NOTICE in the root directory of the PlomRogue source package. + + +def make_map(): + """(Re-)make island map. + + Let "~" represent water, "." land, "X" trees: Build island shape randomly, + start with one land cell in the middle, then go into cycle of repeatedly + selecting a random sea cell and transforming it into land if it is neighbor + to land. The cycle ends when a land cell is due to be created at the map's + border. Then put some trees on the map (TODO: more precise algorithm desc). + """ + from server.config.world_data import world_db + from server.utils import rand + + def is_neighbor(coordinates, type): + y = coordinates[0] + x = coordinates[1] + length = world_db["MAP_LENGTH"] + ind = y % 2 + diag_west = x + (ind > 0) + diag_east = x + (ind < (length - 1)) + pos = (y * length) + x + if (y > 0 and diag_east + and type == chr(world_db["MAP"][pos - length + ind])) \ + or (x < (length - 1) + and type == chr(world_db["MAP"][pos + 1])) \ + or (y < (length - 1) and diag_east + and type == chr(world_db["MAP"][pos + length + ind])) \ + or (y > 0 and diag_west + and type == chr(world_db["MAP"][pos - length - (not ind)])) \ + or (x > 0 + and type == chr(world_db["MAP"][pos - 1])) \ + or (y < (length - 1) and diag_west + and type == chr(world_db["MAP"][pos + length - (not ind)])): + return True + return False + + world_db["MAP"] = bytearray(b'~' * (world_db["MAP_LENGTH"] ** 2)) + length = world_db["MAP_LENGTH"] + add_half_width = (not (length % 2)) * int(length / 2) + world_db["MAP"][int((length ** 2) / 2) + add_half_width] = ord(".") + while (1): + y = rand.next() % length + x = rand.next() % length + pos = (y * length) + x + if "~" == chr(world_db["MAP"][pos]) and is_neighbor((y, x), "."): + if y == 0 or y == (length - 1) or x == 0 or x == (length - 1): + break + world_db["MAP"][pos] = ord(".") + n_trees = int((length ** 2) / 16) + i_trees = 0 + while (i_trees <= n_trees): + single_allowed = rand.next() % 32 + y = rand.next() % length + x = rand.next() % length + pos = (y * length) + x + if "." == chr(world_db["MAP"][pos]) \ + and ((not single_allowed) or is_neighbor((y, x), "X")): + world_db["MAP"][pos] = ord("X") + i_trees += 1 + # This all-too-precise replica of the original C code misses iter_limit(). diff --git a/server/world.py b/server/world.py index c187159..84a3fc1 100644 --- a/server/world.py +++ b/server/world.py @@ -1,3 +1,8 @@ +# This file is part of PlomRogue. PlomRogue is licensed under the GPL version 3 +# or any later version. For details on its copyright, license, and warranties, +# see the file NOTICE in the root directory of the PlomRogue source package. + + from server.config.world_data import world_db from server.io import log from server.utils import rand, libpr, c_pointer_to_bytearray @@ -164,65 +169,6 @@ def set_world_inactive(): world_db["WORLD_ACTIVE"] = 0 -def make_map(): - """(Re-)make island map. - - Let "~" represent water, "." land, "X" trees: Build island shape randomly, - start with one land cell in the middle, then go into cycle of repeatedly - selecting a random sea cell and transforming it into land if it is neighbor - to land. The cycle ends when a land cell is due to be created at the map's - border. Then put some trees on the map (TODO: more precise algorithm desc). - """ - - def is_neighbor(coordinates, type): - y = coordinates[0] - x = coordinates[1] - length = world_db["MAP_LENGTH"] - ind = y % 2 - diag_west = x + (ind > 0) - diag_east = x + (ind < (length - 1)) - pos = (y * length) + x - if (y > 0 and diag_east - and type == chr(world_db["MAP"][pos - length + ind])) \ - or (x < (length - 1) - and type == chr(world_db["MAP"][pos + 1])) \ - or (y < (length - 1) and diag_east - and type == chr(world_db["MAP"][pos + length + ind])) \ - or (y > 0 and diag_west - and type == chr(world_db["MAP"][pos - length - (not ind)])) \ - or (x > 0 - and type == chr(world_db["MAP"][pos - 1])) \ - or (y < (length - 1) and diag_west - and type == chr(world_db["MAP"][pos + length - (not ind)])): - return True - return False - - world_db["MAP"] = bytearray(b'~' * (world_db["MAP_LENGTH"] ** 2)) - length = world_db["MAP_LENGTH"] - add_half_width = (not (length % 2)) * int(length / 2) - world_db["MAP"][int((length ** 2) / 2) + add_half_width] = ord(".") - while (1): - y = rand.next() % length - x = rand.next() % length - pos = (y * length) + x - if "~" == chr(world_db["MAP"][pos]) and is_neighbor((y, x), "."): - if y == 0 or y == (length - 1) or x == 0 or x == (length - 1): - break - world_db["MAP"][pos] = ord(".") - n_trees = int((length ** 2) / 16) - i_trees = 0 - while (i_trees <= n_trees): - single_allowed = rand.next() % 32 - y = rand.next() % length - x = rand.next() % length - pos = (y * length) + x - if "." == chr(world_db["MAP"][pos]) \ - and ((not single_allowed) or is_neighbor((y, x), "X")): - world_db["MAP"][pos] = ord("X") - i_trees += 1 - # This all-too-precise replica of the original C code misses iter_limit(). - - def make_world(seed): """(Re-)build game world, i.e. map, things, to a new turn 1 from seed. @@ -235,6 +181,7 @@ def make_world(seed): other. Init player's memory map. Write "NEW_WORLD" line to out file. """ from server.config.world_data import symbols_passable + from server.config.misc import make_map_func def free_pos(): i = 0 @@ -282,7 +229,7 @@ def make_world(seed): "No thing action with name 'wait' defined.") return world_db["Things"] = {} - make_map() + make_map_func() world_db["WORLD_ACTIVE"] = 1 world_db["TURN"] = 1 for i in range(world_db["ThingTypes"][playertype]["TT_START_NUMBER"]):