Server: Optimize thing position calculation.

[plomrogue] / server / commands.py

diff --git a/server/commands.py b/server/commands.py
index 7ad36d00eedbf87419cef00c1927ee446869273f..536e330522a6c98e2c8a8d26856049da79db43a9 100644 (file)
--- a/server/commands.py
+++ b/server/commands.py
@@ -57,8 +57,7 @@ def command_thingshere(str_y, str_x):
                               for id in world_db["Things"]
                               if not world_db["Things"][id]["carried"]
                               if world_db["Things"][id]["T_TYPE"] == tid
-                              if y == world_db["Things"][id]["T_POSY"]
-                              if x == world_db["Things"][id]["T_POSX"]]:
+                              if pos == world_db["Things"][id]["pos"]]:
                     type = world_db["Things"][id]["T_TYPE"]
                     name = world_db["ThingTypes"][type]["TT_NAME"]
                     strong_write(io_db["file_out"], name + "\n")
@@ -403,7 +402,9 @@ def setter_tpos(axis):
         val = integer_test(str_int, 0, 255)
         if None != val:
             if val < world_db["MAP_LENGTH"]:
-                world_db["Things"][command_tid.id]["T_POS" + axis] = val
+                t = world_db["Things"][command_tid.id]
+                t["T_POS" + axis] = val
+                t["pos"] = t["T_POSY"] * world_db["MAP_LENGTH"] + t["T_POSX"]
                 if world_db["WORLD_ACTIVE"] \
                    and world_db["Things"][command_tid.id]["T_LIFEPOINTS"]:
                     build_fov_map(world_db["Things"][command_tid.id])
@@ -440,13 +441,13 @@ def play_pickup():
     """Try "pickup" as player's T_COMMAND"."""
     if action_exists("pickup"):
         t = world_db["Things"][0]
-        ids = [id for id in world_db["Things"] if id
-               if not world_db["Things"][id]["carried"]
-               if world_db["Things"][id]["T_POSY"] == t["T_POSY"]
-               if world_db["Things"][id]["T_POSX"] == t["T_POSX"]]
+        ids = [tid for tid in world_db["Things"] if tid
+               if not world_db["Things"][tid]["carried"]
+               if world_db["Things"][tid]["pos"] == t["pos"]]
+        from server.config.commands import play_pickup_attempt_hook
         if not len(ids):
              log("NOTHING to pick up.")
-        else:
+        elif play_pickup_attempt_hook(t):
             set_command("pickup")
 
 
@@ -474,10 +475,13 @@ def play_use(str_arg):
         else:
             val = integer_test(str_arg, 0, 255)
             if None != val and val < len(t["T_CARRIES"]):
-                id = t["T_CARRIES"][val]
-                type = world_db["Things"][id]["T_TYPE"]
-                if not world_db["ThingTypes"][type]["TT_TOOL"] == "food":
-                    log("You CAN'T consume this thing.")
+                tid = t["T_CARRIES"][val]
+                tt = world_db["ThingTypes"][world_db["Things"][tid]["T_TYPE"]]
+                from server.config.commands import play_use_attempt_hook
+                hook_test = play_use_attempt_hook(t, tt)
+                if not (tt["TT_TOOL"] == "food" or hook_test):
+                    if hook_test != False:
+                        log("You CAN'T use this thing.")
                     return
                 world_db["Things"][0]["T_ARGUMENT"] = val
                 set_command("use")