Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added deleters for mult (resets to 1.0), fixed more docstring stuff

Browse source
This commit is contained in:
Tegiminis 2022-02-12 15:02:28 -08:00
parent 6246e72a79
commit d86108b276
1 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

20
evennia/contrib/rpg/traits/traits.py
View file

@ -1196,6 +1196,10 @@ class StaticTrait(Trait):
if type(amount) in (int, float): if type(amount) in (int, float):
self._data["mult"] = amount self._data["mult"] = amount
@mult.deleter
def mult(self):
self._data["mult"] = 1.0
@property @property
def value(self): def value(self):
"The value of the Trait." "The value of the Trait."
@ -1209,14 +1213,14 @@ class CounterTrait(Trait):
This includes modifications and min/max limits as well as the notion of a This includes modifications and min/max limits as well as the notion of a
current value. The value can also be reset to the base value. current value. The value can also be reset to the base value.
min/unset base base+mod max/unset min/unset base (base+mod)*mult max/unset
|--------------|--------|---------X--------X------------| |--------------|--------|---------X--------X------------|
current value current value
= (current = (current
+ mod) + mod)
* mult * mult
- value = (current + mod) * mult, starts at base + mod - value = (current + mod) * mult, starts at (base + mod) * mult
- if min or max is None, there is no upper/lower bound (default) - if min or max is None, there is no upper/lower bound (default)
- if max is set to "base", max will be equal ot base+mod - if max is set to "base", max will be equal ot base+mod
- descs are used to optionally describe each value interval. - descs are used to optionally describe each value interval.
@ -1381,6 +1385,10 @@ class CounterTrait(Trait):
if type(amount) in (int, float): if type(amount) in (int, float):
self._data["mult"] = amount self._data["mult"] = amount
@mult.deleter
def mult(self):
self._data["mult"] = 1.0
@property @property
def min(self): def min(self):
return self._data["min"] return self._data["min"]
@ -1407,11 +1415,11 @@ class CounterTrait(Trait):
elif type(value) in (int, float): elif type(value) in (int, float):
if self.min is not None: if self.min is not None:
value = max(self.min, value) value = max(self.min, value)
self._data["max"] = max(value, (self.base + self.mod) * self.mult) self._data["max"] = max(value, self.base + self.mod)
@property @property
def current(self): def current(self):
"""The `current` value of the `Trait`. This does not have .mod added.""" """The `current` value of the `Trait`. This does not have .mod added and is not .mult-iplied."""
return self._update_current(self._data.get("current", self.base)) return self._update_current(self._data.get("current", self.base))
@current.setter @current.setter
@ -1599,6 +1607,10 @@ class GaugeTrait(CounterTrait):
if type(amount) in (int, float): if type(amount) in (int, float):
self._data["mult"] = amount self._data["mult"] = amount
@mult.deleter
def mult(self):
self._data["mult"] = 1.0
@property @property
def min(self): def min(self):
val = self._data["min"] val = self._data["min"]