X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=roguelike-server;h=53cd75148ff46a43b01d4f7a1a0fa3e2fba34214;hb=0eb28cf849ea804c4a2e560df9c73b03cd1ecc73;hp=d4e1cd10a636b709a258749a65260f26bad6a4de;hpb=02b304cd9f900415c13dfd45c05503ed045d9c1c;p=plomrogue
diff --git a/roguelike-server b/roguelike-server
index d4e1cd1..53cd751 100755
--- a/roguelike-server
+++ b/roguelike-server
@@ -212,12 +212,10 @@ def save_world():
string = ""
for key in world_db:
if (dict != type(world_db[key])
- and key != "ALTAR" # #
- and key != "MAP" and key != "WORLD_ACTIVE"):
+ and key != "altar" # #
+ and key != "MAP" and key != "WORLD_ACTIVE"):
string = string + key + " " + str(world_db[key]) + "\n"
string = string + mapsetter("MAP")()
- string = (string + "ALTAR " + str(world_db["ALTAR"][0]) + " " # #
- + str(world_db["ALTAR"][1]) + "\n") # #
string = string + helper("ThingActions", "TA_ID")
string = string + helper("ThingTypes", "TT_ID", {"TT_CORPSE_ID": False})
for id in world_db["ThingTypes"]:
@@ -313,7 +311,7 @@ def try_worldstate_update():
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_CONSUMABLE"]
+ 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) \
@@ -360,7 +358,7 @@ def try_worldstate_update():
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_CONSUMABLE"]
+ 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)
@@ -430,7 +428,7 @@ def make_map():
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).
"""
- # 7DRL: Also add some ":" cells as land to which plants may proliferate.
+ # 7DRL: Also add some ":" cells, and (not surrounded by trees!) "_" altar.
def is_neighbor(coordinates, type):
y = coordinates[0]
@@ -490,6 +488,17 @@ def make_map():
and ((not single_allowed) or is_neighbor((y, x), ":"))): # #
world_db["MAP"][pos] = ord(":") # #
i_colons += 1 # #
+ altar_placed = False # #
+ while not altar_placed: # #
+ y = rand.next() % length # #
+ x = rand.next() % length # #
+ pos = (y * length) + x # #
+ if (("." == chr(world_db["MAP"][pos] # #
+ or ":" == chr(world_db["MAP"][pos]))
+ and not is_neighbor((y, x), 'X'))): # #
+ world_db["MAP"][pos] = ord("_") # #
+ world_db["altar"] = (y, x) # #
+ altar_placed = True # #
def update_map_memory(t, age_map=True):
@@ -597,6 +606,23 @@ def build_fov_map(t):
raise RuntimeError("Malloc error in build_fov_Map().")
+def log_help():
+ """Send quick usage info to log."""
+ strong_write(io_db["file_out"], "LOG "
+ + "Use 'w'/'e'/'s'/'d'/'x'/'c' to move, and 'w' to wait.\n")
+ strong_write(io_db["file_out"], "LOG "
+ + "Use 'p' to pick up objects, and 'D' to drop them.\n")
+ 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")
+ 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 See README file for more details.\n")
+ strong_write(io_db["file_out"], "LOG \n")
+
+
def decrement_lifepoints(t):
"""Decrement t's lifepoints by 1, and if to zero, corpse it.
@@ -620,6 +646,8 @@ def decrement_lifepoints(t):
if world_db["Things"][0] == t:
t["fovmap"] = bytearray(b' ' * (world_db["MAP_LENGTH"] ** 2))
strong_write(io_db["file_out"], "LOG You die.\n")
+ strong_write(io_db["file_out"],
+ "LOG See README on how to start over.\n")
else:
t["fovmap"] = False
t["T_MEMMAP"] = False
@@ -660,13 +688,29 @@ def mv_yx_in_dir_legal(dir, y, x):
def enter_altar(): # #
"""What happens when the player enters the altar."""
- if world_db["GAME_WON"]:
+ if world_db["FAVOR_STAGE"] > 9000:
strong_write(io_db["file_out"],
"LOG You step on a soul-less slab of stone.\n")
return
strong_write(io_db["file_out"], "LOG YOU ENTER SACRED GROUND.\n")
- if world_db["GOD_FAVOR"] > 9000:
- world_db["GAME_WON"] = 1
+ if world_db["FAVOR_STAGE"] == 0:
+ world_db["FAVOR_STAGE"] = 1
+ strong_write(io_db["file_out"], "LOG The Island God speaks to you: "
+ + "\"I don't trust you. You intrude on the island's "
+ + "affairs. I think you're a nuisance at best, and a "
+ + "danger to my children at worst. I will give you a "
+ + "chance to lighten my mood, however: For a while now, "
+ + "I've been trying to spread the plant "
+ + world_db["ThingTypes"][world_db["PLANT_0"]]["TT_NAME"]
+ + " (\""
+ + world_db["ThingTypes"][world_db["PLANT_0"]]["TT_SYMBOL"]
+ + "\"). I have not been very successful so far. Maybe "
+ + "you can make yourself useful there. I will count "
+ + "each further "
+ + world_db["ThingTypes"][world_db["PLANT_0"]]["TT_NAME"]
+ + " that grows to your favor.\n")
+ elif world_db["GOD_FAVOR"] > 9000:
+ world_db["FAVOR_STAGE"] = 9001
strong_write(io_db["file_out"], "LOG The Island God speaks to you: "
+ "\"You have proven yourself worthy of my respect. "
+ "You were a good citizen to the island, and sometimes "
@@ -679,7 +723,7 @@ def enter_altar(): # #
+ "as long as you like.)\"\n")
id = id_setter(-1, "Things")
world_db["Things"][id] = new_Thing(world_db["SLIPPERS"],
- world_db["ALTAR"])
+ world_db["altar"])
def actor_wait(t):
@@ -697,9 +741,6 @@ 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]) 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"]
@@ -721,6 +762,9 @@ def actor_move(t):
if test and t == world_db["Things"][0]: # #
add_gods_favor(-test) # #
return
+ passable = ("." == chr(world_db["MAP"][pos]) or
+ ":" == chr(world_db["MAP"][pos]) or # #
+ "_" == chr(world_db["MAP"][pos])) # #
dir = [dir for dir in directions_db
if directions_db[dir] == chr(t["T_ARGUMENT"])][0]
if passable:
@@ -732,8 +776,8 @@ def actor_move(t):
build_fov_map(t)
if t == world_db["Things"][0]:
strong_write(io_db["file_out"], "LOG You move " + dir + ".\n")
- if (move_result[1] == world_db["ALTAR"][0] and # #
- move_result[2] == world_db["ALTAR"][1]): # #
+ if (move_result[1] == world_db["altar"][0] and # #
+ move_result[2] == world_db["altar"][1]): # #
enter_altar() # #
elif t == world_db["Things"][0]:
strong_write(io_db["file_out"], "LOG You fail to move " + dir + ".\n")
@@ -754,14 +798,16 @@ def actor_pick_up(t):
nutritious = 0
for id in ids:
type = world_db["Things"][id]["T_TYPE"]
- if world_db["ThingTypes"][type]["TT_CONSUMABLE"] > nutritious:
- nutritious = world_db["ThingTypes"][type]["TT_CONSUMABLE"]
+ 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
- if (t != world_db["Things"][0] and # #
- world_db["Things"][highest_id]["T_PLAYERDROP"]): # #
- x = world_db["Things"][highest_id]["T_TYPE"]
- score = world_db["ThingTypes"][x]["TT_CONSUMABLE"] / 32 # #
+ type = world_db["Things"][highest_id]["T_TYPE"] # #
+ if (t != world_db["Things"][0] # #
+ and world_db["Things"][highest_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)
@@ -806,10 +852,10 @@ def actor_use(t):
+ "Island God laughs.\n") # #
t["T_LIFEPOINTS"] = 1 # #
decrement_lifepoints(t) # #
- elif world_db["ThingTypes"][type]["TT_CONSUMABLE"]:
+ elif world_db["ThingTypes"][type]["TT_TOOL"] == "food":
t["T_CARRIES"].remove(id)
del world_db["Things"][id]
- t["T_SATIATION"] += world_db["ThingTypes"][type]["TT_CONSUMABLE"]
+ t["T_SATIATION"] += world_db["ThingTypes"][type]["TT_TOOLPOWER"]
if t == world_db["Things"][0]:
strong_write(io_db["file_out"],
"LOG You consume this object.\n")
@@ -846,6 +892,9 @@ def thingproliferation(t, prol_map):
newT = new_Thing(t["T_TYPE"], (candidates[i][0], candidates[i][1]))
world_db["Things"][id] = newT
world_db["GOD_MOOD"] += 1 # #
+ if (world_db["FAVOR_STAGE"] > 0 # #
+ and t["T_TYPE"] == world_db["PLANT_0"]):
+ world_db["GOD_FAVOR"] += 5
def try_healing(t):
@@ -941,7 +990,7 @@ def get_dir_to_target(t, filter):
for mt in t["T_MEMTHING"]:
if ' ' != chr(t["T_MEMMAP"][(mt[1] * world_db["MAP_LENGTH"])
+ mt[2]]) \
- and world_db["ThingTypes"][mt[0]]["TT_CONSUMABLE"]:
+ and world_db["ThingTypes"][mt[0]]["TT_TOOL"] == "food":
return True
return False
@@ -993,7 +1042,7 @@ def get_dir_to_target(t, filter):
if ord_blank != t["T_MEMMAP"][mt[1]
* world_db["MAP_LENGTH"]
+ mt[2]]
- if world_db["ThingTypes"][mt[0]]["TT_CONSUMABLE"]]:
+ if world_db["ThingTypes"][mt[0]]["TT_TOOL"] == "food"]:
set_map_score(mt[1] * world_db["MAP_LENGTH"] + mt[2], 0)
elif "s" == filter:
zero_score_map_where_char_on_memdepthmap(mem_depth_c[0])
@@ -1079,26 +1128,27 @@ def get_dir_to_target(t, filter):
return dir_to_target
-def standing_on_consumable(t):
+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 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"]]
- ["TT_CONSUMABLE"]]:
+ ["TT_TOOL"] == "food"]:
return True
return False
def get_inventory_slot_to_consume(t):
"""Return slot Id of strongest consumable in t's inventory, else -1."""
- cmp_consumability = 0
+ cmp_food = 0
selection = -1
i = 0
for id in t["T_CARRIES"]:
type = world_db["Things"][id]["T_TYPE"]
- if world_db["ThingTypes"][type]["TT_CONSUMABLE"] > cmp_consumability:
- cmp_consumability = world_db["ThingTypes"][type]["TT_CONSUMABLE"]
+ 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
i += 1
return selection
@@ -1125,7 +1175,7 @@ def ai(t):
if world_db["ThingActions"][id]["TA_NAME"]
== "use"][0]
t["T_ARGUMENT"] = sel
- elif standing_on_consumable(t) \
+ elif standing_on_food(t) \
and (len(t["T_CARRIES"]) < # #
world_db["ThingTypes"][t["T_TYPE"]]["TT_STORAGE"]): # #
t["T_COMMAND"] = [id for id in world_db["ThingActions"]
@@ -1326,6 +1376,7 @@ def command_makeworld(seed_string):
according to ThingTypes' TT_START_NUMBERS, with Thing of ID 0 to ThingType
of ID = world["PLAYER_TYPE"]. Place Things randomly, and actors not on each
other. Init player's memory map. Write "NEW_WORLD" line to out file.
+ Call log_help().
"""
# def free_pos(plant=False):
@@ -1377,11 +1428,11 @@ def command_makeworld(seed_string):
if not world_db["SLIPPERS"] in world_db["ThingTypes"]: # #
print("Ignoring: No valid SLIPPERS set.") # #
return # #
+ if not world_db["PLANT_0"] in world_db["ThingTypes"]: # #
+ print("Ignoring: No valid PLANT_0 set.") # #
+ 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"]):
@@ -1398,18 +1449,7 @@ def command_makeworld(seed_string):
plantness = world_db["ThingTypes"][type]["TT_PROLIFERATE"] # #
world_db["Things"][id] = new_Thing(type, free_pos(plantness))
strong_write(io_db["file_out"], "NEW_WORLD\n")
-
-
-def command_altar(str_y, str_x): # #
- """Set position of Island God's altar."""
- y = integer_test(str_y, 0, 255)
- x = integer_test(str_x, 0, 255)
- 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.")
+ log_help()
def command_maplength(maplength_string):
@@ -1429,8 +1469,10 @@ def command_worldactive(worldactive_string):
An active world can always be set inactive. An inactive world can only be
set active with a "wait" ThingAction, and a player Thing (of ID 0), and a
map. On activation, rebuild all Things' FOVs, and the player's map memory.
+ Also call log_help().
"""
- # 7DRL: ALTAR position and (valid) SLIPPERS must be set for world activation.
+ # 7DRL: altar must be on map, and (valid) SLIPPERS and PLANT_0must be set
+ # for world activation.
val = integer_test(worldactive_string, 0, 1)
if None != val:
if 0 != world_db["WORLD_ACTIVE"]:
@@ -1450,8 +1492,17 @@ def command_worldactive(worldactive_string):
player_exists = True
break
valid_slippers = world_db["SLIPPERS"] in world_db["ThingTypes"] # #
+ valid_plant0 = world_db["PLANT_0"] in world_db["ThingTypes"] # #
+ altar_found = False # #
+ if world_db["MAP"]: # #
+ pos = world_db["MAP"].find(b'_') # #
+ if pos > 0: # #
+ y = int(pos / world_db["MAP_LENGTH"]) # #
+ x = pos % world_db["MAP_LENGTH"] # #
+ world_db["altar"] = (y, x) # #
+ altar_found = True # #
if wait_exists and player_exists and world_db["MAP"] \
- and world_db["ALTAR"] and valid_slippers: # #
+ and altar_found and valid_slippers and valid_plant0: # #
for id in world_db["Things"]:
if world_db["Things"][id]["T_LIFEPOINTS"]:
build_fov_map(world_db["Things"][id])
@@ -1461,6 +1512,7 @@ def command_worldactive(worldactive_string):
empty_fovmap = bytearray(b" " * world_db["MAP_LENGTH"] ** 2)
world_db["Things"][0]["fovmap"] = empty_fovmap
world_db["WORLD_ACTIVE"] = 1
+ log_help()
else:
print("Ignoring: Not all conditions for world activation met.")
@@ -1472,12 +1524,21 @@ def command_slippers(str_int): # #
world_db["SLIPPERS"] = val
if world_db["WORLD_ACTIVE"] and \
world_db["SLIPPERS"] not in world_db["ThingTypes"]:
- print(world_db["ThingTypes"])
- print(":::" + str(world_db["SLIPPERS"]))
world_db["WORLD_ACTIVE"] = 0
print("SLIPPERS matches no known ThingTypes, deactivating world.")
+def command_plant0(str_int): # #
+ """Set PLANT_0, but deactivate world if not in ThingTypes."""
+ val = integer_test(str_int, 0)
+ if None != val:
+ world_db["PLANT_0"] = val
+ if world_db["WORLD_ACTIVE"] and \
+ world_db["PLANT_0"] not in world_db["ThingTypes"]:
+ world_db["WORLD_ACTIVE"] = 0
+ print("PLANT_0 matches no known ThingTypes, deactivating world.")
+
+
def test_for_id_maker(object, category):
"""Return decorator testing for object having "id" attribute."""
def decorator(f):
@@ -1639,19 +1700,21 @@ def setter_tpos(axis):
def command_ttid(id_string):
"""Set ID of ThingType to manipulate. ID unused? Create new one.
- Default new ThingType's TT_SYMBOL to "?", TT_CORPSE_ID to self, others: 0.
+ Default new ThingType's TT_SYMBOL to "?", TT_CORPSE_ID to self, TT_TOOL to
+ "", others: 0.
"""
id = id_setter(id_string, "ThingTypes", command_ttid)
if None != id:
world_db["ThingTypes"][id] = {
"TT_NAME": "(none)",
- "TT_CONSUMABLE": 0,
+ "TT_TOOLPOWER": 0,
"TT_LIFEPOINTS": 0,
"TT_PROLIFERATE": 0,
"TT_START_NUMBER": 0,
"TT_STORAGE": 0, # #
"TT_SYMBOL": "?",
- "TT_CORPSE_ID": id
+ "TT_CORPSE_ID": id,
+ "TT_TOOL": ""
}
@@ -1664,6 +1727,12 @@ def command_ttname(name):
world_db["ThingTypes"][command_ttid.id]["TT_NAME"] = name
+@test_ThingType_id
+def command_tttool(name):
+ """Set TT_TOOL of selected ThingType."""
+ world_db["ThingTypes"][command_ttid.id]["TT_TOOL"] = name
+
+
@test_ThingType_id
def command_ttsymbol(char):
"""Set TT_SYMBOL of selected ThingType. """
@@ -1749,22 +1818,22 @@ commands_db = {
"MAP_LENGTH": (1, False, command_maplength),
"WORLD_ACTIVE": (1, False, command_worldactive),
"MAP": (2, False, setter_map("MAP")),
- "ALTAR": (2, False, command_altar), # #
- "GAME_WON": (1, False, setter(None, "GAME_WON", 0, 1)), # #
+ "FAVOR_STAGE": (1, False, setter(None, "FAVOR_STAGE", 0, 65535)), # #
"SLIPPERS": (1, False, command_slippers), # #
+ "PLANT_0": (1, False, command_plant0), # #
"TA_ID": (1, False, command_taid),
"TA_EFFORT": (1, False, setter("ThingAction", "TA_EFFORT", 0, 255)),
"TA_NAME": (1, False, command_taname),
"TT_ID": (1, False, command_ttid),
"TT_NAME": (1, False, command_ttname),
+ "TT_TOOL": (1, False, command_tttool),
"TT_SYMBOL": (1, False, command_ttsymbol),
"TT_CORPSE_ID": (1, False, command_ttcorpseid),
- "TT_CONSUMABLE": (1, False, setter("ThingType", "TT_CONSUMABLE",
- 0, 65535)),
+ "TT_TOOLPOWER": (1, False, setter("ThingType", "TT_TOOLPOWER", 0, 65535)),
"TT_START_NUMBER": (1, False, setter("ThingType", "TT_START_NUMBER",
0, 255)),
"TT_PROLIFERATE": (1, False, setter("ThingType", "TT_PROLIFERATE",
- 0, 255)),
+ 0, 65535)),
"TT_LIFEPOINTS": (1, False, setter("ThingType", "TT_LIFEPOINTS", 0, 255)),
"TT_STORAGE": (1, False, setter("ThingType", "TT_STORAGE", 0, 255)), # #
"T_ID": (1, False, command_tid),
@@ -1800,9 +1869,9 @@ world_db = {
"GOD_MOOD": 0, # #
"GOD_FAVOR": 0, # #
"MAP": False,
- "ALTAR": False, # #
- "GAME_WON": 0, # #
+ "FAVOR_STAGE": 0, # #
"SLIPPERS": 0, # #
+ "PLANT_0": 0, # #
"ThingActions": {},
"ThingTypes": {},
"Things": {}