From: Christian Heller Date: Tue, 8 Mar 2016 00:26:59 +0000 (+0100) Subject: TCE: Add defecation, different terrain types that may result from it. X-Git-Tag: tce~67 X-Git-Url: https://plomlompom.com/repos/%7B%7Bdb.prefix%7D%7D/static/%7B%7Bprefix%7D%7D/do_tasks?a=commitdiff_plain;h=e9ec414cdee3f9bbab129259b3546f0a32b50607;p=plomrogue TCE: Add defecation, different terrain types that may result from it. --- diff --git a/confserver/TheCrawlingEater b/confserver/TheCrawlingEater index 2d88e69..8e8af8b 100644 --- a/confserver/TheCrawlingEater +++ b/confserver/TheCrawlingEater @@ -7,9 +7,11 @@ TA_ID 1 TA_NAME wait TA_ID 2 -TA_EFFORT 5 TA_NAME move +TA_ID 3 +TA_NAME drop + TT_ID 0 TT_START_NUMBER 1 TT_LIFEPOINTS 1 diff --git a/plugins/client/TheCrawlingEater.py b/plugins/client/TheCrawlingEater.py index e362409..a4be1a5 100644 --- a/plugins/client/TheCrawlingEater.py +++ b/plugins/client/TheCrawlingEater.py @@ -36,8 +36,8 @@ def win_map(self): col_unknown = curses.color_pair(1) col_mem_obstacle = curses.color_pair(2) col_mem = curses.color_pair(2) - col_ground = curses.color_pair(3) - col_stone = curses.color_pair(4) + col_stone = curses.color_pair(1) + col_dirt = curses.color_pair(4) col_earth = curses.color_pair(3) col_player = curses.color_pair(1) for y in range(world_data["map_size"]): @@ -62,9 +62,13 @@ def win_map(self): else: attribute = col_stone if char == ".": - attribute = col_ground - if char == "#": + attribute = col_dirt + elif char == ":": attribute = col_earth + elif char == "%": + attribute = col_earth + elif char == "#": + attribute = col_dirt elif char == "@": attribute = col_player bonus = (" ", attribute) @@ -86,3 +90,6 @@ windows_config[:] = [ ] from client.window_management import set_windows set_windows() +from client.commands import command_sender +from client.config.commands import commands +commands["D"] = (command_sender("drop"),) diff --git a/plugins/server/TheCrawlingEater.py b/plugins/server/TheCrawlingEater.py index 32bff23..a06f07c 100644 --- a/plugins/server/TheCrawlingEater.py +++ b/plugins/server/TheCrawlingEater.py @@ -6,28 +6,62 @@ from server.config.world_data import world_db -def make_map(): - from server.make_map import new_pos, is_neighbor - from server.utils import rand - world_db["MAP"] = bytearray(b'X' * (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, x, pos = new_pos() - if "X" == 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, x, pos = new_pos() - if "#" == chr(world_db["MAP"][pos]) \ - and ((not single_allowed) or is_neighbor((y, x), ".")): - world_db["MAP"][pos] = ord(".") - i_trees += 1 +def play_drop(): + if action_exists("drop") and world_db["WORLD_ACTIVE"]: + if world_db["Things"][0]["T_STOMACH"] < 1: + log("Nothing to drop from empty stomach.") + return + world_db["set_command"]("drop") + + +def actor_drop(t): + if t["T_STOMACH"] < 1: + return + if t == world_db["Things"][0]: + log("You DEFECATE.") + terrain = world_db["MAP"][t["pos"]] + t["T_STOMACH"] -= 1 + if chr(terrain) == "_": + world_db["MAP"][t["pos"]] = ord(".") + elif chr(terrain) == ".": + world_db["MAP"][t["pos"]] = ord(":") + elif chr(terrain) == ":": + world_db["MAP"][t["pos"]] = ord("%") + elif chr(terrain) == "%": + world_db["MAP"][t["pos"]] = ord("#") + elif chr(terrain) == "#": + world_db["MAP"][t["pos"]] = ord("X") + elif chr(terrain) == "X": + t["T_LIFEPOINTS"] = 0 + if t == world_db["Things"][0]: + t["fovmap"] = bytearray(b' ' * (world_db["MAP_LENGTH"] ** 2)) + log("You SUFFOCATE.") + + +def play_move(str_arg): + """Try "move" as player's T_COMMAND, str_arg as T_ARGUMENT / direction.""" + if action_exists("move") and world_db["WORLD_ACTIVE"]: + from server.config.world_data import directions_db, symbols_passable + t = world_db["Things"][0] + if not str_arg in directions_db: + print("Illegal move direction string.") + return + d = ord(directions_db[str_arg]) + from server.utils import mv_yx_in_dir_legal + move_result = mv_yx_in_dir_legal(chr(d), t["T_POSY"], t["T_POSX"]) + if 1 == move_result[0]: + pos = (move_result[1] * world_db["MAP_LENGTH"]) + move_result[2] + if ord("%") == world_db["MAP"][pos] or \ + ord("#") == world_db["MAP"][pos]: + log("You EAT.") + world_db["Things"][0]["T_ARGUMENT"] = d + world_db["set_command"]("move") + return + if chr(world_db["MAP"][pos]) in symbols_passable: + world_db["Things"][0]["T_ARGUMENT"] = d + world_db["set_command"]("move") + return + log("You CAN'T eat your way through there.") def actor_move(t): @@ -63,9 +97,36 @@ def actor_move(t): t["pos"] = move_result[1] * world_db["MAP_LENGTH"] + move_result[2] build_fov_map(t) else: - if ord("#") == world_db["MAP"][pos] and 0 == int(rand.next() % 5): - world_db["MAP"][pos] = ord(".") + if ord("%") == world_db["MAP"][pos] and 0 == int(rand.next() % 2): + world_db["MAP"][pos] = ord("_") t["T_STOMACH"] += 1 + if ord("#") == world_db["MAP"][pos] and 0 == int(rand.next() % 5): + world_db["MAP"][pos] = ord("_") + t["T_STOMACH"] += 2 + + +def make_map(): + from server.make_map import new_pos, is_neighbor + from server.utils import rand + world_db["MAP"] = bytearray(b'X' * (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, x, pos = new_pos() + if "X" == 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, x, pos = new_pos() + if "#" == chr(world_db["MAP"][pos]) \ + and ((not single_allowed) or is_neighbor((y, x), "_")): + world_db["MAP"][pos] = ord("_") + i_trees += 1 def turn_over(): @@ -103,31 +164,6 @@ def turn_over(): world_db["turn_over"] = turn_over -def play_move(str_arg): - """Try "move" as player's T_COMMAND, str_arg as T_ARGUMENT / direction.""" - if action_exists("move") and world_db["WORLD_ACTIVE"]: - from server.config.world_data import directions_db, symbols_passable - t = world_db["Things"][0] - if not str_arg in directions_db: - print("Illegal move direction string.") - return - d = ord(directions_db[str_arg]) - from server.utils import mv_yx_in_dir_legal - move_result = mv_yx_in_dir_legal(chr(d), t["T_POSY"], t["T_POSX"]) - if 1 == move_result[0]: - pos = (move_result[1] * world_db["MAP_LENGTH"]) + move_result[2] - if ord("#") == world_db["MAP"][pos]: - log("You EAT.") - world_db["Things"][0]["T_ARGUMENT"] = d - world_db["set_command"]("move") - return - if chr(world_db["MAP"][pos]) in symbols_passable: - world_db["Things"][0]["T_ARGUMENT"] = d - world_db["set_command"]("move") - return - log("You CAN'T eat your way through there.") - - def command_ai(): """Call ai() on player Thing, then turn_over().""" from server.ai import ai @@ -154,15 +190,17 @@ def play_wait(): from server.config.io import io_db io_db["worldstate_write_order"] += [["T_STOMACH", "player_int"]] import server.config.world_data -server.config.world_data.symbols_hide += "#" +server.config.world_data.symbols_hide = "%#X" +server.config.world_data.symbols_passable = "_.:" server.config.world_data.thing_defaults["T_STOMACH"] = 0 import server.config.make_world_helpers server.config.make_world_helpers.make_map = make_map from server.config.commands import commands_db +commands_db["THINGS_HERE"] = (2, True, lambda x, y: None) commands_db["ai"] = (0, False, command_ai) commands_db["move"] = (1, False, play_move) commands_db["wait"] = (0, False, play_wait) -commands_db["drop"] = (1, False, lambda x: None) +commands_db["drop"] = (0, False, play_drop) commands_db["use"] = (1, False, lambda x: None) commands_db["pickup"] = (0, False, lambda: None) commands_db["T_STOMACH"] = (1, False, setter("Thing", "T_STOMACH", 0, 255)) @@ -170,7 +208,8 @@ from server.actions import actor_wait import server.config.actions server.config.actions.action_db = { "actor_wait": actor_wait, - "actor_move": actor_move + "actor_move": actor_move, + "actor_drop": actor_drop } strong_write(io_db["file_out"], "PLUGIN TheCrawlingEater\n")