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:
@@ -304,7 +304,6 @@ class InventoryWindow(ui.ScriptWindow):
|
||||
self.wndMoney = self.GetChild("Money")
|
||||
self.wndMoneySlot = self.GetChild("Money_Slot")
|
||||
self.mallButton = self.GetChild2("MallButton")
|
||||
self.DSSButton = self.GetChild2("DSSButton")
|
||||
self.costumeButton = self.GetChild2("CostumeButton")
|
||||
|
||||
self.inventoryTab = []
|
||||
@@ -380,8 +379,6 @@ class InventoryWindow(ui.ScriptWindow):
|
||||
if self.mallButton:
|
||||
self.mallButton.SetEvent(ui.__mem_func__(self.ClickMallButton))
|
||||
|
||||
if self.DSSButton:
|
||||
self.DSSButton.SetEvent(ui.__mem_func__(self.ClickDSSButton))
|
||||
|
||||
# Costume Button
|
||||
if self.costumeButton:
|
||||
@@ -417,7 +414,6 @@ class InventoryWindow(ui.ScriptWindow):
|
||||
self.wndMoneySlot = 0
|
||||
self.questionDialog = None
|
||||
self.mallButton = None
|
||||
self.DSSButton = None
|
||||
self.interface = None
|
||||
|
||||
if self.wndCostume:
|
||||
@@ -470,11 +466,6 @@ class InventoryWindow(ui.ScriptWindow):
|
||||
print "click_mall_button"
|
||||
net.SendChatPacket("/click_mall")
|
||||
|
||||
# DSSButton
|
||||
def ClickDSSButton(self):
|
||||
print "click_dss_button"
|
||||
self.interface.ToggleDragonSoulWindow()
|
||||
|
||||
def ClickCostumeButton(self):
|
||||
print "Click Costume Button"
|
||||
if self.wndCostume:
|
||||
@@ -1136,11 +1127,6 @@ class InventoryWindow(ui.ScriptWindow):
|
||||
|
||||
slotIndex = self.__InventoryLocalSlotPosToGlobalSlotPos(slotIndex)
|
||||
|
||||
if app.ENABLE_DRAGON_SOUL_SYSTEM:
|
||||
if self.wndDragonSoulRefine.IsShow():
|
||||
self.wndDragonSoulRefine.AutoSetItem((player.INVENTORY, slotIndex), 1)
|
||||
return
|
||||
|
||||
self.__UseItem(slotIndex)
|
||||
mouseModule.mouseController.DeattachObject()
|
||||
self.OverOutItem()
|
||||
@@ -1192,11 +1178,6 @@ class InventoryWindow(ui.ScriptWindow):
|
||||
return
|
||||
|
||||
net.SendItemMovePacket(srcSlotPos, dstSlotPos, srcItemCount)
|
||||
|
||||
def SetDragonSoulRefineWindow(self, wndDragonSoulRefine):
|
||||
if app.ENABLE_DRAGON_SOUL_SYSTEM:
|
||||
self.wndDragonSoulRefine = wndDragonSoulRefine
|
||||
|
||||
def OnMoveWindow(self, x, y):
|
||||
# print "Inventory Global Pos : ", self.GetGlobalPosition()
|
||||
if self.wndBelt:
|
||||
|
||||
Reference in New Issue
Block a user