wip: started to replace dynamic config with non config data structure

Qbox-project · Nov 8, 2023 · cc8a863 · cc8a863
1 parent e438690
commit cc8a863
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 18 deletions.
diff --git a/client/main.lua b/client/main.lua
@@ -68,7 +68,7 @@ local function takeCoral(coral)
         }
     }) then
         Config.CoralLocations[currentDivingLocation.area].corals[coral].PickedUp = true
-        TriggerServerEvent('qb-diving:server:TakeCoral', currentDivingLocation.area, coral, true)
+        TriggerServerEvent('qb-diving:server:TakeCoral', currentDivingLocation.area, coral)
     end
 
     ClearPedTasks(cache.ped)
@@ -248,8 +248,9 @@ RegisterNetEvent('qb-diving:client:NewLocations', function()
     setDivingLocation(area)
 end)
 
-RegisterNetEvent('qb-diving:client:UpdateCoral', function(area, coral, bool)
-    Config.CoralLocations[area].corals[coral].PickedUp = bool
+RegisterNetEvent('qbx_diving:client:coralTaken', function(area, coralIndex)
+    --- TODO: remove zone at area, and coralIndex
+    Config.CoralLocations[area].corals[coralIndex].PickedUp = true
 end)
 
 RegisterNetEvent('qb-diving:client:CallCops', function(coords, msg)

diff --git a/server/main.lua b/server/main.lua
@@ -1,5 +1,9 @@
 local currentDivingArea = math.random(1, #Config.CoralLocations)
 
+--- Maybe table<integer, boolean>
+---@type integer[]
+local pickedUpCoralIndexes = {}
+
 local function getItemPrice(amount, price)
     for i = 1, #Config.PriceModifiers do
         local modifier = Config.PriceModifiers[i]
@@ -63,30 +67,29 @@ RegisterNetEvent('qb-diving:server:SellCoral', function()
     end
 end)
 
+local function getNewLocation()
+    local newLocation
+    repeat
+        newLocation = math.random(1, #Config.CoralLocations)
+    until newLocation ~= currentDivingArea
+    return newLocation
+end
+
 --- TODO: do not modify Config
-RegisterNetEvent('qb-diving:server:TakeCoral', function(area, coral, bool)
+RegisterNetEvent('qb-diving:server:TakeCoral', function(area, coralIndex)
     local src = source
     local coralType = Config.CoralTypes[math.random(1, #Config.CoralTypes)]
     local amount = math.random(1, coralType.maxAmount)
 
     exports.ox_inventory:AddItem(src, coralType.item, amount)
-    if Config.CoralLocations[area].maxHarvestAmount - 1 == 0 then
-        for _, v in pairs(Config.CoralLocations[currentDivingArea].corals) do
-            v.PickedUp = false
-        end
-        Config.CoralLocations[currentDivingArea].maxHarvestAmount = #Config.CoralLocations[currentDivingArea].corals
-        local newLocation = math.random(1, #Config.CoralLocations)
-        while newLocation == currentDivingArea do
-            newLocation = math.random(1, #Config.CoralLocations)
-        end
-        currentDivingArea = newLocation
+    pickedUpCoralIndexes[#pickedUpCoralIndexes+1] = coralIndex
+    if #pickedUpCoralIndexes == Config.CoralLocations[area].maxHarvestAmount then
+        pickedUpCoralIndexes = {}
+        currentDivingArea = getNewLocation()
         TriggerClientEvent('qb-diving:client:NewLocations', -1)
-    else
-        Config.CoralLocations[area].corals[coral].PickedUp = bool
-        Config.CoralLocations[area].maxHarvestAmount -= 1
     end
 
-    TriggerClientEvent('qb-diving:client:UpdateCoral', -1, area, coral, bool)
+    TriggerClientEvent('qbx_diving:client:coralTaken', -1, area, coralIndex)
 end)
 
 RegisterNetEvent('qb-diving:server:removeItemAfterFill', function()