X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=roguelike-server;h=d1edd521dce06c4db89044753bd98861582afb2a;hb=653c87619e29ea1696d0f2b9e3836cd91275fea7;hp=d452efbee6ec250036dd93e2af50077b48f9270a;hpb=3b6de6a3440290478dff65f5849241d57ae431fb;p=plomrogue
diff --git a/roguelike-server b/roguelike-server
index d452efb..d1edd52 100755
--- a/roguelike-server
+++ b/roguelike-server
@@ -331,9 +331,9 @@ def try_worldstate_update():
name = world_db["ThingTypes"][type_id]["TT_NAME"]
inventory = inventory + name + "\n"
## 7DRL additions: GOD_MOOD, GOD_FAVOR
- string = str(world_db["GOD_MOOD"]) + "\n" + \
+ string = str(world_db["TURN"]) + "\n" + \
+ str(world_db["GOD_MOOD"]) + "\n" + \
str(world_db["GOD_FAVOR"]) + "\n" + \
- str(world_db["TURN"]) + "\n" + \
str(world_db["Things"][0]["T_LIFEPOINTS"]) + "\n" + \
str(world_db["Things"][0]["T_SATIATION"]) + "\n" + \
inventory + "%\n" + \
@@ -474,6 +474,18 @@ def remake_map():
def update_map_memory(t, age_map=True):
"""Update t's T_MEMMAP with what's in its FOV now,age its T_MEMMEPTHMAP."""
+ def age_some_memdepthmap_on_nonfov_cells():
+ # OUTSOURCED FOR PERFORMANCE REASONS TO libplomrogue.so:
+ # for pos in [pos for pos in range(world_db["MAP_LENGTH"] ** 2)
+ # if not ord_v == t["fovmap"][pos]
+ # if ord_0 <= t["T_MEMDEPTHMAP"][pos]
+ # if ord_9 > t["T_MEMDEPTHMAP"][pos]
+ # if not rand.next() % (2 **
+ # (t["T_MEMDEPTHMAP"][pos] - 48))]:
+ # t["T_MEMDEPTHMAP"][pos] += 1
+ memdepthmap = c_pointer_to_bytearray(t["T_MEMDEPTHMAP"])
+ fovmap = c_pointer_to_bytearray(t["fovmap"])
+ libpr.age_some_memdepthmap_on_nonfov_cells(memdepthmap, fovmap)
if not t["T_MEMMAP"]:
t["T_MEMMAP"] = bytearray(b' ' * (world_db["MAP_LENGTH"] ** 2))
if not t["T_MEMDEPTHMAP"]:
@@ -487,14 +499,11 @@ def update_map_memory(t, age_map=True):
if ord_space == t["T_MEMMAP"][pos]:
t["T_MEMMAP"][pos] = world_db["MAP"][pos]
if age_map:
- maptype = ctypes.c_char * len(t["T_MEMDEPTHMAP"])
- memdepthmap = maptype.from_buffer(t["T_MEMDEPTHMAP"])
- fovmap = maptype.from_buffer(t["fovmap"])
- libpr.age_some_memdepthmap_on_nonfov_cells(memdepthmap, fovmap)
+ age_some_memdepthmap_on_nonfov_cells()
for mt in [mt for mt in t["T_MEMTHING"]
if "v" == chr(t["fovmap"][(mt[1] * world_db["MAP_LENGTH"])
+ mt[2]])]:
- t["T_MEMTHING"].remove(mt)
+ t["T_MEMTHING"].remove(mt)
for id in [id for id in world_db["Things"]
if not world_db["Things"][id]["carried"]]:
type = world_db["Things"][id]["T_TYPE"]
@@ -517,12 +526,12 @@ def integer_test(val_string, min, max=None):
"""Return val_string if possible integer >= min and <= max, else None."""
try:
val = int(val_string)
- if val < min or (max != None and val > max):
+ if val < min or (max is not None and val > max):
raise ValueError
return val
except ValueError:
msg = "Ignoring: Please use integer >= " + str(min)
- if max != None:
+ if max is not None:
msg += " and <= " + str(max)
msg += "."
print(msg)
@@ -558,11 +567,9 @@ def setter(category, key, min, max=None):
def build_fov_map(t):
"""Build Thing's FOV map."""
t["fovmap"] = bytearray(b'v' * (world_db["MAP_LENGTH"] ** 2))
- maptype = ctypes.c_char * len(world_db["MAP"])
- test = libpr.build_fov_map(t["T_POSY"], t["T_POSX"],
- maptype.from_buffer(t["fovmap"]),
- maptype.from_buffer(world_db["MAP"]))
- if test:
+ fovmap = c_pointer_to_bytearray(t["fovmap"])
+ map = c_pointer_to_bytearray(world_db["MAP"])
+ if libpr.build_fov_map(t["T_POSY"], t["T_POSX"], fovmap, map):
raise RuntimeError("Malloc error in build_fov_Map().")
@@ -789,10 +796,12 @@ def get_dir_to_target(t, filter):
"""
def zero_score_map_where_char_on_memdepthmap(c):
- maptype = ctypes.c_char * len(t["T_MEMDEPTHMAP"])
- map = maptype.from_buffer(t["T_MEMDEPTHMAP"])
- test = libpr.zero_score_map_where_char_on_memdepthmap(c, map)
- if test:
+ # OUTSOURCED FOR PERFORMANCE REASONS TO libplomrogue.so:
+ # for i in [i for i in range(world_db["MAP_LENGTH"] ** 2)
+ # if t["T_MEMDEPTHMAP"][i] == mem_depth_c[0]]:
+ # set_map_score(i, 0)
+ map = c_pointer_to_bytearray(t["T_MEMDEPTHMAP"])
+ if libpr.zero_score_map_where_char_on_memdepthmap(c, map):
raise RuntimeError("No score map allocated for "
"zero_score_map_where_char_on_memdepthmap().")
@@ -831,7 +840,8 @@ def get_dir_to_target(t, filter):
return False
def set_cells_passable_on_memmap_to_65534_on_scoremap():
- # OUTSOURCED TO libplomrogue.so:
+ # OUTSOURCED FOR PERFORMANCE REASONS TO libplomrogue.so:
+ # ord_dot = ord(".")
# memmap = t["T_MEMMAP"]
# for i in [i for i in range(world_db["MAP_LENGTH"] ** 2)
# if ord_dot == memmap[i]]:
@@ -839,13 +849,12 @@ def get_dir_to_target(t, filter):
map = c_pointer_to_bytearray(t["T_MEMMAP"])
if libpr.set_cells_passable_on_memmap_to_65534_on_scoremap(map):
raise RuntimeError("No score map allocated for "
- "set_cells_passable_on_memmap_to_65534_on_scoremap().")
+ "set_cells_passable_on_memmap_to_65534_on_scoremap().")
def init_score_map():
test = libpr.init_score_map()
if test:
raise RuntimeError("Malloc error in init_score_map().")
- ord_dot = ord(".")
ord_v = ord("v")
ord_blank = ord(" ")
set_cells_passable_on_memmap_to_65534_on_scoremap()
@@ -1554,8 +1563,8 @@ commands_db = {
"SEED_MAP": (1, False, command_seedmap),
"SEED_RANDOMNESS": (1, False, command_seedrandomness),
"TURN": (1, False, setter(None, "TURN", 0, 65535)),
- "GOD_MOOD": (1, False, setter(None, "GOD_MOOD", -32768, 32767)), ##
- "GOD_FAVOR": (1, False, setter(None, "GOD_FAVOR", -32768, 32767)), ##
+ "GOD_MOOD": (1, False, setter(None, "GOD_MOOD", -32768, 32767)), # #
+ "GOD_FAVOR": (1, False, setter(None, "GOD_FAVOR", -32768, 32767)), # #
"PLAYER_TYPE": (1, False, setter(None, "PLAYER_TYPE", 0)),
"MAP_LENGTH": (1, False, command_maplength),
"WORLD_ACTIVE": (1, False, command_worldactive),
@@ -1602,8 +1611,8 @@ world_db = {
"SEED_MAP": 0,
"PLAYER_TYPE": 0,
"WORLD_ACTIVE": 0,
- "GOD_MOOD": 0, ##
- "GOD_FAVOR": 0, ##
+ "GOD_MOOD": 0, # #
+ "GOD_FAVOR": 0, # #
"ThingActions": {},
"ThingTypes": {},
"Things": {}