X-Git-Url: https://plomlompom.com/repos/todo?a=blobdiff_plain;f=roguelike-server;h=d1edd521dce06c4db89044753bd98861582afb2a;hb=7c7628b5ba4a32b65d09c8ea944c93243dbc7658;hp=327cd10ec312b42ff84310d690bcc396ad2582ee;hpb=4d2894ce308220afa3ffcdcee9f267832cadd6aa;p=plomrogue

diff --git a/roguelike-server b/roguelike-server
index 327cd10..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" + \
@@ -475,7 +475,7 @@ 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 TO libplomrogue.so:
+        # 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]
@@ -503,7 +503,7 @@ def update_map_memory(t, age_map=True):
     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"]
@@ -526,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)
@@ -796,7 +796,7 @@ def get_dir_to_target(t, filter):
     """
 
     def zero_score_map_where_char_on_memdepthmap(c):
-        # OUTSOURCED TO libpomrogue.so:
+        # 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)
@@ -840,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]]:
@@ -848,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()
@@ -1563,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),
@@ -1611,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": {}