10.0.2

esoui · Apr 29, 2024 · 8fa7cc2 · 8fa7cc2
1 parent 919eea5
commit 8fa7cc2
Show file tree

Hide file tree

Showing 33 changed files with 5,315 additions and 4,972 deletions.
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ If you're a Zenimax Media Inc. representative and have any objection to any of t
 
 This repo is also available at http://www.esoui.com/downloads/info1213-ESOUI-TheElderScrollsOnlinesourcecode.html
 
-**Last update: 10.0.1 (API 101042) on 24 Apr 2024.**
+**Last update: 10.0.2 (API 101042) on 30 Apr 2024.**
 
 *Join the ESOUI Dev Community on Matrix:*
 

diff --git a/esoui/app/loadingscreen/sharedloadingscreen.lua b/esoui/app/loadingscreen/sharedloadingscreen.lua
@@ -63,7 +63,7 @@ LoadingScreen_Base = {}
 function LoadingScreen_Base:Log(text)
     local gamepadMode = IsInGamepadPreferredMode()
     if gamepadMode and self == GamepadLoadingScreen or
-    not gamepadMode and self == LoadingScreen then         
+    not gamepadMode and self == LoadingScreen then
         WriteToInterfaceLog(text)
     end
 end
@@ -183,7 +183,7 @@ local GAMEPAD_BATTLEGROUND_TEAM_TEXTURES =
 }
 
 function LoadingScreen_Base:Show(zoneName, zoneDescription, loadingTexture, zoneDisplayType)
-    if self:IsPreferredScreen() then
+    if self:IsHidden() and self:IsPreferredScreen() then
         self:Log("Load Screen - Show")
         self.lastUpdate = GetFrameTimeMilliseconds()
         --Some of the logic in this file can cause use to briefly hide the load screen, so we set this to make sure we dont clear narration due to a hide while this function is running

