Skip to content

Commit

Permalink
9.0.3
Browse files Browse the repository at this point in the history
  • Loading branch information
sirinsidiator committed May 8, 2023
1 parent 3dd4e3c commit 95d9642
Show file tree
Hide file tree
Showing 13 changed files with 59 additions and 27 deletions.
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -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: 9.0.2 (API 101038) on 01 May 2023.**
**Last update: 9.0.3 (API 101038) on 08 May 2023.**

*Join ESOUI Dev Community on Gitter :*

Expand Down
6 changes: 3 additions & 3 deletions esoui/ingame/alerttext/alerthandlers.lua
Expand Up @@ -220,7 +220,7 @@ local AlertHandlers =
end,

[EVENT_MAIL_SEND_SUCCESS] = function(playerName)
return ALERT, zo_strformat(SI_MAIL_SEND_SUCCESS, playerName)
return ALERT, zo_strformat(SI_MAIL_SEND_SUCCESS, ZO_FormatUserFacingDisplayName(playerName))
end,

[EVENT_MAIL_SEND_FAILED] = function(reason)
Expand Down Expand Up @@ -332,11 +332,11 @@ local AlertHandlers =
end,

[EVENT_GUILD_INVITE_TO_BLACKLISTED_PLAYER] = function(playerName, guildId)
return ALERT, zo_strformat(SI_GUILD_INVITE_BLACKISTED_ALERT, playerName, GetGuildName(guildId))
return ALERT, zo_strformat(SI_GUILD_INVITE_BLACKISTED_ALERT, ZO_FormatUserFacingDisplayName(playerName), GetGuildName(guildId))
end,

[EVENT_GUILD_INVITE_PLAYER_SUCCESSFUL] = function(playerName, guildId)
return ALERT, zo_strformat(SI_GUILD_ROSTER_INVITED_MESSAGE, playerName, GetGuildName(guildId))
return ALERT, zo_strformat(SI_GUILD_ROSTER_INVITED_MESSAGE, ZO_FormatUserFacingDisplayName(playerName), GetGuildName(guildId))
end,

