jann/m2dev-client
1
0
Fork 0
forked from metin-server/m2dev-client
Code Pull Requests Activity

Guild window tab fixes

Browse Source
This commit is contained in:
Mind Rapist
2026-02-16 02:31:23 +02:00
parent 74c416e9ed
commit 635b329aa5
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():

22
assets/uiscript/uiscript/guildwindow.py
View File

@@ -123,57 +123,57 @@ window = {
"x" : 6,
"y" : 5,
"width" : 53,
"width" : 70,
"height" : 27,
},
{
"name" : "Tab_Button_02",
"type" : "radio_button",
"x" : 61,
"x" : 78,
"y" : 5,
"width" : 67,
"width" : 72,
"height" : 27,
},
{
"name" : "Tab_Button_03",
"type" : "radio_button",
"x" : 130,
"x" : 152,
"y" : 5,
"width" : 60,
"width" : 72,
"height" : 27,
},
{
"name" : "Tab_Button_04",
"type" : "radio_button",
"x" : 192,
"x" : 226,
"y" : 5,
"width" : 60,
"width" : 0,
"height" : 27,
},
{
"name" : "Tab_Button_05",
"type" : "radio_button",
"x" : 254,
"x" : 226,
"y" : 5,
"width" : 60,
"width" : 72,
"height" : 27,
},
{
"name" : "Tab_Button_06",
"type" : "radio_button",
"x" : 316,
"x" : 300,
"y" : 5,
"width" : 55,
"width" : 70,
"height" : 27,
},
),