diff --git a/NS.py b/NS.py index 3569e67..1eaea6e 100644 --- a/NS.py +++ b/NS.py @@ -348,6 +348,10 @@ class Tony(Sprite): self.load_from_path(self.get_resource("newTony/TonyShirtHead"), True) self.add_frameset([0], name="static") self.add_frameset(range(1, len(self.frames)), name="board") + self.taunts = [] + for sfx_name in self.get_audio().sfx: + if sfx_name.startswith("TonyTauntsBend_"): + self.taunts.append(sfx_name) def set_frameset(self, name): Sprite.set_frameset(self, name) @@ -365,7 +369,7 @@ class Tony(Sprite): Sprite.shift_frame(self) frameset = self.get_current_frameset() if frameset.name == "board" and frameset.current_index == 1: - self.get_audio().play_sfx("comeOn") + self.get_audio().play_sfx(choice(self.taunts)) def update(self): save = self.get_display_surface() diff --git a/lib/pgfw b/lib/pgfw index 6c9554a..619a7da 160000 --- a/lib/pgfw +++ b/lib/pgfw @@ -1 +1 @@ -Subproject commit 6c9554a2559d4ae878aeeeb8e356fd8cc3618218 +Subproject commit 619a7dab3fe318d162bd747436b4bfd02c1b17bb diff --git a/resource/sfx/TonyTaunts/IWouldLikeTricks.ogg b/local/TonyTaunts/IWouldLikeTricks.ogg similarity index 100% rename from resource/sfx/TonyTaunts/IWouldLikeTricks.ogg rename to local/TonyTaunts/IWouldLikeTricks.ogg diff --git a/resource/sfx/TonyTaunts/comeOn.ogg b/local/TonyTaunts/comeOn.ogg similarity index 100% rename from resource/sfx/TonyTaunts/comeOn.ogg rename to local/TonyTaunts/comeOn.ogg diff --git a/resource/sfx/TonyTaunts/comeOnComeOn.ogg b/local/TonyTaunts/comeOnComeOn.ogg similarity index 100% rename from resource/sfx/TonyTaunts/comeOnComeOn.ogg rename to local/TonyTaunts/comeOnComeOn.ogg diff --git a/resource/sfx/TonyTaunts/iWouldLike.ogg b/local/TonyTaunts/iWouldLike.ogg similarity index 100% rename from resource/sfx/TonyTaunts/iWouldLike.ogg rename to local/TonyTaunts/iWouldLike.ogg diff --git a/resource/sfx/TonyTaunts/likeToSeeTricks.ogg b/local/TonyTaunts/likeToSeeTricks.ogg similarity index 100% rename from resource/sfx/TonyTaunts/likeToSeeTricks.ogg rename to local/TonyTaunts/likeToSeeTricks.ogg diff --git a/resource/sfx/TonyTaunts/scrapeBoardTricks.ogg b/local/TonyTaunts/scrapeBoardTricks.ogg similarity index 100% rename from resource/sfx/TonyTaunts/scrapeBoardTricks.ogg rename to local/TonyTaunts/scrapeBoardTricks.ogg diff --git a/resource/sfx/TonyTaunts/scrapin.ogg b/local/TonyTaunts/scrapin.ogg similarity index 100% rename from resource/sfx/TonyTaunts/scrapin.ogg rename to local/TonyTaunts/scrapin.ogg diff --git a/resource/sfx/TonyTaunts/showMeMoves.ogg b/local/TonyTaunts/showMeMoves.ogg similarity index 100% rename from resource/sfx/TonyTaunts/showMeMoves.ogg rename to local/TonyTaunts/showMeMoves.ogg diff --git a/resource/sfx/TonyTaunts/showMeTricks.ogg b/local/TonyTaunts/showMeTricks.ogg similarity index 100% rename from resource/sfx/TonyTaunts/showMeTricks.ogg rename to local/TonyTaunts/showMeTricks.ogg diff --git a/resource/sfx/TonyTaunts/thsb.ogg b/local/TonyTaunts/thsb.ogg similarity index 100% rename from resource/sfx/TonyTaunts/thsb.ogg rename to local/TonyTaunts/thsb.ogg diff --git a/resource/sfx/TonyTaunts/wearAMask.ogg b/local/TonyTaunts/wearAMask.ogg similarity index 100% rename from resource/sfx/TonyTaunts/wearAMask.ogg rename to local/TonyTaunts/wearAMask.ogg diff --git a/resource/scores b/resource/scores index b423df2..ef7a589 100644 --- a/resource/scores +++ b/resource/scores @@ -19,4 +19,3 @@ 237842 171298 198296 -142464 diff --git a/resource/sfx/TonyTauntsBend/IWouldLikeTricks.ogg b/resource/sfx/TonyTauntsBend/IWouldLikeTricks.ogg new file mode 100644 index 0000000..1e41ed7 Binary files /dev/null and b/resource/sfx/TonyTauntsBend/IWouldLikeTricks.ogg differ diff --git a/resource/sfx/TonyTauntsBend/comeOn.ogg b/resource/sfx/TonyTauntsBend/comeOn.ogg new file mode 100644 index 0000000..a0558c9 Binary files /dev/null and b/resource/sfx/TonyTauntsBend/comeOn.ogg differ diff --git a/resource/sfx/TonyTauntsBend/comeOnComeOn.ogg b/resource/sfx/TonyTauntsBend/comeOnComeOn.ogg new file mode 100644 index 0000000..007b7ba Binary files /dev/null and b/resource/sfx/TonyTauntsBend/comeOnComeOn.ogg differ diff --git a/resource/sfx/TonyTauntsBend/iWouldLike.ogg b/resource/sfx/TonyTauntsBend/iWouldLike.ogg new file mode 100644 index 0000000..86f2076 Binary files /dev/null and b/resource/sfx/TonyTauntsBend/iWouldLike.ogg differ diff --git a/resource/sfx/TonyTauntsBend/likeToSeeTricks.ogg b/resource/sfx/TonyTauntsBend/likeToSeeTricks.ogg new file mode 100644 index 0000000..7f78ca3 Binary files /dev/null and b/resource/sfx/TonyTauntsBend/likeToSeeTricks.ogg differ diff --git a/resource/sfx/TonyTauntsBend/scrapeBoardTricks.ogg b/resource/sfx/TonyTauntsBend/scrapeBoardTricks.ogg new file mode 100644 index 0000000..6bc7232 Binary files /dev/null and b/resource/sfx/TonyTauntsBend/scrapeBoardTricks.ogg differ diff --git a/resource/sfx/TonyTauntsBend/scrapin.ogg b/resource/sfx/TonyTauntsBend/scrapin.ogg new file mode 100644 index 0000000..539752e Binary files /dev/null and b/resource/sfx/TonyTauntsBend/scrapin.ogg differ diff --git a/resource/sfx/TonyTauntsBend/showMeMoves.ogg b/resource/sfx/TonyTauntsBend/showMeMoves.ogg new file mode 100644 index 0000000..e7899b1 Binary files /dev/null and b/resource/sfx/TonyTauntsBend/showMeMoves.ogg differ diff --git a/resource/sfx/TonyTauntsBend/showMeTricks.ogg b/resource/sfx/TonyTauntsBend/showMeTricks.ogg new file mode 100644 index 0000000..1daf998 Binary files /dev/null and b/resource/sfx/TonyTauntsBend/showMeTricks.ogg differ diff --git a/resource/sfx/TonyTauntsBend/thsb.ogg b/resource/sfx/TonyTauntsBend/thsb.ogg new file mode 100644 index 0000000..df2792a Binary files /dev/null and b/resource/sfx/TonyTauntsBend/thsb.ogg differ diff --git a/resource/sfx/TonyTauntsBend/wearAMask.ogg b/resource/sfx/TonyTauntsBend/wearAMask.ogg new file mode 100644 index 0000000..4e1a73d Binary files /dev/null and b/resource/sfx/TonyTauntsBend/wearAMask.ogg differ