From d5956944ba716a44ebfd2236d1e06182c48ea3fb Mon Sep 17 00:00:00 2001 From: wobozkyng <42249669+wobozkyng@users.noreply.github.com> Date: Wed, 28 Dec 2022 13:52:13 +0700 Subject: [PATCH 1/2] adding delete character confirmation --- [esx]/esx_multicharacter/client/main.lua | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/[esx]/esx_multicharacter/client/main.lua b/[esx]/esx_multicharacter/client/main.lua index c37bf0f7..a6f36f0f 100644 --- a/[esx]/esx_multicharacter/client/main.lua +++ b/[esx]/esx_multicharacter/client/main.lua @@ -140,6 +140,24 @@ if ESX.GetConfig().Multichar then }) end + function CharacterDeleteConfirmation(Characters, slots, SelectedCharacter, value) + local elements = { + {title = 'Delete Confirmation', icon = "fa-solid fa-users", description = 'Are you sure removing selected character?', unselectable = true}, + {title = TranslateCap('char_delete'), icon ="fa-solid fa-xmark", description = 'Yes, I am sure removing selected character', action = 'delete', value = value}, + {title = TranslateCap('return'), unselectable = false, icon = "fa-solid fa-arrow-left", description = 'No, return to character options', 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) 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"}} @@ -157,9 +175,7 @@ if ESX.GetConfig().Multichar then ESX.CloseContext() TriggerServerEvent('esx_multicharacter:CharacterChosen', Action.value, false) elseif Action.action == "delete" then - ESX.CloseContext() - TriggerServerEvent('esx_multicharacter:DeleteCharacter', Action.value) - spawned = false + CharacterDeleteConfirmation(Characters, slots, SelectedCharacter, Action.value) elseif Action.action == "return" then SelectCharacterMenu(Characters, slots) end From de1fb18c796a06434cf134b9175367f81a915eb5 Mon Sep 17 00:00:00 2001 From: wobozkyng <42249669+wobozkyng@users.noreply.github.com> Date: Wed, 28 Dec 2022 17:17:36 +0700 Subject: [PATCH 2/2] adding english translation for delchar confirm text --- [esx]/esx_multicharacter/client/main.lua | 6 +++--- [esx]/esx_multicharacter/locales/en.lua | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[esx]/esx_multicharacter/client/main.lua b/[esx]/esx_multicharacter/client/main.lua index a6f36f0f..de34e7c3 100644 --- a/[esx]/esx_multicharacter/client/main.lua +++ b/[esx]/esx_multicharacter/client/main.lua @@ -142,9 +142,9 @@ if ESX.GetConfig().Multichar then function CharacterDeleteConfirmation(Characters, slots, SelectedCharacter, value) local elements = { - {title = 'Delete Confirmation', icon = "fa-solid fa-users", description = 'Are you sure removing selected character?', unselectable = true}, - {title = TranslateCap('char_delete'), icon ="fa-solid fa-xmark", description = 'Yes, I am sure removing selected character', action = 'delete', value = value}, - {title = TranslateCap('return'), unselectable = false, icon = "fa-solid fa-arrow-left", description = 'No, return to character options', action = "return"} + {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) diff --git a/[esx]/esx_multicharacter/locales/en.lua b/[esx]/esx_multicharacter/locales/en.lua index 64491ee2..d796ec32 100644 --- a/[esx]/esx_multicharacter/locales/en.lua +++ b/[esx]/esx_multicharacter/locales/en.lua @@ -10,6 +10,10 @@ Locales["en"] = { ["char_disabled_description"] = "This Character Is Unusable.", ["char_delete"] = "Delete", ["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", ["return"] = "Return", ["return_description"] = "Return To Character Selection.",