projects
/
mudpy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make command actions implicit
[mudpy.git]
/
mudpy
/
command.py
diff --git
a/mudpy/command.py
b/mudpy/command.py
index
1138aa8
..
5ba3d28
100644
(file)
--- a/
mudpy/command.py
+++ b/
mudpy/command.py
@@
-11,7
+11,7
@@
import unicodedata
import mudpy
import mudpy
-def chat(actor):
+def chat(actor
, parameters
):
"""Toggle chat mode."""
mode = actor.get("mode")
if not mode:
"""Toggle chat mode."""
mode = actor.get("mode")
if not mode:
@@
-148,10
+148,7
@@
def help(actor, parameters):
if parameters and actor.owner:
# is the command word one for which we have data?
if parameters and actor.owner:
# is the command word one for which we have data?
- if parameters in actor.universe.groups["command"]:
- command = actor.universe.groups["command"][parameters]
- else:
- command = None
+ command = mudpy.misc.find_command(parameters)
# only for allowed commands
if actor.can_run(command):
# only for allowed commands
if actor.can_run(command):
@@
-164,7
+161,8
@@
def help(actor, parameters):
output = "$(red)"
else:
output = "$(grn)"
output = "$(red)"
else:
output = "$(grn)"
- output += parameters + "$(nrm) - " + description + "$(eol)$(eol)"
+ output = "%s%s$(nrm) - %s$(eol)$(eol)" % (
+ output, command.subkey, description)
# add the help text if provided
help_text = command.get("help")
# add the help text if provided
help_text = command.get("help")
@@
-273,14
+271,14
@@
def preferences(actor, parameters):
actor.send(message)
actor.send(message)
-def quit(actor):
+def quit(actor
, parameters
):
"""Leave the world and go back to the main menu."""
if actor.owner:
actor.owner.state = "main_utility"
actor.owner.deactivate_avatar()
"""Leave the world and go back to the main menu."""
if actor.owner:
actor.owner.state = "main_utility"
actor.owner.deactivate_avatar()
-def reload(actor):
+def reload(actor
, parameters
):
"""Reload all code modules, configs and data."""
if actor.owner:
"""Reload all code modules, configs and data."""
if actor.owner:
@@
-425,9
+423,8
@@
def show(actor, parameters):
elif arguments[0] == "version":
message = repr(actor.universe.versions)
elif arguments[0] == "time":
elif arguments[0] == "version":
message = repr(actor.universe.versions)
elif arguments[0] == "time":
- message = actor.universe.groups["internal"]["counters"].get(
- "elapsed"
- ) + " increments elapsed since the world was created."
+ message = "%s increments elapsed since the world was created." % (
+ str(actor.universe.groups["internal"]["counters"].get("elapsed")))
elif arguments[0] == "groups":
message = "These are the element groups:$(eol)"
groups = list(actor.universe.groups.keys())
elif arguments[0] == "groups":
message = "These are the element groups:$(eol)"
groups = list(actor.universe.groups.keys())