diff --git a/pgfw/Audio.py b/pgfw/Audio.py index d280957..3e8df6b 100644 --- a/pgfw/Audio.py +++ b/pgfw/Audio.py @@ -232,7 +232,8 @@ class AudioPanel(Animation): def respond(self, event): if self.get_delegate().compare(event, "toggle-audio-panel") and \ - pygame.key.get_mods() & KMOD_CTRL and pygame.key.get_mods() & KMOD_SHIFT: + pygame.key.get_mods() & KMOD_CTRL and pygame.key.get_mods() & KMOD_SHIFT and \ + self.get_audio().sfx: if self.active: self.deactivate() else: diff --git a/pgfw/Vector.py b/pgfw/Vector.py index 8ba476f..d98ce62 100644 --- a/pgfw/Vector.py +++ b/pgfw/Vector.py @@ -60,13 +60,13 @@ class Vector(list): def __eq__(self, other): for sv, ov in zip(self, other): - if value != other[ii]: + if sv != ov: return False return True def __ne__(self, other): for sv, ov in zip(self, other): - if value == other[ii]: + if sv == ov: return False return True @@ -128,8 +128,8 @@ class EVector(Vector): else: from .extension import get_angle, get_distance end = self.x + dx, self.y + dy + self.angle = get_angle(self, end, True) self.magnitude = get_distance(self, end) - self.angle = -get_angle(self, end) - pi def __repr__(self): return "" % \ diff --git a/pgfw/extension.py b/pgfw/extension.py index 1b0c2f8..6b20354 100644 --- a/pgfw/extension.py +++ b/pgfw/extension.py @@ -35,7 +35,8 @@ def get_points_on_line(start, end, count): return points def get_angle(start, end, transpose=False): - angle = atan2(end[1] - start[1], end[0] - start[0]) + """counterclockwise, 0 is down""" + angle = atan2(end[0] - start[0], end[1] - start[1]) if transpose: angle = -angle - pi return angle