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

AO 2.9 vertical offset

Browse Source
This commit is contained in:
Mauricio 2021-03-12 19:42:33 -04:00
parent 81e707989d
commit ea24e3dbd2
1 changed files with 48 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
gameview.py
View File

@ -121,6 +121,9 @@ def download_thread(link, savepath):
print "download missing: %s" % link print "download missing: %s" % link
fp = urllib.urlopen(bucket+link) fp = urllib.urlopen(bucket+link)
if fp.getcode() == 200: if fp.getcode() == 200:
if not os.path.exists(savepath[:-1]):
os.makedirs(savepath[:-1])
with open(savepath, "wb") as f: with open(savepath, "wb") as f:
f.write(fp.read()) f.write(fp.read())
print "successfully downloaded:", link print "successfully downloaded:", link
@ -1552,7 +1555,12 @@ class gui(QtGui.QWidget):
else: else:
msg += "-1#" msg += "-1#"
msg += str(self.pairoffset.value())+"#" # send this anyway; AO 2.8 # AO 2.8: always send offset
if "y_offset" in self.features: # AO 2.9
msg += str(self.pairoffset.value())+"&0#"
else:
msg += str(self.pairoffset.value())+"#"
msg += str(int(self.nointerruptbtn.isChecked()))+"#" # NoInterrupt(TM) msg += str(int(self.nointerruptbtn.isChecked()))+"#" # NoInterrupt(TM)
if "looping_sfx" in self.features: # AO 2.8 if "looping_sfx" in self.features: # AO 2.8
@ -1807,23 +1815,23 @@ class gui(QtGui.QWidget):
emote_mod = int(self.m_chatmessage[EMOTE_MOD]) emote_mod = int(self.m_chatmessage[EMOTE_MOD])
# AO 2.8: always offset player # AO 2.8: always offset player
if side == "def": hor_offset = vert_offset = 0
hor_offset = int(self.m_chatmessage[SELF_OFFSET])
vert_offset = 0
if hor_offset > 0:
vert_offset = hor_offset / 10
self.char.move(256 * hor_offset / 100, 192 * vert_offset / 100)
elif side == "pro":
hor_offset = int(self.m_chatmessage[SELF_OFFSET])
vert_offset = 0
if hor_offset < 0:
vert_offset = -1 * hor_offset / 10
self.char.move(256 * hor_offset / 100, 192 * vert_offset / 100)
if "y_offset" in self.features: # AO 2.9
hor_offset = int(self.m_chatmessage[SELF_OFFSET].split("&")[0])
vert_offset = int(self.m_chatmessage[SELF_OFFSET].split("&")[1]) if len(self.m_chatmessage[SELF_OFFSET].split("&")) > 1 else 0
else: else:
hor_offset = int(self.m_chatmessage[SELF_OFFSET]) hor_offset = int(self.m_chatmessage[SELF_OFFSET])
self.char.move(256 * hor_offset / 100, 0)
if side == "def":
if hor_offset > 0 and vert_offset == 0:
vert_offset = hor_offset / 10
elif side == "pro":
if hor_offset < 0 and vert_offset == 0:
vert_offset = -1 * hor_offset / 10
self.char.move(256 * hor_offset / 100, 192 * vert_offset / 100)
# check if paired # check if paired
if not self.m_chatmessage[OTHER_CHARID]: if not self.m_chatmessage[OTHER_CHARID]:
@ -1835,7 +1843,7 @@ class gui(QtGui.QWidget):
else: else:
got_other_charid = int(self.m_chatmessage[OTHER_CHARID]) got_other_charid = int(self.m_chatmessage[OTHER_CHARID])
if got_other_charid > -1: if got_other_charid > -1: # user is paired
self.sidechar.show() self.sidechar.show()
if "effects" in self.features: if "effects" in self.features:
@ -1843,65 +1851,36 @@ class gui(QtGui.QWidget):
else: else:
pair_order = -1 pair_order = -1
if side == "def": hor2_offset = vert2_offset = 0
hor2_offset = int(self.m_chatmessage[OTHER_OFFSET]) if "y_offset" in self.features: # AO 2.9
vert2_offset = 0 hor2_offset = int(self.m_chatmessage[OTHER_OFFSET].split("&")[0])
if hor2_offset > 0: vert2_offset = int(self.m_chatmessage[OTHER_OFFSET].split("&")[1]) if len(self.m_chatmessage[OTHER_OFFSET].split("&")) > 1 else 0
vert2_offset = hor2_offset / 10
self.sidechar.move(256 * hor2_offset / 100, 192 * vert2_offset / 100)
if pair_order == -1: # pair ordering not supported
if hor2_offset >= hor_offset:
self.sidechar.raise_()
self.char.raise_()
else:
self.char.raise_()
self.sidechar.raise_()
elif pair_order == 0: # front
self.sidechar.raise_()
self.char.raise_()
elif pair_order == 1: # behind
self.sidechar.raise_()
self.char.raise_()
elif side == "pro":
hor2_offset = int(self.m_chatmessage[OTHER_OFFSET])
vert2_offset = 0
if hor2_offset < 0:
vert2_offset = -1 * hor2_offset / 10
self.sidechar.move(256 * hor2_offset / 100, 192 * vert2_offset / 100)
if pair_order == -1: # pair ordering not supported
if hor2_offset <= hor_offset:
self.sidechar.raise_()
self.char.raise_()
else:
self.char.raise_()
self.sidechar.raise_()
elif pair_order == 0: # front
self.sidechar.raise_()
self.char.raise_()
elif pair_order == 1: # behind
self.sidechar.raise_()
self.char.raise_()
else: else:
hor2_offset = int(self.m_chatmessage[OTHER_OFFSET]) hor2_offset = int(self.m_chatmessage[OTHER_OFFSET])
self.sidechar.move(256 * hor2_offset / 100, 0)
if pair_order == -1: # pair ordering not supported if side == "def":
if hor2_offset >= hor_offset: if hor2_offset > 0:
self.sidechar.raise_() vert2_offset = hor2_offset / 10
self.char.raise_()
else: elif side == "pro":
self.char.raise_() if hor2_offset < 0:
self.sidechar.raise_() vert2_offset = -1 * hor2_offset / 10
elif pair_order == 0: # front
if pair_order == -1: # pair ordering not supported
if hor2_offset >= hor_offset:
self.sidechar.raise_() self.sidechar.raise_()
self.char.raise_() self.char.raise_()
elif pair_order == 1: # behind else:
self.sidechar.raise_()
self.char.raise_() self.char.raise_()
self.sidechar.raise_()
elif pair_order == 0: # front
self.char.raise_()
self.sidechar.raise_()
elif pair_order == 1: # behind
self.sidechar.raise_()
self.char.raise_()
self.sidechar.move(256 * hor2_offset / 100, 192 * vert2_offset / 100)
self.bench.raise_() self.bench.raise_()
self.chatbox.raise_() self.chatbox.raise_()