Merge pull request #24 from it-scripts/v1.3.0beta7

V1.3.0beta7

client/cl_menus.lua

@@ -366,6 +366,7 @@ RegisterNetEvent('it-drugs:client:showItemMenu', function(data)
     end
     if #options == 0 then
         ShowNotification(nil, _U('NOTIFICATION__NO__ITEMS'), 'error')
+        TriggerEvent('it-drugs:client:syncRestLoop', false)
         return
     end
 
@@ -447,15 +448,15 @@ RegisterNetEvent("it-drugs:client:showProcessingMenu", function(data)
             -- Menu only shows the amount not the name of the item
             table.insert(options, {
                 title = _U('MENU__UNKNOWN__INGREDIANT'),
-                description = _U('MENU__INGREDIANT__DESC'):format(v),
+                description = _U('MENU__INGREDIANT__DESC'):format(v.amount),
                 icon = "flask",
             })
         end
     else
         for k, v in pairs(recipe.ingrediants) do
             table.insert(options, {
                 title = it.getItemLabel(k),
-                description = _U('MENU__INGREDIANT__DESC'):format(v), --:replace("{amount}", v),
+                description = _U('MENU__INGREDIANT__DESC'):format(v.amount), --:replace("{amount}", v),
                 icon = "flask",
             })
         end

client/cl_notarget.lua

@@ -9,7 +9,7 @@ local restLoop = false
 local function getClosestPlant(coords)
 
     local closestPlant = nil
-    local closestDistance = 1000
+    local closestDistance = 20
 
     for k, v in pairs(plants) do
         local distance = #(coords - v.coords)
@@ -25,7 +25,7 @@ end
 local function getClosestProcessingTable(coords)
 
     local closestTable = nil
-    local closestDistance = 1000
+    local closestDistance = 20
 
     for k, v in pairs(processingTables) do
         local distance = #(coords - v.coords)
@@ -41,7 +41,7 @@ end
 local function getClosestDealer(coords)
 
     local closestDealer = nil
-    local closestDistance = 1000
+    local closestDistance = 20
 
     for k, v in pairs(dealers) do
         local vec3 = vector3(v.position.x, v.position.y, v.position.z)
@@ -107,4 +107,21 @@ CreateThread(function()
         end
         Wait(0)
     end
-end)
+end)
+
+CreateThread(function()
+    while true do
+        Wait(10000)  -- Wait 10 Seconds for refresh Press E and refresh info
+
+        local newPlants = lib.callback.await('it-drugs:server:getPlants', false)
+        if newPlants then
+            plants = newPlants
+        end
+
+        local newProcessingTables = lib.callback.await('it-drugs:server:getTables', false)
+        if newProcessingTables then
+            processingTables = newProcessingTables 
+        end
+
+    end
+end)

client/cl_planting.lua

@@ -457,7 +457,12 @@ 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
+        ShowNotification(nil, _U('NOTIFICATION__NEED_LIGHTER'), "error")
+        TriggerEvent('it-drugs:client:syncRestLoop', false)
+        return
+    end
+
     local plantData = args.plantData
     local type = plantData.seed
     local entity = NetworkGetEntityFromNetworkId(plantData.netId)
@@ -512,4 +517,4 @@ RegisterNetEvent('it-drugs:client:startPlantFire', function(coords)
     local effect = StartParticleFxLoopedAtCoord('ent_ray_paleto_gas_flames', coords.x, coords.y, coords.z, 0.0, 0.0, 0.0, 0.6, false, false, false, false)
     Wait(Config.FireTime)
     StopParticleFxLooped(effect, 0)
-end)
+end)

client/cl_processing.lua

