Drachenseelensystem entfernen: DS-Code aus gemeinsam genutzten UI-Dateien
Entfernt alle Drachenseelen-Referenzen aus interfacemodule.py (groesste Baustelle: Import, Instanziierung beider Fenster, alle dedizierten DragonSoul*-Methoden, Show/Hide/Destroy-Verkabelung), game.py (Hotkey O, alle BINARY_DragonSoul*-Handler inkl. BINARY_Highlight_Item, DS-Zweige in den Affect- und Drag&Drop-Pfaden), sowie kleinere DS-Zweige in uiinventory.py (DSSButton, Refine-Fenster-Kopplung), uiaffectshower.py (Buff-Icons), uiexchange.py, uiprivateshopbuilder.py, uishop.py, uitaskbar.py (Taskbar-Button), uitooltip.py (komplette __DragonSoulInfoString-Methode), mousemodule.py und ui.py.
This commit is contained in:
Andreas Lierschaft
@@ -10,7 +10,6 @@ import player
|
||||
import uiTaskBar
|
||||
import uiCharacter
|
||||
import uiInventory
|
||||
import uiDragonSoul
|
||||
import uiChat
|
||||
import uiMessenger
|
||||
import guild
|
||||
@@ -67,8 +66,6 @@ class Interface(object):
|
||||
self.wndCharacter = None
|
||||
self.wndInventory = None
|
||||
self.wndExpandedTaskBar = None
|
||||
self.wndDragonSoul = None
|
||||
self.wndDragonSoulRefine = None
|
||||
self.wndChat = None
|
||||
self.wndMessenger = None
|
||||
self.wndMiniMap = None
|
||||
@@ -133,7 +130,6 @@ class Interface(object):
|
||||
self.wndTaskBar.SetToggleButtonEvent(uiTaskBar.TaskBar.BUTTON_EXPAND, ui.__mem_func__(self.ToggleExpandedButton))
|
||||
self.wndExpandedTaskBar = uiTaskBar.ExpandedTaskBar()
|
||||
self.wndExpandedTaskBar.LoadWindow()
|
||||
self.wndExpandedTaskBar.SetToggleButtonEvent(uiTaskBar.ExpandedTaskBar.BUTTON_DRAGON_SOUL, ui.__mem_func__(self.ToggleDragonSoulWindow))
|
||||
|
||||
else:
|
||||
self.wndTaskBar.SetToggleButtonEvent(uiTaskBar.TaskBar.BUTTON_CHAT, ui.__mem_func__(self.ToggleChat))
|
||||
@@ -169,13 +165,6 @@ class Interface(object):
|
||||
wndCharacter = uiCharacter.CharacterWindow()
|
||||
wndInventory = uiInventory.InventoryWindow()
|
||||
wndInventory.BindInterfaceClass(self)
|
||||
if app.ENABLE_DRAGON_SOUL_SYSTEM:
|
||||
wndDragonSoul = uiDragonSoul.DragonSoulWindow()
|
||||
wndDragonSoulRefine = uiDragonSoul.DragonSoulRefineWindow()
|
||||
else:
|
||||
wndDragonSoul = None
|
||||
wndDragonSoulRefine = None
|
||||
|
||||
wndMiniMap = uiMiniMap.MiniMap()
|
||||
wndSafebox = uiSafebox.SafeboxWindow()
|
||||
|
||||
@@ -189,16 +178,10 @@ class Interface(object):
|
||||
|
||||
self.wndCharacter = wndCharacter
|
||||
self.wndInventory = wndInventory
|
||||
self.wndDragonSoul = wndDragonSoul
|
||||
self.wndDragonSoulRefine = wndDragonSoulRefine
|
||||
self.wndMiniMap = wndMiniMap
|
||||
self.wndSafebox = wndSafebox
|
||||
self.wndChatLog = wndChatLog
|
||||
|
||||
if app.ENABLE_DRAGON_SOUL_SYSTEM:
|
||||
self.wndDragonSoul.SetDragonSoulRefineWindow(self.wndDragonSoulRefine)
|
||||
self.wndDragonSoulRefine.SetInventoryWindows(self.wndInventory, self.wndDragonSoul)
|
||||
self.wndInventory.SetDragonSoulRefineWindow(self.wndDragonSoulRefine)
|
||||
|
||||
def __MakeDialogs(self):
|
||||
self.dlgExchange = uiExchange.ExchangeDialog()
|
||||
@@ -306,9 +289,6 @@ class Interface(object):
|
||||
self.privateShopAdvertisementBoardDict = {}
|
||||
|
||||
self.wndInventory.SetItemToolTip(self.tooltipItem)
|
||||
if app.ENABLE_DRAGON_SOUL_SYSTEM:
|
||||
self.wndDragonSoul.SetItemToolTip(self.tooltipItem)
|
||||
self.wndDragonSoulRefine.SetItemToolTip(self.tooltipItem)
|
||||
self.wndSafebox.SetItemToolTip(self.tooltipItem)
|
||||
self.wndCube.SetItemToolTip(self.tooltipItem)
|
||||
self.wndCubeResult.SetItemToolTip(self.tooltipItem)
|
||||
@@ -331,7 +311,6 @@ class Interface(object):
|
||||
self.privateShopBuilder.SetItemToolTip(self.tooltipItem)
|
||||
|
||||
self.__InitWhisper()
|
||||
self.DRAGON_SOUL_IS_QUALIFIED = False
|
||||
|
||||
def MakeHyperlinkTooltip(self, hyperlink):
|
||||
tokens = hyperlink.split(":")
|
||||
@@ -376,12 +355,6 @@ class Interface(object):
|
||||
if self.wndInventory:
|
||||
self.wndInventory.Destroy()
|
||||
|
||||
if self.wndDragonSoul:
|
||||
self.wndDragonSoul.Destroy()
|
||||
|
||||
if self.wndDragonSoulRefine:
|
||||
self.wndDragonSoulRefine.Destroy()
|
||||
|
||||
if self.dlgExchange:
|
||||
self.dlgExchange.Destroy()
|
||||
|
||||
@@ -479,10 +452,6 @@ class Interface(object):
|
||||
del self.wndEnergyBar
|
||||
del self.wndCharacter
|
||||
del self.wndInventory
|
||||
if self.wndDragonSoul:
|
||||
del self.wndDragonSoul
|
||||
if self.wndDragonSoulRefine:
|
||||
del self.wndDragonSoulRefine
|
||||
del self.dlgExchange
|
||||
del self.dlgPointReset
|
||||
del self.dlgShop
|
||||
@@ -548,8 +517,6 @@ class Interface(object):
|
||||
self.wndInventory.RefreshStatus()
|
||||
if self.wndEnergyBar:
|
||||
self.wndEnergyBar.RefreshStatus()
|
||||
if app.ENABLE_DRAGON_SOUL_SYSTEM:
|
||||
self.wndDragonSoul.RefreshStatus()
|
||||
|
||||
def RefreshStamina(self):
|
||||
self.wndTaskBar.RefreshStamina()
|
||||
@@ -561,8 +528,6 @@ class Interface(object):
|
||||
def RefreshInventory(self):
|
||||
self.wndTaskBar.RefreshQuickSlot()
|
||||
self.wndInventory.RefreshItemSlot()
|
||||
if app.ENABLE_DRAGON_SOUL_SYSTEM:
|
||||
self.wndDragonSoul.RefreshItemSlot()
|
||||
|
||||
def RefreshCharacter(self): ## Character 페이지의 얼굴, Inventory 페이지의 전신 그림 등의 Refresh
|
||||
self.wndCharacter.RefreshCharacter()
|
||||
@@ -820,9 +785,6 @@ class Interface(object):
|
||||
self.wndTaskBar.Show()
|
||||
self.wndCharacter.Show()
|
||||
self.wndInventory.Show()
|
||||
if app.ENABLE_DRAGON_SOUL_SYSTEM:
|
||||
self.wndDragonSoul.Show()
|
||||
self.wndDragonSoulRefine.Show()
|
||||
self.wndChat.Show()
|
||||
self.wndMiniMap.Show()
|
||||
if self.wndEnergyBar:
|
||||
@@ -844,9 +806,6 @@ class Interface(object):
|
||||
if self.wndInventory:
|
||||
self.wndInventory.Hide()
|
||||
|
||||
if app.ENABLE_DRAGON_SOUL_SYSTEM:
|
||||
self.wndDragonSoul.Hide()
|
||||
self.wndDragonSoulRefine.Hide()
|
||||
|
||||
if self.wndChat:
|
||||
self.wndChat.Hide()
|
||||
@@ -975,79 +934,6 @@ class Interface(object):
|
||||
else:
|
||||
self.wndExpandedTaskBar.Close()
|
||||
|
||||
# 용혼석
|
||||
def DragonSoulActivate(self, deck):
|
||||
if app.ENABLE_DRAGON_SOUL_SYSTEM:
|
||||
self.wndDragonSoul.ActivateDragonSoulByExtern(deck)
|
||||
|
||||
def DragonSoulDeactivate(self):
|
||||
if app.ENABLE_DRAGON_SOUL_SYSTEM:
|
||||
self.wndDragonSoul.DeactivateDragonSoul()
|
||||
|
||||
def Highligt_Item(self, inven_type, inven_pos):
|
||||
if player.DRAGON_SOUL_INVENTORY == inven_type:
|
||||
if app.ENABLE_DRAGON_SOUL_SYSTEM:
|
||||
self.wndDragonSoul.HighlightSlot(inven_pos)
|
||||
|
||||
def DragonSoulGiveQuilification(self):
|
||||
self.DRAGON_SOUL_IS_QUALIFIED = True
|
||||
self.wndExpandedTaskBar.SetToolTipText(uiTaskBar.ExpandedTaskBar.BUTTON_DRAGON_SOUL, uiScriptLocale.TASKBAR_DRAGON_SOUL)
|
||||
|
||||
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()
|
||||
else:
|
||||
self.wndDragonSoul.Close()
|
||||
|
||||
def ToggleDragonSoulWindowWithNoInfo(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:
|
||||
self.wndDragonSoul.Close()
|
||||
|
||||
def FailDragonSoulRefine(self, reason, inven_type, inven_pos):
|
||||
if False == player.IsObserverMode():
|
||||
if app.ENABLE_DRAGON_SOUL_SYSTEM:
|
||||
if True == self.wndDragonSoulRefine.IsShow():
|
||||
self.wndDragonSoulRefine.RefineFail(reason, inven_type, inven_pos)
|
||||
|
||||
def SucceedDragonSoulRefine(self, inven_type, inven_pos):
|
||||
if False == player.IsObserverMode():
|
||||
if app.ENABLE_DRAGON_SOUL_SYSTEM:
|
||||
if True == self.wndDragonSoulRefine.IsShow():
|
||||
self.wndDragonSoulRefine.RefineSucceed(inven_type, inven_pos)
|
||||
|
||||
def OpenDragonSoulRefineWindow(self):
|
||||
if False == player.IsObserverMode():
|
||||
if app.ENABLE_DRAGON_SOUL_SYSTEM:
|
||||
if False == self.wndDragonSoulRefine.IsShow():
|
||||
self.wndDragonSoulRefine.Show()
|
||||
if None != self.wndDragonSoul:
|
||||
if False == self.wndDragonSoul.IsShow():
|
||||
self.wndDragonSoul.Show()
|
||||
|
||||
def CloseDragonSoulRefineWindow(self):
|
||||
if False == player.IsObserverMode():
|
||||
if app.ENABLE_DRAGON_SOUL_SYSTEM:
|
||||
if True == self.wndDragonSoulRefine.IsShow():
|
||||
self.wndDragonSoulRefine.Close()
|
||||
|
||||
# 용혼석 끝
|
||||
|
||||
def ToggleGuildWindow(self):
|
||||
if not self.wndGuild.IsShow():
|
||||
if self.wndGuild.CanOpen():
|
||||
@@ -1149,10 +1035,6 @@ class Interface(object):
|
||||
if self.wndExpandedTaskBar:
|
||||
hideWindows += self.wndExpandedTaskBar,
|
||||
|
||||
if app.ENABLE_DRAGON_SOUL_SYSTEM:
|
||||
hideWindows += self.wndDragonSoul,\
|
||||
self.wndDragonSoulRefine,
|
||||
|
||||
hideWindows = filter(lambda x:x.IsShow(), hideWindows)
|
||||
map(lambda x:x.Hide(), hideWindows)
|
||||
import sys
|
||||
|
||||
Reference in New Issue
Block a user