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

removed mult from checks on setting base/mod in counter/gauge traits; very unintuitive behavior

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

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

@ -1319,16 +1319,16 @@ class CounterTrait(Trait):
now = time() now = time()
tdiff = now - self._data["last_update"] tdiff = now - self._data["last_update"]
current += rate * tdiff current += rate * tdiff
value = (current + self.mod) * self.mult value = (current + self.mod)
# we must make sure so we don't overstep our bounds # we must make sure so we don't overstep our bounds
# even if .mod is included # even if .mod is included
if self._passed_ratetarget(value): if self._passed_ratetarget(value):
current = (self._data["ratetarget"] - self.mod) / self.mult current = (self._data["ratetarget"] - self.mod)
self._stop_timer() self._stop_timer()
elif not self._within_boundaries(value): elif not self._within_boundaries(value):
current = (self._enforce_boundaries(value) - self.mod) / self.mult current = (self._enforce_boundaries(value) - self.mod)
self._stop_timer() self._stop_timer()
else: else:
self._data["last_update"] = now self._data["last_update"] = now
@ -1350,10 +1350,10 @@ class CounterTrait(Trait):
if value is None: if value is None:
self._data["base"] = self.default_keys["base"] self._data["base"] = self.default_keys["base"]
if type(value) in (int, float): if type(value) in (int, float):
if self.min is not None and (value + self.mod) * self.mult < self.min: if self.min is not None and value + self.mod < self.min:
value = (self.min - self.mod) / self.mult value = self.min - self.mod
if self.max is not None and (value + self.mod) * self.mult > self.max: if self.max is not None and value + self.mod > self.max:
value = (self.max - self.mod) / self.mult value = self.max - self.mod
self._data["base"] = value self._data["base"] = value
@property @property
@ -1366,10 +1366,10 @@ class CounterTrait(Trait):
# unsetting the boundary to default # unsetting the boundary to default
self._data["mod"] = self.default_keys["mod"] self._data["mod"] = self.default_keys["mod"]
elif type(value) in (int, float): elif type(value) in (int, float):
if self.min is not None and (value + self.base) * self.mult < self.min: if self.min is not None and value + self.base < self.min:
value = (self.min - self.base) / self.mult value = self.min - self.base
if self.max is not None and (value + self.base) * self.mult > self.max: if self.max is not None and value + self.base > self.max:
value = (self.max - self.base) / self.mult value = self.max - self.base
self._data["mod"] = value self._data["mod"] = value
@property @property
@ -1393,7 +1393,7 @@ class CounterTrait(Trait):
elif type(value) in (int, float): elif type(value) in (int, float):
if self.max is not None: if self.max is not None:
value = min(self.max, value) value = min(self.max, value)
self._data["min"] = min(value, (self.base + self.mod) * self.mult) self._data["min"] = min(value, self.base + self.mod)
@property @property
def max(self): def max(self):
@ -1427,7 +1427,7 @@ class CounterTrait(Trait):
@property @property
def value(self): def value(self):
"The value of the Trait. (current + mod) * mult" "The value of the Trait. (current + mod) * mult"
return self._enforce_boundaries( (self.current + self.mod) * self.mult) return self._enforce_boundaries((self.current + self.mod) * self.mult)
@property @property
def ratetarget(self): def ratetarget(self):