Merge pull request #854 from bitpredator/dev

new update package
bitpredator · Oct 5, 2024 · 2ffee79 · 2ffee79
2 parents edd1c4e + 5897559
commit 2ffee79
Show file tree

Hide file tree

Showing 674 changed files with 58,288 additions and 2,010 deletions.
diff --git a/server-data/[SQL]/es_extended.sql b/server-data/[SQL]/es_extended.sql
diff --git a/server-data/resources/[bpt_addons]/bpt_ambulancejob/client/deathcam.lua b/server-data/resources/[bpt_addons]/bpt_ambulancejob/client/deathcam.lua
@@ -2,7 +2,7 @@ function GetShapeTestResultSync(shape)
     local handle, hit, coords, normal, entity
     repeat
         handle, hit, coords, normal, entity = GetShapeTestResult(shape)
-    until handle ~= 1 or Wait()
+    until handle ~= 1 or Wait(Sleep)
     return hit, coords, normal, entity
 end
 
@@ -14,14 +14,14 @@ local zoom = Config.zoom
 local playerPed
 
 function StartDeathCam()
-    camera = CreateCamWithParams("DEFAULT_SCRIPTED_CAMERA", 0, 0, 0, 0, 0, 0, GetGameplayCamFov(), 1)
+    camera = CreateCamWithParams("DEFAULT_SCRIPTED_CAMERA", 0, 0, 0, 0, 0, 0, GetGameplayCamFov(), true, 1)
     RenderScriptCams(true, true, 1000, true, false)
 
     playerPed = PlayerPedId()
 end
 
 function EndDeathCam()
-    RenderScriptCams(0)
+    RenderScriptCams(false, false, 0, false, false)
     camera = DestroyCam(camera)
 end
 

diff --git a/server-data/resources/[bpt_addons]/bpt_crafting/config.lua b/server-data/resources/[bpt_addons]/bpt_crafting/config.lua
@@ -102,6 +102,7 @@ Config = {
                 ["marijuana"] = 5,
                 ["bandage"] = 1,
                 ["cottonforbandages"] = 2,
+                ["marijuana_extract"] = 2,
             },
         },
 

diff --git a/server-data/resources/[bpt_addons]/bpt_farmer/client/main.lua b/server-data/resources/[bpt_addons]/bpt_farmer/client/main.lua
@@ -89,9 +89,9 @@ function DrawText3D(x, y, z, text, scale)
 
     SetTextScale(scale, scale)
     SetTextFont(4)
-    SetTextProportional(1)
+    SetTextProportional(true)
     SetTextEntry("STRING")
-    SetTextCentre(1)
+    SetTextCentre(true)
     SetTextColour(255, 255, 255, 255)
     SetTextOutline()
 

diff --git a/server-data/resources/[bpt_addons]/bpt_menu/client/main.lua b/server-data/resources/[bpt_addons]/bpt_menu/client/main.lua
@@ -82,7 +82,6 @@ local function getPersonalMenuCategory(id)
     return personalMenuCategoriesById[id]
 end
 
-local animationCategory = addPersonalMenuCategory("animation", TranslateCap("animation_title"))
 local plyPed
 
 addPersonalMenuCategory("vehicle", TranslateCap("vehicle_title"), function()
@@ -97,11 +96,6 @@ addPersonalMenuCategory("admin", TranslateCap("admin_title"), function()
     return adminGroups[PlayerVars.group] ~= nil
 end)
 
-for i = 1, #Config.Animations do
-    local animationCfg = Config.Animations[i]
-    animationCfg.menu = RageUI.CreateSubMenu(animationCategory.menu, animationCfg.name)
-end
-
 if Config.Framework == "esx" then
     AddEventHandler("esx:onPlayerDeath", function()
         PlayerVars.isDead = true
@@ -199,35 +193,6 @@ function DrawPersonalMenu()
     end)
 end
 
-getPersonalMenuCategory("animation").drawer = function()
-    for i = 1, #Config.Animations do
-        local animationCfg = Config.Animations[i]
-        RageUI.Button(animationCfg.name, nil, { RightLabel = "→→→" }, true, nil, animationCfg.menu)
-    end
-end
-
-function DrawAnimationsCategory(animationCfg)
-    ruiDrawContent(drawContentOptions, function()
-        for i = 1, #animationCfg.items do
-            local animItemCfg = animationCfg.items[i]
-
-            RageUI.Button(animItemCfg.name, nil, nil, true, function(Hovered, Active, Selected)
-                if not Selected then
-                    return
-                end
-
-                if animItemCfg.type == "anim" then
-                    startAnim(animItemCfg.animDict, animItemCfg.animName)
-                elseif animItemCfg.type == "scenario" then
-                    TaskStartScenarioInPlace(plyPed, animItemCfg.scenarioName, 0, false)
-                elseif animItemCfg.type == "attitude" then
-                    startAttitude(animItemCfg.animSet)
-                end
-            end)
-        end
-    end)
-end
-
 getPersonalMenuCategory("vehicle").drawer = function()
     RageUI.Button(TranslateCap("vehicle_engine_button"), nil, nil, true, function(Hovered, Active, Selected)
         if not Selected then
@@ -497,15 +462,6 @@ CreateThread(function()
             end
         end
 
-        for i = 1, #Config.Animations do
-            local animationCfg = Config.Animations[i]
-
-            if ruiVisible(animationCfg.menu) then
-                DrawAnimationsCategory(animationCfg)
-                goto continue
-            end
-        end
-
         ::continue::
         Wait(0)
     end
@@ -524,11 +480,10 @@ end, false)
 
 RegisterCommand("-stoptask", function() end, false)
 
-RegisterKeyMapping("+stoptask", "Annulez animation", "KEYBOARD", Config.Controls.StopTasks.keyboard)
 TriggerEvent("chat:removeSuggestion", "/+stoptask")
 TriggerEvent("chat:removeSuggestion", "/-stoptask")
 
-function tpMarker()
+function TpMarker()
     local waypointHandle = GetFirstBlipInfoId(8)
 
     if not DoesBlipExist(waypointHandle) then
@@ -571,7 +526,7 @@ CreateThread(function()
                     return
                 end
 
-                tpMarker()
+                TpMarker()
             end)
         end