diff --git a/commands/default_cmdsets.py b/commands/default_cmdsets.py index 6d408fc..9701c10 100644 --- a/commands/default_cmdsets.py +++ b/commands/default_cmdsets.py @@ -22,7 +22,7 @@ from evennia.contrib.rpg.character_creator.character_creator import ContribCharg from commands.sittables import CmdNoSitStand from commands.everyone import (CmdTake, CmdThink, CmdSay, CmdWhisper, CmdRead, CmdEat, CmdDrink, - CmdUse, CmdPush, CmdPull) + CmdUse, CmdPush, CmdPull, CmdTutorial) from commands.misc import CmdLight from commands.wizards import CmdGM, CmdSpell, CmdGMTrigger, CmdMakeCocktail @@ -41,6 +41,7 @@ class CharacterCmdSet(default_cmds.CharacterCmdSet): Populates the cmdset """ super().at_cmdset_creation() + self.add(CmdTutorial) self.add(CmdNoSitStand) self.add(CmdEat) self.add(CmdDrink) diff --git a/commands/everyone.py b/commands/everyone.py index fec9dd9..885d687 100755 --- a/commands/everyone.py +++ b/commands/everyone.py @@ -10,6 +10,7 @@ from evennia.contrib.rpg.rpsystem import send_emote from evennia.utils import iter_to_str, logger from typeclasses.characters import Character +from typeclasses.tutorial import TutorBird, TutorialState from utils.word_list import routput, paragraph, choices @@ -38,6 +39,16 @@ def speech_effect(speech, verb, target, effects): return (speech, speech, verb) +class CmdTutorial(Command): + """ + Start (or restart) the tutorial. + """ + key = "tutorial" + + def func(self): + TutorBird.do_start_tutorial(self.caller) + + class CmdUse(MuxCommand): """ Use an item. diff --git a/typeclasses/characters.py b/typeclasses/characters.py index 8de3fda..7b3cabe 100644 --- a/typeclasses/characters.py +++ b/typeclasses/characters.py @@ -78,7 +78,7 @@ class Character(Object, GenderCharacter, ContribRPCharacter): obj.delete() def at_post_puppet(self, **kwargs): - if self.db.visited: + if self.db.visited and not self.db.guest_account: self.msg(f"""\n“Welcome back, {self.key.capitalize()}.”\n""") if self.location.key == "Wyldwood Bar": self.msg("You wake up in a meadow with a strange dream of a bar...")