diff --git a/gameview.py b/gameview.py index 87763dd..d24e694 100644 --- a/gameview.py +++ b/gameview.py @@ -3512,6 +3512,21 @@ class GUI(QtGui.QWidget): chatmsg = mChatMessage[CHATMSG].strip() + # Callwords + mentioned = False + if exists(AO2XPpath + "callwords.ini"): + with open(AO2XPpath + "callwords.ini") as f: + callwords = [line.rstrip() for line in f] + for callword in callwords: + if callword.decode('utf-8').lower() in chatmsg.lower().split(" "): + self.OOCLog.append("%s called you." % fChar) + QtGui.QApplication.alert(self, 1000) + snd = audio.loadHandle(False, "word_call.wav", 0, 0, BASS_STREAM_AUTOFREE) + if snd: + audio.playHandle(snd, True) + mentioned = True + break + if mChatMessage[SHOWNAME] and mChatMessage[SHOWNAME].lower() != fChar.lower(): try: logcharName += " (" + mChatMessage[SHOWNAME]+")" @@ -3527,15 +3542,30 @@ class GUI(QtGui.QWidget): if evidence == -1: if chatmsg: - self.ICLog.append(timestamp + '%s: %s' % (logcharName, chatmsg.replace("<", "<"))) + self.ICLog.append(timestamp + '%s%s: %s%s' % ( + "" if mentioned else "", + logcharName, + chatmsg.replace("<", "<"), + "" if mentioned else "" + )) else: eviname = '(NULL) %d' % evidence try: eviname = self.evidence[evidence][0] except: pass - - self.ICLog.append(timestamp + '%s: %s\n%s presented an evidence: %s' % (logcharName, chatmsg, fChar, eviname.strip())) + + if chatmsg: + self.ICLog.append(timestamp + '%s%s: %s%s\n%s presented an evidence: %s' % ( + "" if mentioned else "", + logcharName, + chatmsg.replace("<", "<"), + "" if mentioned else "", + fChar, + eviname.strip() + )) + else: + self.ICLog.append(timestamp + '%s presented an evidence: %s' % (fChar, eviname.strip())) self.isAdditive = (mChatMessage[ADDITIVE] == "1") @@ -3958,18 +3988,6 @@ class GUI(QtGui.QWidget): else: self.char.playIdle(fChar, f_emote, self.scaling[0]) self.animState = 3 - - if exists(AO2XPpath + "callwords.ini"): - with open(AO2XPpath + "callwords.ini") as f: - callwords = [line.rstrip() for line in f] - for callword in callwords: - if callword.decode('utf-8').lower() in self.mChatMessage[CHATMSG].lower().split(" "): - self.OOCLog.append("%s called you: %s" % (fChar, self.mChatMessage[CHATMSG])) - QtGui.QApplication.alert(self, 1000) - snd = audio.loadHandle(False, "word_call.wav", 0, 0, BASS_STREAM_AUTOFREE) - if snd: - audio.playHandle(snd, True) - break def playEffect(self, fxName, fxSound, pChar, pFolder): effect = ini.get_effect(fxName, pChar, pFolder)