and world_db["Things"][0]["T_LIFEPOINTS"] > 0):
return
pos = world_db["Things"][0]["pos"]
- if not (chr(world_db["MAP"][pos]) == "0"
+ if not (chr(world_db["MAP"][pos]) in "0-+"
and world_db["wetmap"][pos] > ord("0")):
log("NOTHING to drink here.")
return
def actor_drink(t):
pos = t["pos"]
- if chr(world_db["MAP"][pos]) == "0" and \
+ if chr(world_db["MAP"][pos]) in "0-+" and \
world_db["wetmap"][pos] > ord("0") and t["T_KIDNEY"] < 32:
if world_db["Things"][0] == t:
log("You DRINK.")
t["T_KIDNEY"] += 1
world_db["wetmap"][pos] -= 1
- if world_db["wetmap"][pos] == ord("0"):
- world_db["MAP"][pos] = ord("0")
- elif t == world_db["Things"][0]:
- log("YOU FAIL TO DRINK " + str(world_db["MAP"][pos] - ord("0")))
def play_pee():
if not world_db["test_air"](t):
return
t["T_BLADDER"] -= 1
- world_db["wetmap"][t["pos"]] += 1
+ if chr(world_db["MAP"][t["pos"]]) not in "*&":
+ world_db["wetmap"][t["pos"]] += 1
def play_drop():
log("You DROP waste.")
if not world_db["test_air"](t):
return
- world_db["MAP"][t["pos"]] += 1
+ if world_db["MAP"][t["pos"]] == ord("+"):
+ world_db["MAP"][t["pos"]] = ord("-")
+ elif world_db["MAP"][t["pos"]] == ord("-"):
+ world_db["MAP"][t["pos"]] = ord("0")
+ elif chr(world_db["MAP"][t["pos"]]) not in "*&":
+ world_db["MAP"][t["pos"]] += 1
t["T_BOWEL"] -= 1
world_db["Things"][0]["T_ARGUMENT"] = d
world_db["set_command"]("eat")
return
- if chr(world_db["MAP"][pos]) in "34":
+ legal_targets = "34"
+ if world_db["GRACE"] >= 8:
+ legal_targets += "5"
+ if chr(world_db["MAP"][pos]) in legal_targets:
if t["T_STOMACH"] >= 32:
if t == world_db["Things"][0]:
log("You're too FULL to eat.")
log("You try to EAT, but fail.")
else:
height = world_db["MAP"][pos] - ord("0")
- if t["T_STOMACH"] >= 32 or height == 5:
+ if t["T_STOMACH"] >= 32:
+ return
+ if height == 5 and not \
+ (t == world_db["Things"][0] and world_db["GRACE"] >= 8):
return
t["T_STOMACH"] += 1
if t == world_db["Things"][0]:
log("You EAT.")
eaten = (height == 3 and 0 == int(rand.next() % 2)) or \
- (height == 4 and 0 == int(rand.next() % 5))
+ (height == 4 and 0 == int(rand.next() % 5)) or \
+ (height == 5 and 0 == int(rand.next() % 10))
if eaten:
world_db["MAP"][pos] = ord("0")
if t["T_STOMACH"] > 32:
t["T_POSX"] = move_result[2]
t["pos"] = move_result[1] * world_db["MAP_LENGTH"] + move_result[2]
world_db["soundmap"][t["pos"]] = ord("9")
+ if t == world_db["Things"][0] and world_db["MAP"][t["pos"]] == ord("$"):
+ world_db["MAP"][t["pos"]] = ord("0")
+ if world_db["GRACE"] < 8:
+ log("You can now eat ALL walls.")
+ if world_db["GRACE"] < 24:
+ log("You will now LEVITATE over holes.")
+ world_db["GRACE"] += 8
elif t == world_db["Things"][0]:
log("You try to MOVE there, but fail.")
def test_hole(t):
- if world_db["MAP"][t["pos"]] == ord("-"):
+ if world_db["GRACE"] >= 32 and world_db["MAP"][t["pos"]] == ord("&"):
+ world_db["die"](t, "YOU WIN, CONGRATULATIONS.")
+ return False
+ if world_db["GRACE"] >= 24:
+ return True
+ if chr(world_db["MAP"][t["pos"]]) in "*&":
world_db["die"](t, "You FALL in a hole, and die.")
return False
return True
t["T_MEMMAP"][t["pos"]] = ord("@")
log(message)
else:
- world_db["MAP"][t["pos"]] = ord("5")
+ if world_db["MAP"][t["pos"]] != ord("$"):
+ world_db["MAP"][t["pos"]] = ord("5")
world_db["HUMILITY"] = t["T_KIDNEY"] + t["T_BLADDER"] + \
(world_db["wetmap"][t["pos"]] - ord("0"))
world_db["wetmap"][t["pos"]] = 0
ord("0") == world_db["wetmap"][pos]:
world_db["wetmap"][pos] = ord("3")
i_water += 1
+ n_altars = 4
+ i_altars = 0
+ while (i_altars < n_altars):
+ y, x, pos = new_pos()
+ if ord("0") == world_db["MAP"][pos]:
+ world_db["MAP"][pos] = ord("$")
+ i_altars += 1
def calc_effort(ta, t):
world_db["die"](t, "You DIE of hunger.")
elif t["T_KIDNEY"] <= 0:
world_db["die"](t, "You DIE of dehydration.")
- for pos in range(world_db["MAP_LENGTH"] ** 2):
+ mapsize = world_db["MAP_LENGTH"] ** 2
+ for pos in range(mapsize):
wetness = world_db["wetmap"][pos] - ord("0")
height = world_db["MAP"][pos] - ord("0")
- if height == 0 and wetness > 0 \
- and 0 == rand.next() % ((2 ** 13) / (2 ** wetness)):
+ if world_db["MAP"][pos] == ord("-"):
+ height = -1
+ elif world_db["MAP"][pos] == ord("+"):
+ height = -2
+ elif world_db["MAP"][pos] == ord("$"):
+ height = -3
+ if height == -2 and wetness > 1 \
+ and 0 == rand.next() % ((2 ** 11) / (2 ** wetness)):
+ world_db["MAP"][pos] = ord("*")
+ world_db["HUMIDITY"] += wetness
+ if height == -1 and wetness > 1 \
+ and 0 == rand.next() % ((2 ** 10) / (2 ** wetness)):
+ world_db["MAP"][pos] = ord("+")
+ if height == 0 and wetness > 1 \
+ and 0 == rand.next() % ((2 ** 9) / (2 ** wetness)):
world_db["MAP"][pos] = ord("-")
- if ((wetness > 0 and height != 0) or wetness > 1) \
+ if ((wetness > 0 and height > 0) or wetness > 1) \
and 0 == rand.next() % 5:
world_db["wetmap"][pos] -= 1
world_db["HUMIDITY"] += 1
pos = y * world_db["MAP_LENGTH"] + x
break
positions_to_wet = []
- for pos in range(world_db["MAP_LENGTH"] ** 2):
- if world_db["MAP"][pos] == ord("0") \
+ for pos in range(mapsize):
+ if chr(world_db["MAP"][pos]) in "0-+" \
and world_db["wetmap"][pos] < ord("5"):
positions_to_wet += [pos]
while world_db["HUMIDITY"] > 0 and len(positions_to_wet) > 0:
world_db["wetmap"][pos] += 1
positions_to_wet.remove(pos)
world_db["HUMIDITY"] -= 1
- for pos in range(world_db["MAP_LENGTH"] ** 2):
+ for pos in range(mapsize):
if world_db["soundmap"][pos] > ord("0"):
world_db["soundmap"][pos] -= 1
+ from server.utils import libpr
+ libpr.init_score_map()
+ def set_map_score(pos, score):
+ test = libpr.set_map_score(pos, score)
+ if test:
+ raise RuntimeError("No score map allocated for set_map_score().")
+ [set_map_score(pos, 1) for pos in range(mapsize)
+ if world_db["MAP"][pos] == ord("*")]
+ for pos in range(mapsize):
+ if world_db["MAP"][pos] == ord("*"):
+ if libpr.ready_neighbor_scores(pos):
+ raise RuntimeError("No score map allocated for " +
+ "ready_neighbor_scores.()")
+ score = 0
+ dirs = "edcxsw"
+ for i in range(len(dirs)):
+ score += libpr.get_neighbor_score(i)
+ if score == 5 or score == 6:
+ world_db["MAP"][pos] = ord("&")
+ libpr.free_score_map()
world_db["TURN"] += 1
io_db["worldstate_updateable"] = True
try_worldstate_update()
if t["fovmap"] == ord("v")
if world_db["MAP"][pos] == ord("0")
if world_db["wetmap"][pos] > ord("0"))
+ elif target == "crack" and t["T_MEMMAP"]:
+ return exists(pos for pos in range(mapsize)
+ if t["T_MEMMAP"][pos] == ord("-"))
elif target == "fluid_potential" and t["T_MEMMAP"] and t["fovmap"]:
return exists(pos for pos in range(mapsize)
if t["T_MEMMAP"][pos] == ord("0")
if t["fovmap"] != ord("v"))
- elif target == "space_big" and t["T_MEMMAP"] and t["fovmap"]:
+ elif target == "space" and t["T_MEMMAP"] and t["fovmap"]:
return exists(pos for pos in range(mapsize)
- if ord("0") <= t["T_MEMMAP"][pos] <= ord("2")
+ if ord("-") <= t["T_MEMMAP"][pos] <= ord("2")
if (t["fovmap"] != ord("v")
or world_db["terrain_fullness"](pos) < 5))
elif target in {"hunt", "flee"} and t["fovmap"]:
mapsize = world_db["MAP_LENGTH"] ** 2
test = libpr.TCE_init_score_map()
[set_map_score(pos, 65535) for pos in range(mapsize)
- if chr(t["T_MEMMAP"][pos]) in "5-"]
+ if chr(t["T_MEMMAP"][pos]) in "5*&"]
set_movement_cost_map()
if test:
raise RuntimeError("Malloc error in init_score_map().")
if t["fovmap"] == ord("v")
if world_db["MAP"][pos] == ord("0")
if world_db["wetmap"][pos] > ord("0")]
+ elif target == "crack" and t["T_MEMMAP"]:
+ [set_map_score(pos, 0) for pos in range(mapsize)
+ if t["T_MEMMAP"][pos] == ord("-")]
elif target == "fluid_potential" and t["T_MEMMAP"] and t["fovmap"]:
[set_map_score(pos, 0) for pos in range(mapsize)
if t["T_MEMMAP"][pos] == ord("0")
if t["fovmap"] != ord("v")]
elif target == "space" and t["T_MEMMAP"] and t["fovmap"]:
[set_map_score(pos, 0) for pos in range(mapsize)
- if ord("0") <= t["T_MEMMAP"][pos] <= ord("2")
+ if ord("-") <= t["T_MEMMAP"][pos] <= ord("2")
if (t["fovmap"] != ord("v")
or world_db["terrain_fullness"](pos) < 5)]
elif target == "search":
def terrain_fullness(pos):
- return (world_db["MAP"][pos] - ord("0")) + \
- (world_db["wetmap"][pos] - ord("0"))
+ wetness = world_db["wetmap"][pos] - ord("0")
+ if chr(world_db["MAP"][pos]) in "-+":
+ height = 0
+ else:
+ height = world_db["MAP"][pos] - ord("0")
+ return wetness + height
world_db["terrain_fullness"] = terrain_fullness
t["T_COMMAND"] = thing_action_id("wait")
needs = {
+ "fix_cracks": 24,
"flee": 24,
"safe_pee": (world_db["terrain_fullness"](t["pos"]) * t["T_BLADDER"]) / 4,
"safe_drop": (world_db["terrain_fullness"](t["pos"]) * t["T_BOWEL"]) / 4,
needs.reverse()
for need in needs:
if need[1] > 0:
+ if need[0] == "fix_cracks":
+ if world_db["MAP"][t["pos"]] == ord("-") and \
+ t["T_BOWEL"] > 0 and \
+ world_db["terrain_fullness"](t["pos"]) <= 3:
+ t["T_COMMAND"] = thing_action_id("drop")
+ return
+ elif world_db["get_dir_to_target"](t, "crack"):
+ return
if need[0] in {"fluid_certain", "fluid_potential"}:
if standing_on_fluid(t):
t["T_COMMAND"] = thing_action_id("drink")
if test[0]:
if test[1] < 5:
return
- elif world["terrain_fullness"](t["pos"]) < 5:
+ elif world_db["terrain_fullness"](t["pos"]) < 5:
t["T_COMMAND"] = thing_action_id(action_name)
return
if t["T_STOMACH"] < 32 and \
io_db["worldstate_write_order"] += [["T_BLADDER", "player_int"]]
io_db["worldstate_write_order"] += [[write_wetmap, "func"]]
io_db["worldstate_write_order"] += [[write_soundmap, "func"]]
+io_db["worldstate_write_order"] += [["GRACE", "world_int"]]
import server.config.world_data
server.config.world_data.symbols_hide = "345"
-server.config.world_data.symbols_passable = "012-"
+server.config.world_data.symbols_passable = "012-+*&$"
server.config.world_data.thing_defaults["T_STOMACH"] = 16
server.config.world_data.thing_defaults["T_BOWEL"] = 0
server.config.world_data.thing_defaults["T_KIDNEY"] = 16
world_db["NEW_SPAWN"] = 0
if not "HUMIDITY" in world_db:
world_db["HUMIDITY"] = 0
+if not "GRACE" in world_db:
+ world_db["GRACE"] = 0
io_db["hook_save"] = save_maps
import server.config.make_world_helpers
server.config.make_world_helpers.make_map = make_map
commands_db["pee"] = (0, False, play_pee)
commands_db["use"] = (1, False, lambda x: None)
commands_db["pickup"] = (0, False, lambda: None)
+commands_db["GRACE"] = (1, False, setter(None, "GRACE", 0, 255))
commands_db["NEW_SPAWN"] = (1, False, setter(None, "NEW_SPAWN", 0, 255))
commands_db["HUMIDITY"] = (1, False, setter(None, "HUMIDITY", 0, 65535))
commands_db["T_STOMACH"] = (1, False, setter("Thing", "T_STOMACH", 0, 255))
projects / plomrogue / blobdiff