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.

root/game.py

@@ -368,7 +368,6 @@ class GameWindow(ui.ScriptWindow):
 		#onPressKeyDict[app.DIK_B]			= lambda state = "EMOTICON": self.interface.ToggleCharacterWindow(state)
 		onPressKeyDict[app.DIK_N]			= lambda state = "QUEST": self.interface.ToggleCharacterWindow(state)
 		onPressKeyDict[app.DIK_I]			= lambda : self.interface.ToggleInventoryWindow()
-		onPressKeyDict[app.DIK_O]			= lambda : self.interface.ToggleDragonSoulWindowWithNoInfo()
 		onPressKeyDict[app.DIK_M]			= lambda : self.interface.PressMKey()
 		#onPressKeyDict[app.DIK_H]			= lambda : self.interface.OpenHelpWindow()
 		onPressKeyDict[app.DIK_ADD]			= lambda : self.interface.MiniMapScaleUp()
@@ -751,15 +750,9 @@ class GameWindow(ui.ScriptWindow):
 	# UNKNOWN_UPDATE
 	def BINARY_NEW_AddAffect(self, type, pointIdx, value, duration):
 		self.affectShower.BINARY_NEW_AddAffect(type, pointIdx, value, duration)
-		if chr.NEW_AFFECT_DRAGON_SOUL_DECK1 == type or chr.NEW_AFFECT_DRAGON_SOUL_DECK2 == type:
-			self.interface.DragonSoulActivate(type - chr.NEW_AFFECT_DRAGON_SOUL_DECK1)
-		elif chr.NEW_AFFECT_DRAGON_SOUL_QUALIFIED == type:
-			self.BINARY_DragonSoulGiveQuilification()
 
 	def BINARY_NEW_RemoveAffect(self, type, pointIdx):
 		self.affectShower.BINARY_NEW_RemoveAffect(type, pointIdx)
-		if chr.NEW_AFFECT_DRAGON_SOUL_DECK1 == type or chr.NEW_AFFECT_DRAGON_SOUL_DECK2 == type:
-			self.interface.DragonSoulDeactivate()
 	
  
  
@@ -1264,10 +1257,6 @@ class GameWindow(ui.ScriptWindow):
 				else:
 					self.__PutItem(attachedType, attachedItemIndex, attachedItemSlotPos, attachedItemCount, self.PickingCharacterIndex)
 
-			## DragonSoul
-			elif player.SLOT_TYPE_DRAGON_SOUL_INVENTORY == attachedType:
-				self.__PutItem(attachedType, attachedItemIndex, attachedItemSlotPos, attachedItemCount, self.PickingCharacterIndex)
-			
 			mouseModule.mouseController.DeattachObject()
 
 		else:
@@ -1286,10 +1275,10 @@ class GameWindow(ui.ScriptWindow):
 		return True
 
 	def __PutItem(self, attachedType, attachedItemIndex, attachedItemSlotPos, attachedItemCount, dstChrID):
-		if player.SLOT_TYPE_INVENTORY == attachedType or player.SLOT_TYPE_DRAGON_SOUL_INVENTORY == attachedType:
+		if player.SLOT_TYPE_INVENTORY == attachedType:
 			attachedInvenType = player.SlotTypeToInvenType(attachedType)
 			if True == chr.HasInstance(self.PickingCharacterIndex) and player.GetMainCharacterIndex() != dstChrID:
-				if player.IsEquipmentSlot(attachedItemSlotPos) and player.SLOT_TYPE_DRAGON_SOUL_INVENTORY != attachedType:
+				if player.IsEquipmentSlot(attachedItemSlotPos):
 					self.stream.popupWindow.Close()
 					self.stream.popupWindow.Open(localeInfo.EXCHANGE_FAILURE_EQUIP_ITEM, 0, localeInfo.UI_OK)
 				else:
@@ -1362,27 +1351,6 @@ class GameWindow(ui.ScriptWindow):
 				itemDropQuestionDialog.dropCount = attachedItemCount
 				self.itemDropQuestionDialog = itemDropQuestionDialog
 
