Merge pull request #51 from it-scripts/v1.4.1beta

AllRoundJonU · web-flow · commit 7fd0704530da · 2025-03-11T01:12:31.000+01:00
v1.4.1beta
diff --git a/client/cl_menus.lua b/client/cl_menus.lua
@@ -501,35 +501,62 @@ RegisterNetEvent("it-drugs:client:showSellMenu", function(data)
     local amount = data.amount
     local price = data.price
     local ped = data.entity
+    local rewardItems = data.rewardItems
 
     local itemLabel = exports.it_bridge:GetItemLabel(item)
 
+
+    local options = {}
+    if price > 0 then
+        table.insert(options, {
+            title = _U('MENU__SELL__DEAL'),
+            description = _U('MENU__SELL__DESC'):format(itemLabel, amount, amount * price),
+            icon = "coins",
+        })
+    else
+        table.insert(options, {
+            title = _U('MENU__SELL__DEAL'),
+            description = _U('MENU__SEEL__DESC__ZERO'):format(itemLabel, amount),
+            icon = "coins",
+        })
+    end
+
+    if rewardItems then
+        table.insert(options, {
+            title = _U('MENU__SELL__REWARD'),
+            icon = "gift",
+        })
+        for _, itemData in pairs(rewardItems) do
+            table.insert(options, {
+                title = exports.it_bridge:GetItemLabel(itemData.name),
+                description = _U('MENU__SELL_REWARD_DESC'):format(itemData.amount * amount),
+                icon = "coins",
+            })
+        end
+    end
+
+    table.insert(options, {
+        title = _U('MENU__SELL__ACCEPT'),
+        icon = "circle-check",
+        description = _U('MENU__SELL__ACCEPT__DESC'),
+        arrow = true,
+        event = "it-drugs:client:salesInitiate",
+        args = {type = 'buy', item = item, price = price, amount = amount, tped = ped}
+    })
+
+    table.insert(options, {
+        title = _U('MENU__SELL__REJECT'),
+        icon = "circle-xmark",
+        description = _U('MENU__SELL__REJECT__DESC'),
+        arrow = true,
+        event = "it-drugs:client:salesInitiate",
+        args = {type = 'close', tped = ped}
+    })
+
     lib.registerContext({
         id = "it-drugs-sell-menu",
         title = _U('MENU__SELL'),
-        options = {
-            {
-                title = _U('MENU__SELL__DEAL'),
-                description = _U('MENU__SELL__DESC'):format(itemLabel, amount, amount * price),
-                icon = "coins",
-            },
-            {
-                title = _U('MENU__SELL__ACCEPT'),
-                icon = "circle-check",
-                description = _U('MENU__SELL__ACCEPT__DESC'),
-                arrow = true,
-                event = "it-drugs:client:salesInitiate",
-                args = {type = 'buy', item = item, price = price, amount = amount, tped = ped}
-            },
-            {
-                title = _U('MENU__SELL__REJECT'),
-                icon = "circle-xmark",
-                description = _U('MENU__SELL__REJECT__DESC'),
-                arrow = true,
-                event = "it-drugs:client:salesInitiate",
-                args = {type = 'close', tped = ped}
-            }
-        }
+        options = options,
     })
     lib.showContext("it-drugs-sell-menu")
 end)
