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

mystery gif character fix (it was a regression)

Browse Source
This commit is contained in:
cidoku 2025-06-20 22:30:33 -04:00
parent b556251742
commit 79296d911a
1 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
gameview.py
View File

@ -433,7 +433,6 @@ class AOCharMovie(QtGui.QLabel):
#print "[debug]", p_char, emote_prefix, p_emote, "(!) path is null!" if img_path == "" else img_path #print "[debug]", p_char, emote_prefix, p_emote, "(!) path is null!" if img_path == "" else img_path
if not self.use_pillow: if not self.use_pillow:
self.m_movie.stop()
self.m_movie.setFileName(img_path) self.m_movie.setFileName(img_path)
self.m_movie.start() self.m_movie.start()
elif self.use_pillow == 1: # apng elif self.use_pillow == 1: # apng
@ -508,11 +507,11 @@ class AOCharMovie(QtGui.QLabel):
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()
#gif_path = AOpath + 'characters/' + p_char + '/(b)' + p_emote + '.gif' gif_path = AOpath + 'characters/' + p_char + '/(b)' + p_emote + '.gif'
self.m_movie.stop() self.m_movie.stop()
self.clear() self.clear()
#self.m_movie.setFileName(gif_path) self.m_movie.setFileName(gif_path)
self.m_movie.jumpToFrame(0) self.m_movie.jumpToFrame(0)
self.play_once = False self.play_once = False
@ -522,11 +521,11 @@ class AOCharMovie(QtGui.QLabel):
def play_idle(self, p_char, p_emote, scaling = SCALING_AUTO): def play_idle(self, p_char, p_emote, scaling = SCALING_AUTO):
p_char = p_char.lower() p_char = p_char.lower()
#gif_path = AOpath + 'characters/' + p_char + '/(a)' + p_emote + '.gif' gif_path = AOpath + 'characters/' + p_char + '/(a)' + p_emote + '.gif'
self.m_movie.stop() self.m_movie.stop()
self.clear() self.clear()
#self.m_movie.setFileName(gif_path) self.m_movie.setFileName(gif_path)
self.m_movie.jumpToFrame(0) self.m_movie.jumpToFrame(0)
self.play_once = False self.play_once = False
@ -2986,7 +2985,6 @@ class GUI(QtGui.QWidget):
def handle_chatmessage_2(self): def handle_chatmessage_2(self):
self.zoom.set_zoom(False) self.zoom.set_zoom(False)
self.char.stop()
self.effectview.stop() self.effectview.stop()
self.text_state = 0 self.text_state = 0
@ -3109,7 +3107,7 @@ class GUI(QtGui.QWidget):
else: else:
self.sidechar.hide() self.sidechar.hide()
self.sidechar.move(0, 0) self.sidechar.move(0, 0)
self.scaling[0] = get_scaling(ini.read_ini(AOpath + 'characters/' + self.m_chatmessage[CHARNAME] + '/char.ini', "options", "scaling").lower()) self.scaling[0] = get_scaling(ini.read_ini(AOpath + 'characters/' + self.m_chatmessage[CHARNAME] + '/char.ini', "options", "scaling").lower())
if self.slide_enabled and self.slide_available: if self.slide_enabled and self.slide_available:
@ -4025,18 +4023,21 @@ class GUI(QtGui.QWidget):
self.changechar.setText('Switch &character') self.changechar.setText('Switch &character')
def update_area_list(self): def update_area_list(self):
for i in range(self.areas_len): try:
area_players = self.areas[0][i] for i in range(self.areas_len):
area_status = self.areas[1][i].title() area_players = self.areas[0][i]
area_cm = self.areas[2][i].decode('utf-8') area_status = self.areas[1][i].title()
area_locked = self.areas[3][i].title() area_cm = self.areas[2][i].decode('utf-8')
area_name = self.areas[4][i].decode('utf-8') area_locked = self.areas[3][i].title()
if area_status == "Casing": area_name = self.areas[4][i].decode('utf-8')
self.areaitems.item(i).setText("%s\n%s | %s\n%s users | %s" % (area_name, area_status, area_cm, area_players, area_locked)) if area_status == "Casing":
else: self.areaitems.item(i).setText("%s\n%s | %s\n%s users | %s" % (area_name, area_status, area_cm, area_players, area_locked))
self.areaitems.item(i).setText("%s\n%s\n%s users | %s" % (area_name, area_status, area_players, area_locked)) else:
self.areaitems.item(i).setText("%s\n%s\n%s users | %s" % (area_name, area_status, area_players, area_locked))
if area_locked == "Locked":
self.areaitems.item(i).setIcon(QtGui.QIcon(AO2XPpath + "icons/" + "lock.png")) if area_locked == "Locked":
else: self.areaitems.item(i).setIcon(QtGui.QIcon(AO2XPpath + "icons/" + "lock.png"))
self.areaitems.item(i).setIcon(QtGui.QIcon(AO2XPpath + "icons/" + "house.png")) else:
self.areaitems.item(i).setIcon(QtGui.QIcon(AO2XPpath + "icons/" + "house.png"))
except:
print "[debug] Couldn't update areas"