diff --git a/README.md b/README.md index 16c74c39..2050d27e 100644 --- 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 index 8a1fee11..7d43656b 100755 --- 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 index 1d58fd52..9bc5bd90 100644 --- 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 \ No newline at end of file +MAX_LOCAL_MAILS = MAX_MAILS_PER_CATEGORY + +-- Removed MAX_BOSSES in favor of BOSS_RANK_ITERATION_END +MAX_BOSSES = BOSS_RANK_ITERATION_END \ No newline at end of file diff --git a/esoui/ingame/centerscreenannounce/centerscreenannouncehandlers.lua b/esoui/ingame/centerscreenannounce/centerscreenannouncehandlers.lua index 860e1374..58d7b349 100755 --- 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 index 4c64003b..5b5b4f34 100644 --- 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 index e4fc35c7..83753960 100755 --- 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 index f2780ab7..c515d3a7 100644 --- 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 index f53099c8..4c24174a 100644 --- a/esoui/ingame/crafting/gamepad/scribing_gamepad.xml +++ b/esoui/ingame/crafting/gamepad/scribing_gamepad.xml @@ -3,7 +3,7 @@