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

Resolve merge conflicts against develop branch

Browse source
This commit is contained in:
Griatch 2017-11-05 14:20:25 +01:00
commit 20ef7f26ed
186 changed files with 1363 additions and 2081 deletions
Download patch file Download diff file Expand all files Collapse all files

2
evennia/contrib/turnbattle/tb_basic.py
View file

@ -733,7 +733,7 @@ class CmdCombatHelp(CmdHelp):
"|wPass:|n Pass your turn without further action.|/" +
"|wDisengage:|n End your turn and attempt to end combat.|/")
else:
super(CmdCombatHelp, self).func() # Call the default help command
super().func() # Call the default help command
class BattleCmdSet(default_cmds.CharacterCmdSet):

2
evennia/contrib/turnbattle/tb_equip.py
View file

@ -850,7 +850,7 @@ class CmdCombatHelp(CmdHelp):
"|wPass:|n Pass your turn without further action.|/" +
"|wDisengage:|n End your turn and attempt to end combat.|/")
else:
super(CmdCombatHelp, self).func() # Call the default help command
super().func() # Call the default help command
class CmdWield(Command):
"""