diff --git a/evennia/contrib/test_traits.py b/evennia/contrib/test_traits.py index 16402feb12..9b90d57785 100644 --- a/evennia/contrib/test_traits.py +++ b/evennia/contrib/test_traits.py @@ -519,7 +519,7 @@ class TestTraitGauge(_TraitHandlerBase): def setUp(self): super().setUp() self.traithandler.add( - "test2", + "test1", name="Test1", trait_type='gauge', base=8, # max = base + mod @@ -527,7 +527,7 @@ class TestTraitGauge(_TraitHandlerBase): extra_val1="xvalue1", extra_val2="xvalue2" ) - self.trait1 = self.traithandler.get("test2") + self.trait1 = self.traithandler.get("test1") def _get_values(self): return (self.trait1.base, self.trait1.mod, self.trait1.actual, @@ -537,9 +537,10 @@ class TestTraitGauge(_TraitHandlerBase): self.assertEqual( self._get_dbstore("test1"), {"name": "Test1", - "trait_type": 'counter', + "trait_type": 'gauge', "base": 8, "mod": 2, + "min": 0, "extra_val1": "xvalue1", "extra_val2": "xvalue2" } @@ -559,8 +560,8 @@ class TestTraitGauge(_TraitHandlerBase): self.trait1.base -= 4 self.assertEqual(self._get_values(), (8, 2, 5, 0, 10)) self.trait1.min = -100 - self.trait.base = -20 - self.assertEqual(self._get_values(), (-20, 2, -18, -100, 10)) + self.trait1.base = -20 + self.assertEqual(self._get_values(), (-20, 2, -18, -100, -18)) def test_boundaries__minmax(self): """Test range""" diff --git a/evennia/contrib/traits.py b/evennia/contrib/traits.py index f342d0c4c6..9b29b5801d 100644 --- a/evennia/contrib/traits.py +++ b/evennia/contrib/traits.py @@ -686,7 +686,7 @@ class Trait: try: # check if we have a custom deleter _DA(self, key) - except AttributeHandler: + except AttributeError: # delete normally del self._data[key] else: