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

revert some changes from commit 7f4043546e as they broke the client + added cancel button on charlist

Browse Source
This commit is contained in:
cidoku 2025-02-21 14:31:03 -03:00
parent cf4b58b011
commit ac75a9eeb1
2 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
charselect.py
View File

@ -24,22 +24,31 @@ class charselect(QtGui.QWidget):
def __init__(self, parent): def __init__(self, parent):
super(charselect, self).__init__(parent) super(charselect, self).__init__(parent)
self.parent = parent self.parent = parent
# self.populated = 0 self.populated = False
self.dropdownloaded = False
self.page = 0 self.page = 0
self.dropdownloaded = 0
self.image = QtGui.QLabel(self) self.image = QtGui.QLabel(self)
self.image.setPixmap(QtGui.QPixmap(AO2XPpath+"themes/default/charselect_background.png")) self.image.setPixmap(QtGui.QPixmap(AO2XPpath+"themes/default/charselect_background.png"))
self.image.show() self.image.show()
self.charDropdown = QtGui.QComboBox(self) self.charDropdown = QtGui.QComboBox(self)
self.charDropdown.setEditable(True) self.charDropdown.setEditable(True)
self.charDropdown.setGeometry(255, 5, 200, 30) # Position and size of the dropdown self.charDropdown.move(255, 7)
self.charDropdown.resize(200, self.charDropdown.sizeHint().height())
self.charDropdown.currentIndexChanged.connect(self.onDropdownSelect) self.charDropdown.currentIndexChanged.connect(self.onDropdownSelect)
self.charDropdown.setToolTip("Select a character from the list")
self.quittolobby = QtGui.QPushButton(self) self.quittolobby = QtGui.QPushButton(self)
self.quittolobby.setText("Disconnect") self.quittolobby.setText("Disconnect")
self.quittolobby.resize(self.quittolobby.sizeHint()) self.quittolobby.resize(self.quittolobby.sizeHint())
self.quittolobby.clicked.connect(self.quitToLobby) self.quittolobby.clicked.connect(self.quitToLobby)
self.quittolobby.move(714 - 25 - self.quittolobby.size().width(), 6)
self.cancelbtn = QtGui.QPushButton(self)
self.cancelbtn.setText("Cancel")
self.cancelbtn.resize(self.cancelbtn.sizeHint())
self.cancelbtn.clicked.connect(self.onCancel)
self.cancelbtn.move(25, self.quittolobby.y())
self.buttons = [] self.buttons = []
self.chartaken = [] self.chartaken = []
@ -91,13 +100,13 @@ class charselect(QtGui.QWidget):
self.charDropdown.clear() self.charDropdown.clear()
for char in self.charlist: for char in self.charlist:
self.charDropdown.addItem(char[0]) self.charDropdown.addItem(char[0])
# self.populated = 1 self.populated = True
def setCharList(self, charlist): def setCharList(self, charlist):
self.charlist = charlist self.charlist = charlist
self.showCharPage() self.showCharPage()
# if self.populated == 0: if not self.populated:
self.populateCharacterDropdown() self.populateCharacterDropdown()
def nextPageButton(self): def nextPageButton(self):
self.page += 1 self.page += 1
@ -145,18 +154,23 @@ class charselect(QtGui.QWidget):
def onCharClicked(self, ind): def onCharClicked(self, ind):
if self.parent.charname.lower() == self.charlist[ind + self.page * self.max_chars_on_page][0].lower(): if self.parent.charname.lower() == self.charlist[ind + self.page * self.max_chars_on_page][0].lower():
self.hide() self.onCancel()
self.parent.gamewindow.setFixedSize(self.parent.width, self.parent.height)
self.parent.gamewindow.center()
return return
self.selectChar(ind+(self.page*self.max_chars_on_page)) self.selectChar(ind+(self.page*self.max_chars_on_page))
def onDropdownSelect(self, index): def onDropdownSelect(self, index):
if self.dropdownloaded == 1: self.selectChar(index) if self.dropdownloaded:
self.dropdownloaded = 1 self.selectChar(index)
else:
self.dropdownloaded = True
def selectChar(self, charIndex): def selectChar(self, charIndex):
self.parent.tcp.send("CC#0#"+str(charIndex)+"#ur mom gay#%") self.parent.tcp.send("CC#0#"+str(charIndex)+"#ur mom gay#%")
def onCancel(self):
self.hide()
self.parent.gamewindow.setFixedSize(self.parent.width, self.parent.height)
self.parent.gamewindow.center()
def show(self): def show(self):
super(charselect, self).show() super(charselect, self).show()

3
gameview.py
View File

@ -1853,8 +1853,6 @@ class gui(QtGui.QWidget):
self.gamewindow.returnToMenu() self.gamewindow.returnToMenu()
def disconnectCommon(self): def disconnectCommon(self):
#negro donde mierda pongo esto
self.charselect.populated = 0
self.onSwitchInventory(True) self.onSwitchInventory(True)
self.selectedplayer = -1 self.selectedplayer = -1
self.playerList.clear() self.playerList.clear()
@ -1863,6 +1861,7 @@ class gui(QtGui.QWidget):
self.ooclogin.setText("Login") self.ooclogin.setText("Login")
self.login = False self.login = False
self.privateinv = False self.privateinv = False
self.charselect.populated = False
self.tcp.close() self.tcp.close()
self.stopMusic() self.stopMusic()