-				constInfo.SET_ITEM_QUESTION_DIALOG_STATUS(1)
-			elif player.SLOT_TYPE_DRAGON_SOUL_INVENTORY == attachedType:
-				dropItemIndex = player.GetItemIndex(player.DRAGON_SOUL_INVENTORY, attachedItemSlotPos)
-
-				item.SelectItem(dropItemIndex)
-				dropItemName = item.GetItemName()
-
-				## Question Text
-				questionText = localeInfo.HOW_MANY_ITEM_DO_YOU_DROP(dropItemName, attachedItemCount)
-
-				## Dialog
-				itemDropQuestionDialog = uiCommon.QuestionDialog()
-				itemDropQuestionDialog.SetText(questionText)
-				itemDropQuestionDialog.SetAcceptEvent(lambda arg=True: self.RequestDropItem(arg))
-				itemDropQuestionDialog.SetCancelEvent(lambda arg=False: self.RequestDropItem(arg))
-				itemDropQuestionDialog.Open()
-				itemDropQuestionDialog.dropType = attachedType
-				itemDropQuestionDialog.dropNumber = attachedItemSlotPos
-				itemDropQuestionDialog.dropCount = attachedItemCount
-				self.itemDropQuestionDialog = itemDropQuestionDialog
-
 				constInfo.SET_ITEM_QUESTION_DIALOG_STATUS(1)
 
 	def RequestDropItem(self, answer):
@@ -1402,10 +1370,6 @@ class GameWindow(ui.ScriptWindow):
 					# PRIVATESHOP_DISABLE_ITEM_DROP
 					self.__SendDropItemPacket(dropNumber, dropCount)
 					# END_OF_PRIVATESHOP_DISABLE_ITEM_DROP
-			elif player.SLOT_TYPE_DRAGON_SOUL_INVENTORY == dropType:
-					# PRIVATESHOP_DISABLE_ITEM_DROP
-					self.__SendDropItemPacket(dropNumber, dropCount, player.DRAGON_SOUL_INVENTORY)
-					# END_OF_PRIVATESHOP_DISABLE_ITEM_DROP
 
 		self.itemDropQuestionDialog.Close()
 		self.itemDropQuestionDialog = None
@@ -1742,24 +1706,6 @@ class GameWindow(ui.ScriptWindow):
 	
 	# END_OF_CUBE
 	
-	# 용혼석	
-	def BINARY_Highlight_Item(self, inven_type, inven_pos):
-		self.interface.Highligt_Item(inven_type, inven_pos)
-	
-	def BINARY_DragonSoulGiveQuilification(self):
-		self.interface.DragonSoulGiveQuilification()
-		
-	def BINARY_DragonSoulRefineWindow_Open(self):
-		self.interface.OpenDragonSoulRefineWindow()
-
-	def BINARY_DragonSoulRefineWindow_RefineFail(self, reason, inven_type, inven_pos):
-		self.interface.FailDragonSoulRefine(reason, inven_type, inven_pos)
-
-	def BINARY_DragonSoulRefineWindow_RefineSucceed(self, inven_type, inven_pos):
-		self.interface.SucceedDragonSoulRefine(inven_type, inven_pos)
-	
-	# END of DRAGON SOUL REFINE WINDOW
-	
 	def BINARY_SetBigMessage(self, message):
 		self.interface.bigBoard.SetTip(message)
 

root/interfacemodule.py

@@ -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

root/mousemodule.py

@@ -188,8 +188,7 @@ class CMouseController(object):
 				Type == player.SLOT_TYPE_PRIVATE_SHOP or\
 				Type == player.SLOT_TYPE_SHOP or\
 				Type == player.SLOT_TYPE_SAFEBOX or\
-				Type == player.SLOT_TYPE_MALL or\
+				Type == player.SLOT_TYPE_MALL:
-				Type == player.SLOT_TYPE_DRAGON_SOUL_INVENTORY:
 
 				item.SelectItem(self.AttachedItemIndex)
 				self.AttachedIconHandle = item.GetIconInstance()

