Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-16 21:06:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix bug if red button demo losing cmdset after reload

Browse source
This commit is contained in:
Griatch 2022-11-07 23:37:23 +01:00
parent 789b8784d5
commit 340b979d0d
2 changed files with 7 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
evennia/commands/cmdset.py
View file

@ -515,12 +515,6 @@ class CmdSet(object, metaclass=_CmdSetMeta):
existing ones to make a unique set.
"""
if hasattr(cmd, "key") and (cmd.key in ("say", "whisper")):
from evennia.utils import calledby
print(calledby(2))
print(f"cmdset.add {cmd.__class__}")
if inherits_from(cmd, "evennia.commands.cmdset.CmdSet"):
# cmd is a command set so merge all commands in that set
# to this one. We raise a visible error if we created

15
evennia/contrib/tutorials/red_button/red_button.py
View file

@ -32,10 +32,9 @@ such as when closing the lid and un-blinding a character.
"""
import random
from evennia import DefaultObject
from evennia import Command, CmdSet
from evennia.utils.utils import delay, repeat, interactive
from evennia import CmdSet, Command, DefaultObject
from evennia.utils.utils import delay, interactive, repeat
# Commands on the button (not all awailable at the same time)
@ -385,8 +384,7 @@ class BlindCmdSet(CmdSet):
def at_cmdset_creation(self):
"Setup the blind cmdset"
from evennia.commands.default.general import CmdSay
from evennia.commands.default.general import CmdPose
from evennia.commands.default.general import CmdPose, CmdSay
self.add(CmdSay())
self.add(CmdPose())
@ -434,7 +432,7 @@ class RedButton(DefaultObject):
# these on the fly.
desc_closed_lid = (
"This is a large red button, inviting yet evil-looking. " "A closed glass lid protects it."
"This is a large red button, inviting yet evil-looking. A closed glass lid protects it."
)
desc_open_lid = (
"This is a large red button, inviting yet evil-looking. "
@ -520,7 +518,7 @@ class RedButton(DefaultObject):
# remove lidopen-state, if it exists
self.cmdset.remove(LidOpenCmdSet)
# add lid-closed cmdset
self.cmdset.add(LidClosedCmdSet)
self.cmdset.add(LidClosedCmdSet, persistent=True)
if msg and self.location:
self.location.msg_contents(msg)
@ -535,7 +533,7 @@ class RedButton(DefaultObject):
# remove lidopen-state, if it exists
self.cmdset.remove(LidClosedCmdSet)
# add lid-open cmdset
self.cmdset.add(LidOpenCmdSet)
self.cmdset.add(LidOpenCmdSet, persistent=True)
# wait 20s then call self.to_closed_state with a message as argument
delay(
@ -566,6 +564,7 @@ class RedButton(DefaultObject):
# we don't need to remove other cmdsets, this will replace all,
# then restore whatever was there when it goes away.
# we don't make this persistent, to make sure any problem is just a reload away
caller.cmdset.add(BlindCmdSet)
# wait 20s then call self._unblind to remove blindness effect. The