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:
65c5761
)
Server: Refactor command_taname.
author
Christian Heller
<c.heller@plomlompom.de>
Fri, 26 Feb 2016 12:44:31 +0000
(13:44 +0100)
committer
Christian Heller
<c.heller@plomlompom.de>
Fri, 26 Feb 2016 12:44:31 +0000
(13:44 +0100)
server/commands.py
patch
|
blob
|
history
diff --git
a/server/commands.py
b/server/commands.py
index 1ce6464a3527965e16da391940217f86cc9269c7..eb8cf1cedcc8f8937a5800f888d7c0740987b879 100644
(file)
--- a/
server/commands.py
+++ b/
server/commands.py
@@
-142,7
+142,6
@@
def command_worldactive(worldactive_string):
world_db["WORLD_ACTIVE"] = 1
else:
print("Ignoring: No map defined for world to activate.")
world_db["WORLD_ACTIVE"] = 1
else:
print("Ignoring: No map defined for world to activate.")
- return
def command_tid(id_string):
def command_tid(id_string):
@@
-316,16
+315,13
@@
def command_taname(name):
or name == "pickup":
world_db["ThingActions"][command_taid.id]["TA_NAME"] = name
if 1 == world_db["WORLD_ACTIVE"]:
or name == "pickup":
world_db["ThingActions"][command_taid.id]["TA_NAME"] = name
if 1 == world_db["WORLD_ACTIVE"]:
- wait_defined = False
for id in world_db["ThingActions"]:
if "wait" == world_db["ThingActions"][id]["TA_NAME"]:
for id in world_db["ThingActions"]:
if "wait" == world_db["ThingActions"][id]["TA_NAME"]:
- wait_defined = True
break
break
-
if not wait_defined
:
+
else
:
set_world_inactive()
else:
print("Ignoring: Invalid action name.")
set_world_inactive()
else:
print("Ignoring: Invalid action name.")
- # In contrast to the original,naming won't map a function to a ThingAction.
def setter(category, key, min, max=None):
def setter(category, key, min, max=None):