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:
2ad562c
)
Server/py: Apply PEP8.
author
Christian Heller
<c.heller@plomlompom.de>
Fri, 6 Mar 2015 21:43:14 +0000
(22:43 +0100)
committer
Christian Heller
<c.heller@plomlompom.de>
Fri, 6 Mar 2015 21:43:14 +0000
(22:43 +0100)
plomrogue-server.py
patch
|
blob
|
history
diff --git
a/plomrogue-server.py
b/plomrogue-server.py
index 82e2cbc87c2823f4ce3bc1164a4b74fdc64bc4e8..06fe20819d1a3a66d293ae99b4a564131d2505a1 100755
(executable)
--- a/
plomrogue-server.py
+++ b/
plomrogue-server.py
@@
-604,7
+604,7
@@
def actor_move(t):
hitted_name = world_db["ThingTypes"][hitted_type]["TT_NAME"]
hitted = "you" if hit_id == 0 else hitted_name
verb = " wound " if hitter == "You" else " wounds "
hitted_name = world_db["ThingTypes"][hitted_type]["TT_NAME"]
hitted = "you" if hit_id == 0 else hitted_name
verb = " wound " if hitter == "You" else " wounds "
- strong_write(io_db["file_out"], "LOG " + hitter + verb + hitted +
\
+ strong_write(io_db["file_out"], "LOG " + hitter + verb + hitted +
".\n")
decrement_lifepoints(world_db["Things"][hit_id])
return
".\n")
decrement_lifepoints(world_db["Things"][hit_id])
return
@@
-687,7
+687,7
@@
def thingproliferation(t):
if y == world_db["Things"][id]["T_POSY"]
if x == world_db["Things"][id]["T_POSX"]
if (t["T_TYPE"] == world_db["Things"][id]["T_TYPE"])
if y == world_db["Things"][id]["T_POSY"]
if x == world_db["Things"][id]["T_POSX"]
if (t["T_TYPE"] == world_db["Things"][id]["T_TYPE"])
- or (t["T_LIFEPOINTS"] and
+ or (t["T_LIFEPOINTS"] and
world_db["Things"][id]["T_LIFEPOINTS"])]:
return False
return True
world_db["Things"][id]["T_LIFEPOINTS"])]:
return False
return True
@@
-728,7
+728,7
@@
def try_healing(t):
def hunger(t):
def hunger(t):
- """Decrement t's satiation,
dependent on it trigger lifepoint dec chance."""
+ """Decrement t's satiation,dependent on it trigger lifepoint dec chance."""
if t["T_SATIATION"] > -32768:
t["T_SATIATION"] -= 1
testbase = t["T_SATIATION"] if t["T_SATIATION"] >= 0 else -t["T_SATIATION"]
if t["T_SATIATION"] > -32768:
t["T_SATIATION"] -= 1
testbase = t["T_SATIATION"] if t["T_SATIATION"] >= 0 else -t["T_SATIATION"]
@@
-740,7
+740,7
@@
def hunger(t):
strong_write(io_db["file_out"], "LOG You suffer from hunger.\n")
else:
name = world_db["ThingTypes"][t["T_TYPE"]]["TT_NAME"]
strong_write(io_db["file_out"], "LOG You suffer from hunger.\n")
else:
name = world_db["ThingTypes"][t["T_TYPE"]]["TT_NAME"]
- strong_write(io_db["file_out"], "LOG " + name +
\
+ strong_write(io_db["file_out"], "LOG " + name +
" suffers from hunger.\n")
decrement_lifepoints(t)
" suffers from hunger.\n")
decrement_lifepoints(t)
@@
-776,7
+776,7
@@
def turn_over():
world_db["TURN"] += 1
world_db["TURN"] += 1
-def new_Thing(type, pos=(0,0)):
+def new_Thing(type, pos=(0,
0)):
"""Return Thing of type T_TYPE, with fovmap if alive and world active."""
thing = {
"T_LIFEPOINTS": world_db["ThingTypes"][type]["TT_LIFEPOINTS"],
"""Return Thing of type T_TYPE, with fovmap if alive and world active."""
thing = {
"T_LIFEPOINTS": world_db["ThingTypes"][type]["TT_LIFEPOINTS"],