From c5f1d9fa04af2c44840e066de4c75f2522cc02e3 Mon Sep 17 00:00:00 2001 From: VinniTR <71152012+VinniTR@users.noreply.github.com> Date: Mon, 1 Jul 2024 13:58:47 -0500 Subject: [PATCH 1/5] Update spaz.py --- src/assets/ba_data/python/bascenev1lib/actor/spaz.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/assets/ba_data/python/bascenev1lib/actor/spaz.py b/src/assets/ba_data/python/bascenev1lib/actor/spaz.py index f70383f0..59e58400 100644 --- a/src/assets/ba_data/python/bascenev1lib/actor/spaz.py +++ b/src/assets/ba_data/python/bascenev1lib/actor/spaz.py @@ -1188,6 +1188,8 @@ class Spaz(bs.Actor): self.bomb_count += 1 elif isinstance(msg, bs.DieMessage): + if self._dead: + return None wasdead = self._dead self._dead = True self.hitpoints = 0 From d775ed95b485350a07c6a9fc31725f84c72b7f8a Mon Sep 17 00:00:00 2001 From: VinniTR <71152012+VinniTR@users.noreply.github.com> Date: Tue, 2 Jul 2024 09:30:46 -0500 Subject: [PATCH 2/5] remove wasdead --- src/assets/ba_data/python/bascenev1lib/actor/spaz.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/assets/ba_data/python/bascenev1lib/actor/spaz.py b/src/assets/ba_data/python/bascenev1lib/actor/spaz.py index 59e58400..8ed9ee46 100644 --- a/src/assets/ba_data/python/bascenev1lib/actor/spaz.py +++ b/src/assets/ba_data/python/bascenev1lib/actor/spaz.py @@ -1190,7 +1190,6 @@ class Spaz(bs.Actor): elif isinstance(msg, bs.DieMessage): if self._dead: return None - wasdead = self._dead self._dead = True self.hitpoints = 0 if msg.immediate: @@ -1198,7 +1197,7 @@ class Spaz(bs.Actor): self.node.delete() elif self.node: self.node.hurt = 1.0 - if self.play_big_death_sound and not wasdead: + if self.play_big_death_sound: SpazFactory.get().single_player_death_sound.play() self.node.dead = True bs.timer(2.0, self.node.delete) From bd4d41d63105b809f66b1e1bbdaf3a9b085621b3 Mon Sep 17 00:00:00 2001 From: VinniTR <71152012+VinniTR@users.noreply.github.com> Date: Sun, 7 Jul 2024 21:27:45 -0500 Subject: [PATCH 3/5] Update spaz.py --- src/assets/ba_data/python/bascenev1lib/actor/spaz.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/ba_data/python/bascenev1lib/actor/spaz.py b/src/assets/ba_data/python/bascenev1lib/actor/spaz.py index 8ed9ee46..64509ce6 100644 --- a/src/assets/ba_data/python/bascenev1lib/actor/spaz.py +++ b/src/assets/ba_data/python/bascenev1lib/actor/spaz.py @@ -1140,7 +1140,7 @@ class Spaz(bs.Actor): scale=0.4, spread=0.1, ) - if self.hitpoints > 0: + if self.hitpoints >= 0: # It's kinda crappy to die from impacts, so lets reduce # impact damage by a reasonable amount *if* it'll keep us alive. if msg.hit_type == 'impact' and damage >= self.hitpoints: From 4415f3384b1472b5bb45701c45a625e5d648f8cb Mon Sep 17 00:00:00 2001 From: VinniTR <71152012+VinniTR@users.noreply.github.com> Date: Thu, 25 Jul 2024 22:59:23 -0500 Subject: [PATCH 4/5] Actualizar spaz.py --- src/assets/ba_data/python/bascenev1lib/actor/spaz.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/ba_data/python/bascenev1lib/actor/spaz.py b/src/assets/ba_data/python/bascenev1lib/actor/spaz.py index 64509ce6..8ed9ee46 100644 --- a/src/assets/ba_data/python/bascenev1lib/actor/spaz.py +++ b/src/assets/ba_data/python/bascenev1lib/actor/spaz.py @@ -1140,7 +1140,7 @@ class Spaz(bs.Actor): scale=0.4, spread=0.1, ) - if self.hitpoints >= 0: + if self.hitpoints > 0: # It's kinda crappy to die from impacts, so lets reduce # impact damage by a reasonable amount *if* it'll keep us alive. if msg.hit_type == 'impact' and damage >= self.hitpoints: From 7ac5e282c32e8a6aa95ede58928c98105ea7f152 Mon Sep 17 00:00:00 2001 From: VinniTR <71152012+VinniTR@users.noreply.github.com> Date: Sat, 31 Aug 2024 14:30:48 -0500 Subject: [PATCH 5/5] Update spaz.py --- .../ba_data/python/bascenev1lib/actor/spaz.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/assets/ba_data/python/bascenev1lib/actor/spaz.py b/src/assets/ba_data/python/bascenev1lib/actor/spaz.py index 8ed9ee46..25addf36 100644 --- a/src/assets/ba_data/python/bascenev1lib/actor/spaz.py +++ b/src/assets/ba_data/python/bascenev1lib/actor/spaz.py @@ -1188,19 +1188,19 @@ class Spaz(bs.Actor): self.bomb_count += 1 elif isinstance(msg, bs.DieMessage): - if self._dead: - return None + wasdead = self._dead self._dead = True self.hitpoints = 0 if msg.immediate: if self.node: self.node.delete() elif self.node: - self.node.hurt = 1.0 - if self.play_big_death_sound: - SpazFactory.get().single_player_death_sound.play() - self.node.dead = True - bs.timer(2.0, self.node.delete) + if not wasdead: + self.node.hurt = 1.0 + if self.play_big_death_sound: + SpazFactory.get().single_player_death_sound.play() + self.node.dead = True + bs.timer(2.0, self.node.delete) elif isinstance(msg, bs.OutOfBoundsMessage): # By default we just die here.