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

add vertical offset slider & fix 'wtf HDF?' bug

Browse Source
This commit is contained in:
Mauricio 2021-03-12 20:15:05 -04:00
parent 06cc2e4c27
commit 93d1c2349c
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
gameview.py
View File

@ -834,9 +834,13 @@ class gui(QtGui.QWidget):
self.pairoffset = QtGui.QSlider(QtCore.Qt.Horizontal, self.gametab_pair) self.pairoffset = QtGui.QSlider(QtCore.Qt.Horizontal, self.gametab_pair)
self.pairoffset.setRange(-100, 100) self.pairoffset.setRange(-100, 100)
self.pairoffset.setValue(0) self.pairoffset.setValue(0)
self.pairoffset_l = QtGui.QLabel("Position offset", self.gametab_pair) self.pairoffset_l = QtGui.QLabel("X offset", self.gametab_pair)
self.ypairoffset = QtGui.QSlider(QtCore.Qt.Vertical, self.gametab_pair)
self.ypairoffset.setRange(-100, 100)
self.ypairoffset.setValue(0)
self.ypairoffset_l = QtGui.QLabel("Y offset", self.gametab_pair)
self.pairoffsetreset = QtGui.QPushButton("Reset", self.gametab_pair) self.pairoffsetreset = QtGui.QPushButton("Reset", self.gametab_pair)
self.pairoffsetreset.clicked.connect(partial(self.pairoffset.setValue, 0)) self.pairoffsetreset.clicked.connect(self.resetOffsets)
self.pair_order = QtGui.QComboBox(self.gametab_pair) self.pair_order = QtGui.QComboBox(self.gametab_pair)
self.pair_order.addItem("Front") self.pair_order.addItem("Front")
self.pair_order.addItem("Behind") self.pair_order.addItem("Behind")
@ -1036,6 +1040,10 @@ class gui(QtGui.QWidget):
self.charselect = charselect.charselect(self) self.charselect = charselect.charselect(self)
def resetOffsets(self):
self.pairoffset.setValue(0)
self.ypairoffset.setValue(0)
def screenShakeTick(self): def screenShakeTick(self):
self.shakes_remaining -= 1 self.shakes_remaining -= 1
shakeforce = 8 shakeforce = 8
@ -1821,8 +1829,9 @@ class gui(QtGui.QWidget):
hor_offset = vert_offset = 0 hor_offset = vert_offset = 0
if "y_offset" in self.features: # AO 2.9 if "y_offset" in self.features: # AO 2.9
hor_offset = int(self.m_chatmessage[SELF_OFFSET].split("&")[0]) keyword = "<and>" if "<and>" in self.m_chatmessage[SELF_OFFSET] else "&" # WHAT THE FUCK HDF??? how and why??!
vert_offset = int(self.m_chatmessage[SELF_OFFSET].split("&")[1]) if len(self.m_chatmessage[SELF_OFFSET].split("&")) > 1 else 0 hor_offset = int(self.m_chatmessage[SELF_OFFSET].split(keyword)[0])
vert_offset = int(self.m_chatmessage[SELF_OFFSET].split(keyword)[1]) if len(self.m_chatmessage[SELF_OFFSET].split(keyword)) > 1 else 0
else: else:
hor_offset = int(self.m_chatmessage[SELF_OFFSET]) hor_offset = int(self.m_chatmessage[SELF_OFFSET])
@ -1856,6 +1865,7 @@ class gui(QtGui.QWidget):
hor2_offset = vert2_offset = 0 hor2_offset = vert2_offset = 0
if "y_offset" in self.features: # AO 2.9 if "y_offset" in self.features: # AO 2.9
keyword = "<and>" if "<and>" in self.m_chatmessage[OTHER_OFFSET] else "&" # WHAT THE FUCK HDF??? how and why??!
hor2_offset = int(self.m_chatmessage[OTHER_OFFSET].split("&")[0]) hor2_offset = int(self.m_chatmessage[OTHER_OFFSET].split("&")[0])
vert2_offset = int(self.m_chatmessage[OTHER_OFFSET].split("&")[1]) if len(self.m_chatmessage[OTHER_OFFSET].split("&")) > 1 else 0 vert2_offset = int(self.m_chatmessage[OTHER_OFFSET].split("&")[1]) if len(self.m_chatmessage[OTHER_OFFSET].split("&")) > 1 else 0
else: else:
@ -2369,16 +2379,11 @@ class gui(QtGui.QWidget):
self.nointerruptbtn.hide() self.nointerruptbtn.hide()
self.paircheckbox.setDisabled(True) self.paircheckbox.setDisabled(True)
self.paircheckbox.setText("This server does not support pairing.") self.paircheckbox.setText("This server does not support pairing.")
if "flipping" in features: self.flipbutton.setVisible("flipping" in features)
self.flipbutton.show() self.customobject.setVisible("customobjections" in features)
else: self.ypairoffset.setVisible("y_offset" in features)
self.flipbutton.hide() self.ypairoffset_l.setVisible("y_offset" in features)
if "customobjections" in features:
self.customobject.show()
else:
self.customobject.hide()
self.colordropdown.clear() self.colordropdown.clear()
self.colordropdown.addItems(['white', 'green', 'red', 'orange', 'blue']) self.colordropdown.addItems(['white', 'green', 'red', 'orange', 'blue'])