X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/edit?a=blobdiff_plain;f=roguelike-server;h=0bda2ca27c897970fff4e5f2887a6966011183a5;hb=2a943947dfe7d07cb29f81b40f9c4406c0c01424;hp=faea5aa4b7cac2561f3d3a3ddf0937484675d78d;hpb=82521c73e04bca0cea8f1368ac034291cb9f1cf9;p=plomrogue

diff --git a/roguelike-server b/roguelike-server
index faea5aa..0bda2ca 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" + \
@@ -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)