diff --git a/fxmanifest.lua b/fxmanifest.lua index 71b22f4..d89d630 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -3,7 +3,7 @@ author "mustache_dom" description "drugs by mustache dom" fx_version "cerulean" game "gta5" -version '4.0.6' +version '4.0.7' client_scripts { 'client/functions.lua', 'client/plantSpawns.lua', diff --git a/locales/DJ.lua b/locales/DJ.lua index b0f74d4..8817233 100644 --- a/locales/DJ.lua +++ b/locales/DJ.lua @@ -5,7 +5,7 @@ Lang.Catches = { needItems = 'Whoa! You’re missing the ESSENTIALS, come on!', notEnoughMoney = 'Uh-oh! Not enough CASH, gotta grind!', buySuccess = 'BOOM! You copped %s %s for $%s, YEAH!', - itemMissings = 'CHECK IT! You need: \n', + itemMissings = 'CHECK IT! You need: %s', itemNeeded = 'Grab that %s, LET’S GOOOO!', cooldown = 'Hold up! Chill for a sec, speed racer!', invalidItem = 'Uh-uh! That ain’t sold HERE, fam!', diff --git a/locales/cs.lua b/locales/cs.lua index e4bb1f7..50274f6 100644 --- a/locales/cs.lua +++ b/locales/cs.lua @@ -5,7 +5,7 @@ Lang.Catches = { needItems = 'Nemáte potřebné předměty', notEnoughMoney = 'Jste příliš chudí', buySuccess = 'Koupili jste %s %s za $%s', - itemMissings = 'Potřebujete \n', + itemMissings = 'Potřebujete %s', itemNeeded = 'Potřebujete %s', cooldown = 'Zpomalte, rychlíku', invalidItem = 'Tento předmět zde není k prodeji', diff --git a/locales/de.lua b/locales/de.lua index 83ab615..f346b12 100644 --- a/locales/de.lua +++ b/locales/de.lua @@ -5,7 +5,7 @@ Lang.Catches = { needItems = 'Du hast nicht die benötigten Gegenstände', notEnoughMoney = 'Du bist zu pleite', buySuccess = 'Du hast %s %s für $%s gekauft', - itemMissings = 'Du brauchst \n', + itemMissings = 'Du brauchst %s', itemNeeded = 'Du brauchst %s', cooldown = 'Langsam, Speed Racer', invalidItem = 'Dieser Artikel wird hier nicht verkauft', diff --git a/locales/dovahzul.lua b/locales/dovahzul.lua index a744b6f..32f834b 100644 --- a/locales/dovahzul.lua +++ b/locales/dovahzul.lua @@ -5,7 +5,7 @@ Lang.Catches = { needItems = 'Zu’u fen do los vulon los wah dii', notEnoughMoney = 'Nii lot kruziik, fin sahvot!', buySuccess = 'Zu’u krah %s %s do $%s, wahrii!', - itemMissings = 'Zu’u fen do wah: \n', + itemMissings = 'Zu’u fen do wah: %s', itemNeeded = 'Zu’u fen do %s', cooldown = 'Zu’u pahk do, naal vokun', invalidItem = 'Dii item ni los los hi', diff --git a/locales/en.lua b/locales/en.lua index 5fd14af..be3f993 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -5,7 +5,7 @@ Lang.Catches = { needItems = 'You Do Not Have The Required Items', notEnoughMoney = 'Youre To Broke', buySuccess = 'You Bought %s %s For $%s', - itemMissings = 'You Need \n', + itemMissings = 'You Need %s', itemNeeded = 'You Need %s', cooldown = 'Slow Down Speed Racer', invalidItem = 'This Item Is Not Sold Here', diff --git a/locales/es.lua b/locales/es.lua index f55d8b9..fd6ec2a 100644 --- a/locales/es.lua +++ b/locales/es.lua @@ -5,7 +5,7 @@ Lang.Catches = { needItems = 'No tienes los objetos requeridos', notEnoughMoney = 'Estás demasiado pobre', buySuccess = 'Compraste %s %s por $%s', - itemMissings = 'Necesitas \n', + itemMissings = 'Necesitas %s', itemNeeded = 'Necesitas %s', cooldown = 'Despacio, Speed Racer', invalidItem = 'Este artículo no se vende aquí', diff --git a/locales/fr.lua b/locales/fr.lua index eda439a..098a03d 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -5,7 +5,7 @@ Lang.Catches = { needItems = 'Vous n’avez pas les objets requis', notEnoughMoney = 'Vous êtes trop fauché', buySuccess = 'Vous avez acheté %s %s pour $%s', - itemMissings = 'Vous avez besoin de \n', + itemMissings = 'Vous avez besoin de %s', itemNeeded = 'Vous avez besoin de %s', cooldown = 'Ralentissez, Speed Racer', invalidItem = 'Cet objet n’est pas vendu ici', diff --git a/locales/gungan.lua b/locales/gungan.lua index 45c650c..592e77a 100644 --- a/locales/gungan.lua +++ b/locales/gungan.lua @@ -5,7 +5,7 @@ Lang.Catches = { needItems = 'Yousa no havin da tings needed!', notEnoughMoney = 'Yousa too broke, mooey mooey!', buySuccess = 'Yousa buyin %s %s for %s credits!', - itemMissings = 'Yousa needin dis stuff: \n', + itemMissings = 'Yousa needin dis stuff: %s', itemNeeded = 'Yousa needin %s', cooldown = 'Ooooh, slow down speeda racer!', invalidItem = 'Dis item not bein sold here, okeeday?', diff --git a/locales/klingon.lua b/locales/klingon.lua index 538866d..bcbbc8a 100644 --- a/locales/klingon.lua +++ b/locales/klingon.lua @@ -5,7 +5,7 @@ Lang.Catches = { needItems = 'Dochmey lugh DaHutlh', notEnoughMoney = 'HuchlIj machqu’', buySuccess = 'DaSuqta’ %s %s chenmoHmeH $%s', - itemMissings = 'DaHutlh Dochmey \n', + itemMissings = 'DaHutlh Dochmey %s', itemNeeded = 'DaHutlh %s', cooldown = 'yIyep! nomqu’ bIvum', invalidItem = 'Dochvam naDbe’ SuvwI’', diff --git a/locales/meanieweenie.lua b/locales/meanieweenie.lua index 881dacb..b004f41 100644 --- a/locales/meanieweenie.lua +++ b/locales/meanieweenie.lua @@ -5,7 +5,7 @@ Lang.Catches = { needItems = 'You don’t even have the shit you need', notEnoughMoney = 'You’re too broke, loser', buySuccess = 'Finally bought %s %s for $%s, smartass', - itemMissings = 'You need this crap: \n', + itemMissings = 'You need this crap: %s', itemNeeded = 'Get your hands on %s, idiot', cooldown = 'Slow your ass down, speed freak', invalidItem = 'This crap ain’t sold here, dumbfuck', diff --git a/locales/nl.lua b/locales/nl.lua index 22c11bc..0b0ec85 100644 --- a/locales/nl.lua +++ b/locales/nl.lua @@ -5,7 +5,7 @@ Lang.Catches = { needItems = 'Je hebt de benodigde items niet', notEnoughMoney = 'Je bent te arm', buySuccess = 'Je hebt %s %s gekocht voor $%s', - itemMissings = 'Je hebt nodig: \n', + itemMissings = 'Je hebt nodig: %s', itemNeeded = 'Je hebt %s nodig', cooldown = 'Rustig aan, Speed Racer', invalidItem = 'Dit item wordt hier niet verkocht', diff --git a/locales/piglatin.lua b/locales/piglatin.lua index d1ff108..82d05bc 100644 --- a/locales/piglatin.lua +++ b/locales/piglatin.lua @@ -5,7 +5,7 @@ Lang.Catches = { needItems = 'ouYay Oday Otnay Avehay Ethay Equiredray Itemsyay', notEnoughMoney = 'ouYay Ereyay Otay Okebray', buySuccess = 'ouYay Oughtbay %s %s Orfay $%s', - itemMissings = 'ouYay Eednay \n', + itemMissings = 'ouYay Eednay %s', itemNeeded = 'ouYay Eednay %s', cooldown = 'owSlay OwnDay Eedspay AcerRay', invalidItem = 'isThay Itemyay Isyay Otnay Oldsay EreHay', diff --git a/locales/pirate.lua b/locales/pirate.lua index bc1a560..a25e10e 100644 --- a/locales/pirate.lua +++ b/locales/pirate.lua @@ -5,7 +5,7 @@ Lang.Catches = { needItems = 'Ye be lackin’ the proper booty', notEnoughMoney = 'Ye pockets be emptier than Davey Jones’ locker', buySuccess = 'Ye plundered %s %s fer $%s', - itemMissings = 'Ye be needin’ \n', + itemMissings = 'Ye be needin’ %s', itemNeeded = 'Ye be needin’ %s', cooldown = 'Avast! Slow yer sails, sailor!', invalidItem = 'This booty ain’t sold on these seas', diff --git a/locales/pt-br.lua b/locales/pt-br.lua index 6803183..39aa59d 100644 --- a/locales/pt-br.lua +++ b/locales/pt-br.lua @@ -5,7 +5,7 @@ Lang.Catches = { needItems = 'Você não tem os itens necessários', notEnoughMoney = 'Você tá muito liso', buySuccess = 'Você comprou %s %s por $%s', - itemMissings = 'Você precisa de \n', + itemMissings = 'Você precisa de %s', itemNeeded = 'Você precisa de %s', cooldown = 'Calma, Speed Racer', invalidItem = 'Este item não é vendido aqui', diff --git a/locales/tr.lua b/locales/tr.lua index 2dadcf9..9a192c3 100644 --- a/locales/tr.lua +++ b/locales/tr.lua @@ -5,7 +5,7 @@ Lang.Catches = { needItems = 'Gerekli eşyalara sahip değilsiniz', notEnoughMoney = 'Çok fakirsin', buySuccess = '%s adet %s satın aldınız, ücret: $%s', - itemMissings = 'Şunlara ihtiyacınız var: \n', + itemMissings = 'Şunlara ihtiyacınız var: %s', itemNeeded = '%s gerekli', cooldown = 'Yavaşla, Speed Racer', invalidItem = 'Bu ürün burada satılmıyor', diff --git a/locales/uwu.lua b/locales/uwu.lua index 5683a0f..89ba106 100644 --- a/locales/uwu.lua +++ b/locales/uwu.lua @@ -5,7 +5,7 @@ Lang.Catches = { needItems = 'Aww... you don’t have all da items I need... 😢', notEnoughMoney = 'Oof, you’re too broke, sweetie 💸', buySuccess = 'Yay! You bought %s %s for $%s! 💖', - itemMissings = 'You need:\n', + itemMissings = 'You need:%s', itemNeeded = 'You need %s... plz go get it! 🥺', cooldown = 'Silly baka, slow down! ⏳', invalidItem = 'Eh? This item isn’t sold here, silly! 🙃', diff --git a/locales/wookie.lua b/locales/wookie.lua index 7e90b09..55ae7b4 100644 --- a/locales/wookie.lua +++ b/locales/wookie.lua @@ -5,7 +5,7 @@ Lang.Catches = { needItems = 'Hnnngh oogar!', notEnoughMoney = 'Whroooaah mmgra!', buySuccess = 'Raaar %s %s whrrr $%s!', - itemMissings = 'Oogar:\n%s', + itemMissings = 'Oogar:%s', itemNeeded = 'Rraa %s!', cooldown = 'Whhrrroooaannn!', invalidItem = 'Khhrrrnnngh!', diff --git a/shared/config.lua b/shared/config.lua index d874b9a..8842c58 100644 --- a/shared/config.lua +++ b/shared/config.lua @@ -1,4 +1,16 @@ Config = {} --Ignore. + +if GetResourceState('ps_lib') ~= 'started' then + print('^1ERROR: ps_lib is not started, please start ps_lib before starting this resource.^0') + return +end + +if GetResourceState('ps_lib') == 'missing' then + print('^1ERROR: ps_lib is missing, please install ps_lib to use this resource.^0') + print('^1You can find ps_lib here: https://github.com/Project-Sloth/ps_lib') + return +end + ps = exports.ps_lib:init() --Ignore. ps.loadLangs("en") -- set your language diff --git a/version.txt b/version.txt index 23151fb..6aafd28 100644 --- a/version.txt +++ b/version.txt @@ -60,9 +60,20 @@ Build: 4.0.5 - Replace server/xtc.lua - adjust fxmanifest version to 4.0.5 -Newest Build: 4.0.6 +Build: 4.0.6 - add whippits to the script - to add move the folder `ate_balloon` to standalone folder - or anywhere else like it is its own script - add the items ( located at the bottom of ox.md/qb.md) and images - add the server and client file named whippit.lua + +Newest Build: 4.0.7 + - add checks in config for ps lib being installed and started before to + - reduce the questions i get + +- small fix for notifications not displaying what you need properly + +- THIS VERSION HAS NO STRUCTURAL CHANGES. IF YOU WANT THE FIX FOR NOTIFICATIONS, ONLY UPDATE YOUR LOCALE FILE + +- if you are seeing this, you most likely already have ps_lib working properly +