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

accidentally broke new bg packet

Browse Source
This commit is contained in:
cidoku 2025-02-28 17:27:22 -03:00
parent 7993fe5cf8
commit c911fa00b0
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gameview.py
View File

@ -863,6 +863,7 @@ class gui(QtGui.QWidget):
self.slide_bg = QtGui.QLabel(self.viewport) self.slide_bg = QtGui.QLabel(self.viewport)
self.slide_bg_animation = QtCore.QPropertyAnimation(self.slide_bg, "geometry") self.slide_bg_animation = QtCore.QPropertyAnimation(self.slide_bg, "geometry")
self.slide_bg_animation.finished.connect(self.slide_done) self.slide_bg_animation.finished.connect(self.slide_done)
self.slide_bg_animation.valueChanged.connect(self.slide_changed)
self.slide_bg.hide() self.slide_bg.hide()
self.zoom = ZoomLines(self.viewport) self.zoom = ZoomLines(self.viewport)
@ -2260,11 +2261,9 @@ class gui(QtGui.QWidget):
blip = ini.read_ini(AOpath+"characters/"+self.charname+"/char.ini", "options", "gender") blip = ini.read_ini(AOpath+"characters/"+self.charname+"/char.ini", "options", "gender")
if blip: if blip:
msg += str(blip) + "#" msg += str(blip) + "#"
else:
msg += "#" # Slides
msg += "%d#" % self.slidebutton.isChecked()
# Slides
msg += "0#"
msg += "%" msg += "%"
@ -2339,7 +2338,7 @@ class gui(QtGui.QWidget):
self.bench.hide() self.bench.hide()
self.slide_bg.show() self.slide_bg.show()
bg_start = QtCore.QRect(0, 0, self.slide_bg.width(), self.slide_bg.height()) bg_start = QtCore.QRect(0, 0, self.slide_bg.width(), VIEWPORT_H)
bg_end = QtCore.QRect(-bg_start.size().width() + VIEWPORT_W, bg_start.top(), bg_start.size().width(), VIEWPORT_H) bg_end = QtCore.QRect(-bg_start.size().width() + VIEWPORT_W, bg_start.top(), bg_start.size().width(), VIEWPORT_H)
self.slide_bg_animation.setStartValue(bg_start) self.slide_bg_animation.setStartValue(bg_start)
self.slide_bg_animation.setEndValue(bg_end) self.slide_bg_animation.setEndValue(bg_end)
@ -2356,8 +2355,14 @@ class gui(QtGui.QWidget):
self.slide_overlay_animation.start() self.slide_overlay_animation.start()
def slide_done(self): def slide_done(self):
print "---------------------"
self.slide_bg.hide() self.slide_bg.hide()
self.slide_overlay.hide() self.slide_overlay.hide()
def slide_changed(self):
x = self.slide_bg_animation.currentValue().toRect().x()
if x < -648:
print "half"
def netmsg_hp(self, type, health): def netmsg_hp(self, type, health):
if type == 1: if type == 1:
@ -3686,7 +3691,7 @@ class TCP_Thread(QtCore.QThread):
connectionError = QtCore.pyqtSignal(str, str, str) connectionError = QtCore.pyqtSignal(str, str, str)
MS_Chat = QtCore.pyqtSignal(list) MS_Chat = QtCore.pyqtSignal(list)
newChar = QtCore.pyqtSignal(str) newChar = QtCore.pyqtSignal(str)
newBackground = QtCore.pyqtSignal(str) newBackground = QtCore.pyqtSignal(str, bool)
IC_Log = QtCore.pyqtSignal(str) IC_Log = QtCore.pyqtSignal(str)
OOC_Log = QtCore.pyqtSignal(str) OOC_Log = QtCore.pyqtSignal(str)
charSlots = QtCore.pyqtSignal() charSlots = QtCore.pyqtSignal()