From b20aebf260fed582d9e4e2902ae1da4d7eff65cf Mon Sep 17 00:00:00 2001 From: 0x_Hazel <0x.voidweaver@gmail.com> Date: Wed, 10 Jan 2024 06:43:33 +0000 Subject: [PATCH] Implemented clothing system --- commands/default_cmdsets.py | 5 ++--- typeclasses/characters.py | 7 +++---- typeclasses/objects.py | 1 - typeclasses/rooms.py | 2 -- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/commands/default_cmdsets.py b/commands/default_cmdsets.py index f60e96c..39a7f95 100644 --- a/commands/default_cmdsets.py +++ b/commands/default_cmdsets.py @@ -14,6 +14,7 @@ own cmdsets by inheriting from them or directly from `evennia.CmdSet`. """ +from evennia.contrib.game_systems.clothing import ClothedCharacterCmdSet from evennia import default_cmds from .encounter_cmdset import CmdEngage @@ -32,10 +33,8 @@ class CharacterCmdSet(default_cmds.CharacterCmdSet): Populates the cmdset """ super().at_cmdset_creation() - # - # any commands you add below will overload the default ones. - # self.add(CmdEngage) + self.add(ClothedCharacterCmdSet) class AccountCmdSet(default_cmds.AccountCmdSet): diff --git a/typeclasses/characters.py b/typeclasses/characters.py index 987bfc1..4b0b2d8 100644 --- a/typeclasses/characters.py +++ b/typeclasses/characters.py @@ -1,14 +1,13 @@ -from evennia.objects.objects import DefaultCharacter +from evennia.contrib.game_systems.clothing import ClothedCharacter + from evennia.contrib.rpg.traits import TraitHandler from commands.encounter_cmdset import SetEncounterSpecial from world.species import SPECIES_CMDSET -from .objects import ObjectParent - CURRENT_VERSION = 1 -class Character(ObjectParent, DefaultCharacter): +class Character(ClothedCharacter): def at_object_creation(self): self.db.version = 1 self.db.species = 0 diff --git a/typeclasses/objects.py b/typeclasses/objects.py index bb1efb1..12327b7 100644 --- a/typeclasses/objects.py +++ b/typeclasses/objects.py @@ -12,7 +12,6 @@ inheritance. """ from evennia.objects.objects import DefaultObject - class ObjectParent: pass diff --git a/typeclasses/rooms.py b/typeclasses/rooms.py index 71f4aa0..60da48c 100644 --- a/typeclasses/rooms.py +++ b/typeclasses/rooms.py @@ -4,12 +4,10 @@ Room Rooms are simple containers that has no location of their own. """ - from evennia.objects.objects import DefaultRoom from .objects import ObjectParent - class Room(ObjectParent, DefaultRoom): """ Rooms are like any Object, except their location is None