diff --git a/assets/root/uitooltip.py b/assets/root/uitooltip.py index 7cce17ce..da627b4c 100644 --- a/assets/root/uitooltip.py +++ b/assets/root/uitooltip.py @@ -20,6 +20,14 @@ import constInfo WARP_SCROLLS = [22011, 22000, 22010] +TALISMAN_ELEMENT_NAMES = { + 1: "Fire", + 2: "Ice", + 3: "Lightning", + 4: "Wind", + 5: "Earth", +} + # Tooltip max width when descriptions are long DESC_MAX_WIDTH = 280 @@ -1119,6 +1127,16 @@ class ItemToolTip(ToolTip): self.__AppendAccessoryMetinSlotInfo(metinSlot, constInfo.GET_BELT_MATERIAL_VNUM(itemVnum)) + ### Talisman ### + elif 26 == itemType: + self.__AppendLimitInformation() + self.__AppendAffectInformation() + self.__AppendAttributeInformation(attrSlot) + self.AppendWearableInformation() + self.AppendSpace(5) + elementName = TALISMAN_ELEMENT_NAMES.get(item.GetValue(0), "Unknown") + self.AppendTextLine("Element: %s" % elementName, self.NORMAL_COLOR) + ## Costume Item ## elif 0 != isCostumeItem: self.__AppendLimitInformation() diff --git a/assets/uiscript/uiscript/equipmentdialog.py b/assets/uiscript/uiscript/equipmentdialog.py index f09c1c4b..f8f6fd34 100644 --- a/assets/uiscript/uiscript/equipmentdialog.py +++ b/assets/uiscript/uiscript/equipmentdialog.py @@ -70,6 +70,7 @@ window = { ## 새 벨트 {"index":23, "x":39, "y":106, "width":32, "height":32}, {"index":24, "x":2, "y":106, "width":32, "height":32}, + {"index":25, "x":75, "y":106, "width":32, "height":32}, ), }, diff --git a/assets/uiscript/uiscript/inventorywindow.py b/assets/uiscript/uiscript/inventorywindow.py index 6fd079a4..66837746 100644 --- a/assets/uiscript/uiscript/inventorywindow.py +++ b/assets/uiscript/uiscript/inventorywindow.py @@ -91,6 +91,7 @@ window = { # {"index":item.EQUIPMENT_RING2, "x":75, "y":106, "width":32, "height":32}, ## »ő ş§Ć® {"index":item.EQUIPMENT_BELT, "x":39, "y":106, "width":32, "height":32}, + {"index":EQUIPMENT_START_INDEX+25, "x":75, "y":106, "width":32, "height":32}, ), }, ## Dragon Soul Button