@@ -76,7 +76,7 @@ RegisterNetEvent('it-drugs:client:placeProcessingTable', function(tableItem, met
     RequestModel(hashModel)
     while not HasModelLoaded(hashModel) do Wait(0) end
 
-    lib.showTextUI(_U('INTERACTION__PLACING__TEXT'), {
+    lib.showTextUI(_U('INTERACTION__PLACING_TABLE__TEXT'), {
         position = "left-center",
         icon = "spoon",
     })
@@ -181,6 +181,7 @@ RegisterNetEvent('it-drugs:client:processDrugs', function(args)
         if not it.hasItem(item, itemData.amount * amount) then
             ShowNotification(nil, _U('NOTIFICATION__MISSING__INGIDIANT'), 'error')
             proccessing = false
+            TriggerEvent('it-drugs:client:syncRestLoop', false)
             return
         end
     end
@@ -338,4 +339,4 @@ RegisterNetEvent('it-drugs:client:syncparticlefx', function(status, tableId, net
     else
         CreateSmokeEffect(status, tableId, netId, particlefx)
     end
-end)
+end)

locales/de.lua

@@ -147,6 +147,8 @@ Locales['de'] = {
     ['NOTIFICATION__ADD__BLIP'] = 'Blip wurde zur Karte hinzugefügt',
     ['NOTIFICATION__REMOVE__BLIP'] = 'Blip wurde von der Karte entfernt',
 
+    ['NOTIFICATION__NEED_LIGHTER'] = 'Um die Pflanze zu zerstören, benötigen Sie ein Feuerzeug', -- NEED TRANSLATE
+
     ['PROGRESSBAR__SPAWN__PLANT'] = 'Pflanzen...',
     ['PROGRESSBAR__HARVEST__PLANT'] = 'Ernten...',
     ['PROGRESSBAR__SOAK__PLANT'] = 'Gießen...',
@@ -158,6 +160,7 @@ Locales['de'] = {
     ['PROGRESSBAR__PROCESS__DRUG'] = 'Verarbeiten...',
 
     ['INTERACTION__PLACING__TEXT'] = '[E] - Pflanze platzieren / [G] - Abbrechen',
+    ['INTERACTION__PLACING_TABLE__TEXT'] = '[E] - Verarbeitungstisch platzieren / [G] - Abbrechen', -- Need Translate
     ['INTERACTION__INTERACT_TEXT'] = '[E] - Interagieren',
 
     ['INPUT__BUY__HEADER'] = 'Kaufen',
@@ -176,4 +179,4 @@ Locales['de'] = {
     ['COMMAND__GROUNDHASH'] = 'getGroundHash',
 
     ['COMMAND__GROUNDHASH__HELP'] = 'Bekomme den aktuellen groundHash'
-}
+}

locales/en.lua

@@ -161,6 +161,8 @@ Locales['en'] = {
     ['NOTIFICATION__ADD__BLIP'] = 'Added Blip to Map',
     ['NOTIFICATION__REMOVE__BLIP'] = 'Removed Blip from Map',
 
+    ['NOTIFICATION__NEED_LIGHTER'] = 'You need a lighter to destroy the plant',
+
     ['PROGRESSBAR__SPAWN__PLANT'] = 'Planting...',
     ['PROGRESSBAR__HARVEST__PLANT'] = 'Harvesting...',
     ['PROGRESSBAR__SOAK__PLANT'] = 'Watering...',
@@ -172,6 +174,8 @@ Locales['en'] = {
     ['PROGRESSBAR__PROCESS__DRUG'] = 'Processing...',
 
     ['INTERACTION__PLACING__TEXT'] = '[E] - Place Plant / [G] - Cancel',
+    ['INTERACTION__PLACING_TABLE__TEXT'] = '[E] - Place Table / [G] - Cancel',
+
     ['INTERACTION__INTERACT_TEXT'] = '[E] - Interact',
 
     ['INPUT__AMOUNT__HEADER'] = 'Processing',
@@ -201,4 +205,4 @@ function _U(string)
 		return string
 	end
 	return Locales[Config.Language][string]
-end
+end

locales/es.lua

@@ -147,6 +147,8 @@ Locales['es'] = {
     ['NOTIFICATION__ADD__BLIP'] = 'Blip añadido al mapa',
     ['NOTIFICATION__REMOVE__BLIP'] = 'Blip eliminado del mapa',
 
+    ['NOTIFICATION__NEED_LIGHTER'] = 'Necesitas un encendedor para destruir la planta.', -- NEED TRANSLATE
+
     ['PROGRESSBAR__SPAWN__PLANT'] = 'Plantando...',
     ['PROGRESSBAR__HARVEST__PLANT'] = 'Cosechando...',
     ['PROGRESSBAR__SOAK__PLANT'] = 'Regando...',
@@ -176,4 +178,4 @@ Locales['es'] = {
     ['COMMAND__GROUNDHASH'] = 'getGroundHash',
 
     ['COMMAND__GROUNDHASH__HELP'] = 'Obtener el hash de suelo actual.'
-}
+}

locales/fr.lua

@@ -157,6 +157,8 @@ Locales['fr'] = {
     ['NOTIFICATION__ADD__BLIP'] = 'Repère ajouté à la carte',
     ['NOTIFICATION__REMOVE__BLIP'] = 'Repère supprimé de la carte',
 
+    ['NOTIFICATION__NEED_LIGHTER'] = 'Il vous faut un briquet pour détruire la plante',
+
     ['PROGRESSBAR__SPAWN__PLANT'] = 'Plantation...',
     ['PROGRESSBAR__HARVEST__PLANT'] = 'Récolte...',
     ['PROGRESSBAR__SOAK__PLANT'] = 'Arrosage...',
@@ -168,6 +170,7 @@ Locales['fr'] = {
     ['PROGRESSBAR__PROCESS__DRUG'] = 'Traitement...',
 
     ['INTERACTION__PLACING__TEXT'] = '[E] - Placer la plante / [G] - Annuler',
+    ['INTERACTION__PLACING_TABLE__TEXT'] = '[E] - Placer la table / [G] - Annuler',
     ['INTERACTION__INTERACT_TEXT'] = '[E] - Interagir',
 
     ['INPUT__AMOUNT__HEADER'] = 'Traitement',
@@ -187,4 +190,4 @@ Locales['fr'] = {
     ['COMMAND__GROUNDHASH'] = 'getGroundHash',
 
     ['COMMAND__GROUNDHASH__HELP'] = 'Obtenez le hash du sol actuel'
-}
+}

locales/he.lua

@@ -151,6 +151,8 @@ Locales['he'] = {
     ['NOTIFICATION__ADD__BLIP'] = 'נוסף בליפ למפה',
     ['NOTIFICATION__REMOVE__BLIP'] = 'הוסר בליפ מהמפה',
 
+    ['NOTIFICATION__NEED_LIGHTER'] = '', -- NEED TRANSLATE
+
     ['PROGRESSBAR__SPAWN__PLANT'] = '...שותל',
     ['PROGRESSBAR__HARVEST__PLANT'] = '...קוצר',
     ['PROGRESSBAR__SOAK__PLANT'] = '...משקה',
@@ -162,6 +164,7 @@ Locales['he'] = {
     ['PROGRESSBAR__PROCESS__DRUG'] = '...מעבד',
 
     ['INTERACTION__PLACING__TEXT'] = '[E] - למקם עציץ / [G] - ביטול',
+    ['INTERACTION__PLACING_TABLE__TEXT'] = '[E] - למקם עציץ / [G] - ביטול', -- NEED TRANSLATE
     ['INTERACTION__INTERACT_TEXT'] = '[E] - אינטראקציה',
 
     ['INPUT__AMOUNT__HEADER'] = 'מעבד',

server/sv_planting.lua

@@ -148,6 +148,12 @@ function Plant:updateHealth(health)
 
     -- Update the plant health in the plants table
     plants[self.id].health = health
+
+    -- Send data to database
+    MySQL.update('UPDATE drug_plants SET health = (:health) WHERE id = (:id)', {
+        ['health'] = health,
+        ['id'] = self.id,
+    })
 end
 
 --- Method to get the plant data
@@ -188,7 +194,7 @@ function Plant:calcHealth()
     -- If the plant has no fertilizer and water, decrease the health
     if fertilizer_amount == 0 and water_amount == 0 then
         health -= math.random(Config.HealthBaseDecay[1], Config.HealthBaseDecay[2])
-    elseif fertilizer_amount < Config.FertilizerThreshold or water_amount < Config.WaterThreshold then
+    elseif fertilizer_amount < Config.FertilizerThreshold and water_amount < Config.WaterThreshold then
         health -= math.random(Config.HealthBaseDecay[1], Config.HealthBaseDecay[2])
     end
 

server/sv_processing.lua

@@ -450,6 +450,7 @@ RegisterNetEvent('it-drugs:server:createNewTable', function(coords, type, rotati
     end
 end)
 
+
 RegisterNetEvent('it-drugs:server:syncparticlefx', function(status, tableId, netId, particlefx)
     TriggerClientEvent('it-drugs:client:syncparticlefx',-1, status, tableId, netId, particlefx)
 end)

shared/config.lua

@@ -126,6 +126,9 @@ Config.FertilizerThreshold = 10
 Config.WaterThreshold = 10
 Config.HealthBaseDecay = {7, 10} -- Min/Max Amount of health decay when the plant is below the above thresholds for water and nutrition
 
+Config.ItemToDestroyPlant = false -- true to need an item to destroy a plant
+Config.DestroyItemName = "lighter"
+
 
 Config.Items = {
     ['watering_can'] = {