diff --git a/esoui/ingame/addoncompatibilityaliases/pc/addoncompatibilityaliases.lua b/esoui/ingame/addoncompatibilityaliases/pc/addoncompatibilityaliases.lua
@@ -1541,4 +1541,7 @@ function GetAbilityCostOverTime(abilityId, mechanic, overrideRank, casterUnitTag
 end
 
 -- System Mail Improvements
-MAX_LOCAL_MAILS = MAX_MAILS_PER_CATEGORY
+MAX_LOCAL_MAILS = MAX_MAILS_PER_CATEGORY
+
+-- Removed MAX_BOSSES in favor of BOSS_RANK_ITERATION_END
+MAX_BOSSES = BOSS_RANK_ITERATION_END
diff --git a/esoui/ingame/centerscreenannounce/centerscreenannouncehandlers.lua b/esoui/ingame/centerscreenannounce/centerscreenannouncehandlers.lua
@@ -1498,8 +1498,10 @@ function ZO_CenterScreenAnnounce_InitializePriorities()
     end
 
     -- Quest Advancement displays all the "appropriate" conditions that the player needs to do to advance the current step
-    local function OnQuestAdvanced(eventId, questIndex, questName, isPushed, isComplete, mainStepChanged)
-        if(not mainStepChanged) then return end
+    local function OnQuestAdvanced(eventId, questIndex, questName, isPushed, isComplete, mainStepChanged, doesConditionHideAnnouncements)
+        if not mainStepChanged or doesConditionHideAnnouncements then
+            return
+        end
 
         local announceObject = CENTER_SCREEN_ANNOUNCE
         local sound = SOUNDS.QUEST_OBJECTIVE_STARTED

diff --git a/esoui/ingame/companion/gamepad/companioncollectionbook_gamepad.lua b/esoui/ingame/companion/gamepad/companioncollectionbook_gamepad.lua
@@ -263,8 +263,10 @@ function ZO_CompanionCollectionBook_Gamepad:SetupList(list)
         ZO_SharedGamepadEntry_OnSetup(control, data, selected, reselectingDuringRebuild, enabled, active)
     end
 
-    list:AddDataTemplate("ZO_GamepadCompanionCollectible", CollectibleEntrySetup, ZO_GamepadMenuEntryTemplateParametricListFunction)
-    list:AddDataTemplateWithHeader("ZO_GamepadCompanionCollectible", CollectibleEntrySetup, ZO_GamepadMenuEntryTemplateParametricListFunction, nil, "ZO_GamepadMenuEntryHeaderTemplate")
+    local DEFAULT_EQUALITY_FUNCTION = nil
+    local DEFAULT_HEADER_SETUP_FUNCTION = nil
+    list:AddDataTemplate("ZO_GamepadCompanionCollectible", CollectibleEntrySetup, ZO_GamepadMenuEntryTemplateParametricListFunction, DEFAULT_EQUALITY_FUNCTION, "CompanionCollectible")
+    list:AddDataTemplateWithHeader("ZO_GamepadCompanionCollectible", CollectibleEntrySetup, ZO_GamepadMenuEntryTemplateParametricListFunction, DEFAULT_EQUALITY_FUNCTION, "ZO_GamepadMenuEntryHeaderTemplate", DEFAULT_HEADER_SETUP_FUNCTION, "CompanionCollectible")
 end
 
 function ZO_CompanionCollectionBook_Gamepad:OnShowing()

diff --git a/esoui/ingame/crafting/craftingresults_base.lua b/esoui/ingame/crafting/craftingresults_base.lua
@@ -481,7 +481,7 @@ do
                 local skillLineData = skillData:GetSkillLineData()
                 local skillTypeData = skillLineData:GetSkillTypeData()
 
-                local messageParams = CENTER_SCREEN_ANNOUNCE:CreateMessageParams(CSA_CATEGORY_LARGE_TEXT)
+                local messageParams = CENTER_SCREEN_ANNOUNCE:CreateMessageParams(CSA_CATEGORY_LARGE_TEXT, SOUNDS.SCRIBING_SCRIBE_COMPLETE_ANNOUNCE)
                 messageParams:SetCSAType(CENTER_SCREEN_ANNOUNCE_TYPE_CRAFTING_RESULTS)
                 local bodyText = zo_strformat(SI_CRAFTED_ABILITY_NAME_AND_SKILL_LINE_FORMATTER, GetAbilityName(abilityId), skillTypeData:GetName(), skillLineData:GetName())
                 messageParams:SetText(GetString(SI_SCRIBING_ABILITY_CRAFTED_ANNOUNCEMENT_TITLE), bodyText)

diff --git a/esoui/ingame/crafting/gamepad/scribing_gamepad.lua b/esoui/ingame/crafting/gamepad/scribing_gamepad.lua
@@ -12,7 +12,13 @@ function ZO_Scribing_Gamepad:Initialize(control)
 
     self.headerData =
     {
-        titleText = GetString(SI_SCRIBING_GAMEPAD_SCRIBING_TITLE),
+        titleText = function()
+            if self:IsCurrentList(self.recentCraftedAbilitiesList) then
+                return GetString(SI_SCRIBING_RECENT_TITLE)
+            else
+                return GetString(SI_SCRIBING_GAMEPAD_SCRIBING_TITLE)
+            end
+        end,
         subtitleText = function()
             if self:IsCurrentList(self.craftedAbilityList) then
                 return GetString(SI_CRAFTED_ABILITY_SUBTITLE)

diff --git a/esoui/ingame/crafting/gamepad/scribing_gamepad.xml b/esoui/ingame/crafting/gamepad/scribing_gamepad.xml
@@ -3,7 +3,7 @@
         <Button name="ZO_GamepadCraftedAbilitySlot" inherits="ZO_CraftingSlot_Gamepad" virtual="true">
             <Controls>
                 <Label name="$(parent)Name" font="ZoFontGamepad34" verticalAlignment="CENTER" horizontalAlignment="CENTER" color="INTERFACE_COLOR_TYPE_TEXT_COLORS:INTERFACE_TEXT_COLOR_SELECTED">
-                    <Dimensions x="106" y="80" />
+                    <Dimensions x="175" y="80" />
                     <Anchor point="TOP" relativePoint="BOTTOM" />
                     <OnInitialized>
                         local fonts =
@@ -27,7 +27,7 @@
         <Button name="ZO_GamepadCraftedAbilityScriptSlot" inherits="ZO_CraftingSlot_Gamepad" virtual="true">
             <Controls>
                 <Label name="$(parent)Name" font="ZoFontGamepad34" verticalAlignment="CENTER" horizontalAlignment="CENTER" color="INTERFACE_COLOR_TYPE_TEXT_COLORS:INTERFACE_TEXT_COLOR_SELECTED">
-                    <Dimensions x="106" y="80" />
+                    <Dimensions x="175" y="80" />
                     <Anchor point="TOP" relativePoint="BOTTOM" />
                     <OnInitialized>
                         local fonts =

diff --git a/esoui/ingame/crafting/keyboard/scribing_keyboard.xml b/esoui/ingame/crafting/keyboard/scribing_keyboard.xml
@@ -1,7 +1,7 @@
 <GuiXml>
     <Controls>
         <Button name="ZO_ScribingSlotBase" mouseOverBlendMode="ADD" virtual="true">
-            <Dimensions x="140" y="120" />
+            <Dimensions x="160" y="120" />
             <MouseButton button="RIGHT" enabled="true" />
 
             <OnInitialized>
@@ -42,7 +42,7 @@
         </Button>
 
         <Button name="ZO_ScribingCraftedAbilitySlot" inherits="ZO_ScribingSlotBase" virtual="true">
-            <Dimensions x="140" y="140" />
+            <Dimensions y="140" />
             <OnMouseEnter name="CraftedAbility">
                 ZO_Scribing_Keyboard.OnCraftedAbilitySlotMouseEnter(...)
             </OnMouseEnter>

diff --git a/esoui/ingame/guildhistory/gamepad/guildhistory_gamepad.lua b/esoui/ingame/guildhistory/gamepad/guildhistory_gamepad.lua
@@ -249,7 +249,7 @@ function ZO_GuildHistory_Gamepad:FocusEventsList()
     self:RefreshFooter()
 end
 
-function ZO_GuildHistory_Gamepad:SetShowLoadingSpinner(showLoadingSpinner)
+function ZO_GuildHistory_Gamepad:SetShowLoadingSpinner(showLoadingSpinner, isTargetingEvents)
     self.loadingIcon:SetHidden(not showLoadingSpinner)
 end
 

diff --git a/esoui/ingame/guildhistory/guildhistory_data.lua b/esoui/ingame/guildhistory/guildhistory_data.lua
@@ -40,8 +40,12 @@ function ZO_GuildHistoryRequest:IsRequestResponsePending()
     return ZO_FlagHelpers.MaskHasFlag(self:GetFlags(), GUILD_HISTORY_REQUEST_FLAG_RESPONSE_PENDING)
 end
 
-function ZO_GuildHistoryRequest:RequestMoreEvents(queueRequestIfOnCooldown)
-    local guildHistoryDataReadyState = RequestMoreGuildHistoryEvents(self.requestId, queueRequestIfOnCooldown)
+function ZO_GuildHistoryRequest:IsTargetingEvents()
+    return IsGuildHistoryRequestTargetingEvents(self.requestId)
+end
+
+function ZO_GuildHistoryRequest:RequestMoreEvents(queueRequestIfOnCooldown, newestEventId, oldestEventId)
+    local guildHistoryDataReadyState = RequestMoreGuildHistoryEvents(self.requestId, queueRequestIfOnCooldown, newestEventId, oldestEventId)
     return guildHistoryDataReadyState
 end
 
@@ -69,9 +73,15 @@ function ZO_GuildHistoryEventData_Base:Dirty()
 end
 
 function ZO_GuildHistoryEventData_Base:Clean()
-    -- The relationship between index and event id got shifted, invalidate eventInfo
-    if self.eventInfo.dirty and self.eventInfo.eventId and self.eventInfo.eventId ~= GetGuildHistoryEventId(self:GetGuildId(), self:GetEventCategory(), self.eventIndex) then
-        self:ResetEventInfo()
+    if self.eventInfo.dirty then
+            -- The relationship between index and event id got shifted, invalidate eventInfo
+        local eventIdMismatch = self.eventInfo.eventId and self.eventInfo.eventId ~= GetGuildHistoryEventId(self:GetGuildId(), self:GetEventCategory(), self.eventIndex)
+
+        -- The redacted state changed, invalidate eventInfo
+        local redactedMismatch = self.eventInfo.isRedacted ~= IsGuildHistoryEventRedacted(self:GetGuildId(), self:GetEventCategory(), self.eventIndex)
+        if eventIdMismatch or redactedMismatch then
+            self:ResetEventInfo()
+        end
     end
     self.eventInfo.dirty = nil
 end
@@ -404,6 +414,10 @@ function ZO_GuildHistoryEventCategoryData:GetOldestEventForUpToDateEventsWithout
     return nil
 end
 
+function ZO_GuildHistoryEventCategoryData:HasUpToDateEvents()
+    return DoesGuildHistoryEventCategoryHaveUpToDateEvents(self.guildData:GetId(), self.eventCategory)
+end
+
 function ZO_GuildHistoryEventCategoryData:GetEventsInTimeRange(newestTimeS, oldestTimeS)
     local newestIndex, oldestIndex = GetGuildHistoryEventIndicesForTimeRange(self.guildData:GetId(), self.eventCategory, newestTimeS, oldestTimeS)
     if newestIndex then
@@ -416,11 +430,15 @@ function ZO_GuildHistoryEventCategoryData:GetEventsInIndexRange(newestIndex, old
     local numEvents = self:GetNumEvents()
     assert((newestIndex <= oldestIndex) and (oldestIndex <= numEvents))
     local events = {}
+    local redactedEvents = {}
     for eventIndex = newestIndex, oldestIndex do
         local event = self.events:AcquireObject(eventIndex)
         table.insert(events, event)
+        if event:IsRedacted() then
+            table.insert(redactedEvents, event)
+        end
     end
-    return events
+    return events, redactedEvents
 end
 
 ----------------