diff --git a/client/cl_selling.lua b/client/cl_selling.lua
@@ -128,7 +128,7 @@ RegisterNetEvent('it-drugs:client:checkSellOffer', function(entity)
 		local availabeItems = {}
 		for itemName, itemData in pairs(zoneConfig.drugs) do
 			if exports.it_bridge:HasItem(itemName)then
-				table.insert(availabeItems, {item = itemName, price = itemData.price, moneyType = itemData.moneyType})
+				table.insert(availabeItems, {item = itemName, price = itemData.price, moneyType = itemData.moneyType, rewardItems = itemData.rewardItems})
 			end
 		end
 
@@ -156,7 +156,8 @@ RegisterNetEvent('it-drugs:client:checkSellOffer', function(entity)
 		sellItemData = {
 			item = randomDrugKey,
 			price = zoneConfig.drugs[randomDrugKey].price,
-			moneyType = zoneConfig.drugs[randomDrugKey].moneyType
+			moneyType = zoneConfig.drugs[randomDrugKey].moneyType,
+			rewardItems = zoneConfig.drugs[randomDrugKey].rewardItems
 		}
 
 		playerItems = exports.it_bridge:GetItemCount(sellItemData.item)
@@ -170,7 +171,7 @@ RegisterNetEvent('it-drugs:client:checkSellOffer', function(entity)
 		sellAmount = playerItems
 	end
 
-	TriggerEvent('it-drugs:client:showSellMenu', {item = sellItemData.item, price = sellItemData.price, amount = sellAmount, entity = entity})
+	TriggerEvent('it-drugs:client:showSellMenu', {item = sellItemData.item, price = sellItemData.price, amount = sellAmount, entity = entity, rewardItems = sellItemData.rewardItems})
 	SetTimeout(Config.SellSettings['sellTimeout']*1000, function()
 		if Config.Debug then lib.print.info('Sell Menu Timeout... Current Menu', lib.getOpenContextMenu()) end
 		if lib.getOpenContextMenu() ~= nil then
diff --git a/fxmanifest.lua b/fxmanifest.lua
@@ -3,7 +3,7 @@ game 'gta5'
 
 author '@allroundjonu'
 description 'Advanced Drug System for FiveM'
-version 'v1.4.0'
+version 'v1.4.1'
 
 identifier 'it-drugs'
 
diff --git a/locales/de.lua b/locales/de.lua
@@ -49,11 +49,13 @@ Locales['de'] = {
     ['MENU__DEALER__SELL_DESC'] = 'Verkaufe Gegenstände an den Dealer',
     ['MENU__DEALER_SELL_ITEM__DESC'] = 'Verkaufe %s für $%g pro Stück',
 
-    
-
     ['MENU__SELL'] = 'Verkaufen',
     ['MENU__SELL__DEAL'] = 'Deal',
     ['MENU__SELL__DESC'] = 'Verkaufe %s (x%g) für $%g',
+    ['MENU__SEEL__DESC__ZERO'] = 'Verkaufe %s (x%g) und erhalte:',
+
+    ['MENU__SELL__REWARD'] = 'Gegenstände:',
+    ['MENU__SELL_REWARD_DESC'] = 'Du erhältst x%g',
 
     ['MENU__SELL__ACCEPT'] = 'Angebot annehmen',
     ['MENU__SELL__ACCEPT__DESC'] = 'Nimm das aktuelle Angebot an',
diff --git a/locales/en.lua b/locales/en.lua
@@ -49,11 +49,13 @@ Locales['en'] = {
     ['MENU__DEALER__SELL_DESC'] = 'Sell items to the dealer',
     ['MENU__DEALER_SELL_ITEM__DESC'] = 'Sell %s for $%g per item',
 
-    
-
     ['MENU__SELL'] = 'Sell',
     ['MENU__SELL__DEAL'] = 'Deal',
     ['MENU__SELL__DESC'] = 'Sell %s (x%g) for $%g',
+    ['MENU__SEEL__DESC__ZERO'] = 'Sell %s (x%g) and get:',
+
+    ['MENU__SELL__REWARD'] = 'Items:',
+    ['MENU__SELL_REWARD_DESC'] = 'You will get x%g',
 
     ['MENU__SELL__ACCEPT'] = 'Accept offer',
     ['MENU__SELL__ACCEPT__DESC'] = 'Accept the current offer',
diff --git a/locales/es.lua b/locales/es.lua
@@ -48,10 +48,14 @@ Locales['es'] = {
     ['MENU__DEALER_SELL'] = 'Vender',
     ['MENU__DEALER__SELL_DESC'] = 'Vende objetos al traficante',
     ['MENU__DEALER_SELL_ITEM__DESC'] = 'Vende %s por $%g cada uno',
-
+    
     ['MENU__SELL'] = 'Vender',
     ['MENU__SELL__DEAL'] = 'Trato',
     ['MENU__SELL__DESC'] = 'Vende %s (x%g) por $%g',
+    ['MENU__SEEL__DESC__ZERO'] = 'Vende %s (x%g) y obtén:',
+
+    ['MENU__SELL__REWARD'] = 'Objetos:',
+    ['MENU__SELL_REWARD_DESC'] = 'Recibirás x%g',
 
     ['MENU__SELL__ACCEPT'] = 'Aceptar oferta',
     ['MENU__SELL__ACCEPT__DESC'] = 'Acepta la oferta actual',
diff --git a/locales/fr.lua b/locales/fr.lua
@@ -49,11 +49,13 @@ Locales['fr'] = {
     ['MENU__DEALER__SELL_DESC'] = 'Vendre des objets au dealer',
     ['MENU__DEALER_SELL_ITEM__DESC'] = 'Vendre %s pour $%g pièce',
 
-
-
     ['MENU__SELL'] = 'Vendre',
     ['MENU__SELL__DEAL'] = 'Accord',
     ['MENU__SELL__DESC'] = 'Vendre %s (x%g) pour $%g',
+    ['MENU__SEEL__DESC__ZERO'] = 'Vendre %s (x%g) et obtenir :',
+
+    ['MENU__SELL__REWARD'] = 'Objets :',
+    ['MENU__SELL_REWARD_DESC'] = 'Vous recevrez x%g',
 
     ['MENU__SELL__ACCEPT'] = 'Accepter l\'offre',
     ['MENU__SELL__ACCEPT__DESC'] = 'Accepter l\'offre actuelle',
diff --git a/locales/he.lua b/locales/he.lua
@@ -54,6 +54,10 @@ Locales['he'] = {
     ['MENU__SELL'] = 'מכירה',
     ['MENU__SELL__DEAL'] = 'עסקה',
     ['MENU__SELL__DESC'] = 'מכור %s (x%g) תמורת ₪%g',
+    ['MENU__SEEL__DESC__ZERO'] = 'מכור %s (x%g) ותקבל:',
+
+    ['MENU__SELL__REWARD'] = 'פריטים:',
+    ['MENU__SELL_REWARD_DESC'] = 'תקבל x%g',
 
     ['MENU__SELL__ACCEPT'] = 'קבל הצעה',
     ['MENU__SELL__ACCEPT__DESC'] = 'קבל את ההצעה הנוכחית',
diff --git a/locales/it.lua b/locales/it.lua
@@ -49,11 +49,13 @@ Locales['it'] = {
     ['MENU__DEALER__SELL_DESC'] = 'Vendi oggetti al trafficante',
     ['MENU__DEALER_SELL_ITEM__DESC'] = 'Vendi %s a $%g al pezzo',
 
-
-
     ['MENU__SELL'] = 'Vendi',
     ['MENU__SELL__DEAL'] = 'Affare',
     ['MENU__SELL__DESC'] = 'Vendi %s (x%g) per $%g',
+    ['MENU__SEEL__DESC__ZERO'] = 'Vendi %s (x%g) e ottieni:',
+
+    ['MENU__SELL__REWARD'] = 'Oggetti:',
+    ['MENU__SELL_REWARD_DESC'] = 'Otterrai x%g',
 
     ['MENU__SELL__ACCEPT'] = 'Accetta offerta',
     ['MENU__SELL__ACCEPT__DESC'] = 'Accetta l\'offerta corrente',
diff --git a/locales/nl.lua b/locales/nl.lua
@@ -27,8 +27,6 @@ Locales['nl'] = {
     ['MENU__ITEM'] = 'Items',
     ['MENU__ITEM__DESC'] = 'Gebnuikt dit item om je plant te verzorgen',
 
-    
-    
     ['MENU__PROCESSING'] = 'Verwerk',
     ['MENU__RECIPE__DESC'] = 'Verwerk je drugs met dit recept',
 
@@ -51,11 +49,13 @@ Locales['nl'] = {
     ['MENU__DEALER__SELL_DESC'] = 'Verkoop items aan dealer',
     ['MENU__DEALER_SELL_ITEM__DESC'] = 'verkoop %s voor $%g per item',
 
-    
-
     ['MENU__SELL'] = 'Verkoop',
     ['MENU__SELL__DEAL'] = 'Deal',
     ['MENU__SELL__DESC'] = 'Verkoop %s (x%g) voor $%g',
+    ['MENU__SEEL__DESC__ZERO'] = 'Verkoop %s (x%g) en krijg:',
+
+    ['MENU__SELL__REWARD'] = 'Items:',
+    ['MENU__SELL_REWARD_DESC'] = 'Je krijgt x%g',
 
     ['MENU__SELL__ACCEPT'] = 'Accepteer offer',
     ['MENU__SELL__ACCEPT__DESC'] = 'Accepteer het huidig offer',
diff --git a/server/sv_planting.lua b/server/sv_planting.lua
@@ -40,6 +40,8 @@ function Plant:constructor(id, plantData)
     self.water = plantData.water
     ---@type number: the plant health
     self.health = plantData.health
+    ---@type number: the plant growth
+    self.growth = self:calcGrowth()
 
     self.growtime = plantData.growtime
     self.stage = self:calcStage()
@@ -198,11 +200,13 @@ function Plant:calcHealth()
 
     -- If the plant has no fertilizer and water, decrease the health
     if fertilizer_amount == 0 or water_amount == 0 then
-    health = health - math.random(Config.HealthBaseDecay[1], Config.HealthBaseDecay[2])
+        health = health - math.random(Config.HealthBaseDecay[1], Config.HealthBaseDecay[2])
     elseif fertilizer_amount < Config.FertilizerThreshold or water_amount < Config.WaterThreshold then
         health = health - math.random(Config.HealthBaseDecay[1], Config.HealthBaseDecay[2])
     end
 
+    health = math.max(health, 0.0)
+
     self.health = health
     -- Return the health value with a minimum of 0
     return math.max(health, 0.0)
@@ -213,7 +217,7 @@ end
 function Plant:calcGrowth()
     if not plants[self.id] then return 0 end
     -- If the plant is dead the growth doesnt change anymore
-    if self.health <= 0 then return 0 end
+    if self.health <= 0 then return self.growth end
     ---@type number: the current time
     local current_time = os.time()
     ---@type number: the grow time
@@ -224,6 +228,7 @@ function Plant:calcGrowth()
     local growth = math.round(progress * 100 / growTime, 2)
     ---@type number: the return value
     local retval = math.min(growth, 100.00)
+    self.growth = retval
     return retval
 end
 
diff --git a/server/sv_selling.lua b/server/sv_selling.lua
@@ -56,13 +56,21 @@ RegisterNetEvent('it-drugs:server:initiatedrug', function(cad)
 					ShowNotification(src, _U('NOTIFICATION__STOLEN__DRUG'), 'Error')
 				else
 					local moneyType = 'cash'
+					local rewardItems = nil
 					if Config.SellEverywhere['enabled'] then
 						moneyType = Config.SellEverywhere.drugs[cad.item].moneyType or 'cash'
+						rewardItems = Config.SellEverywhere.drugs[cad.item].rewardItems
 					else
 						moneyType = Config.SellZones[cad.zone].drugs[cad.item].moneyType or 'cash'
+						rewardItems = Config.SellZones[cad.zone].drugs[cad.item].rewardItems
 					end
 
 					exports.it_bridge:AddMoney(src, moneyType, price, "Money from Drug Selling")
+					if rewardItems then
+						for _, v in pairs(rewardItems) do
+							exports.it_bridge:GiveItem(src, v.name, (v.amount * cad.amount))
+						end
+					end
 					ShowNotification(src, _U('NOTIFICATION__SOLD__DRUG'):format(price), 'Success')
 				end
 				local coords = GetEntityCoords(GetPlayerPed(src))
diff --git a/version b/version
@@ -1,4 +1,4 @@
 {
-    "version": "v1.4.0",
-    "message": "Major Update"
+    "version": "v1.4.1",
+    "message": "Negativ health hotfix"
 }
