From 9e56ba1fcc0fc06b4f6251cd9493426d5d99830c Mon Sep 17 00:00:00 2001 From: Amber Date: Fri, 12 Jan 2024 23:35:04 -0600 Subject: [PATCH] minor stuff --- commands/command.py | 14 ++++++++++++++ commands/custom_cmdset.py | 2 +- commands/encounter_cmdset.py | 2 ++ typeclasses/characters.py | 2 +- world/species.py | 2 +- 5 files changed, 19 insertions(+), 3 deletions(-) diff --git a/commands/command.py b/commands/command.py index 0495e28..00ac8a0 100644 --- a/commands/command.py +++ b/commands/command.py @@ -46,6 +46,20 @@ class CmdMeow(Command): self.caller.msg(f"You meowed at {target.key}!") target.msg(f"You got meowed at by {self.caller.key}!") +class CmdBark(Command): + + key = 'bark' + + def func(self): + args = self.args.strip() + if not args: + self.caller.msg("Who or what would you like to bark at?") + return + target = self.caller.search(args) + if not target: + return + self.caller.msg(f"You barked at {target.key}!") + target.msg(f"You got barked at by {self.caller.key}!") # ------------------------------------------------------------- diff --git a/commands/custom_cmdset.py b/commands/custom_cmdset.py index e862fff..4a780ba 100644 --- a/commands/custom_cmdset.py +++ b/commands/custom_cmdset.py @@ -12,4 +12,4 @@ class SetSpeciesCatkin(CmdSet): class SetSpeciesDogkin(CmdSet): def at_cmdset_creation(self): - self.add(cmd.CmdMeow()) + self.add(cmd.CmdBark()) diff --git a/commands/encounter_cmdset.py b/commands/encounter_cmdset.py index 38f6261..0f93a26 100644 --- a/commands/encounter_cmdset.py +++ b/commands/encounter_cmdset.py @@ -182,6 +182,8 @@ class SetEncounterSpecial(CmdSet): self.add(CmdFlee) self.add(CmdOOC) self.add(CmdPose) + self.add(CmdKiss) + self.add(CmdBite) # Encounter-related character commands diff --git a/typeclasses/characters.py b/typeclasses/characters.py index 8e73253..77a3fca 100644 --- a/typeclasses/characters.py +++ b/typeclasses/characters.py @@ -25,7 +25,7 @@ class Character(ClothedCharacter): self.cmdset.add(SPECIES_CMDSET[self.db.species]) def revoke_encounter_cmdset(self): - self.cmdset.remove(SPECIES_CMDSET[self.db.species]) +# self.cmdset.remove(SPECIES_CMDSET[self.db.species]) self.cmdset.remove(SetEncounterSpecial) pass diff --git a/world/species.py b/world/species.py index 81c1824..9fca573 100644 --- a/world/species.py +++ b/world/species.py @@ -15,5 +15,5 @@ SPECIES_LIST = [ SPECIES_CMDSET = [ SetSpeciesHuman, SetSpeciesCatkin, - SetSpeciesDogkin + SetSpeciesDogkin, ]