chore: removed the ability to find halloween pumpkins

bitpredator · Nov 23, 2024 · 52a9a81 · 52a9a81
1 parent d64f2cd
commit 52a9a81
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 4 deletions.
diff --git a/server-data/inventory.cfg b/server-data/inventory.cfg
@@ -65,8 +65,6 @@ set inventory:dumpsterloot [
     ["trash_can", 1, 3],
     ["trash_chips", 1, 3],
     ["plastic_bag", 1, 3],
-    ["halloween", 1, 3]
-
 ]
 
 # Set datadog API key for inventory logging (https://app.datadoghq.com/organization-settings/api-keys)

diff --git a/server-data/resources/[wasabi]/wasabi_fishing/client/client.lua b/server-data/resources/[wasabi]/wasabi_fishing/client/client.lua
@@ -1,5 +1,54 @@
+---@diagnostic disable: undefined-global
 local fishing = false
 
+if Config.sellShop.enabled then
+    CreateThread(function()
+        local ped, textUI
+        CreateBlip(Config.sellShop.coords, 356, 1, Strings.sell_shop_blip, 0.80)
+        local point = lib.points.new({
+            coords = Config.sellShop.coords,
+            distance = 30,
+        })
+
+        function point:nearby()
+            if self.currentDistance < self.distance then
+                if not ped then
+                    lib.requestAnimDict("mini@strip_club@idles@bouncer@base", 100)
+                    lib.requestModel(Config.sellShop.ped, 100)
+                    ped = CreatePed(28, Config.sellShop.ped, Config.sellShop.coords.x, Config.sellShop.coords.y, Config.sellShop.coords.z, Config.sellShop.heading, false, false)
+                    FreezeEntityPosition(ped, true)
+                    SetEntityInvincible(ped, true)
+                    SetBlockingOfNonTemporaryEvents(ped, true)
+                    TaskPlayAnim(ped, "mini@strip_club@idles@bouncer@base", "base", 8.0, 0.0, -1, 1, 0, 0, 0, 0)
+                end
+                if self.currentDistance <= 1.8 then
+                    if not textUI then
+                        lib.showTextUI(Strings.sell_fish)
+                        textUI = true
+                    end
+                    if IsControlJustReleased(0, 38) then
+                        FishingSellItems()
+                    end
+                elseif self.currentDistance >= 1.9 and textUI then
+                    lib.hideTextUI()
+                    textUI = nil
+                end
+            end
+        end
+
+        function point:onExit()
+            if ped then
+                local model = GetEntityModel(ped)
+                SetModelAsNoLongerNeeded(model)
+                DeletePed(ped)
+                SetPedAsNoLongerNeeded(ped)
+                RemoveAnimDict("mini@strip_club@idles@bouncer@base")
+                ped = nil
+            end
+        end
+    end)
+end
+
 RegisterNetEvent("wasabi_fishing:startFishing", function()
     if IsPedInAnyVehicle(cache.ped) or IsPedSwimming(cache.ped) then
         TriggerEvent("wasabi_fishing:notify", Strings.cannot_perform, Strings.cannot_perform_desc, "error")

diff --git a/server-data/resources/[wasabi]/wasabi_fishing/configuration/config.lua b/server-data/resources/[wasabi]/wasabi_fishing/configuration/config.lua
@@ -25,7 +25,6 @@ Config.fish = {
     { item = "trout", label = "Trout", difficulty = { "easy" } },
     { item = "anchovy", label = "Anchovy", difficulty = { "easy" } },
     { item = "plastic_bag", label = "Plastic Bag", difficulty = { "easy" } },
-    { item = "halloween", label = "Halloween", difficulty = { "easy" } },
 }
 
 RegisterNetEvent("wasabi_fishing:notify")

diff --git a/server-data/resources/[wasabi]/wasabi_mining/configuration/config.lua b/server-data/resources/[wasabi]/wasabi_mining/configuration/config.lua
@@ -12,7 +12,6 @@ Config.rocks = { -- Items obtained from mining
     { item = "steel", label = "Steel", difficulty = { "easy" } },
     { item = "gold", label = "Gold", difficulty = { "easy" } },
     { item = "gunpowder", label = "polvere da sparo", difficulty = { "easy" } },
-    { item = "halloween", label = "Halloween", difficulty = { "easy" } },
 }
 
 Config.miningAreas = {