From 0656c216478d04d6b914dd2aa58c2fb3a857ff17 Mon Sep 17 00:00:00 2001 From: Goonz <71152012+GoonZ166@users.noreply.github.com> Date: Thu, 4 Aug 2022 21:48:26 -0500 Subject: [PATCH 1/3] Weak punch sound (spaz.py) --- assets/src/ba_data/python/bastd/actor/spaz.py | 6 ++++-- 1 file changed, 4 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 5362c2f3..919e974b 100644 --- a/assets/src/ba_data/python/bastd/actor/spaz.py +++ b/assets/src/ba_data/python/bastd/actor/spaz.py @@ -979,9 +979,11 @@ class Spaz(ba.Actor): position=self.node.position) if damage > 500: sounds = SpazFactory.get().punch_sound_strong - sound = sounds[random.randrange(len(sounds))] + sound = sounds[random.randrange(len(sounds))] + elif damage > 300: + sound = SpazFactory.get().punch_sound else: - sound = SpazFactory.get().punch_sound + sound = SpazFactory.get().punch_sound_weak ba.playsound(sound, 1.0, position=self.node.position) # Throw up some chunks. From 17d97258e9dccf3dd6b443df16ec8cbe0bc7491e Mon Sep 17 00:00:00 2001 From: rallet <71152012+rallet@users.noreply.github.com> Date: Fri, 12 Aug 2022 13:58:23 -0500 Subject: [PATCH 2/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 919e974b..31114d7f 100644 --- a/assets/src/ba_data/python/bastd/actor/spaz.py +++ b/assets/src/ba_data/python/bastd/actor/spaz.py @@ -966,7 +966,7 @@ class Spaz(ba.Actor): self.on_punched(damage) # If damage was significant, lets show it. - if damage > 350: + if damage >= 350: assert msg.force_direction is not None ba.show_damage_count('-' + str(int(damage / 10)) + '%', msg.pos, msg.force_direction) @@ -977,10 +977,10 @@ class Spaz(ba.Actor): ba.playsound(SpazFactory.get().punch_sound_stronger, 1.0, position=self.node.position) - if damage > 500: + if damage >= 500: sounds = SpazFactory.get().punch_sound_strong sound = sounds[random.randrange(len(sounds))] - elif damage > 300: + elif damage >= 300: sound = SpazFactory.get().punch_sound else: sound = SpazFactory.get().punch_sound_weak From 7f5746d98ad07b5dfb45c44dc35eddd104478d1e Mon Sep 17 00:00:00 2001 From: ral <71152012+gooeyRalet@users.noreply.github.com> Date: Fri, 2 Sep 2022 13:50:26 -0500 Subject: [PATCH 3/3] Update spaz.py --- assets/src/ba_data/python/bastd/actor/spaz.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/assets/src/ba_data/python/bastd/actor/spaz.py b/assets/src/ba_data/python/bastd/actor/spaz.py index 31114d7f..a2fc51e4 100644 --- a/assets/src/ba_data/python/bastd/actor/spaz.py +++ b/assets/src/ba_data/python/bastd/actor/spaz.py @@ -979,9 +979,9 @@ class Spaz(ba.Actor): position=self.node.position) if damage >= 500: sounds = SpazFactory.get().punch_sound_strong - sound = sounds[random.randrange(len(sounds))] - elif damage >= 300: - sound = SpazFactory.get().punch_sound + sound = sounds[random.randrange(len(sounds))] + elif damage >= 300: + sound = SpazFactory.get().punch_sound else: sound = SpazFactory.get().punch_sound_weak ba.playsound(sound, 1.0, position=self.node.position) @@ -1077,7 +1077,7 @@ class Spaz(ba.Actor): # us if its grown high enough. if self.hitpoints <= 0: damage_avg = self.node.damage_smoothed * damage_scale - if damage_avg > 1000: + if damage_avg >= 1000: self.shatter() elif isinstance(msg, BombDiedMessage): @@ -1343,9 +1343,9 @@ class Spaz(ba.Actor): hit_type='impact')) self.node.handlemessage('knockout', max(0.0, 50.0 * intensity)) sounds: Sequence[ba.Sound] - if intensity > 5.0: + if intensity >= 5.0: sounds = SpazFactory.get().impact_sounds_harder - elif intensity > 3.0: + elif intensity >= 3.0: sounds = SpazFactory.get().impact_sounds_hard else: sounds = SpazFactory.get().impact_sounds_medium