X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=roguelike-server;h=c51b65de6a9eeb5f830caef517ffef1efc6027fb;hb=294144fde53ac36b9f5e03fa9557dbb384863e47;hp=231348818557752327f3fd562ee401940b6a877b;hpb=d9ffb83abd56478242bd7c6228f6b85056ae1d90;p=plomrogue
diff --git a/roguelike-server b/roguelike-server
index 2313488..c51b65d 100755
--- a/roguelike-server
+++ b/roguelike-server
@@ -308,21 +308,6 @@ def try_worldstate_update():
"""Write worldstate file if io_db["worldstate_updateable"] is set."""
if io_db["worldstate_updateable"]:
- def draw_visible_Things(map, run):
- for id in world_db["Things"]:
- type = world_db["Things"][id]["T_TYPE"]
- consumable = world_db["ThingTypes"][type]["TT_TOOL"] == "food"
- alive = world_db["ThingTypes"][type]["TT_LIFEPOINTS"]
- if (0 == run and not consumable and not alive) \
- or (1 == run and consumable and not alive) \
- or (2 == run and alive):
- y = world_db["Things"][id]["T_POSY"]
- x = world_db["Things"][id]["T_POSX"]
- fovflag = world_db["Things"][0]["fovmap"][(y * length) + x]
- if 'v' == chr(fovflag):
- c = world_db["ThingTypes"][type]["TT_SYMBOL"]
- map[(y * length) + x] = ord(c)
-
def write_map(string, map):
for i in range(length):
line = map[i * length:(i * length) + length].decode()
@@ -348,21 +333,79 @@ def try_worldstate_update():
str(world_db["Things"][0]["T_POSX"]) + "\n" + \
str(world_db["MAP_LENGTH"]) + "\n"
length = world_db["MAP_LENGTH"]
+
fov = bytearray(b' ' * (length ** 2))
- for pos in range(length ** 2):
- if 'v' == chr(world_db["Things"][0]["fovmap"][pos]):
- fov[pos] = world_db["MAP"][pos]
- for i in range(3):
- draw_visible_Things(fov, i)
+ ord_v = ord("v")
+ for pos in [pos for pos in range(length ** 2)
+ if ord_v == world_db["Things"][0]["fovmap"][pos]]:
+ fov[pos] = world_db["MAP"][pos]
+ for id in [id for tid in reversed(sorted(list(world_db["ThingTypes"])))
+ for id in world_db["Things"]
+ if not world_db["Things"][id]["carried"]
+ if world_db["Things"][id]["T_TYPE"] == tid
+ if world_db["Things"][0]["fovmap"][
+ world_db["Things"][id]["T_POSY"] * length
+ + world_db["Things"][id]["T_POSX"]] == ord_v]:
+ type = world_db["Things"][id]["T_TYPE"]
+ c = ord(world_db["ThingTypes"][type]["TT_SYMBOL"])
+ fov[world_db["Things"][id]["T_POSY"] * length
+ + world_db["Things"][id]["T_POSX"]] = c
string = write_map(string, fov)
+
mem = world_db["Things"][0]["T_MEMMAP"][:]
- for i in range(2):
- for mt in world_db["Things"][0]["T_MEMTHING"]:
- consumable = world_db["ThingTypes"][mt[0]]["TT_TOOL"] == "food"
- if (i == 0 and not consumable) or (i == 1 and consumable):
- c = world_db["ThingTypes"][mt[0]]["TT_SYMBOL"]
- mem[(mt[1] * length) + mt[2]] = ord(c)
+ for mt in [mt for tid in reversed(sorted(list(world_db["ThingTypes"])))
+ for mt in world_db["Things"][0]["T_MEMTHING"]
+ if mt[0] == tid]:
+ c = world_db["ThingTypes"][mt[0]]["TT_SYMBOL"]
+ mem[(mt[1] * length) + mt[2]] = ord(c)
string = write_map(string, mem)
+
+ metamapA = bytearray(b'0' * (length ** 2)) # #
+ for id in [id for id in world_db["Things"] # #
+ if not world_db["Things"][id]["carried"] # #
+ if world_db["Things"][id]["T_LIFEPOINTS"] # #
+ if world_db["Things"][0]["fovmap"][ # #
+ world_db["Things"][id]["T_POSY"] * length # #
+ + world_db["Things"][id]["T_POSX"]] == ord_v]: # #
+ pos = (world_db["Things"][id]["T_POSY"] * length # #
+ + world_db["Things"][id]["T_POSX"]) # #
+ if id == 0 or world_db["EMPATHY"]: # #
+ type = world_db["Things"][id]["T_TYPE"] # #
+ max_hp = world_db["ThingTypes"][type]["TT_LIFEPOINTS"] # #
+ third_of_hp = max_hp / 3 # #
+ hp = world_db["Things"][id]["T_LIFEPOINTS"] # #
+ add = 0 # #
+ if hp > 2 * third_of_hp: # #
+ add = 2 # #
+ elif hp > third_of_hp: # #
+ add = 1 # #
+ metamapA[pos] = ord('a') + add # #
+ else: # #
+ metamapA[pos] = ord('X') # #
+ for mt in world_db["Things"][0]["T_MEMTHING"]: # #
+ pos = mt[1] * length + mt[2] # #
+ if metamapA[pos] < ord('2'): # #
+ metamapA[pos] += 1 # #
+ string = write_map(string, metamapA) # #
+
+ metamapB = bytearray(b' ' * (length ** 2)) # #
+ for id in [id for id in world_db["Things"] # #
+ if not world_db["Things"][id]["carried"] # #
+ if world_db["Things"][id]["T_LIFEPOINTS"] # #
+ if world_db["Things"][0]["fovmap"][ # #
+ world_db["Things"][id]["T_POSY"] * length # #
+ + world_db["Things"][id]["T_POSX"]] == ord_v]: # #
+ pos = (world_db["Things"][id]["T_POSY"] * length # #
+ + world_db["Things"][id]["T_POSX"]) # #
+ if id == 0 or world_db["EMPATHY"]: # #
+ action = world_db["Things"][id]["T_COMMAND"] # #
+ if 0 != action: # #
+ name = world_db["ThingActions"][action]["TA_NAME"] # #
+ else: # #
+ name = " " # #
+ metamapB[pos] = ord(name[0]) # #
+ string = write_map(string, metamapB) # #
+
atomic_write(io_db["path_worldstate"], string, delete=False)
strong_write(io_db["file_out"], "WORLD_UPDATED\n")
io_db["worldstate_updateable"] = False
@@ -614,12 +657,13 @@ def log_help():
strong_write(io_db["file_out"], "LOG "
+ "Some objects can be used (such as: eaten) by 'u' if "
+ "they are in your inventory. "
- + "Use 'UP'/'DOWN' to navigate the inventory.\n")
+ + "Use 'Up'/'Down' to navigate the inventory.\n")
strong_write(io_db["file_out"], "LOG "
+ "Use 'l' to toggle 'look' mode (move an exploration cursor "
+ "instead of the player over the map).\n")
+ strong_write(io_db["file_out"], "LOG "
+ + "Use 'PgUp'/PgDn' to scroll the 'Things here' window.\n")
strong_write(io_db["file_out"], "LOG See README file for more details.\n")
- strong_write(io_db["file_out"], "LOG \n")
def decrement_lifepoints(t):
@@ -854,9 +898,12 @@ def actor_move(t):
def actor_pick_up(t):
- """Make t pick up (topmost?) Thing from ground into inventory."""
- # Topmostness is actually not defined so far. Picks most nutritious Thing.
+ """Make t pick up (topmost?) Thing from ground into inventory.
+
+ Define topmostness by how low the thing's type ID is.
+ """
# 7DRL: Non-player picking up player-dropped consumable -> GOD_FAVOR gain.
+ # 7DRL: Only player picks up non-food.
used_slots = len(t["T_CARRIES"]) # #
if used_slots < world_db["ThingTypes"][t["T_TYPE"]]["TT_STORAGE"]: # #
ids = [id for id in world_db["Things"] if world_db["Things"][id] != t
@@ -864,23 +911,24 @@ def actor_pick_up(t):
if world_db["Things"][id]["T_POSY"] == t["T_POSY"]
if world_db["Things"][id]["T_POSX"] == t["T_POSX"]]
if len(ids):
- highest_id = ids[0]
- nutritious = 0
- for id in ids:
- type = world_db["Things"][id]["T_TYPE"]
- if world_db["ThingTypes"][type]["TT_TOOL"] == "food" \
- and world_db["ThingTypes"][type]["TT_TOOLPOWER"] > nutritious:
- nutritious = world_db["ThingTypes"][type]["TT_TOOLPOWER"]
- highest_id = id
- world_db["Things"][highest_id]["carried"] = True
- type = world_db["Things"][highest_id]["T_TYPE"] # #
+ lowest_tid = -1
+ for iid in ids:
+ tid = world_db["Things"][iid]["T_TYPE"]
+ if lowest_tid == -1 or tid < lowest_tid:
+ if (t != world_db["Things"][0] and # #
+ world_db["ThingTypes"][tid]["TT_TOOL"] != "food"):
+ continue
+ id = iid
+ lowest_tid = tid
+ world_db["Things"][id]["carried"] = True
+ type = world_db["Things"][id]["T_TYPE"] # #
if (t != world_db["Things"][0] # #
- and world_db["Things"][highest_id]["T_PLAYERDROP"] # #
+ and world_db["Things"][id]["T_PLAYERDROP"] # #
and world_db["ThingTypes"][type]["TT_TOOL"] == "food"): # #
score = world_db["ThingTypes"][type]["TT_TOOLPOWER"] / 32 # #
add_gods_favor(score) # #
- world_db["Things"][highest_id]["T_PLAYERDROP"] = 0 # #
- t["T_CARRIES"].append(highest_id)
+ world_db["Things"][id]["T_PLAYERDROP"] = 0 # #
+ t["T_CARRIES"].append(id)
if t == world_db["Things"][0]:
strong_write(io_db["file_out"], "LOG You pick up an object.\n")
elif t == world_db["Things"][0]:
@@ -1025,36 +1073,39 @@ def thingproliferation(t, prol_map):
def try_healing(t):
- """Grow t's HP to a 1/32 chance if < HP max, satiation > 0, and waiting.
-
- On success, decrease satiation score by 32.
- """
+ """If t's HP < max, increment them if well-nourished, maybe waiting."""
# 7DRL: Successful heals increment God's mood.
- if t["T_SATIATION"] > 0 \
- and t["T_LIFEPOINTS"] < \
- world_db["ThingTypes"][t["T_TYPE"]]["TT_LIFEPOINTS"] \
- and 0 == (rand.next() % 31) \
- and t["T_COMMAND"] == [id for id in world_db["ThingActions"]
- if world_db["ThingActions"][id]["TA_NAME"] ==
- "wait"][0]:
- t["T_LIFEPOINTS"] += 1
- world_db["GOD_MOOD"] += 1 # #
- t["T_SATIATION"] -= 32
- if t == world_db["Things"][0]:
- strong_write(io_db["file_out"], "LOG You heal.\n")
+ if t["T_LIFEPOINTS"] < \
+ world_db["ThingTypes"][t["T_TYPE"]]["TT_LIFEPOINTS"]:
+ wait_id = [id for id in world_db["ThingActions"]
+ if world_db["ThingActions"][id]["TA_NAME"] == "wait"][0]
+ wait_divider = 8 if t["T_COMMAND"] == wait_id else 1
+ testval = int(abs(t["T_SATIATION"]) / wait_divider)
+ if (testval <= 1 or 1 == (rand.next() % testval)):
+ t["T_LIFEPOINTS"] += 1
+ if t != world_db["Things"][0]: # #
+ world_db["GOD_MOOD"] += 1 # #
+ if t == world_db["Things"][0]:
+ strong_write(io_db["file_out"], "LOG You heal.\n")
+
+
+def hunger_per_turn(type_id):
+ """The amount of satiation score lost per turn for things of given type."""
+ return int(math.sqrt(world_db["ThingTypes"][type_id]["TT_LIFEPOINTS"]))
def hunger(t):
"""Decrement t's satiation,dependent on it trigger lifepoint dec chance."""
if t["T_SATIATION"] > -32768:
- t["T_SATIATION"] -= 1
- testbase = t["T_SATIATION"] if t["T_SATIATION"] >= 0 else -t["T_SATIATION"]
- if not world_db["ThingTypes"][t["T_TYPE"]]["TT_LIFEPOINTS"]:
- raise RuntimeError("A thing that should not hunger is hungering.")
- stomach = int(32767 / world_db["ThingTypes"][t["T_TYPE"]]["TT_LIFEPOINTS"])
- if int(int(testbase / stomach) / ((rand.next() % stomach) + 1)):
+ #max_hp = world_db["ThingTypes"][t["T_TYPE"]]["TT_LIFEPOINTS"]
+ t["T_SATIATION"] -= hunger_per_turn(t["T_TYPE"]) # int(math.sqrt(max_hp))
+ if 0 != t["T_SATIATION"] and 0 == int(rand.next() / abs(t["T_SATIATION"])):
if t == world_db["Things"][0]:
- strong_write(io_db["file_out"], "LOG You suffer from hunger.\n")
+ if t["T_SATIATION"] < 0:
+ strong_write(io_db["file_out"], "LOG You suffer from hunger.\n")
+ else:
+ strong_write(io_db["file_out"],
+ "LOG You suffer from over-eating.\n")
decrement_lifepoints(t)
@@ -1258,6 +1309,7 @@ def get_dir_to_target(t, filter):
def standing_on_food(t):
"""Return True/False whether t is standing on a consumable."""
for id in [id for id in world_db["Things"] if world_db["Things"][id] != t
+ if not world_db["Things"][id]["carried"]
if world_db["Things"][id]["T_POSY"] == t["T_POSY"]
if world_db["Things"][id]["T_POSX"] == t["T_POSX"]
if world_db["ThingTypes"][world_db["Things"][id]["T_TYPE"]]
@@ -1267,16 +1319,24 @@ def standing_on_food(t):
def get_inventory_slot_to_consume(t):
- """Return slot Id of strongest consumable in t's inventory, else -1."""
- cmp_food = 0
+ """Return invent. slot of healthiest consumable(if any healthy),else -1."""
+ cmp_food = -1
selection = -1
i = 0
+ hunger_u = hunger_per_turn(t["T_TYPE"])
+ type = [id for id in world_db["ThingActions"]
+ if world_db["ThingActions"][id]["TA_NAME"] == "use"][0]
+ consume_hungering = world_db["ThingActions"][type]["TA_EFFORT"] * hunger_u
for id in t["T_CARRIES"]:
type = world_db["Things"][id]["T_TYPE"]
if world_db["ThingTypes"][type]["TT_TOOL"] == "food" \
- and world_db["ThingTypes"][type]["TT_TOOLPOWER"] > cmp_food:
- cmp_food = world_db["ThingTypes"][type]["TT_TOOLPOWER"]
- selection = i
+ and world_db["ThingTypes"][type]["TT_TOOLPOWER"]:
+ nutvalue = world_db["ThingTypes"][type]["TT_TOOLPOWER"]
+ tmp_cmp = abs(t["T_SATIATION"] + nutvalue - consume_hungering)
+ if (cmp_food < 0 and tmp_cmp < abs(t["T_SATIATION"])) \
+ or tmp_cmp < cmp_food:
+ cmp_food = tmp_cmp
+ selection = i
i += 1
return selection
@@ -1426,6 +1486,7 @@ def command_quit():
def command_thingshere(str_y, str_x):
"""Write to out file list of Things known to player at coordinate y, x."""
+ # 7DRL: terrain, too
if world_db["WORLD_ACTIVE"]:
y = integer_test(str_y, 0, 255)
x = integer_test(str_x, 0, 255)
@@ -1433,19 +1494,38 @@ def command_thingshere(str_y, str_x):
if None != y and None != x and y < length and x < length:
pos = (y * world_db["MAP_LENGTH"]) + x
strong_write(io_db["file_out"], "THINGS_HERE START\n")
+ pos = y * world_db["MAP_LENGTH"] + x; # #
if "v" == chr(world_db["Things"][0]["fovmap"][pos]):
- for id in world_db["Things"]:
- if y == world_db["Things"][id]["T_POSY"] \
- and x == world_db["Things"][id]["T_POSX"] \
- and not world_db["Things"][id]["carried"]:
- type = world_db["Things"][id]["T_TYPE"]
- name = world_db["ThingTypes"][type]["TT_NAME"]
- strong_write(io_db["file_out"], name + "\n")
+ for id in [id for tid in sorted(list(world_db["ThingTypes"]))
+ for id in world_db["Things"]
+ if not world_db["Things"][id]["carried"]
+ if world_db["Things"][id]["T_TYPE"] == tid
+ if y == world_db["Things"][id]["T_POSY"]
+ if x == world_db["Things"][id]["T_POSX"]]:
+ type = world_db["Things"][id]["T_TYPE"]
+ name = world_db["ThingTypes"][type]["TT_NAME"]
+ strong_write(io_db["file_out"], name + "\n")
else:
- for mt in world_db["Things"][0]["T_MEMTHING"]:
- if y == mt[1] and x == mt[2]:
- name = world_db["ThingTypes"][mt[0]]["TT_NAME"]
- strong_write(io_db["file_out"], name + "\n")
+ for mt in [mt for tid in sorted(list(world_db["ThingTypes"]))
+ for mt in world_db["Things"][0]["T_MEMTHING"]
+ if mt[0] == tid if y == mt[1] if x == mt[2]]:
+ name = world_db["ThingTypes"][mt[0]]["TT_NAME"]
+ strong_write(io_db["file_out"], name + "\n")
+ if world_db["Things"][0]["T_MEMMAP"][pos] == ord("~"): # #
+ name = "(terrain: SEA)" # #
+ elif world_db["Things"][0]["T_MEMMAP"][pos] == ord("."): # #
+ name = "(terrain: EARTH)" # #
+ elif world_db["Things"][0]["T_MEMMAP"][pos] == ord(":"): # #
+ name = "(terrain: SOIL)" # #
+ elif world_db["Things"][0]["T_MEMMAP"][pos] == ord("X"): # #
+ name = "(terrain: TREE)" # #
+ elif world_db["Things"][0]["T_MEMMAP"][pos] == ord("|"): # #
+ name = "(terrain: WALL)" # #
+ elif world_db["Things"][0]["T_MEMMAP"][pos] == ord("_"): # #
+ name = "(terrain: ALTAR)" # #
+ else: # #
+ name = "(?)" # #
+ strong_write(io_db["file_out"], name + "\n") # #
strong_write(io_db["file_out"], "THINGS_HERE END\n")
else:
print("Ignoring: Invalid map coordinates.")
@@ -1941,6 +2021,7 @@ commands_db = {
"PLANT_1": (1, False, specialtypesetter("PLANT_1")), # #
"LUMBER": (1, False, specialtypesetter("LUMBER")), # #
"TOOL_0": (1, False, specialtypesetter("TOOL_0")), # #
+ "EMPATHY": (1, False, setter(None, "EMPATHY", 0, 1)), # #
"TA_ID": (1, False, command_taid),
"TA_EFFORT": (1, False, setter("ThingAction", "TA_EFFORT", 0, 255)),
"TA_NAME": (1, False, command_taname),
@@ -1995,6 +2076,7 @@ world_db = {
"PLANT_1": 0, # #
"LUMBER": 0, # #
"TOOL_0": 0, # #
+ "EMPATHY": 1, # #
"ThingActions": {},
"ThingTypes": {},
"Things": {}