jann/m2dev-client
1
0
Fork 0
forked from metin-server/m2dev-client
Code Pull Requests 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

8
README.md
View File

@@ -7,13 +7,7 @@ This repository contains all client-side data, including locale files, configura
## 📋 Changelog ## 📋 Changelog
### 🐛 Bug Fixes ### 🐛 Bug Fixes
- **Refining**: The window now sorts empty slots (from broken stones) to the end of the list, displaying an exact preview of how the item will look like after successful attaching. - **Guild window**: Removed the clickable area for the `BASE` tab and adjusted positions and widths for all other Guild window tabs.
- **Affects**: Added affect shower support for Mall Attack Speed.
- **Dragonsoul Alchemy**:
- Fixed the deck affect countdown not auto-updating when time is increased in one of the equipped items.
- Fixed the affect countdown requiring a check for remaining time in 500ms-intervals.
- The window now opens without the player being qualified (consistency with the official).
- **Spirit stone attachment**: The window now displays the item's existing attributes.
<br> <br>
<br> <br>

26
assets/root/interfacemodule.py
View File

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

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

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