Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes in batchprocessor. The batchprocessor now completely ignores states (so running a batch file where e.g. a player is forced into a state by entering a room will no longer also trap the builder using the batchprocessor to build that trapping room.) This is by automatically setting the flag ADMIN_NOSTATE on the user running batchprocessor.

Browse source 
.
Griatch
This commit is contained in:
Griatch 2009-11-25 23:02:28 +00:00
parent 1e2fba9680
commit c2d603c3db
1 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/commands/batchprocess.py
View file

@ -193,24 +193,40 @@ def cmd_batchprocess(command):
#parse indata file #parse indata file
commands = parse_batchbuild_file(filename) commands = parse_batchbuild_file(filename)
if not commands: if not commands:
source_object.emit_to("'%s' not found.\nYou have to supply the real path of the file relative to \nyour batch-file directory (%s)." % (filename, settings.BATCH_IMPORT_PATH)) string = "'%s' not found.\nYou have to supply the real path "
string += "of the file relative to \nyour batch-file directory (%s)."
source_object.emit_to(string % (filename, settings.BATCH_IMPORT_PATH))
return return
switches = command.command_switches switches = command.command_switches
if switches and switches[0] in ['inter','interactive']: if switches and switches[0] in ['inter','interactive']:
# allow more control over how batch file is executed # allow more control over how batch file is executed
if not source_object.set_state(STATENAME): if not source_object.set_state(STATENAME):
source_object.emit_to("You cannot use the interactive mode while you have the flag ADMIN_NOSTATE set.") # if we failed it is likely because we have
return # ADMIN_NOSTATE set.
source_object.unset_flag("ADMIN_NOSTATE")
if not source_object.set_state(STATENAME):
source_object.emit_to("Error in entering the interactive state.")
source_object.set_flag("ADMIN_NOSTATE")
return
else:
string = "OBS: Flag ADMIN_NOSTATE unset in order to "
string += "run Interactive mode. Don't forget to re-set "
string += "it (if you need it) after you're done."
source_object.emit_to(string)
CMDSTACKS[source_object] = commands CMDSTACKS[source_object] = commands
STACKPTRS[source_object] = 0 STACKPTRS[source_object] = 0
FILENAMES[source_object] = filename FILENAMES[source_object] = filename
source_object.emit_to("\nBatch processor - Interactive mode for %s ..." % filename) source_object.emit_to("\nBatch processor - Interactive mode for %s ..." % filename)
show_curr(source_object) show_curr(source_object)
else: else:
source_object.set_flag("ADMIN_NOSTATE")
source_object.emit_to("Running Batch processor - Automatic mode for %s ..." % filename) source_object.emit_to("Running Batch processor - Automatic mode for %s ..." % filename)
source_object.clear_state() source_object.clear_state()
batch_process(source_object, commands) batch_process(source_object, commands)
source_object.emit_to("%s== Batchfile '%s' applied." % (cgreen,filename)) source_object.emit_to("%s== Batchfile '%s' applied." % (cgreen,filename))
source_object.unset_flag("ADMIN_NOSTATE")
GLOBAL_CMD_TABLE.add_command("@batchprocess", cmd_batchprocess, GLOBAL_CMD_TABLE.add_command("@batchprocess", cmd_batchprocess,
priv_tuple=("genperms.process_control",), help_category="Building") priv_tuple=("genperms.process_control",), help_category="Building")
@ -507,10 +523,11 @@ def cmd_state_hh(command):
nl [steps] - next & look nl [steps] - next & look
bb [steps] - back to previous command (no processing) bb [steps] - back to previous command (no processing)
bl [steps] - back & look bl [steps] - back & look
jj <N> - jump to command no N (no processing) jj <N> - jump to command nr N (no processing)
jl <N> - jump & look jl <N> - jump & look
pp - process currently shown command (no step) pp - process currently shown command (no step)
ss [steps] - process & step ss [steps] - process & step
sl [steps] - process & step & look
ll - look at full definition of current command ll - look at full definition of current command
rr - reload batch file (stay on current) rr - reload batch file (stay on current)
rrr - reload batch file (start from first) rrr - reload batch file (start from first)