diff --git a/LeoAltholic.lua b/LeoAltholic.lua index b27bc9c..601ac39 100644 --- a/LeoAltholic.lua +++ b/LeoAltholic.lua @@ -2,7 +2,7 @@ LeoAltholic = {} LeoAltholic.name = "LeoAltholic" LeoAltholic.displayName = "Leo's Altholic" -LeoAltholic.version = "0.9.9" +LeoAltholic.version = "1.0.0" LeoAltholic.chatPrefix = "|c39B027" .. LeoAltholic.name .. "|r: " LeoAltholic.timerQueue = {} @@ -36,7 +36,6 @@ function LeoAltholic.loadPlayerDataPart(skillType, baseElem) for aj = 1, qty do local name2, icon, earnedRank, passive, ultimate, purchased, progressionIndex = GetSkillAbilityInfo(skillType, i, aj) local currentUpgradeLevel, maxUpgradeLevel = GetSkillAbilityUpgradeInfo(skillType, i, aj) - --if type(currentUpgradeLevel) == "number" and currentUpgradeLevel > 0 then if rank >= earnedRank then local _, _, nextUpgradeEarnedRank = GetSkillAbilityNextUpgradeInfo(skillType, i, aj) local plainName = zo_strformat(SI_ABILITY_NAME, name2) @@ -49,6 +48,12 @@ function LeoAltholic.loadPlayerDataPart(skillType, baseElem) selL.level = currentUpgradeLevel selL.maxLevel = maxUpgradeLevel selL.nextUpgradeEarnedRank = nextUpgradeEarnedRank + if passive then + selL.passive = passive + end + if ultimate then + selL.ultimate = ultimate + end end end end @@ -252,14 +257,10 @@ function LeoAltholic.InitCharsList() char.research = {} for _,craft in pairs(LeoAltholic.craftResearch) do - --local craftName = GetCraftingSkillName(craft) char.research[craft] = GetBonus(craft) for line = 1, GetNumSmithingResearchLines(craft) do - --local lineName = GetSmithingResearchLineInfo(craft, line) char.research[craft][line] = {} for trait = 1, LeoAltholic.maxTraits do - local traitType = GetSmithingResearchLineTraitInfo(craft, line, trait) - --local traitName = GetString('SI_ITEMTRAITTYPE',traitType) if not char.research[craft][line][trait] then char.research[craft][line][trait] = {} end @@ -268,12 +269,9 @@ function LeoAltholic.InitCharsList() end for _,craft in pairs(LeoAltholic.craftResearch) do - --local craftName = GetCraftingSkillName(craft) for line = 1, GetNumSmithingResearchLines(craft) do - --local lineName = GetSmithingResearchLineInfo(craft, line) for trait = 1, LeoAltholic.maxTraits do local traitType, _, known = GetSmithingResearchLineTraitInfo(craft, line, trait) - --local traitName = GetString('SI_ITEMTRAITTYPE',traitType) if known == false then local _,remaining = GetSmithingResearchLineTraitTimes(craft,line,trait) if remaining and remaining > 0 then @@ -304,8 +302,6 @@ function LeoAltholic.InitCharsList() } char.champion[attribute].spent = char.champion[attribute].spent + char.champion[attribute].disciplines[i].spent for j = 1, GetNumChampionDisciplineSkills(i) do - --local dispName = GetChampionDisciplineName(i) - --local skillName = GetChampionSkillName(i, j) if WillChampionSkillBeUnlocked(i, j) then char.champion[attribute].disciplines[i].skills[j] = true else @@ -329,7 +325,6 @@ function LeoAltholic.InitCharsList() char.inventory.telvar = GetCarriedCurrencyAmount(CURT_TELVAR_STONES) char.inventory.writVoucher = GetCarriedCurrencyAmount(CURT_WRIT_VOUCHERS) - --if not bag then bag = SHARED_INVENTORY:GenerateFullSlotData(nil,BAG_WORN,BAG_BACKPACK,BAG_BANK,BAG_SUBSCRIBER_BANK,BAG_VIRTUAL) end local bag = SHARED_INVENTORY:GenerateFullSlotData(nil,BAG_WORN,BAG_BACKPACK) char.inventory[BAG_WORN] = {} char.inventory[BAG_BACKPACK] = {} diff --git a/LeoAltholic.txt b/LeoAltholic.txt index c071473..dec5477 100644 --- a/LeoAltholic.txt +++ b/LeoAltholic.txt @@ -1,6 +1,6 @@ ## Title: Leo's Altholic ## APIVersion: 100024 -## Version: 0.9.9 +## Version: 1.0.0 ## Author: |c39B027@LeandroSilva|r ## SavedVariables: LeoAltholicSavedVariables ## DependsOn: LibStub LibFeedback diff --git a/LeoAltholic.xml b/LeoAltholic.xml index 4dae19e..aa63de1 100644 --- a/LeoAltholic.xml +++ b/LeoAltholic.xml @@ -396,11 +396,11 @@ </Control> <Control name="LeoAltholicSkillsRowTemplate" virtual="true" horizontalAlignment="LEFT" verticalAlignment="CENTER"> - <Dimensions x="880" y="105"/> + <Dimensions x="880" y="520"/> <Controls> <Backdrop name="$(parent)BG" centerColor="222222" edgeColor="444444" tier="LOW"> <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="2" offsetY="2"/> - <Dimensions x="880" y="105"/> + <Dimensions x="880" y="520"/> <Edge edgeSize="1"/> </Backdrop> @@ -421,6 +421,310 @@ <Dimensions x="450" y="30"/> </Label> + <Label name="$(parent)ClassLabel" text="Class" mouseEnabled="true" font="ZoFontWinH4" color="E8DFAF" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="250" offsetY="4"/> + <Dimensions x="160" y="35"/> + </Label> + <Label name="$(parent)Class1Label" mouseEnabled="true" font="ZoFontGame" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="250" offsetY="34"/> + <Dimensions x="160" y="35"/> + </Label> + <Label name="$(parent)Class2Label" mouseEnabled="true" font="ZoFontGame" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="250" offsetY="64"/> + <Dimensions x="160" y="35"/> + </Label> + <Label name="$(parent)Class3Label" mouseEnabled="true" font="ZoFontGame" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="250" offsetY="94"/> + <Dimensions x="160" y="35"/> + </Label> + <Label name="$(parent)Class1Rank" mouseEnabled="true" font="ZoFontGame" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="420" offsetY="34"/> + <Dimensions x="50" y="35"/> + </Label> + <Label name="$(parent)Class2Rank" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="420" offsetY="64"/> + <Dimensions x="50" y="35"/> + </Label> + <Label name="$(parent)Class3Rank" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="420" offsetY="94"/> + <Dimensions x="50" y="35"/> + </Label> + + <Label name="$(parent)ArmorLabel" text="Armor" mouseEnabled="true" font="ZoFontWinH4" color="E8DFAF" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="250" offsetY="124"/> + <Dimensions x="160" y="35"/> + </Label> + <Label name="$(parent)Armor1Label" mouseEnabled="true" font="ZoFontGame" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="250" offsetY="154"/> + <Dimensions x="160" y="35"/> + </Label> + <Label name="$(parent)Armor2Label" mouseEnabled="true" font="ZoFontGame" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="250" offsetY="184"/> + <Dimensions x="160" y="35"/> + </Label> + <Label name="$(parent)Armor3Label" mouseEnabled="true" font="ZoFontGame" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="250" offsetY="214"/> + <Dimensions x="160" y="35"/> + </Label> + <Label name="$(parent)Armor1Rank" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="420" offsetY="154"/> + <Dimensions x="50" y="35"/> + </Label> + <Label name="$(parent)Armor2Rank" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="420" offsetY="184"/> + <Dimensions x="50" y="35"/> + </Label> + <Label name="$(parent)Armor3Rank" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="420" offsetY="214"/> + <Dimensions x="50" y="35"/> + </Label> + + <Label name="$(parent)WeaponLabel" text="Weapon" mouseEnabled="true" font="ZoFontWinH4" color="E8DFAF" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="480" offsetY="4"/> + <Dimensions x="160" y="35"/> + </Label> + <Label name="$(parent)Weapon1Label" mouseEnabled="true" font="ZoFontGame" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="480" offsetY="34"/> + <Dimensions x="160" y="35"/> + </Label> + <Label name="$(parent)Weapon2Label" mouseEnabled="true" font="ZoFontGame" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="480" offsetY="64"/> + <Dimensions x="160" y="35"/> + </Label> + <Label name="$(parent)Weapon3Label" mouseEnabled="true" font="ZoFontGame" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="480" offsetY="94"/> + <Dimensions x="160" y="35"/> + </Label> + <Label name="$(parent)Weapon4Label" mouseEnabled="true" font="ZoFontGame" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="480" offsetY="124"/> + <Dimensions x="160" y="35"/> + </Label> + <Label name="$(parent)Weapon5Label" mouseEnabled="true" font="ZoFontGame" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="480" offsetY="154"/> + <Dimensions x="160" y="35"/> + </Label> + <Label name="$(parent)Weapon6Label" mouseEnabled="true" font="ZoFontGame" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="480" offsetY="184"/> + <Dimensions x="160" y="35"/> + </Label> + <Label name="$(parent)Weapon1Rank" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="650" offsetY="34"/> + <Dimensions x="160" y="35"/> + </Label> + <Label name="$(parent)Weapon2Rank" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="650" offsetY="64"/> + <Dimensions x="160" y="35"/> + </Label> + <Label name="$(parent)Weapon3Rank" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="650" offsetY="94"/> + <Dimensions x="160" y="35"/> + </Label> + <Label name="$(parent)Weapon4Rank" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="650" offsetY="124"/> + <Dimensions x="160" y="35"/> + </Label> + <Label name="$(parent)Weapon5Rank" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="650" offsetY="154"/> + <Dimensions x="160" y="35"/> + </Label> + <Label name="$(parent)Weapon6Rank" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="650" offsetY="184"/> + <Dimensions x="160" y="35"/> + </Label> + + <Label name="$(parent)CraftLabel" text="Craft" mouseEnabled="true" font="ZoFontWinH4" color="E8DFAF" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="680" offsetY="4"/> + <Dimensions x="160" y="35"/> + </Label> + <Label name="$(parent)Craft1Label" mouseEnabled="true" font="ZoFontGame" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="680" offsetY="34"/> + <Dimensions x="160" y="35"/> + </Label> + <Label name="$(parent)Craft2Label" mouseEnabled="true" font="ZoFontGame" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="680" offsetY="64"/> + <Dimensions x="160" y="35"/> + </Label> + <Label name="$(parent)Craft3Label" mouseEnabled="true" font="ZoFontGame" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="680" offsetY="94"/> + <Dimensions x="160" y="35"/> + </Label> + <Label name="$(parent)Craft4Label" mouseEnabled="true" font="ZoFontGame" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="680" offsetY="124"/> + <Dimensions x="160" y="35"/> + </Label> + <Label name="$(parent)Craft5Label" mouseEnabled="true" font="ZoFontGame" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="680" offsetY="154"/> + <Dimensions x="160" y="35"/> + </Label> + <Label name="$(parent)Craft6Label" mouseEnabled="true" font="ZoFontGame" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="680" offsetY="184"/> + <Dimensions x="160" y="35"/> + </Label> + <Label name="$(parent)Craft7Label" mouseEnabled="true" font="ZoFontGame" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="680" offsetY="214"/> + <Dimensions x="160" y="35"/> + </Label> + <Label name="$(parent)Craft1Rank" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="850" offsetY="34"/> + <Dimensions x="160" y="35"/> + </Label> + <Label name="$(parent)Craft2Rank" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="850" offsetY="64"/> + <Dimensions x="160" y="35"/> + </Label> + <Label name="$(parent)Craft3Rank" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="850" offsetY="94"/> + <Dimensions x="160" y="35"/> + </Label> + <Label name="$(parent)Craft4Rank" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="850" offsetY="124"/> + <Dimensions x="160" y="35"/> + </Label> + <Label name="$(parent)Craft5Rank" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="850" offsetY="154"/> + <Dimensions x="160" y="35"/> + </Label> + <Label name="$(parent)Craft6Rank" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="850" offsetY="184"/> + <Dimensions x="160" y="35"/> + </Label> + <Label name="$(parent)Craft7Rank" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="850" offsetY="214"/> + <Dimensions x="160" y="35"/> + </Label> + + <Label name="$(parent)GuildLabel" text="Guild" mouseEnabled="true" font="ZoFontWinH4" color="E8DFAF" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="250" offsetY="244"/> + <Dimensions x="160" y="35"/> + </Label> + <Label name="$(parent)Guild1Label" mouseEnabled="true" font="ZoFontGame" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="250" offsetY="274"/> + <Dimensions x="160" y="35"/> + </Label> + <Label name="$(parent)Guild2Label" mouseEnabled="true" font="ZoFontGame" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="250" offsetY="304"/> + <Dimensions x="160" y="35"/> + </Label> + <Label name="$(parent)Guild3Label" mouseEnabled="true" font="ZoFontGame" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="250" offsetY="334"/> + <Dimensions x="160" y="35"/> + </Label> + <Label name="$(parent)Guild4Label" mouseEnabled="true" font="ZoFontGame" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="250" offsetY="364"/> + <Dimensions x="160" y="35"/> + </Label> + <Label name="$(parent)Guild5Label" mouseEnabled="true" font="ZoFontGame" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="250" offsetY="394"/> + <Dimensions x="160" y="35"/> + </Label> + <Label name="$(parent)Guild6Label" mouseEnabled="true" font="ZoFontGame" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="250" offsetY="424"/> + <Dimensions x="160" y="35"/> + </Label> + <Label name="$(parent)Guild1Rank" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="420" offsetY="274"/> + <Dimensions x="50" y="35"/> + </Label> + <Label name="$(parent)Guild2Rank" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="420" offsetY="304"/> + <Dimensions x="50" y="35"/> + </Label> + <Label name="$(parent)Guild3Rank" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="420" offsetY="334"/> + <Dimensions x="50" y="35"/> + </Label> + <Label name="$(parent)Guild4Rank" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="420" offsetY="364"/> + <Dimensions x="50" y="35"/> + </Label> + <Label name="$(parent)Guild5Rank" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="420" offsetY="394"/> + <Dimensions x="50" y="35"/> + </Label> + <Label name="$(parent)Guild6Rank" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="420" offsetY="424"/> + <Dimensions x="50" y="35"/> + </Label> + + <Label name="$(parent)WorldLabel" text="World" mouseEnabled="true" font="ZoFontWinH4" color="E8DFAF" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="480" offsetY="244"/> + <Dimensions x="160" y="35"/> + </Label> + <Label name="$(parent)World1Label" mouseEnabled="true" font="ZoFontGame" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="480" offsetY="274"/> + <Dimensions x="160" y="35"/> + </Label> + <Label name="$(parent)World2Label" mouseEnabled="true" font="ZoFontGame" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="480" offsetY="304"/> + <Dimensions x="160" y="35"/> + </Label> + <Label name="$(parent)World3Label" mouseEnabled="true" font="ZoFontGame" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="480" offsetY="334"/> + <Dimensions x="160" y="35"/> + </Label> + <Label name="$(parent)World4Label" mouseEnabled="true" font="ZoFontGame" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="480" offsetY="364"/> + <Dimensions x="160" y="35"/> + </Label> + <Label name="$(parent)World1Rank" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="650" offsetY="274"/> + <Dimensions x="50" y="35"/> + </Label> + <Label name="$(parent)World2Rank" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="650" offsetY="304"/> + <Dimensions x="50" y="35"/> + </Label> + <Label name="$(parent)World3Rank" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="650" offsetY="334"/> + <Dimensions x="50" y="35"/> + </Label> + <Label name="$(parent)World4Rank" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="650" offsetY="364"/> + <Dimensions x="50" y="35"/> + </Label> + + <Label name="$(parent)AllianceLabel" text="Alliance" mouseEnabled="true" font="ZoFontWinH4" color="E8DFAF" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="480" offsetY="394"/> + <Dimensions x="160" y="35"/> + </Label> + <Label name="$(parent)Alliance1Label" mouseEnabled="true" font="ZoFontGame" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="480" offsetY="424"/> + <Dimensions x="160" y="35"/> + </Label> + <Label name="$(parent)Alliance2Label" mouseEnabled="true" font="ZoFontGame" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="480" offsetY="454"/> + <Dimensions x="160" y="35"/> + </Label> + <Label name="$(parent)Alliance3Label" mouseEnabled="true" font="ZoFontGame" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="480" offsetY="484"/> + <Dimensions x="160" y="35"/> + </Label> + <Label name="$(parent)Alliance1Rank" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="650" offsetY="424"/> + <Dimensions x="50" y="35"/> + </Label> + <Label name="$(parent)Alliance2Rank" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="650" offsetY="454"/> + <Dimensions x="50" y="35"/> + </Label> + <Label name="$(parent)Alliance3Rank" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="650" offsetY="484"/> + <Dimensions x="50" y="35"/> + </Label> + + <Label name="$(parent)RacialLabel" text="Racial" mouseEnabled="true" font="ZoFontWinH4" color="E8DFAF" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="680" offsetY="244"/> + <Dimensions x="160" y="35"/> + </Label> + <Label name="$(parent)Racial1Label" mouseEnabled="true" font="ZoFontGame" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="680" offsetY="274"/> + <Dimensions x="160" y="35"/> + </Label> + <Label name="$(parent)Racial1Rank" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="850" offsetY="274"/> + <Dimensions x="50" y="35"/> + </Label> + </Controls> </Control> @@ -698,6 +1002,11 @@ <Dimensions x="450" y="30"/> </Label> + <Backdrop name="$(parent)Craft1BG" centerColor="000000" edgeColor="222222"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="252" offsetY="4"/> + <Dimensions x="260" y="122"/> + <Edge edgeSize="1"/> + </Backdrop> <Label name="$(parent)Craft1Label" text="Level" mouseEnabled="true" font="ZoFontGame" color="E8DFAF" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false"> <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="250" offsetY="4"/> <Dimensions x="150" y="35"/> @@ -720,17 +1029,22 @@ </Label> <Label name="$(parent)Craft1Timer1" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false"> <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="410" offsetY="34"/> - <Dimensions x="50" y="35"/> + <Dimensions x="75" y="35"/> </Label> <Label name="$(parent)Craft1Timer2" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false"> <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="410" offsetY="64"/> - <Dimensions x="50" y="35"/> + <Dimensions x="75" y="35"/> </Label> <Label name="$(parent)Craft1Timer3" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false"> <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="410" offsetY="94"/> - <Dimensions x="50" y="35"/> + <Dimensions x="75" y="35"/> </Label> + <Backdrop name="$(parent)Craft2BG" centerColor="000000" edgeColor="222222"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="252" offsetY="128"/> + <Dimensions x="260" y="122"/> + <Edge edgeSize="1"/> + </Backdrop> <Label name="$(parent)Craft2Label" text="Level" mouseEnabled="true" font="ZoFontGame" color="E8DFAF" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false"> <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="250" offsetY="124"/> <Dimensions x="150" y="35"/> @@ -753,17 +1067,22 @@ </Label> <Label name="$(parent)Craft2Timer1" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false"> <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="410" offsetY="154"/> - <Dimensions x="50" y="35"/> + <Dimensions x="75" y="35"/> </Label> <Label name="$(parent)Craft2Timer2" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false"> <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="410" offsetY="184"/> - <Dimensions x="50" y="35"/> + <Dimensions x="75" y="35"/> </Label> <Label name="$(parent)Craft2Timer3" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false"> <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="410" offsetY="214"/> - <Dimensions x="50" y="35"/> + <Dimensions x="75" y="35"/> </Label> + <Backdrop name="$(parent)Craft6BG" centerColor="000000" edgeColor="222222"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="582" offsetY="4"/> + <Dimensions x="260" y="122"/> + <Edge edgeSize="1"/> + </Backdrop> <Label name="$(parent)Craft6Label" text="Level" mouseEnabled="true" font="ZoFontGame" color="E8DFAF" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false"> <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="590" offsetY="4"/> <Dimensions x="150" y="35"/> @@ -782,21 +1101,26 @@ </Label> <Label name="$(parent)Craft6" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false"> <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="750" offsetY="4"/> - <Dimensions x="50" y="35"/> + <Dimensions x="75" y="35"/> </Label> <Label name="$(parent)Craft6Timer1" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false"> <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="750" offsetY="34"/> - <Dimensions x="50" y="35"/> + <Dimensions x="75" y="35"/> </Label> <Label name="$(parent)Craft6Timer2" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false"> <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="750" offsetY="64"/> - <Dimensions x="50" y="35"/> + <Dimensions x="75" y="35"/> </Label> <Label name="$(parent)Craft6Timer3" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false"> <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="750" offsetY="94"/> - <Dimensions x="50" y="35"/> + <Dimensions x="75" y="35"/> </Label> + <Backdrop name="$(parent)Craft7BG" centerColor="000000" edgeColor="222222"> + <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="582" offsetY="128"/> + <Dimensions x="260" y="122"/> + <Edge edgeSize="1"/> + </Backdrop> <Label name="$(parent)Craft7Label" text="Level" mouseEnabled="true" font="ZoFontGame" color="E8DFAF" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false"> <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="590" offsetY="124"/> <Dimensions x="150" y="35"/> @@ -815,19 +1139,19 @@ </Label> <Label name="$(parent)Craft7" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false"> <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="750" offsetY="124"/> - <Dimensions x="50" y="35"/> + <Dimensions x="75" y="35"/> </Label> <Label name="$(parent)Craft7Timer1" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false"> <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="750" offsetY="154"/> - <Dimensions x="150" y="35"/> + <Dimensions x="75" y="35"/> </Label> <Label name="$(parent)Craft7Timer2" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false"> <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="750" offsetY="184"/> - <Dimensions x="150" y="35"/> + <Dimensions x="75" y="35"/> </Label> <Label name="$(parent)Craft7Timer3" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false"> <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="750" offsetY="214"/> - <Dimensions x="150" y="35"/> + <Dimensions x="75" y="35"/> </Label> </Controls> diff --git a/LeoAltholicUI.lua b/LeoAltholicUI.lua index 7d93704..59e6ab7 100644 --- a/LeoAltholicUI.lua +++ b/LeoAltholicUI.lua @@ -119,6 +119,8 @@ function LeoAltholic.InitializeCharacterFrames() anchorY = 139 elseif panel == "Research" then anchorY = 262 + elseif panel == "Skills" then + anchorY = 522 end row:SetAnchor(TOPLEFT,sc,TOPLEFT,0,(x - 1) * anchorY) if char.bio.name == LeoAltholic.CharName then @@ -144,52 +146,107 @@ function LeoAltholic.InitializeCharacterFrames() local label = row:GetNamedChild("Craft"..craft.."Label") label:SetText(GetCraftingSkillName(craft)) end + elseif panel == "Skills" then + local c = 1 + for i = 1, 3 do + if char.skills.class[i] then + control = row:GetNamedChild("Class"..c.."Label") + control:SetText(char.skills.class[i].name) + control:SetHandler('OnMouseEnter', function(self) LeoAltholic.TooltipSkill(self, true, x, "class", i) end) + control:SetHandler('OnMouseExit', function(self) LeoAltholic.TooltipSkill(self, false) end) + control = row:GetNamedChild("Class"..c.."Rank") + control:SetText(char.skills.class[i].rank) + c = c + 1 + end + end + c = 1 + for i = 1, 3 do + if char.skills.armor[i] then + control = row:GetNamedChild("Armor"..c.."Label") + control:SetText(char.skills.armor[i].name) + control:SetHandler('OnMouseEnter', function(self) LeoAltholic.TooltipSkill(self, true, x, "armor", i) end) + control:SetHandler('OnMouseExit', function(self) LeoAltholic.TooltipSkill(self, false) end) + control = row:GetNamedChild("Armor"..c.."Rank") + control:SetText(char.skills.armor[i].rank) + c = c + 1 + end + end + c = 1 + for i = 1, 6 do + if char.skills.weapon[i] then + control = row:GetNamedChild("Weapon"..c.."Label") + control:SetText(char.skills.weapon[i].name) + control:SetHandler('OnMouseEnter', function(self) LeoAltholic.TooltipSkill(self, true, x, "weapon", i) end) + control:SetHandler('OnMouseExit', function(self) LeoAltholic.TooltipSkill(self, false) end) + control = row:GetNamedChild("Weapon"..c.."Rank") + control:SetText(char.skills.weapon[i].rank) + c = c + 1 + end + end + c = 1 + for i = 1, 7 do + if char.skills.craft[i] then + control = row:GetNamedChild("Craft"..c.."Label") + control:SetText(char.skills.craft[i].name) + control:SetHandler('OnMouseEnter', function(self) LeoAltholic.TooltipSkill(self, true, x, "craft", i) end) + control:SetHandler('OnMouseExit', function(self) LeoAltholic.TooltipSkill(self, false) end) + control = row:GetNamedChild("Craft"..c.."Rank") + control:SetText(char.skills.craft[i].rank) + c = c + 1 + end + end + c = 1 + for i = 1, 6 do + if char.skills.guild[i] then + control = row:GetNamedChild("Guild"..c.."Label") + control:SetText(char.skills.guild[i].name) + control:SetHandler('OnMouseEnter', function(self) LeoAltholic.TooltipSkill(self, true, x, "guild", i) end) + control:SetHandler('OnMouseExit', function(self) LeoAltholic.TooltipSkill(self, false) end) + control = row:GetNamedChild("Guild"..c.."Rank") + control:SetText(char.skills.guild[i].rank) + c = c + 1 + end + end + c = 1 + for i = 1, 4 do + if char.skills.world[i] then + control = row:GetNamedChild("World"..c.."Label") + control:SetText(char.skills.world[i].name) + control:SetHandler('OnMouseEnter', function(self) LeoAltholic.TooltipSkill(self, true, x, "world", i) end) + control:SetHandler('OnMouseExit', function(self) LeoAltholic.TooltipSkill(self, false) end) + control = row:GetNamedChild("World"..c.."Rank") + control:SetText(char.skills.world[i].rank) + c = c + 1 + end + end + c = 1 + for i = 1, 3 do + if char.skills.ava[i] then + control = row:GetNamedChild("Alliance"..c.."Label") + control:SetText(char.skills.ava[i].name) + control:SetHandler('OnMouseEnter', function(self) LeoAltholic.TooltipSkill(self, true, x, "ava", i) end) + control:SetHandler('OnMouseExit', function(self) LeoAltholic.TooltipSkill(self, false) end) + control = row:GetNamedChild("Alliance"..c.."Rank") + control:SetText(char.skills.ava[i].rank) + c = c + 1 + end + end + if char.skills.racial[1] then + control = row:GetNamedChild("Racial1Label") + control:SetText(char.skills.racial[1].name) + control:SetHandler('OnMouseEnter', function(self) LeoAltholic.TooltipSkill(self, true, x, "racial", 1) end) + control:SetHandler('OnMouseExit', function(self) LeoAltholic.TooltipSkill(self, false) end) + control = row:GetNamedChild("Racial1Rank") + control:SetText(char.skills.racial[1].rank) + end end end - - --[[ - - frame:SetAnchor(TOPLEFT,LeoAltholicWindowResearchPanelScrollChild,TOPLEFT,0,(x - 1) * 259) - - local crafts = {"Blacksmithing", "Clothing", "Woodworking", "Jewelry Crafting" } - for index,craft in ipairs(crafts) do - - for i = 1, 3 do - btn = WINDOW_MANAGER:CreateControl('LeoAltholicWindowResearchPanel_Character'..x..craft..i,frame,CT_BUTTON) - btn:SetAnchor(TOPLEFT,frame,TOPLEFT, anchorX, anchorY + (30 * i)) - btn:SetDimensions(200,35) - btn:SetHorizontalAlignment(0) - btn:SetVerticalAlignment(1) - btn:SetFont('ZoFontWinH4') - btn:SetNormalFontColor(1,1,1,1) - - btn = WINDOW_MANAGER:CreateControl('LeoAltholicWindowResearchPanel_Character'..x..craft..i.."Timer",frame,CT_BUTTON) - btn:SetAnchor(TOPLEFT,frame,TOPLEFT, anchorX + 180, anchorY + (30 * i)) - btn:SetDimensions(200,35) - btn:SetHorizontalAlignment(0) - btn:SetVerticalAlignment(1) - btn:SetFont('ZoFontWinH4') - btn:SetNormalFontColor(1,1,1,1) - end - - btn = WINDOW_MANAGER:CreateControl('LeoAltholicWindowResearchPanel_Character'..x..craft..'Count',frame,CT_BUTTON) - btn:SetAnchor(TOPLEFT, frame, TOPLEFT, anchorX + 180, anchorY) - btn:SetDimensions(80,35) - btn:SetHorizontalAlignment(0) - btn:SetVerticalAlignment(1) - btn:SetFont('ZoFontWinH4') - btn:SetNormalFontColor(ZO_NORMAL_TEXT:UnpackRGBA()) - - end - ]] - end end function LeoAltholic.GetTime(seconds) if seconds and seconds > 0 then - --seconds = tostring(ZO_FormatTime(seconds,TIME_FORMAT_STYLE_COLONS,TIME_FORMAT_PRECISION_SECONDS)) local ss = seconds % 60 local mm = math.floor(seconds / 60) local hh = math.floor(mm / 60) @@ -237,16 +294,46 @@ function LeoAltholic.TooltipChampionSkill(control, visible, charId, attribute, d end end +function LeoAltholic.TooltipSkill(control, visible, charId, line, lineId) + + if visible then + if not parent then parent = control end + + control.text = InformationTooltip + InitializeTooltip(control.text,control,2,1,0,8) + + local char = LeoAltholic.GetCharacters()[charId] + local added = false + for _, s in pairs(char.skills[line][lineId].list) do + local skillName = s.name + local rank = s.earnedRank + control.text:AddLine("|cE8DFAF" .. skillName .. "|r " .. rank) + added = true + end + if added then + control.text:SetHidden(false) + else + control.text:SetHidden(true) + end + else + ClearTooltip(control.text) + control.text:SetHidden(true) + control.text = nil + end +end + function LeoAltholic.DisplayCharacterFrames() local control for _,panel in ipairs(LeoAltholic.panelList) do control = WINDOW_MANAGER:GetControlByName('LeoAltholicWindow' .. panel .. 'PanelScrollChild') - control:SetHeight(#LeoAltholic.GetCharacters() * 110) + control:SetHeight(#LeoAltholic.GetCharacters() * 109) end control = WINDOW_MANAGER:GetControlByName('LeoAltholicWindowChampionPanelScrollChild') - control:SetHeight(#LeoAltholic.GetCharacters() * 140) + control:SetHeight(#LeoAltholic.GetCharacters() * 139) control = WINDOW_MANAGER:GetControlByName('LeoAltholicWindowResearchPanelScrollChild') - control:SetHeight(#LeoAltholic.GetCharacters() * 260) + control:SetHeight(#LeoAltholic.GetCharacters() * 262) + control = WINDOW_MANAGER:GetControlByName('LeoAltholicWindowSkillsPanelScrollChild') + control:SetHeight(#LeoAltholic.GetCharacters() * 522) for x,char in pairs(LeoAltholic.GetCharacters()) do