mirror of
https://github.com/esx-framework/esx_core.git
synced 2026-08-28 17:01:14 +00:00
Merge pull request #777 from wobozkyng/multichar
refactor(esx_multicharacter): adding delete character confirmation
This commit is contained in:
@@ -140,6 +140,24 @@ if ESX.GetConfig().Multichar then
|
|||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function CharacterDeleteConfirmation(Characters, slots, SelectedCharacter, value)
|
||||||
|
local elements = {
|
||||||
|
{title = TranslateCap('char_delete_confirmation'), icon = "fa-solid fa-users", description = TranslateCap('char_delete_confirmation_description'), unselectable = true},
|
||||||
|
{title = TranslateCap('char_delete'), icon ="fa-solid fa-xmark", description = TranslateCap('char_delete_yes_description'), action = 'delete', value = value},
|
||||||
|
{title = TranslateCap('return'), unselectable = false, icon = "fa-solid fa-arrow-left", description = TranslateCap('char_delete_no_description'), action = "return"}
|
||||||
|
}
|
||||||
|
|
||||||
|
ESX.OpenContext("left", elements, function(element, Action)
|
||||||
|
if Action.action == "delete" then
|
||||||
|
ESX.CloseContext()
|
||||||
|
TriggerServerEvent('esx_multicharacter:DeleteCharacter', Action.value)
|
||||||
|
spawned = false
|
||||||
|
elseif Action.action == "return" then
|
||||||
|
CharacterOptions(Characters, slots, SelectedCharacter)
|
||||||
|
end
|
||||||
|
end, nil, false)
|
||||||
|
end
|
||||||
|
|
||||||
function CharacterOptions(Characters, slots, SelectedCharacter)
|
function CharacterOptions(Characters, slots, SelectedCharacter)
|
||||||
local elements = {{title = TranslateCap('character', Characters[SelectedCharacter.value].firstname .. " ".. Characters[SelectedCharacter.value].lastname),icon = "fa-regular fa-user", unselectable = true},
|
local elements = {{title = TranslateCap('character', Characters[SelectedCharacter.value].firstname .. " ".. Characters[SelectedCharacter.value].lastname),icon = "fa-regular fa-user", unselectable = true},
|
||||||
{title = TranslateCap('return'), unselectable = false,icon = "fa-solid fa-arrow-left",description = TranslateCap('return_description'), action = "return"}}
|
{title = TranslateCap('return'), unselectable = false,icon = "fa-solid fa-arrow-left",description = TranslateCap('return_description'), action = "return"}}
|
||||||
@@ -157,9 +175,7 @@ if ESX.GetConfig().Multichar then
|
|||||||
ESX.CloseContext()
|
ESX.CloseContext()
|
||||||
TriggerServerEvent('esx_multicharacter:CharacterChosen', Action.value, false)
|
TriggerServerEvent('esx_multicharacter:CharacterChosen', Action.value, false)
|
||||||
elseif Action.action == "delete" then
|
elseif Action.action == "delete" then
|
||||||
ESX.CloseContext()
|
CharacterDeleteConfirmation(Characters, slots, SelectedCharacter, Action.value)
|
||||||
TriggerServerEvent('esx_multicharacter:DeleteCharacter', Action.value)
|
|
||||||
spawned = false
|
|
||||||
elseif Action.action == "return" then
|
elseif Action.action == "return" then
|
||||||
SelectCharacterMenu(Characters, slots)
|
SelectCharacterMenu(Characters, slots)
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -10,6 +10,10 @@ Locales["en"] = {
|
|||||||
["char_disabled_description"] = "This Character Is Unusable.",
|
["char_disabled_description"] = "This Character Is Unusable.",
|
||||||
["char_delete"] = "Delete",
|
["char_delete"] = "Delete",
|
||||||
["char_delete_description"] = "Permanently Remove This Character.",
|
["char_delete_description"] = "Permanently Remove This Character.",
|
||||||
|
["char_delete_confirmation"] = "Delete Confirmation",
|
||||||
|
["char_delete_confirmation_description"] = "Are you sure removing selected character?",
|
||||||
|
["char_delete_yes_description"] = "Yes, I am sure removing selected character",
|
||||||
|
["char_delete_no_description"] = "No, return to character options",
|
||||||
["character"] = "Character: %s",
|
["character"] = "Character: %s",
|
||||||
["return"] = "Return",
|
["return"] = "Return",
|
||||||
["return_description"] = "Return To Character Selection.",
|
["return_description"] = "Return To Character Selection.",
|
||||||
|
|||||||
Reference in New Issue
Block a user