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

fix objection bubbles (forgot gameview.py)

Browse Source
This commit is contained in:
Mauricio 2020-08-05 22:19:31 -04:00
parent 0deb97ed18
commit 1af0e54595
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gameview.py
View File

@ -443,6 +443,7 @@ class AOMovie(QtGui.QLabel):
pathlist = [ pathlist = [
get_img_suffix("base/characters/"+p_char+"/"+p_image), get_img_suffix("base/characters/"+p_char+"/"+p_image),
get_img_suffix("base/misc/default/"+p_image), get_img_suffix("base/misc/default/"+p_image),
get_img_suffix("base/misc/default/"+p_image+"_bubble"),
get_img_suffix("base/themes/default/"+p_image), get_img_suffix("base/themes/default/"+p_image),
"base/themes/default/placeholder.gif" "base/themes/default/placeholder.gif"
] ]
@ -708,6 +709,9 @@ class gui(QtGui.QWidget):
self.whiteflash.setSingleShot(False) self.whiteflash.setSingleShot(False)
self.whiteflash.timeout.connect(partial(self.setWhiteFlash, False)) self.whiteflash.timeout.connect(partial(self.setWhiteFlash, False))
self.screenshake = QtCore.QTimer()
self.screenshake.timeout.connect(self.screenShakeTick)
self.ooclog = ChatLogs(self, 1) self.ooclog = ChatLogs(self, 1)
self.ooclog.setReadOnly(True) self.ooclog.setReadOnly(True)
self.ooclog.setStyleSheet('background-color: rgb(139, 139, 139);') self.ooclog.setStyleSheet('background-color: rgb(139, 139, 139);')
@ -1005,6 +1009,9 @@ class gui(QtGui.QWidget):
self.charselect = charselect.charselect(self) self.charselect = charselect.charselect(self)
def screenShakeTick(self):
pass
def onAdditiveCheck(self): def onAdditiveCheck(self):
if self.additivebtn.isChecked(): if self.additivebtn.isChecked():
self.icchatinput.home(False) self.icchatinput.home(False)
@ -1633,17 +1640,9 @@ class gui(QtGui.QWidget):
objection_mod = 0 objection_mod = 0
if objection_mod <= 4 and objection_mod >= 1: if objection_mod <= 4 and objection_mod >= 1:
if objection_mod == 1: objections = [None, "holdit", "objection", "takethat", "custom_objections/"+custom_objection if custom_objection != "custom" else "custom"]
self.objectionview.play("holdit", f_char) print objections[objection_mod], f_char
elif objection_mod == 2: self.objectionview.play(objections[objection_mod], f_char)
self.objectionview.play("objection", f_char)
elif objection_mod == 3:
self.objectionview.play("takethat", f_char)
elif objection_mod == 4:
if custom_objection != "custom":
self.objectionview.play("custom_objections/"+custom_objection, f_char)
else:
self.objectionview.play(custom_objection, f_char)
self.playObjectionSnd(f_char, objection_mod) self.playObjectionSnd(f_char, objection_mod)
emote_mod = int(self.m_chatmessage[EMOTE_MOD]) emote_mod = int(self.m_chatmessage[EMOTE_MOD])