X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=roguelike-server;h=b5468a59c3b91fa675144f63fd9f1cb374df8e8d;hb=f7fe49e9089c184002d455a71ed4ba81db4d98ad;hp=29fe11994b79c15bca1ac95536f788cb16345e21;hpb=49679df70be008106ba63448b5ea66297c134bea;p=plomrogue diff --git a/roguelike-server b/roguelike-server index 29fe119..b5468a5 100755 --- a/roguelike-server +++ b/roguelike-server @@ -903,6 +903,7 @@ def actor_pick_up(t): Define topmostness by how low the thing's type ID is. """ # 7DRL: Non-player picking up player-dropped consumable -> GOD_FAVOR gain. + # 7DRL: Only player picks up non-food. used_slots = len(t["T_CARRIES"]) # # if used_slots < world_db["ThingTypes"][t["T_TYPE"]]["TT_STORAGE"]: # # ids = [id for id in world_db["Things"] if world_db["Things"][id] != t @@ -914,6 +915,9 @@ def actor_pick_up(t): for iid in ids: tid = world_db["Things"][iid]["T_TYPE"] if lowest_tid == -1 or tid < lowest_tid: + if (t != world_db["Things"][0] and # # + world_db["ThingTypes"][tid]["TT_TOOL"] != "food"): + continue id = iid lowest_tid = tid world_db["Things"][id]["carried"] = True