diff --git a/AO2XPbase/themes/default/effects/hearts.png b/AO2XPbase/themes/default/effects/hearts.apng similarity index 100% rename from AO2XPbase/themes/default/effects/hearts.png rename to AO2XPbase/themes/default/effects/hearts.apng diff --git a/AO2XPbase/themes/default/effects/hearts.png~ b/AO2XPbase/themes/default/effects/hearts.png~ deleted file mode 100644 index 7f775d1..0000000 Binary files a/AO2XPbase/themes/default/effects/hearts.png~ and /dev/null differ diff --git a/AO2XPbase/themes/default/effects/hearts.webp~ b/AO2XPbase/themes/default/effects/hearts.webp~ deleted file mode 100644 index 890342e..0000000 Binary files a/AO2XPbase/themes/default/effects/hearts.webp~ and /dev/null differ diff --git a/AO2XPbase/themes/default/effects/impact.png b/AO2XPbase/themes/default/effects/impact.apng similarity index 100% rename from AO2XPbase/themes/default/effects/impact.png rename to AO2XPbase/themes/default/effects/impact.apng diff --git a/AO2XPbase/themes/default/effects/impact.webp~ b/AO2XPbase/themes/default/effects/impact.webp~ deleted file mode 100644 index b86c924..0000000 Binary files a/AO2XPbase/themes/default/effects/impact.webp~ and /dev/null differ diff --git a/AO2XPbase/themes/default/effects/reaction.png b/AO2XPbase/themes/default/effects/reaction.apng similarity index 100% rename from AO2XPbase/themes/default/effects/reaction.png rename to AO2XPbase/themes/default/effects/reaction.apng diff --git a/AO2XPbase/themes/default/effects/reaction.webp~ b/AO2XPbase/themes/default/effects/reaction.webp~ deleted file mode 100644 index 20688c8..0000000 Binary files a/AO2XPbase/themes/default/effects/reaction.webp~ and /dev/null differ diff --git a/AO2XPbase/themes/default/effects/realization.apng b/AO2XPbase/themes/default/effects/realization.apng new file mode 100644 index 0000000..fa73919 Binary files /dev/null and b/AO2XPbase/themes/default/effects/realization.apng differ diff --git a/AO2XPbase/themes/default/effects/realization.png b/AO2XPbase/themes/default/effects/realization.png deleted file mode 100644 index 776c70d..0000000 Binary files a/AO2XPbase/themes/default/effects/realization.png and /dev/null differ diff --git a/AO2XPbase/themes/default/effects/realization.webp~ b/AO2XPbase/themes/default/effects/realization.webp~ deleted file mode 100644 index 647bed3..0000000 Binary files a/AO2XPbase/themes/default/effects/realization.webp~ and /dev/null differ diff --git a/gameview.py b/gameview.py index 83dfa5a..56aea23 100644 --- a/gameview.py +++ b/gameview.py @@ -458,6 +458,7 @@ class AOMovie(QtGui.QLabel): pillow_frames = [] pillow_frame = 0 pillow_speed = 1 + pillow_loops = 0 xx = 0 # for restoring from screenshake yy = 0 # for restoring from screenshake @@ -485,7 +486,7 @@ class AOMovie(QtGui.QLabel): def play(self, p_image, p_char=""): gif_path = p_image - pillow_modes = {".gif": 0, ".apng": 1, ".webp": 2} + pillow_modes = {".gif": 0, ".apng": 1, ".webp": 2, ".png": 1} p_image = unicode(p_image) @@ -502,7 +503,7 @@ class AOMovie(QtGui.QLabel): if exists(f): gif_path = f break - + self.use_pillow = pillow_modes[os.path.splitext(gif_path)[1]] if not self.use_pillow: @@ -723,6 +724,8 @@ class gui(QtGui.QWidget): self.bench.setPixmap(bench.scaled(VIEWPORT_W, VIEWPORT_H, QtCore.Qt.KeepAspectRatioByExpanding, QtCore.Qt.FastTransformation)) self.effectview = AOMovie(self.viewport) + self.effectview.resize(VIEWPORT_W, VIEWPORT_H) + self.effectview.setScaledContents(True) font_db = QtGui.QFontDatabase() font_db.addApplicationFont(AO2XPpath + 'font/Igiari.ttf') @@ -2215,11 +2218,12 @@ class gui(QtGui.QWidget): self.playSound(fx_sound) if "effects" not in self.features: return + #print "effect", repr(effect) - self.effectview.set_play_once(False) - try: self.effectview.play(effect) - except: pass # Windows XP webp error with Pillow - print "effect", repr(effect) + self.effectview.set_play_once(True) + #try: + self.effectview.play(effect) + #except: pass # Windows XP webp error with Pillow def start_chat_ticking(self): if self.text_state != 0: