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:
00c8261
)
turn_over(): hunger() before Thing action, so no suicide corpses hunger.
author
Christian Heller
<c.heller@plomlompom.de>
Thu, 12 Mar 2015 01:28:44 +0000
(
02:28
+0100)
committer
Christian Heller
<c.heller@plomlompom.de>
Thu, 12 Mar 2015 01:28:44 +0000
(
02:28
+0100)
roguelike-server
patch
|
blob
|
history
diff --git
a/roguelike-server
b/roguelike-server
index 887bf7e1ca468dd7d42879dffbf9515728c77c46..e9db093340cce2edce79f7485fe8868f16a7a292 100755
(executable)
--- a/
roguelike-server
+++ b/
roguelike-server
@@
-1125,15
+1125,16
@@
def turn_over():
break
ai(Thing)
try_healing(Thing)
break
ai(Thing)
try_healing(Thing)
- Thing["T_PROGRESS"] += 1
- taid = [a for a in world_db["ThingActions"]
- if a == Thing["T_COMMAND"]][0]
- ThingAction = world_db["ThingActions"][taid]
- if Thing["T_PROGRESS"] == ThingAction["TA_EFFORT"]:
- eval("actor_" + ThingAction["TA_NAME"])(Thing)
- Thing["T_COMMAND"] = 0
- Thing["T_PROGRESS"] = 0
hunger(Thing)
hunger(Thing)
+ if Thing["T_LIFEPOINTS"]:
+ Thing["T_PROGRESS"] += 1
+ taid = [a for a in world_db["ThingActions"]
+ if a == Thing["T_COMMAND"]][0]
+ ThingAction = world_db["ThingActions"][taid]
+ if Thing["T_PROGRESS"] == ThingAction["TA_EFFORT"]:
+ eval("actor_" + ThingAction["TA_NAME"])(Thing)
+ Thing["T_COMMAND"] = 0
+ Thing["T_PROGRESS"] = 0
thingproliferation(Thing, proliferable_map)
if whilebreaker:
break
thingproliferation(Thing, proliferable_map)
if whilebreaker:
break