From 706a91dee7ef237fc2871d6c94c58ccbdf2d65bf Mon Sep 17 00:00:00 2001 From: Melo <71152012+rafriz@users.noreply.github.com> Date: Sun, 8 Jan 2023 20:08:32 -0500 Subject: [PATCH 1/3] Update spaz.py --- assets/src/ba_data/python/bastd/actor/spaz.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/src/ba_data/python/bastd/actor/spaz.py b/assets/src/ba_data/python/bastd/actor/spaz.py index 4d1529fe..d449a7c7 100644 --- a/assets/src/ba_data/python/bastd/actor/spaz.py +++ b/assets/src/ba_data/python/bastd/actor/spaz.py @@ -88,12 +88,12 @@ class Spaz(ba.Actor): self.play_big_death_sound = False - # scales how much impacts affect us (most damage calcs) + # Scales how much impacts affect us (most damage calcs). self.impact_scale = 1.0 self.source_player = source_player self._dead = False - if self._demo_mode: # preserve old behavior + if self._demo_mode: # Preserve old behavior. self._punch_power_scale = 1.2 else: self._punch_power_scale = factory.punch_power_scale @@ -376,7 +376,7 @@ class Spaz(ba.Actor): Called to 'press jump' on this spaz; used by player or AI connections. """ - if not self.node: + if not self.node or self.frozen or self.node.knockout > 0.0: return t_ms = ba.time(timeformat=ba.TimeFormat.MILLISECONDS) assert isinstance(t_ms, int) From 2a50321753935d3f1aaaf8c7dc50018386b4e2ef Mon Sep 17 00:00:00 2001 From: Melo <71152012+rafriz@users.noreply.github.com> Date: Thu, 12 Jan 2023 21:08:21 -0500 Subject: [PATCH 2/3] Update spaz.py --- assets/src/ba_data/python/bastd/actor/spaz.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/src/ba_data/python/bastd/actor/spaz.py b/assets/src/ba_data/python/bastd/actor/spaz.py index d449a7c7..994585cf 100644 --- a/assets/src/ba_data/python/bastd/actor/spaz.py +++ b/assets/src/ba_data/python/bastd/actor/spaz.py @@ -262,7 +262,7 @@ class Spaz(ba.Actor): def _turbo_filter_add_press(self, source: str) -> None: """ Can pass all button presses through here; if we see an obscene number - of them in a short time let's shame/pushish this guy for using turbo + of them in a short time let's shame/pushish this guy for using turbo. """ t_ms = ba.time( timetype=ba.TimeType.BASE, timeformat=ba.TimeFormat.MILLISECONDS @@ -399,7 +399,7 @@ class Spaz(ba.Actor): Called to 'press pick-up' on this spaz; used by player or AI connections. """ - if not self.node: + if not self.node or self.frozen or self.node.knockout > 0.0: return t_ms = ba.time(timeformat=ba.TimeFormat.MILLISECONDS) assert isinstance(t_ms, int) From f7c235f03042b9c7b62edc24869963e0e58a8eae Mon Sep 17 00:00:00 2001 From: Melo <71152012+ElSBP@users.noreply.github.com> Date: Tue, 17 Jan 2023 22:18:30 -0500 Subject: [PATCH 3/3] Update spaz.py --- assets/src/ba_data/python/bastd/actor/spaz.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/src/ba_data/python/bastd/actor/spaz.py b/assets/src/ba_data/python/bastd/actor/spaz.py index 994585cf..54843fff 100644 --- a/assets/src/ba_data/python/bastd/actor/spaz.py +++ b/assets/src/ba_data/python/bastd/actor/spaz.py @@ -376,7 +376,7 @@ class Spaz(ba.Actor): Called to 'press jump' on this spaz; used by player or AI connections. """ - if not self.node or self.frozen or self.node.knockout > 0.0: + if not self.node: return t_ms = ba.time(timeformat=ba.TimeFormat.MILLISECONDS) assert isinstance(t_ms, int) @@ -399,7 +399,7 @@ class Spaz(ba.Actor): Called to 'press pick-up' on this spaz; used by player or AI connections. """ - if not self.node or self.frozen or self.node.knockout > 0.0: + if not self.node: return t_ms = ba.time(timeformat=ba.TimeFormat.MILLISECONDS) assert isinstance(t_ms, int)