root/ui.py

@@ -2758,7 +2758,6 @@ class PythonScriptLoader(object):
 			import player
 			import app
 			self.ScriptDictionary["PLAYER_NAME_MAX_LEN"] = chr.PLAYER_NAME_MAX_LEN
-			self.ScriptDictionary["DRAGON_SOUL_EQUIPMENT_SLOT_START"] = player.DRAGON_SOUL_EQUIPMENT_SLOT_START
 			self.ScriptDictionary["LOCALE_PATH"] = app.GetLocalePath()
 			execfile(FileName, self.ScriptDictionary)
 		except IOError, err:

root/uiaffectshower.py

@@ -423,11 +423,6 @@ class AffectShower(ui.Window):
 			MALL_DESC_IDX_START+player.POINT_PC_BANG_EXP_BONUS : (localeInfo.TOOLTIP_MALL_EXPBONUS_P_STATIC, "d:/ymir work/ui/skill/common/affect/EXP_Bonus_p_on.sub",),
 			MALL_DESC_IDX_START+player.POINT_PC_BANG_DROP_BONUS: (localeInfo.TOOLTIP_MALL_ITEMBONUS_P_STATIC, "d:/ymir work/ui/skill/common/affect/Item_Bonus_p_on.sub",),
 	}
-	if app.ENABLE_DRAGON_SOUL_SYSTEM:
-		# 용혼석 천, 지 덱.
-		AFFECT_DATA_DICT[chr.NEW_AFFECT_DRAGON_SOUL_DECK1] = (localeInfo.TOOLTIP_DRAGON_SOUL_DECK1, "d:/ymir work/ui/dragonsoul/buff_ds_sky1.tga")
-		AFFECT_DATA_DICT[chr.NEW_AFFECT_DRAGON_SOUL_DECK2] = (localeInfo.TOOLTIP_DRAGON_SOUL_DECK2, "d:/ymir work/ui/dragonsoul/buff_ds_land1.tga")
-
 	def __init__(self):
 		ui.Window.__init__(self)
 
@@ -541,9 +536,6 @@ class AffectShower(ui.Window):
 				else:
 					image.UpdateDescription()
 					
-				if affect == chr.NEW_AFFECT_DRAGON_SOUL_DECK1 or affect == chr.NEW_AFFECT_DRAGON_SOUL_DECK2:
-					image.SetScale(1, 1)
-				else:
 					image.SetScale(0.7, 0.7)
 				image.SetSkillAffectFlag(FALSE)
 				image.Show()

root/uiexchange.py

@@ -124,8 +124,7 @@ class ExchangeDialog(ui.ScriptWindow):
 			net.SendExchangeElkAddPacket(mouseModule.mouseController.GetAttachedMoneyAmount())
 		else:
 			attachedSlotType = mouseModule.mouseController.GetAttachedType()
-			if (player.SLOT_TYPE_INVENTORY == attachedSlotType
+			if player.SLOT_TYPE_INVENTORY == attachedSlotType:
-				or player.SLOT_TYPE_DRAGON_SOUL_INVENTORY == attachedSlotType):
 
 				attachedInvenType = player.SlotTypeToInvenType(attachedSlotType)
 				SrcSlotNumber = mouseModule.mouseController.GetAttachedSlotNumber()

root/uiinventory.py

@@ -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:

root/uiprivateshopbuilder.py

@@ -225,7 +225,7 @@ class PrivateShopBuilder(ui.ScriptWindow):
 			attachedSlotPos = mouseModule.mouseController.GetAttachedSlotNumber()
 			mouseModule.mouseController.DeattachObject()
 
-			if player.SLOT_TYPE_INVENTORY != attachedSlotType and player.SLOT_TYPE_DRAGON_SOUL_INVENTORY != attachedSlotType:
+			if player.SLOT_TYPE_INVENTORY != attachedSlotType:
 				return
 			attachedInvenType = player.SlotTypeToInvenType(attachedSlotType)
 				

root/uishop.py

@@ -287,7 +287,6 @@ class ShopDialog(ui.ScriptWindow):
 		if localeInfo.IsBRAZIL() == 0:
 			attachedItemIndex = mouseModule.mouseController.GetAttachedItemIndex()
 		
-		# if player.SLOT_TYPE_INVENTORY == attachedSlotType or player.SLOT_TYPE_DRAGON_SOUL_INVENTORY == attachedSlotType:
 		if player.SLOT_TYPE_INVENTORY == attachedSlotType:
 
 			# if localeInfo.IsBRAZIL():
@@ -309,10 +308,6 @@ class ShopDialog(ui.ScriptWindow):
 				
 			itemtype = player.INVENTORY
 
-			if localeInfo.IsBRAZIL() == 0:
-				if player.SLOT_TYPE_DRAGON_SOUL_INVENTORY == attachedSlotType:
-					itemtype = player.DRAGON_SOUL_INVENTORY
-			
 			# if player.IsValuableItem(itemtype, attachedSlotPos):
 			if player.IsValuableItem(attachedSlotPos):
 

root/uitaskbar.py

@@ -180,7 +180,6 @@ class EnergyBar(ui.ScriptWindow):
 			self.tooltipEnergy.Hide()
 
 class ExpandedTaskBar(ui.ScriptWindow):
-	BUTTON_DRAGON_SOUL = 0
 	def __init__(self):
 		ui.Window.__init__(self)
 		self.SetWindowName("ExpandedTaskBar")
@@ -196,8 +195,6 @@ class ExpandedTaskBar(ui.ScriptWindow):
 		self.expandedTaskBarBoard = self.GetChild("ExpanedTaskBar_Board")
 
 		self.toggleButtonDict = {}
-		self.toggleButtonDict[ExpandedTaskBar.BUTTON_DRAGON_SOUL] = self.GetChild("DragonSoulButton")
-		self.toggleButtonDict[ExpandedTaskBar.BUTTON_DRAGON_SOUL].SetParent(self)
 	
 	def SetTop(self):
 		super(ExpandedTaskBar, self).SetTop()	

root/uitooltip.py

@@ -1178,9 +1178,6 @@ class ItemToolTip(ToolTip):
 
 				if item.LIMIT_REAL_TIME == limitType:
 					self.AppendMallItemLastTime(metinSlot[0])
-		elif item.ITEM_TYPE_DS == itemType:
-			self.AppendTextLine(self.__DragonSoulInfoString(itemVnum))
-			self.__AppendAttributeInformation(attrSlot)
 		else:
 			self.__AppendLimitInformation()
 
@@ -1200,23 +1197,6 @@ class ItemToolTip(ToolTip):
 				
 		self.ShowToolTip()
 
-	def __DragonSoulInfoString (self, dwVnum):
-		step = (dwVnum / 100) % 10
-		refine = (dwVnum / 10) % 10
-		if 0 == step:
-			return localeInfo.DRAGON_SOUL_STEP_LEVEL1 + " " + localeInfo.DRAGON_SOUL_STRENGTH(refine)
-		elif 1 == step:
-			return localeInfo.DRAGON_SOUL_STEP_LEVEL2 + " " + localeInfo.DRAGON_SOUL_STRENGTH(refine)
-		elif 2 == step:
-			return localeInfo.DRAGON_SOUL_STEP_LEVEL3 + " " + localeInfo.DRAGON_SOUL_STRENGTH(refine)
-		elif 3 == step:
-			return localeInfo.DRAGON_SOUL_STEP_LEVEL4 + " " + localeInfo.DRAGON_SOUL_STRENGTH(refine)
-		elif 4 == step:
-			return localeInfo.DRAGON_SOUL_STEP_LEVEL5 + " " + localeInfo.DRAGON_SOUL_STRENGTH(refine)
-		else:
-			return ""
-
-
 	## 헤어인가?
 	def __IsHair(self, itemVnum):
 		return (self.__IsOldHair(itemVnum) or