home · contact · privacy
Remove unused variable.
[plomrogue] / roguelike-server
index faea5aa4b7cac2561f3d3a3ddf0937484675d78d..cf836ec90b6b19f9b76aded8851cc9c3b145f1ac 100755 (executable)
@@ -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" + \
@@ -526,7 +526,7 @@ 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 (if max is not None and val > max):
+        if val < min or (max is not None and val > max):
             raise ValueError
         return val
     except ValueError:
@@ -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 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)
@@ -841,6 +841,7 @@ def get_dir_to_target(t, filter):
 
     def set_cells_passable_on_memmap_to_65534_on_scoremap():
         # OUTSOURCED 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]]:
@@ -854,7 +855,6 @@ def get_dir_to_target(t, filter):
         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()