From 6f00c8cfc0e34597e8644821c7d492b08e4be26b Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Mon, 1 Apr 2024 11:16:19 +0200
Subject: [PATCH] Named the rpsystem cmdset, trying to address #3452

---
 evennia/contrib/rpg/rpsystem/rpsystem.py      |  2 ++
 .../tutorials/evadventure/combat_turnbased.py | 14 ++++-------
 .../tutorials/evadventure/combat_twitch.py    | 25 +++++++------------
 3 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/evennia/contrib/rpg/rpsystem/rpsystem.py b/evennia/contrib/rpg/rpsystem/rpsystem.py
index 22a3bffa3b..bf808ff307 100644
--- a/evennia/contrib/rpg/rpsystem/rpsystem.py
+++ b/evennia/contrib/rpg/rpsystem/rpsystem.py
@@ -1277,6 +1277,8 @@ class RPSystemCmdSet(CmdSet):
     Mix-in for adding rp-commands to default cmdset.
     """
 
+    key = "rpsystem_cmdset"
+
     def at_cmdset_creation(self):
         self.add(CmdEmote())
         self.add(CmdSay())
diff --git a/evennia/contrib/tutorials/evadventure/combat_turnbased.py b/evennia/contrib/tutorials/evadventure/combat_turnbased.py
index 14b7f0bb26..fdea4a0038 100644
--- a/evennia/contrib/tutorials/evadventure/combat_turnbased.py
+++ b/evennia/contrib/tutorials/evadventure/combat_turnbased.py
@@ -26,15 +26,9 @@ from evennia import AttributeProperty, CmdSet, Command, EvMenu
 from evennia.utils import inherits_from, list_to_string
 
 from .characters import EvAdventureCharacter
-from .combat_base import (
-    CombatAction,
-    CombatActionAttack,
-    CombatActionHold,
-    CombatActionStunt,
-    CombatActionUseItem,
-    CombatActionWield,
-    EvAdventureCombatBaseHandler,
-)
+from .combat_base import (CombatAction, CombatActionAttack, CombatActionHold,
+                          CombatActionStunt, CombatActionUseItem,
+                          CombatActionWield, EvAdventureCombatBaseHandler)
 from .enums import Ability
 
 
@@ -843,5 +837,7 @@ class TurnCombatCmdSet(CmdSet):
     CmdSet for the turn-based combat.
     """
 
+    key = "turncombat_cmdset"
+
     def at_cmdset_creation(self):
         self.add(CmdTurnAttack())
diff --git a/evennia/contrib/tutorials/evadventure/combat_twitch.py b/evennia/contrib/tutorials/evadventure/combat_twitch.py
index 787081fc28..9e860ffff8 100644
--- a/evennia/contrib/tutorials/evadventure/combat_twitch.py
+++ b/evennia/contrib/tutorials/evadventure/combat_twitch.py
@@ -8,24 +8,13 @@ This implements a 'twitch' (aka DIKU or other traditional muds) style of MUD com
 """
 from evennia import AttributeProperty, CmdSet, default_cmds
 from evennia.commands.command import Command, InterruptCommand
-from evennia.utils.utils import (
-    display_len,
-    inherits_from,
-    list_to_string,
-    pad,
-    repeat,
-    unrepeat,
-)
+from evennia.utils.utils import (display_len, inherits_from, list_to_string,
+                                 pad, repeat, unrepeat)
 
 from .characters import EvAdventureCharacter
-from .combat_base import (
-    CombatActionAttack,
-    CombatActionHold,
-    CombatActionStunt,
-    CombatActionUseItem,
-    CombatActionWield,
-    EvAdventureCombatBaseHandler,
-)
+from .combat_base import (CombatActionAttack, CombatActionHold,
+                          CombatActionStunt, CombatActionUseItem,
+                          CombatActionWield, EvAdventureCombatBaseHandler)
 from .enums import ABILITY_REVERSE_MAP
 
 
@@ -560,6 +549,8 @@ class TwitchCombatCmdSet(CmdSet):
     Add to character, to be able to attack others in a twitch-style way.
     """
 
+    key = "twitch_combat_cmdset"
+
     def at_cmdset_creation(self):
         self.add(CmdAttack())
         self.add(CmdHold())
@@ -573,5 +564,7 @@ class TwitchLookCmdSet(CmdSet):
     This will be added/removed dynamically when in combat.
     """
 
+    key = "twitch_look_cmdset"
+
     def at_cmdset_creation(self):
         self.add(CmdLook())