From e10800abd969245ce1579f08611e0c72460671a4 Mon Sep 17 00:00:00 2001 From: bitpredator <67551273+bitpredator@users.noreply.github.com> Date: Fri, 21 Jun 2024 11:08:13 +0200 Subject: [PATCH 1/6] fix Fixed character generation issue --- server-data/resources/[esx]/es_extended/server/main.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server-data/resources/[esx]/es_extended/server/main.lua b/server-data/resources/[esx]/es_extended/server/main.lua index 0c227d58c..161f40920 100644 --- a/server-data/resources/[esx]/es_extended/server/main.lua +++ b/server-data/resources/[esx]/es_extended/server/main.lua @@ -239,7 +239,7 @@ function loadESXPlayer(identifier, playerId, isNew) end -- Position - userData.coords = json.decode(result.position) or Config.DefaultSpawns[ESX.Math.Random(1,#Config.DefaultSpawns)] + userData.coords = json.decode(result.position) or Config.DefaultSpawns[math.random(#Config.DefaultSpawns)] -- Skin userData.skin = (result.skin and result.skin ~= "") and json.decode(result.skin) or { sex = userData.sex == "f" and 1 or 0 } From b36976dc3282a91e597dca6f7a06d1f69ae10716 Mon Sep 17 00:00:00 2001 From: bitpredator <67551273+bitpredator@users.noreply.github.com> Date: Fri, 21 Jun 2024 11:59:47 +0200 Subject: [PATCH 2/6] fix: corrected invoice issuing error --- .../resources/[esx_addons]/esx_vehicleshop/client/main.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server-data/resources/[esx_addons]/esx_vehicleshop/client/main.lua b/server-data/resources/[esx_addons]/esx_vehicleshop/client/main.lua index 0a4fdba7e..67e262ecd 100644 --- a/server-data/resources/[esx_addons]/esx_vehicleshop/client/main.lua +++ b/server-data/resources/[esx_addons]/esx_vehicleshop/client/main.lua @@ -385,7 +385,7 @@ function OpenResellerMenu() ESX.ShowNotification(TranslateCap("no_players")) else TriggerServerEvent( - "esx_billing:sendBill", + "bpt_billing:sendBill", GetPlayerServerId(closestPlayer), "society_cardealer", TranslateCap("car_dealer"), From 20f1054653fb5d76b78ab34fc8a18dfeba95156f Mon Sep 17 00:00:00 2001 From: bitpredator <67551273+bitpredator@users.noreply.github.com> Date: Fri, 21 Jun 2024 12:02:05 +0200 Subject: [PATCH 3/6] fix: fixed typo on bank translations --- server-data/resources/[esx]/es_extended/locales/it.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server-data/resources/[esx]/es_extended/locales/it.lua b/server-data/resources/[esx]/es_extended/locales/it.lua index 24280c155..e5369f96d 100644 --- a/server-data/resources/[esx]/es_extended/locales/it.lua +++ b/server-data/resources/[esx]/es_extended/locales/it.lua @@ -44,7 +44,7 @@ Locales["it"] = { ["received_salary"] = "Sei stato pagato: $%s", ["received_help"] = "Hai ricevuto il reddito di cittadinanza: $%s", ["company_nomoney"] = "La tua compagnia è troppo povera per pagarti", - ["received_paycheck"] = "Ricveuto stipendio", + ["received_paycheck"] = "Hai ricevuto lo stipendio", ["bank"] = "Banca", ["account_bank"] = "Conto", ["account_black_money"] = "Soldi sporchi", From dc5b4da4ce72fde7a4b89b9f5e32513df6bdc60a Mon Sep 17 00:00:00 2001 From: bitpredator <67551273+bitpredator@users.noreply.github.com> Date: Fri, 21 Jun 2024 12:10:06 +0200 Subject: [PATCH 4/6] bpt_billing\locales\it.lua (fixed missing translation error) --- server-data/resources/[bpt_addons]/bpt_billing/locales/it.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/server-data/resources/[bpt_addons]/bpt_billing/locales/it.lua b/server-data/resources/[bpt_addons]/bpt_billing/locales/it.lua index 3f5019159..010f16b8c 100644 --- a/server-data/resources/[bpt_addons]/bpt_billing/locales/it.lua +++ b/server-data/resources/[bpt_addons]/bpt_billing/locales/it.lua @@ -9,4 +9,5 @@ Locales["it"] = { ["no_money"] = "non hai abbastanza soldi per pagare questa fattura", ["target_no_money"] = "il giocatore ~r~non ha~s~ abbastanza soldi per pagare la fattura!", ["keymap_showbills"] = "apri il menu delle fatture", + ["billing"] = "fattura", } From 93cd523ce0db77c78f2580c122edc159d942d741 Mon Sep 17 00:00:00 2001 From: bitpredator <67551273+bitpredator@users.noreply.github.com> Date: Fri, 21 Jun 2024 17:21:39 +0200 Subject: [PATCH 5/6] chore: set the Italian language as default --- .../resources/[bpt_addons]/bpt_dmvschool/fxmanifest.lua | 8 ++++---- .../[bpt_addons]/bpt_dmvschool/html/questions_it.js | 4 ++-- .../resources/[bpt_addons]/bpt_dmvschool/html/ui_it.html | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/server-data/resources/[bpt_addons]/bpt_dmvschool/fxmanifest.lua b/server-data/resources/[bpt_addons]/bpt_dmvschool/fxmanifest.lua index fac470cd1..26309228d 100644 --- a/server-data/resources/[bpt_addons]/bpt_dmvschool/fxmanifest.lua +++ b/server-data/resources/[bpt_addons]/bpt_dmvschool/fxmanifest.lua @@ -4,7 +4,7 @@ game("gta5") description("A DMV School for players to get their drivers license") -version("1.0.0") +version("1.0.1") lua54("yes") @@ -24,13 +24,13 @@ client_scripts({ "client/main.lua", }) -ui_page("html/ui.html") +ui_page("html/ui_it.html") files({ - "html/ui.html", + "html/ui_it.html", "html/dmv.png", "html/styles.css", - "html/questions.js", + "html/questions_it.js", "html/scripts.js", "html/debounce.min.js", }) diff --git a/server-data/resources/[bpt_addons]/bpt_dmvschool/html/questions_it.js b/server-data/resources/[bpt_addons]/bpt_dmvschool/html/questions_it.js index f395efec4..05681796e 100644 --- a/server-data/resources/[bpt_addons]/bpt_dmvschool/html/questions_it.js +++ b/server-data/resources/[bpt_addons]/bpt_dmvschool/html/questions_it.js @@ -3,13 +3,13 @@ var tableauQuestion = [ question: "Se stai andando a 80 km/h, e ti stai avvicinando a una zona residenziale devi::", propositionA: "Accellerare", propositionB: "Mantieni la velocità, se non sorpassi altri veicoli", - propositionC: "Ralenti", + propositionC: "Rallenti", propositionD: "Mantieni la velocità", reponse: "C" }, { - question: "Se al semaforo stai svoltaando a destra, ma vedi un pedone cosa fai:", + question: "Se al semaforo stai svoltando a destra, ma vedi un pedone cosa fai:", propositionA: "Superi il pedone", propositionB: "Controlli che non ci siano altri veicoli in giro", propositionC: "Aspetti che il pedone abbia attraversato", diff --git a/server-data/resources/[bpt_addons]/bpt_dmvschool/html/ui_it.html b/server-data/resources/[bpt_addons]/bpt_dmvschool/html/ui_it.html index ba1dea593..579bc7dfa 100644 --- a/server-data/resources/[bpt_addons]/bpt_dmvschool/html/ui_it.html +++ b/server-data/resources/[bpt_addons]/bpt_dmvschool/html/ui_it.html @@ -114,7 +114,7 @@

Progressi

- + From b47e68bc209218c4e06cc2b69bf816263bf5cda8 Mon Sep 17 00:00:00 2001 From: bitpredator <67551273+bitpredator@users.noreply.github.com> Date: Fri, 21 Jun 2024 17:22:19 +0200 Subject: [PATCH 6/6] chore: the quantity of nourishment increases --- server-data/resources/[ox]/ox_inventory/data/items.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server-data/resources/[ox]/ox_inventory/data/items.lua b/server-data/resources/[ox]/ox_inventory/data/items.lua index 9ec1f429d..46105376f 100644 --- a/server-data/resources/[ox]/ox_inventory/data/items.lua +++ b/server-data/resources/[ox]/ox_inventory/data/items.lua @@ -18,7 +18,7 @@ return { label = "Burger", weight = 220, client = { - status = { hunger = 2000 }, + status = { hunger = 25000 }, anim = "eating", prop = "burger", usetime = 2500,