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

Merge pull request #3306 from InspectorCaracal/patch-clothing-type

Browse source 
Fix Clothing contrib ignoring clothing type limits
This commit is contained in:
Griatch 2023-10-29 07:44:31 +01:00 • committed by GitHub
commit d4302c461a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
evennia/contrib/game_systems/clothing/clothing.py
View file

@ -487,12 +487,12 @@ class CmdWear(MuxCommand):
return
# Apply individual clothing type limits.
if clothing_type := clothing.db.type:
if clothing_type := clothing.db.clothing_type:
if clothing_type in CLOTHING_TYPE_LIMIT:
type_count = single_type_count(already_worn, clothing_type)
if type_count >= CLOTHING_TYPE_LIMIT[clothing_type]:
self.caller.msg(
"You can't wear any more clothes of the type '{clothing_type}'."
f"You can't wear any more clothes of the type '{clothing_type}'."
)
return

19
evennia/contrib/game_systems/clothing/tests.py
View file

@ -79,6 +79,25 @@ class TestClothingCmd(BaseEvenniaCommandTest):
)
self.call(clothing.CmdUncover(), "hat", "You uncover test hat.", caller=self.wearer)
def test_clothing_limits(self):
"""
make sure clothing type limits are being enforced
"""
# change the scarf to a hat for convenience
# since the "hat" type is limited to 1 by default
self.test_scarf.db.clothing_type = "hat"
# move to wearer to be wearable
self.test_scarf.location = self.wearer
self.test_hat.location = self.wearer
# try wearing the hat and scarf-hat
self.call(clothing.CmdWear(), "hat", "You put on test hat.", caller=self.wearer)
self.call(
clothing.CmdWear(),
"scarf",
"You can't wear any more clothes of the type 'hat'.",
caller=self.wearer,
)
class TestClothingFunc(BaseEvenniaTest):
def setUp(self):