metin-server/m2dev-client
3
0
Fork 1
Code Issues 7 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #65 from MindRapist/mr-13

Browse Source 
Guild window tab fixes
This commit is contained in:
d1str4ught
2026-02-16 02:01:56 +01:00
committed by GitHub
parent 4bee017834 635b329aa5
commit 1efd43b59e
3 changed files with 24 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
assets/root/interfacemodule.py
View File

@@ -996,21 +996,20 @@ class Interface(object):
self.DRAGON_SOUL_IS_QUALIFIED = True
self.wndExpandedTaskBar.SetToolTipText(uiTaskBar.ExpandedTaskBar.BUTTON_DRAGON_SOUL, uiScriptLocale.TASKBAR_DRAGON_SOUL)
# MR-12: Enable Dragon Soul window opening without completing the quest
def ToggleDragonSoulWindow(self):
if False == player.IsObserverMode():
if app.ENABLE_DRAGON_SOUL_SYSTEM:
if False == self.wndDragonSoul.IsShow():
# if self.DRAGON_SOUL_IS_QUALIFIED:
self.wndDragonSoul.Show()
# else:
# try:
# self.wndPopupDialog.SetText(localeInfo.DRAGON_SOUL_UNQUALIFIED)
# self.wndPopupDialog.Open()
# except:
# self.wndPopupDialog = uiCommon.PopupDialog()
# self.wndPopupDialog.SetText(localeInfo.DRAGON_SOUL_UNQUALIFIED)
# self.wndPopupDialog.Open()
if self.DRAGON_SOUL_IS_QUALIFIED:
self.wndDragonSoul.Show()
else:
try:
self.wndPopupDialog.SetText(localeInfo.DRAGON_SOUL_UNQUALIFIED)
self.wndPopupDialog.Open()
except:
self.wndPopupDialog = uiCommon.PopupDialog()
self.wndPopupDialog.SetText(localeInfo.DRAGON_SOUL_UNQUALIFIED)
self.wndPopupDialog.Open()
else:
self.wndDragonSoul.Close()
@@ -1018,11 +1017,10 @@ class Interface(object):
if False == player.IsObserverMode():
if app.ENABLE_DRAGON_SOUL_SYSTEM:
if False == self.wndDragonSoul.IsShow():
# if self.DRAGON_SOUL_IS_QUALIFIED:
self.wndDragonSoul.Show()
if self.DRAGON_SOUL_IS_QUALIFIED:
self.wndDragonSoul.Show()
else:
self.wndDragonSoul.Close()
# MR-12: -- END OF -- Enable Dragon Soul window opening without completing the quest
def FailDragonSoulRefine(self, reason, inven_type, inven_pos):
if False == player.IsObserverMode():