[EVENT_GROUP_INVITE_ACCEPT_RESPONSE_TIMEOUT] = function()
Expand Down
11 changes: 5 additions & 6 deletions esoui/ingame/crafting/gamepad/fishfillet_gamepad.lua
Expand Up @@ -57,11 +57,13 @@ function ZO_FishFillet_Gamepad:Initialize(panelControl, floatingControl, owner,
ZO_GamepadCraftingUtils_SetupGenericHeader(GAMEPAD_PROVISIONER, GetString(SI_GAMEPAD_PROVISIONING_TAB_FILLET))
ZO_GamepadCraftingUtils_RefreshGenericHeader(GAMEPAD_PROVISIONER)

-- TODO Fillet: Reevaluate the need for these lines once filleting is working.
self.inventory:HandleDirtyEvent()
elseif newState == SCENE_SHOWN then
GAMEPAD_CRAFTING_RESULTS:SetForceCenterResultsText(true)
GAMEPAD_CRAFTING_RESULTS:ModifyAnchor(ZO_Anchor:New(RIGHT, GuiRoot, RIGHT, -310, -175))

self.inventory:HandleDirtyEvent()
elseif newState == SCENE_HIDING then
GAMEPAD_CRAFTING_RESULTS:SetForceCenterResultsText(false)
GAMEPAD_CRAFTING_RESULTS:RestoreAnchor()
elseif newState == SCENE_HIDDEN then
self.itemActions:SetInventorySlot(nil)
KEYBIND_STRIP:RemoveKeybindButtonGroup(self.keybindStripDescriptor)
Expand All @@ -71,9 +73,6 @@ function ZO_FishFillet_Gamepad:Initialize(panelControl, floatingControl, owner,
self.tooltip:SetHidden(true)
GAMEPAD_TOOLTIPS:Reset(GAMEPAD_LEFT_TOOLTIP)
ZO_GamepadGenericHeader_Deactivate(self.owner.header)

GAMEPAD_CRAFTING_RESULTS:SetForceCenterResultsText(false)
GAMEPAD_CRAFTING_RESULTS:RestoreAnchor()
end
end)

Expand Down
19 changes: 17 additions & 2 deletions esoui/ingame/crafting/gamepad/gamepadprovisioner.lua
Expand Up @@ -90,6 +90,8 @@ function ZO_GamepadProvisioner:Initialize(control, scene)
local NARRATE_HEADER = true
SCREEN_NARRATION_MANAGER:QueueParametricListEntry(self.modeList, NARRATE_HEADER)

self:RefreshAnimationSounds()

self.resetUIs = nil
elseif newState == SCENE_HIDDEN then
ZO_InventorySlot_RemoveMouseOverKeybinds()
Expand Down Expand Up @@ -234,6 +236,20 @@ function ZO_GamepadProvisioner:SetMode(mode)
end
self:UpdateKeybindStrip()
end

-- Always refresh the audio to handle scene state changes.
self:RefreshAnimationSounds()
end

function ZO_GamepadProvisioner:RefreshAnimationSounds()
local mode = self.mode
if mode == PROVISIONER_MODE_CREATION then
local recipeData = self:GetRecipeData()
local soundId = recipeData and recipeData.createSound or nil
GAMEPAD_CRAFTING_RESULTS:SetTooltipAnimationSounds(soundId)
elseif mode == PROVISIONER_MODE_FILLET then
GAMEPAD_CRAFTING_RESULTS:SetTooltipAnimationSounds(SOUNDS.PROVISIONING_FILLET)
end
end

function ZO_GamepadProvisioner:SetEnableSkillBar(enable)
Expand Down Expand Up @@ -764,14 +780,13 @@ function ZO_GamepadProvisioner:RefreshRecipeDetails(selectedData)
end

self.ingredientsBar:Commit()

GAMEPAD_CRAFTING_RESULTS:SetTooltipAnimationSounds(selectedData.createSound)
else
self.resultTooltip:SetHidden(true)

self.ingredientsBar:Clear()
end

self:RefreshAnimationSounds()
KEYBIND_STRIP:UpdateKeybindButtonGroup(self.mainKeybindStripDescriptor)
end

Expand Down
18 changes: 14 additions & 4 deletions esoui/ingame/crafting/keyboard/fishfillet_keyboard.lua
Expand Up @@ -5,19 +5,24 @@ function ZO_FishFillet_Keyboard:Initialize(control, owner)
self.control = control
ZO_FishFillet_Shared.Initialize(self, slotContainer:GetNamedChild("FilletSlot"), slotContainer:GetNamedChild("FilletLabel"), owner)

control:SetHandler("OnEffectivelyHidden", function() self:OnHidden() end)
control:SetHandler("OnEffectivelyShown", function() self:OnShown() end)

self.inventory = ZO_FishFilletInventory:New(self, self.control:GetNamedChild("Inventory"))
self:InitFilletSlot("provisioner")

self.multiFilletSpinner = ZO_MultiCraftSpinner:New(control:GetNamedChild("SlotContainerSpinner"))

-- connect fillet spinner to crafting process
-- Connect fillet spinner to crafting process
local function UpdateMultiFilletSpinner()
if not self.control:IsHidden() then
self:UpdateMultiFillet()
end
end
CALLBACK_MANAGER:RegisterCallback("CraftingAnimationsStarted", UpdateMultiFilletSpinner)
CALLBACK_MANAGER:RegisterCallback("CraftingAnimationsStopped", UpdateMultiFilletSpinner)

ZO_CraftingUtils_ConnectSpinnerToCraftingProcess(self.multiFilletSpinner)
end

function ZO_FishFillet_Keyboard_FilterOnMouseExit(control)
Expand All @@ -32,9 +37,14 @@ function ZO_FishFillet_Keyboard:SetCraftingType(craftingType, oldCraftingType, i
self.inventory:HandleDirtyEvent()
end

function ZO_FishFillet_Keyboard:SetHidden(hidden)
self.control:SetHidden(hidden)
function ZO_FishFillet_Keyboard:OnHidden()
self.inventory:HandleDirtyEvent()
CRAFTING_RESULTS:SetTooltipAnimationSounds(nil)
end

function ZO_FishFillet_Keyboard:OnShown()
self.inventory:HandleDirtyEvent()
CRAFTING_RESULTS:SetTooltipAnimationSounds(SOUNDS.PROVISIONING_FILLET)
end

function ZO_FishFillet_Keyboard:OnFilterChanged()
Expand Down
7 changes: 5 additions & 2 deletions esoui/ingame/crafting/keyboard/provisioner.lua
Expand Up @@ -26,7 +26,6 @@ function ZO_Provisioner:Initialize(control)
end

AddMenuItem(GetString(SI_ITEM_ACTION_LINK_TO_CHAT), AddLink)

ShowMenu(self)
end
end
Expand Down Expand Up @@ -81,6 +80,8 @@ function ZO_Provisioner:Initialize(control)
self:ResetMultiCraftNumIterations()
SYSTEMS:GetObject("craftingResults"):SetCraftingTooltip(self.resultTooltip)
KEYBIND_STRIP:AddKeybindButtonGroup(self.mainKeybindStripDescriptor)
elseif newState == SCENE_FRAGMENT_SHOWN then
self:RefreshRecipeDetails()
elseif newState == SCENE_FRAGMENT_HIDDEN then
SYSTEMS:GetObject("craftingResults"):SetCraftingTooltip(nil)
KEYBIND_STRIP:RemoveKeybindButtonGroup(self.mainKeybindStripDescriptor)
Expand Down Expand Up @@ -558,7 +559,9 @@ function ZO_Provisioner:RefreshRecipeDetails()
end
end

CRAFTING_RESULTS:SetTooltipAnimationSounds(recipeData.createSound)
if self.filletPanel.control:IsHidden() then
CRAFTING_RESULTS:SetTooltipAnimationSounds(recipeData.createSound)
end

if ITEM_PREVIEW_KEYBOARD:IsInteractionCameraPreviewEnabled() and self:CanPreviewRecipe(recipeData) then
self:PreviewRecipe(recipeData)
Expand Down
2 changes: 1 addition & 1 deletion esoui/ingame/playertoplayer/playertoplayer.lua
Expand Up @@ -1862,7 +1862,7 @@ function ZO_PlayerToPlayer:OnUpdate()
incomingEntry.updateFn(incomingEntry, isActive)
end

if TIMED_PROMPTS[incomingEntry.incomingType] and not incomingEntry.seen and SCENE_MANAGER:IsInUIMode() then
if TIMED_PROMPTS[incomingEntry.incomingType] and not incomingEntry.seen and (not IsGameCameraActive() or SCENE_MANAGER:IsInUIMode()) then
-- For time sensitive prompts, the player probably won't see them if they are currently in a UI menu. Let's throw up a dialog before it's too late to respond
ZO_Dialogs_ShowPlatformDialog("PTP_TIMED_RESPONSE_PROMPT", incomingEntry)
incomingEntry.seen = true
Expand Down
5 changes: 4 additions & 1 deletion esoui/ingame/storewindow/keyboard/storewindow_keyboard.lua
Expand Up @@ -235,9 +235,12 @@ function ZO_StoreManager:Initialize(control)
self.scene = ZO_InteractScene:New("store", SCENE_MANAGER, STORE_INTERACTION)
self.scene:RegisterCallback("StateChange", function(oldState, newState)
if newState == SCENE_SHOWING then
self:InitializeStore()
-- set search context before calling InitializeStore, since that can add the
-- inventory fragment which will set a search context on showing (which is immediate)
PLAYER_INVENTORY:SetContextForInventories("storeTextSearch", INVENTORY_TYPE_LIST)
TEXT_SEARCH_MANAGER:ActivateTextSearch("storeTextSearch")

self:InitializeStore()
PLAYER_INVENTORY:SelectAndChangeSort(INVENTORY_BACKPACK, ITEMFILTERTYPE_ALL, "sellInformationSortOrder", ZO_SORT_ORDER_UP)
elseif newState == SCENE_HIDDEN then
if TEXT_SEARCH_MANAGER:IsActiveTextSearch("storeTextSearch") then
Expand Down
4 changes: 2 additions & 2 deletions esoui/lang/de_client.lua
Expand Up @@ -8265,8 +8265,8 @@ SafeAddString(SI_RANDOMROLLRESULT0, "Zufälliger Wert gewürfelt.", 0)
SafeAddString(SI_RANDOMROLLRESULT1, "Zufälliger Wert konnte nicht gewürfelt werden.", 0)
SafeAddString(SI_RANDOMROLLRESULT2, "Anzahl an Würfen ist nicht gültig.", 0)
SafeAddString(SI_RANDOMROLLRESULT3, "Wurfresultat ist ungültig.", 0)
SafeAddString(SI_RANDOM_ROLL_DICE_RESULT, "<<1>> hat mit <<3>> <<4>>-seitigen Würfeln <<2>> gewürfelt.", 1)
SafeAddString(SI_RANDOM_ROLL_DICE_WITH_MODIFIER_RESULT, "<<1>> hat mit <<3>> <<4>>-seitigen Würfeln <<2>> gewürfelt <<5>>.", 1)
SafeAddString(SI_RANDOM_ROLL_DICE_RESULT, "<<1>> hat mit <<3>> <<4>>-seitigen <<3[Würfel/Würfeln]>> <<2>> gewürfelt.", 1)
SafeAddString(SI_RANDOM_ROLL_DICE_WITH_MODIFIER_RESULT, "<<1>> hat mit <<3>> <<4>>-seitigen <<3[Würfel/Würfeln]>> <<2>> gewürfelt <<5>>.", 1)
SafeAddString(SI_RANDOM_ROLL_HELP_HEADER, "Würfelt eine zufällige Zahl für Euch und Eure Gruppe.\nEinige Beispiele:", 0)
SafeAddString(SI_RANDOM_ROLL_HELP_HINT, "Benutzt <<1>> für mehr Informationen", 0)
SafeAddString(SI_RANDOM_ROLL_KEYBIND, "Zahl erwürfeln", 0)
Expand Down
4 changes: 2 additions & 2 deletions esoui/lang/en_client.lua
Expand Up @@ -8265,8 +8265,8 @@ SafeAddString(SI_RANDOMROLLRESULT0, "Random value rolled.", 0)
SafeAddString(SI_RANDOMROLLRESULT1, "Random value could not be rolled.", 0)
SafeAddString(SI_RANDOMROLLRESULT2, "Number of rolls is invalid.", 0)
SafeAddString(SI_RANDOMROLLRESULT3, "Roll result is invalid.", 0)
SafeAddString(SI_RANDOM_ROLL_DICE_RESULT, "<<1>> rolls <<2>> with <<3>> x <<4>>-sided dice.", 1)
SafeAddString(SI_RANDOM_ROLL_DICE_WITH_MODIFIER_RESULT, "<<1>> rolls <<2>> with <<3>> x <<4>>-sided dice <<5>>.", 1)
SafeAddString(SI_RANDOM_ROLL_DICE_RESULT, "<<1>> rolls <<2>> with <<3>> x <<4>>-sided <<3[die/dice]>>.", 1)
SafeAddString(SI_RANDOM_ROLL_DICE_WITH_MODIFIER_RESULT, "<<1>> rolls <<2>> with <<3>> x <<4>>-sided <<3[die/dice]>> <<5>>.", 1)
SafeAddString(SI_RANDOM_ROLL_HELP_HEADER, "Roll a random number for you and your group.\nSome examples:", 0)
SafeAddString(SI_RANDOM_ROLL_HELP_HINT, "For more information use: <<1>>", 0)
SafeAddString(SI_RANDOM_ROLL_KEYBIND, "Random Roll", 0)
Expand Down
4 changes: 2 additions & 2 deletions esoui/lang/fr_client.lua
Expand Up @@ -8265,8 +8265,8 @@ SafeAddString(SI_RANDOMROLLRESULT0, "Valeur aléatoire lancée.", 0)
SafeAddString(SI_RANDOMROLLRESULT1, "Valeur aléatoire n'a pas pu être lancée.", 0)
SafeAddString(SI_RANDOMROLLRESULT2, "Nombre de lancers invalide.", 0)
SafeAddString(SI_RANDOMROLLRESULT3, "Résultat du lancer invalide.", 0)
SafeAddString(SI_RANDOM_ROLL_DICE_RESULT, "<<1>> lance <<2>> avec <<3>> d<<4>>", 1)
SafeAddString(SI_RANDOM_ROLL_DICE_WITH_MODIFIER_RESULT, "<<1>> lance <<2>> avec <<3>> d<<4>> <<5>>", 1)
SafeAddString(SI_RANDOM_ROLL_DICE_RESULT, "<<1>> lance <<2>> avec <<3>> x <<4>>-face <<3[dé/dés]>>", 1)
SafeAddString(SI_RANDOM_ROLL_DICE_WITH_MODIFIER_RESULT, "<<1>> lance <<2>> avec <<3>> x <<4>>-face <<3[dé/dés]>> <<5>>", 1)
SafeAddString(SI_RANDOM_ROLL_HELP_HEADER, "Lance un nombre aléatoire pour votre groupe et vous.\nQuelques exemples :", 0)
SafeAddString(SI_RANDOM_ROLL_HELP_HINT, "Pour en savoir plus, utilisez : <<1>>", 0)
SafeAddString(SI_RANDOM_ROLL_KEYBIND, "Lancement aléatoire", 0)
Expand Down
2 changes: 2 additions & 0 deletions esoui/libraries/globals/soundids.lua
Expand Up @@ -630,6 +630,8 @@ SOUNDS =
PROVISIONING_OPENED = "Provisioning_Opened",
PROVISIONING_CLOSED = "Provisioning_Closed",

PROVISIONING_FILLET = "Provisioning_Fillet",

RECIPE_LEARNED = "Recipe_Learned",
DEFAULT_RECIPE_CRAFTED = "Default_Recipe_Crafted",

Expand Down
2 changes: 1 addition & 1 deletion esoui/libraries/zo_mouseinputgroup/zo_mouseinputgroup.lua
Expand Up @@ -95,7 +95,7 @@ end
function ZO_MouseInputGroup:RefreshMouseOver()
local currentMouseOverControlInGroup = false
--there seems to be a weird case where 3D controls can be mouse entered when exiting UI mode. So we prevent this from registering enters when not in UI mode
if SCENE_MANAGER:IsInUIMode() then
if not IsGameCameraActive() or SCENE_MANAGER:IsInUIMode() then
currentMouseOverControlInGroup = self:IsControlInGroup(WINDOW_MANAGER:GetMouseOverControl(), ZO_MOUSE_INPUT_GROUP_MOUSE_OVER)
end
if currentMouseOverControlInGroup ~= self.over then
Expand Down

0 comments on commit 95d9642

Please sign in to comment.