diff --git a/root/uiinventory.py b/root/uiinventory.py index 2800046..4825d13 100644 --- a/root/uiinventory.py +++ b/root/uiinventory.py @@ -561,7 +561,7 @@ class InventoryWindow(ui.ScriptWindow): ## Allgemein aktivierbare Items (z.B. Reit-Siegel) - Rahmen ueber metinSocket[0], ohne Auto-Potion-Logik elif constInfo.IS_ACTIVATABLE_ITEM(itemVnum): - isActivated = 0 != player.GetItemMetinSocket(slotNumber, 0) + isActivated = 0 != player.GetItemMetinSocket(slotNumber, 2) # Socket2: Aktiv-Flag (Socket0 ist bei zeitbasierten Siegeln die Restzeit) if slotNumber >= player.INVENTORY_PAGE_SIZE: slotNumber -= player.INVENTORY_PAGE_SIZE diff --git a/root/uitooltip.py b/root/uitooltip.py index 1dba06e..c844e85 100644 --- a/root/uitooltip.py +++ b/root/uitooltip.py @@ -1035,23 +1035,30 @@ class ItemToolTip(ToolTip): elif item.ITEM_TYPE_UNIQUE == itemType: if 0 != metinSlot: - bHasRealtimeFlag = 0 - - for i in xrange(item.LIMIT_MAX_NUM): - (limitType, limitValue) = item.GetLimit(i) + if constInfo.IS_MOUNT_SEAL(itemVnum): + if 0 != metinSlot[2]: + self.AppendSpace(5) + self.AppendTextLine("(Aktiv)", self.SPECIAL_POSITIVE_COLOR) - if item.LIMIT_REAL_TIME == limitType: - bHasRealtimeFlag = 1 - - if 1 == bHasRealtimeFlag: - self.AppendMallItemLastTime(metinSlot[0]) + self.AppendTimerBasedOnWearLastTime(metinSlot) else: - time = metinSlot[player.METIN_SOCKET_MAX_NUM-1] + bHasRealtimeFlag = 0 + + for i in xrange(item.LIMIT_MAX_NUM): + (limitType, limitValue) = item.GetLimit(i) - if 1 == item.GetValue(2): ## ½Ç½Ã°£ ÀÌ¿ë Flag / ÀåÂø ¾ÈÇØµµ ÁØ´Ù - self.AppendMallItemLastTime(time) + if item.LIMIT_REAL_TIME == limitType: + bHasRealtimeFlag = 1 + + if 1 == bHasRealtimeFlag: + self.AppendMallItemLastTime(metinSlot[0]) else: - self.AppendUniqueItemLastTime(time) + time = metinSlot[player.METIN_SOCKET_MAX_NUM-1] + + if 1 == item.GetValue(2): ## ½Ç½Ã°£ ÀÌ¿ë Flag / ÀåÂø ¾ÈÇØµµ ÁØ´Ù + self.AppendMallItemLastTime(time) + else: + self.AppendUniqueItemLastTime(time) ### Use ### elif item.ITEM_TYPE_USE == itemType: