home
·
contact
·
privacy
projects
/
plomrogue
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
b3b4cee
)
Server/py: Let actor_pick_up() pick up Things by highest ID.
author
Christian Heller
<c.heller@plomlompom.de>
Sun, 8 Mar 2015 00:05:21 +0000
(
01:05
+0100)
committer
Christian Heller
<c.heller@plomlompom.de>
Sun, 8 Mar 2015 00:05:21 +0000
(
01:05
+0100)
plomrogue-server.py
patch
|
blob
|
history
diff --git
a/plomrogue-server.py
b/plomrogue-server.py
index 2d53bb56fdea150011f046a68c1d798a88e4831a..b08899a5a67d40c4ab8aafcacc7012732578898c 100755
(executable)
--- a/
plomrogue-server.py
+++ b/
plomrogue-server.py
@@
-629,14
+629,18
@@
def actor_move(t):
def actor_pick_up(t):
"""Make t pick up (topmost?) Thing from ground into inventory."""
def actor_pick_up(t):
"""Make t pick up (topmost?) Thing from ground into inventory."""
- # Topmostness is actually not defined so far.
+ # Topmostness is actually not defined so far.
Picks Thing with highest ID.
ids = [id for id in world_db["Things"] if world_db["Things"][id] != t
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"]]
if len(ids):
ids = [id for id in world_db["Things"] if world_db["Things"][id] != t
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"]]
if len(ids):
- world_db["Things"][ids[0]]["carried"] = True
- t["T_CARRIES"].append(ids[0])
+ highest_id = 0
+ for id in ids:
+ if id > highest_id:
+ highest_id = id
+ world_db["Things"][highest_id]["carried"] = True
+ t["T_CARRIES"].append(highest_id)
if t == world_db["Things"][0]:
strong_write(io_db["file_out"], "LOG You pick up an object.\n")
elif t == world_db["Things"][0]:
if t == world_db["Things"][0]:
strong_write(io_db["file_out"], "LOG You pick up an object.\n")
elif t == world_db["Things"][0]: