cidoku/AO2XP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve handling of single frame images + look in more dirs for anims

Browse Source
This commit is contained in:
cidoku 2025-02-27 22:15:44 -03:00
parent ddc7b971a4
commit 5b07e9a3ad
1 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
gameview.py
View File

@ -288,7 +288,7 @@ class AOCharMovie(QtGui.QLabel):
def set_flipped(self, flip): def set_flipped(self, flip):
self.m_flipped = flip self.m_flipped = flip
def play(self, p_char, p_emote, emote_prefix, scaling = SCALING_AUTO): def play(self, p_char, p_emote, emote_prefix, scaling = SCALING_AUTO, single_frame_duration=-1):
if p_emote[0] == "/" or p_emote[0] == "/": if p_emote[0] == "/" or p_emote[0] == "/":
p_emote = p_emote[1:] p_emote = p_emote[1:]
elif "../../characters" in p_emote: elif "../../characters" in p_emote:
@ -306,10 +306,25 @@ class AOCharMovie(QtGui.QLabel):
p_char = p_char.lower() p_char = p_char.lower()
p_emote = p_emote.lower() p_emote = p_emote.lower()
original_path = test_path([AOpath+"characters/"+p_char+"/"+emote_prefix+p_emote+".gif", AOpath+"characters/"+p_char+"/"+emote_prefix+p_emote+".gif"]) original_path = test_path(
[
AOpath+"characters/"+p_char+"/"+emote_prefix+p_emote+".gif",
AOpath+"characters/"+p_char+"/"+emote_prefix+p_emote+".gif",
AOpath+"characters/"+p_char+"/"+p_emote+".gif"
])
alt_path = AOpath+"characters/"+p_char+"/"+p_emote+".png" alt_path = AOpath+"characters/"+p_char+"/"+p_emote+".png"
apng_path = test_path([AOpath+"characters/"+p_char+"/"+emote_prefix+p_emote+".apng", AOpath+"characters/"+p_char+"/"+emote_prefix+"/"+p_emote+".apng"]) apng_path = test_path(
webp_path = test_path([AOpath+"characters/"+p_char+"/"+emote_prefix+p_emote+".webp", AOpath+"characters/"+p_char+"/"+emote_prefix+"/"+p_emote+".webp"]) [
AOpath+"characters/"+p_char+"/"+emote_prefix+p_emote+".apng",
AOpath+"characters/"+p_char+"/"+emote_prefix+"/"+p_emote+".apng",
AOpath+"characters/"+p_char+"/"+p_emote+".apng"
])
webp_path = test_path(
[
AOpath+"characters/"+p_char+"/"+emote_prefix+p_emote+".webp",
AOpath+"characters/"+p_char+"/"+emote_prefix+"/"+p_emote+".webp",
AOpath+"characters/"+p_char+"/"+p_emote+".webp"
])
placeholder_path = AO2XPpath+"themes/default/placeholder.gif" placeholder_path = AO2XPpath+"themes/default/placeholder.gif"
gif_path = "" gif_path = ""
@ -368,11 +383,17 @@ class AOCharMovie(QtGui.QLabel):
self.pillow_frames = images.load_apng(apng_path) self.pillow_frames = images.load_apng(apng_path)
if len(self.pillow_frames) > 1: if len(self.pillow_frames) > 1:
self.pillow_timer.start(int(self.pillow_frames[0][1] * self.pillow_speed)) self.pillow_timer.start(int(self.pillow_frames[0][1] * self.pillow_speed))
else:
self.pillow_timer.start(int(single_frame_duration * self.pillow_speed))
self.set_pillow_frame() self.set_pillow_frame()
elif self.use_pillow == 2: # webp elif self.use_pillow == 2: # webp
self.pillow_frames = images.load_webp(webp_path) self.pillow_frames = images.load_webp(webp_path)
if len(self.pillow_frames) > 1: if len(self.pillow_frames) > 1:
self.pillow_timer.start(int(self.pillow_frames[0][1] * self.pillow_speed)) self.pillow_timer.start(int(self.pillow_frames[0][1] * self.pillow_speed))
else:
self.pillow_timer.start(int(single_frame_duration * self.pillow_speed))
self.set_pillow_frame() self.set_pillow_frame()
self.show() self.show()
@ -383,20 +404,18 @@ class AOCharMovie(QtGui.QLabel):
gif_path = AOpath+"characters/"+p_char+"/"+p_emote+".gif" gif_path = AOpath+"characters/"+p_char+"/"+p_emote+".gif"
apng_path = AOpath+"characters/"+p_char+"/"+p_emote+".apng" apng_path = AOpath+"characters/"+p_char+"/"+p_emote+".apng"
webp_path = AOpath+"characters/"+p_char+"/"+p_emote+".webp" webp_path = AOpath+"characters/"+p_char+"/"+p_emote+".webp"
full_duration = duration * self.time_mod full_duration = duration * self.time_mod
real_duration = 0 real_duration = 0
self.play_once = False self.play_once = False
self.m_movie.stop() self.m_movie.stop()
self.clear() self.clear()
if exists(apng_path): if exists(apng_path):
real_duration = images.get_apng_duration(apng_path) real_duration = images.get_apng_duration(apng_path)
elif exists(webp_path): elif exists(webp_path):
real_duration = images.get_webp_duration(webp_path) real_duration = images.get_webp_duration(webp_path)
elif exists(gif_path): elif exists(gif_path):
self.m_movie.setFileName(gif_path) self.m_movie.setFileName(gif_path)
self.m_movie.jumpToFrame(0) self.m_movie.jumpToFrame(0)
@ -422,8 +441,12 @@ class AOCharMovie(QtGui.QLabel):
self.preanim_timer.start(full_duration) self.preanim_timer.start(full_duration)
self.m_movie.setSpeed(int(percentage_modifier)) self.m_movie.setSpeed(int(percentage_modifier))
self.pillow_speed = percentage_modifier / 100. self.pillow_speed = percentage_modifier / 100.
self.play(p_char, p_emote, "", scaling) if real_duration > 0:
self.play(p_char, p_emote, "", scaling)
else:
self.play(p_char, p_emote, "", scaling, full_duration)
def play_talking(self, p_char, p_emote, scaling = SCALING_AUTO): def play_talking(self, p_char, p_emote, scaling = SCALING_AUTO):
p_char = p_char.lower() p_char = p_char.lower()
@ -2541,15 +2564,11 @@ class gui(QtGui.QWidget):
f_char = self.m_chatmessage[CHARNAME].lower() f_char = self.m_chatmessage[CHARNAME].lower()
f_preanim = self.m_chatmessage[PREANIM] f_preanim = self.m_chatmessage[PREANIM]
ao2_duration = ini.read_ini_int(AOpath+"characters/"+f_char+"/char.ini", "time", "%"+f_preanim, -1) ao2_duration = ini.read_ini_int(AOpath+"characters/"+f_char+"/char.ini", "time", f_preanim, -1)
text_delay = ini.read_ini_int(AOpath+"characters/"+f_char+"/char.ini", "textdelay", f_preanim, -1) text_delay = ini.read_ini_int(AOpath+"characters/"+f_char+"/char.ini", "textdelay", f_preanim, -1)
sfx_delay = int(self.m_chatmessage[SFX_DELAY]) * 60 sfx_delay = int(self.m_chatmessage[SFX_DELAY]) * 60
preanim_duration = 0 preanim_duration = ao2_duration
if ao2_duration < 0:
preanim_duration = ini.read_ini_int(AOpath+"characters/"+f_char+"/char.ini", "time", f_preanim, -1)
else:
preanim_duration = ao2_duration
anim_to_find = AOpath+"characters/"+f_char+"/"+f_preanim+".gif" anim_to_find = AOpath+"characters/"+f_char+"/"+f_preanim+".gif"
apng_to_find = AOpath+"characters/"+f_char+"/"+f_preanim+".apng" apng_to_find = AOpath+"characters/"+f_char+"/"+f_preanim+".apng"