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

Change how cmdset options are merged by priority - this is now a straight priority order, where the option from the higher prio goes. Also add unit tests for cmdset mergers.

Browse source
This commit is contained in:
Griatch 2016-10-08 19:39:52 +02:00
parent 300758b2dd
commit 40e1c67f88
3 changed files with 212 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

4
evennia/commands/cmdhandler.py
View file

@ -329,7 +329,7 @@ def get_and_merge_cmdsets(caller, session, player, obj, callertype):
prio = cmdset.priority
if prio in tempmergers:
# merge same-prio cmdset together separately
tempmergers[prio] = yield cmdset + tempmergers[prio]
tempmergers[prio] = yield tempmergers[prio] + cmdset
else:
tempmergers[prio] = cmdset
@ -339,7 +339,7 @@ def get_and_merge_cmdsets(caller, session, player, obj, callertype):
# Merge all command sets into one, beginning with the lowest-prio one
cmdset = cmdsets[0]
for merging_cmdset in cmdsets[1:]:
cmdset = yield merging_cmdset + cmdset
cmdset = yield cmdset + merging_cmdset
# store the full sets for diagnosis
cmdset.merged_from = cmdsets
# cache