X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=server%2Fcommands.py;fp=server%2Fcommands.py;h=7755f880fdb78d1489894c8212466fdac958d3a8;hb=4f88b914763e1a8e3ab8889d4affc6205b158e9b;hp=493fb761d46058b4751e643b93417566c893e1a3;hpb=51baedbbcc82b64b36bd95f9e1493962853e801b;p=plomrogue diff --git a/server/commands.py b/server/commands.py index 493fb76..7755f88 100644 --- a/server/commands.py +++ b/server/commands.py @@ -440,13 +440,14 @@ 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]["T_POSY"] == t["T_POSY"] + if world_db["Things"][tid]["T_POSX"] == t["T_POSX"]] + 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")