Merge pull request #39 from it-scripts/v1.3.1

v1.3.1

client/cl_dealer.lua

@@ -52,8 +52,14 @@ RegisterNetEvent('it-drugs:client:handleDealerInteraction', function(args)
     local price = args.price
     local action = args.action
 
+    local _description
+    if action == "buy" then
+        _description = _U('INPUT__BUY__DESCRIPTION'):format(itemLabel)
+    else
+        _description = _U('INPUT__SELL__DESCRIPTION'):format(itemLabel)
+    end
     local input = lib.inputDialog(_U('INPUT__BUY__HEADER'), {
-        {type = 'number', label = _U('INPUT__BUY__TEXT'), description = _U('INPUT__BUY__DESCRIPTION'):format(itemLabel), required = true, min = 1}
+        {type = 'number', label = _U('INPUT__BUY__TEXT'), description = _description, required = true, min = 1}
     })
 
     if not input then
@@ -82,4 +88,4 @@ AddEventHandler('onResourceStop', function(resource)
             DeleteEntity(ped)
         end
     end
-end)
+end)

client/cl_planting.lua

@@ -457,7 +457,7 @@ RegisterNetEvent('it-drugs:client:useItem', function (args)
 end)
 
 RegisterNetEvent('it-drugs:client:destroyPlant', function(args)
-    if not it.hasItem(Config.DestroyItemName, 1) and Config.ItemToDestroyPlant then
+    if Config.ItemToDestroyPlant and not it.hasItem(Config.DestroyItemName, 1) then
         ShowNotification(nil, _U('NOTIFICATION__NEED_LIGHTER'), "error")
         TriggerEvent('it-drugs:client:syncRestLoop', false)
         return

client/cl_selling.lua

@@ -45,8 +45,13 @@ CreateThread(function()
 				if zone:contains(pedCoords) then
 					if currentZone ~= k then
 						zone:onEnter()
+						if Config.Debug then lib.print.info("Entered Zone ["..k.."]") end
 					end
 					if Config.Debug then lib.print.info("Inside Zone ["..k.."]") end
+				elseif currentZone == k then
+					zone:onExit()
+					currentZone = nil
+					if Config.Debug then lib.print.info("Exited Zone ["..k.."]") end
 				end
 			end
 		end
@@ -176,4 +181,4 @@ RegisterNetEvent('it-drugs:client:salesInitiate', function(cad)
 		TriggerServerEvent('it-drugs:server:initiatedrug', cad)
 		SetPedAsNoLongerNeeded(cad.tped)
 	end
-end)
+end)

fxmanifest.lua

@@ -3,7 +3,7 @@ game 'gta5'
 
 author '@allroundjonu'
 description 'Advanced Drug System for FiveM'
-version 'v1.3.0'
+version 'v1.3.1'
 
 identifier 'it-drugs'
 
@@ -123,4 +123,4 @@ dependencies {
     'oxmysql'
 }
 
-lua54 'yes'
+lua54 'yes'

locales/de.lua

@@ -99,9 +99,6 @@ Locales['de'] = {
     ['MENU__TABLE__DESTROY'] = 'Tisch zerstören',
     ['MENU__TABLE__DESTROY__DESC'] = 'Zerstöre diesen Tisch',
 
-    ['NOTIFICATION__NO__MONEY'] = 'Du hast nicht genug Geld dabei!',
-    ['NOTIFICATION__BUY__SUCCESS'] = 'Du hast erfolgreich etwas %s gekauft.',
-
     ['NOTIFICATION__IN__VEHICLE'] = 'Das geht nicht mit einem Fahrzeug',
     ['NOTIFICATION__MAX__PLANTS'] = 'Bitte kümmere dich ersteinmal um deinen aktuellen Pflanzen',
     ['NOTIFICATION__CANT__PLACE'] = 'Das kannst du hier nicht tun',
@@ -118,6 +115,9 @@ Locales['de'] = {
 
     ['NOTIFICATION__DEALER__SELL__SUCCESS'] = 'Du hast erflogreich %gx %s für %g verkauft',
     ['NOTIFICATION__DEALER__BUY__SUCCESS'] = 'Du hast erflogreich %gx %s für %g gekauft',
+    ['NOTIFICATION__BUY__SUCCESS'] = 'Du hast erfolgreich etwas %s gekauft.',
+    ['NOTIFICATION__NO__MONEY'] = 'Du hast nicht genug Geld dabei!',
+    ['NOTIFICATION__DEALER__NO__ITEM'] = 'Du hast nicht genug Items zum verkaufen!',
 
     ['NOTIFICATION__CALLING__COPS'] = 'Der Käufer ruft die Polizei!',
     ['NOTIFICATION__NOT__INTERESTED'] = 'Der Käufer ist gerade nicht interessiert!',
@@ -166,6 +166,7 @@ Locales['de'] = {
     ['INPUT__BUY__HEADER'] = 'Kaufen',
     ['INPUT__BUY__TEXT'] = 'Anzahl',
     ['INPUT__BUY__DESCRIPTION'] = 'Wie viel %s möchtest du Kaufen?',
+    ['INPUT__SELL__DESCRIPTION'] = 'Wie viel %s möchtest du Verkaufen?',
 
     ['INPUT__AMOUNT__HEADER'] = 'Verarbeiten',
     ['INPUT__AMOUNT__TEXT'] = 'Menge',

locales/en.lua

@@ -27,8 +27,6 @@ Locales['en'] = {
     ['MENU__ITEM'] = 'Items',
     ['MENU__ITEM__DESC'] = 'Use this item to take care of your plant',
 
-
-
     ['MENU__PROCESSING'] = 'Proccessing',
     ['MENU__RECIPE__DESC'] = 'Process your drugs with this recipe',
 
@@ -116,8 +114,9 @@ Locales['en'] = {
 
     ['NOTIFICATION__DEALER__SELL__SUCCESS'] = 'You have successfully sold %gx %s for $%g',
     ['NOTIFICATION__DEALER__BUY__SUCCESS'] = 'You have successfully bought %gx %s for $%g',
-    ['NOTIFICATION__NO__MONEY'] = 'You don´t have enought money on you',
-    ['NOTIFICATION__BUY__SUCCESS'] = 'You successfuly bought some %s',
+    ['NOTIFICATION__NO__MONEY'] = 'You don`t have enough money on you',
+    ['NOTIFICATION__BUY__SUCCESS'] = 'You successfully bought some %s',
+    ['NOTIFICATION__DEALER__NO__ITEM'] = 'You don`t have enough items to sell',
 
     ['NOTIFICATION__IN__VEHICLE'] = 'You can´t do this in a Vehicle',
     ['NOTIFICATION__CANT__PLACE'] = 'You can´t do this here',
@@ -185,6 +184,7 @@ Locales['en'] = {
     ['INPUT__BUY__HEADER'] = 'Buying',
     ['INPUT__BUY__TEXT'] = 'Amount',
     ['INPUT__BUY__DESCRIPTION'] = 'How many %s do you want to buy?',
+    ['INPUT__SELL__DESCRIPTION'] = 'How many %s do you want to sell?',
 
     ['TARGET__DEALER__LABLE'] = 'Check Dealer',
     ['TARGET__PLANT__LABEL'] = 'Check Plant',

locales/es.lua

@@ -104,6 +104,7 @@ Locales['es'] = {
     ['NOTIFICATION__DEALER__SELL__SUCCESS'] = 'Has vendido con éxito %gx %s por $%g',
     ['NOTIFICATION__DEALER__BUY__SUCCESS'] = 'Has comprado %gx %s por $%g',
     ['NOTIFICATION__BUY__SUCCESS'] = 'Has comprado con éxito algunos %s',
+    ['NOTIFICATION__DEALER__NO__ITEM'] = 'No tiene suficientes artículos para vender',
 
     ['NOTIFICATION__IN__VEHICLE'] = 'No puedes hacer esto en un vehículo.',
     ['NOTIFICATION__CANT__PLACE'] = 'No puedes hacer esto aquí.',
@@ -169,6 +170,7 @@ Locales['es'] = {
     ['INPUT__BUY__HEADER'] = 'Compra',
     ['INPUT__BUY__TEXT'] = 'Cantidad',
     ['INPUT__BUY__DESCRIPTION'] = '¿Cuántos %s quieres comprar?',
+    ['INPUT__SELL__DESCRIPTION'] = '¿Cuántos %s quiere vender?',
 
     ['TARGET__PLANT__LABEL'] = 'Ver Planta',
     ['TARGET__TABLE__LABEL'] = 'Usar Mesa',

locales/fr.lua

@@ -112,8 +112,9 @@ Locales['fr'] = {
 
     ['NOTIFICATION__NO__MONEY'] = 'Vous n\'avez pas assez d\'argent sur vous',
     ['NOTIFICATION__DEALER__SELL__SUCCESS'] = 'Vous avez vendu %gx %s avec succès pour $%g',
-['NOTIFICATION__DEALER__BUY__SUCCESS'] = 'Vous avez acheté %gx %s avec succès pour $%g',
+    ['NOTIFICATION__DEALER__BUY__SUCCESS'] = 'Vous avez acheté %gx %s avec succès pour $%g',
     ['NOTIFICATION__BUY__SUCCESS'] = 'Vous avez acheté avec succès du %s',
+    ['NOTIFICATION__DEALER__NO__ITEM'] = 'Vous n´avez pas assez d´articles à vendre',
 
     ['NOTIFICATION__IN__VEHICLE'] = 'Vous ne pouvez pas faire cela dans un véhicule',
     ['NOTIFICATION__CANT__PLACE'] = 'Vous ne pouvez pas faire cela ici',
@@ -179,7 +180,8 @@ Locales['fr'] = {
 
     ['INPUT__BUY__HEADER'] = 'Achat',
     ['INPUT__BUY__TEXT'] = 'Quantité',
-    ['INPUT__BUY__DESCRIPTION'] = 'Combien de %s voulez-vous acheter ?',
+    ['INPUT__BUY__DESCRIPTION'] = 'Combien de %s voulez-vous acheter?',
+    ['INPUT__SELL__DESCRIPTION'] = 'Combien de %s voulez-vous vendre?',
 
     ['TARGET__DEALER__LABLE'] = 'Vérifier le dealer',
     ['TARGET__PLANT__LABEL'] = 'Vérifier la plante',

locales/he.lua

@@ -110,13 +110,17 @@ Locales['he'] = {
     ['MENU__TABLE__DESTROY'] = 'השמד שולחן',
     ['MENU__TABLE__DESTROY__DESC'] = 'השמד את השולחן הזה',
 
+    ['NOTIFICATION__DEALER__SELL__SUCCESS'] = 'מכרת בהצלחה %gx %s תמורת $%g',
+    ['NOTIFICATION__DEALER__BUY__SUCCESS'] = 'קנית בהצלחה %gx %s עבור $%g',
+    ['NOTIFICATION__NO__MONEY'] = 'אין לך מספיק כסף עליך',
+    ['NOTIFICATION__BUY__SUCCESS'] = 'קנית בהצלחה כמה %s',
+    ['NOTIFICATION__DEALER__NO__ITEM'] = 'אין לך מספיק פריטים למכור',
+
     ['NOTIFICATION__IN__VEHICLE'] = 'אתה לא יכול לעשות את זה ברכב',
     ['NOTIFICATION__CANT__PLACE'] = 'אתה לא יכול לעשות את זה כאן',
     ['NOTIFICATION__TO__NEAR'] = 'אתה לא יכול לשתול את זה ליד צמח אחר',
     ['NOTIFICATION__CANCELED'] = '...בוטל',
     ['NOTIFICATION__NO__ITEMS'] = 'אין לך פריטים לטפל בצמח הזה',
-    ['NOTIFICATION__NO__MONEY'] = 'אין לך מספיק כסף עליך',
-    ['NOTIFICATION__BUY__SUCCESS'] = 'רכשת בהצלחה קצת %s',
     ['NOTIFICATION__DRUG__COOLDOWN'] = 'עליך להמתין לפני שתוכל לקחת שוב את הסם הזה',
     ['NOTIFICATION__NO__AMOUNT'] = 'אתה צריך להזין סכום',
 
@@ -170,9 +174,11 @@ Locales['he'] = {
     ['INPUT__AMOUNT__HEADER'] = 'מעבד',
     ['INPUT__AMOUNT__TEXT'] = 'כמות',
     ['INPUT__AMOUNT__DESCRIPTION'] = '?כמה אתה רוצה לעבד',
+
     ['INPUT__BUY__HEADER'] = 'רכישה',
     ['INPUT__BUY__TEXT'] = 'כמות',
     ['INPUT__BUY__DESCRIPTION'] = '?כמה %s אתה רוצה לקנות',
+    ['INPUT__SELL__DESCRIPTION'] = 'כמה %s אתה רוצה למכור?',
 
     ['TARGET__PLANT__LABEL'] = 'בדוק צמח',
     ['TARGET__TABLE__LABEL'] = 'השתמש בשולחן',
@@ -184,13 +190,3 @@ Locales['he'] = {
 
     ['COMMAND__GROUNDHASH__HELP'] = 'קבל את ה-hash הקרקע הנוכחי'
 }
-
-function _U(string)
-    if Locales[Config.Language] == nil then
-        return "Language not found"
-    end
-    if Locales[Config.Language][string] == nil then
-        return string
-    end
-    return Locales[Config.Language][string]
-end