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 (parent:
858dd9d
)
Let actor_pick_up pick up most nutritious Thing as topmost Thing.
author
Christian Heller
<c.heller@plomlompom.de>
Wed, 26 Aug 2015 03:29:29 +0000
(
05:29
+0200)
committer
Christian Heller
<c.heller@plomlompom.de>
Wed, 26 Aug 2015 03:29:29 +0000
(
05:29
+0200)
roguelike-server
patch
|
blob
|
history
diff --git
a/roguelike-server
b/roguelike-server
index 483dc22f75171bb588c2d4c471a44637da88938e..77c53d44025e821c0b6ad4a5949960f8132bb01f 100755
(executable)
--- a/
roguelike-server
+++ b/
roguelike-server
@@
-656,15
+656,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. Picks
Thing with highest ID
.
+ # Topmostness is actually not defined so far. Picks
most nutritious Thing
.
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):
- highest_id = 0
+ highest_id = ids[0]
+ nutritious = 0
for id in ids:
for id in ids:
- if id > highest_id:
+ type = world_db["Things"][id]["T_TYPE"]
+ if world_db["ThingTypes"][type]["TT_CONSUMABLE"] > nutritious:
+ nutritious = world_db["ThingTypes"][type]["TT_CONSUMABLE"]
highest_id = id
world_db["Things"][highest_id]["carried"] = True
t["T_CARRIES"].append(highest_id)
highest_id = id
world_db["Things"][highest_id]["carried"] = True
t["T_CARRIES"].append(highest_id)