fix: correction of coordinates for the shop in the armory

server-data/resources/[bpt_addons]/bpt_crafting/bpt_crafting.sql

@@ -43,5 +43,7 @@ INSERT INTO `bpt_items` (`name`, `label`) VALUES
 	('grain', 'grain'),
 	('flour', 'flour'),
 	('bread', 'empty sandwich'),
-	('ammo-9', '9mm')
+	('ammo-9', '9mm'),
+	('WEAPON_KNIFE', 'Knife'),
+	('WEAPON_KNUCKLE', 'KNUCKLE')
 ;

server-data/resources/[bpt_addons]/bpt_crafting/config.lua

@@ -242,7 +242,7 @@ Config = {
 			Time = 180,
 			Ingredients = {
 				["copper"] = 1,
-				["iron"] = 1,
+				["iron"] = 3,
 				["wood"] = 1,
 			},
 		},
@@ -283,6 +283,38 @@ Config = {
 			},
 		},
 
+		["WEAPON_KNIFE"] = {
+			Level = 10,
+			Category = "ammu",
+			isGun = false,
+			Jobs = { "ammu" },
+			JobGrades = {},
+			Amount = 1,
+			SuccessRate = 100,
+			requireBlueprint = false,
+			Time = 30,
+			Ingredients = {
+				["iron"] = 2,
+				["wood"] = 1,
+			},
+		},
+
+		["WEAPON_KNUCKLE"] = {
+			Level = 10,
+			Category = "ammu",
+			isGun = false,
+			Jobs = { "ammu" },
+			JobGrades = {},
+			Amount = 1,
+			SuccessRate = 100,
+			requireBlueprint = false,
+			Time = 30,
+			Ingredients = {
+				["iron"] = 2,
+				["gold"] = 1,
+			},
+		},
+
 		["bread"] = {
 			Level = 0,
 			Category = "baker",
@@ -371,7 +403,7 @@ Config = {
 			coords = vector3(808.984619, -2159.630859, 29.616821),
 			jobs = { "ammu" },
 			blip = false,
-			recipes = { "WEAPON_APPISTOL", "ammo-sniper", "ammo-9" },
+			recipes = { "WEAPON_APPISTOL", "ammo-sniper", "ammo-9", "WEAPON_KNIFE", "WEAPON_KNUCKLE" },
 			radius = 1.0,
 		},
 		{

server-data/resources/[bpt_addons]/bpt_menu/config.lua

@@ -117,7 +117,7 @@ Config.GPS = {
 -- ANIMATIONS --
 Config.Animations = {
 	{
-		name = "party",
+		{ name = "party" },
 		name = TranslateCap("animation_party_title"),
 		items = {
 			{ name = TranslateCap("animation_party_smoke"), type = "scenario", scenarioName = "WORLD_HUMAN_SMOKING" },
@@ -171,7 +171,7 @@ Config.Animations = {
 		},
 	},
 	{
-		name = "salute",
+		{ name = "salute" },
 		name = TranslateCap("animation_salute_title"),
 		items = {
 			{
@@ -207,7 +207,7 @@ Config.Animations = {
 		},
 	},
 	{
-		name = "work",
+		{ name = "work" },
 		name = TranslateCap("animation_work_title"),
 		items = {
 			{
@@ -299,7 +299,7 @@ Config.Animations = {
 		},
 	},
 	{
-		name = "mood",
+		{ name = "mood" },
 		name = TranslateCap("animation_mood_title"),
 		items = {
 			{
@@ -418,7 +418,7 @@ Config.Animations = {
 		},
 	},
 	{
-		name = "sports",
+		{ name = "sports" },
 		name = TranslateCap("animation_sports_title"),
 		items = {
 			{
@@ -454,7 +454,7 @@ Config.Animations = {
 		},
 	},
 	{
-		name = "other",
+		{ name = "other" },
 		name = TranslateCap("animation_other_title"),
 		items = {
 			{
@@ -504,7 +504,7 @@ Config.Animations = {
 		},
 	},
 	{
-		name = "pegi",
+		{ name = "pegi" },
 		name = TranslateCap("animation_pegi_title"),
 		items = {
 			{
@@ -575,7 +575,7 @@ Config.Animations = {
 		},
 	},
 	{
-		name = "attitudes",
+		{ name = "attitudes" },
 		name = TranslateCap("animation_attitudes_title"),
 		items = {
 			{ name = "Normal", type = "attitude" },

server-data/resources/[esx]/rprogress/fxmanifest.lua

@@ -5,7 +5,7 @@ description("Radial Progress")
 
 author("Karl Saunders")
 
-version("0.7.9")
+version("1.0.1")
 
 client_scripts({
 	"config.lua",

server-data/resources/[esx_addons]/esx-radialmenu/client/clothing.lua

@@ -840,7 +840,7 @@ function ToggleClothing(whic, extra)
     local Gender = IsMpPed(Ped)
     if which ~= "Mask" then
         if not Gender then
-            Notify(_U("wrong_ped"))
+            Notify(TranslateCap("wrong_ped"))
             return false
         end -- We cancel the command here if the person is not using a multiplayer model.
     end
@@ -873,7 +873,7 @@ function ToggleClothing(whic, extra)
                 end
             end
         end
-        Notify(_U("no_variants"))
+        Notify(TranslateCap("no_variants"))
         return
     else
         if not LastEquipped[which] then
@@ -915,7 +915,7 @@ function ToggleClothing(whic, extra)
             return true
         end
     end
-    Notify(_U("already_wearing"))
+    Notify(TranslateCap("already_wearing"))
     return false
 end
 
@@ -956,12 +956,12 @@ function ToggleProps(whic)
                 return true
             end
         end
-        Notify(_U("nothing_to_remove"))
+        Notify(TranslateCap("nothing_to_remove"))
         return false
     else
         local Gender = IsMpPed(Ped)
         if not Gender then
-            Notify(_U("wrong_ped"))
+            Notify(TranslateCap("wrong_ped"))
             return false
         end -- We dont really allow for variants on ped models, Its possible, but im pretty sure 95% of ped models dont really have variants.
         variations = Prop.Variants[Gender]
@@ -973,7 +973,7 @@ function ToggleProps(whic)
                 return true
             end
         end
-        Notify(_U("no_variants"))
+        Notify(TranslateCap("no_variants"))
         return false
     end
 end
@@ -982,14 +982,14 @@ RegisterNetEvent("esx-radialmenu:ToggleProps", ToggleProps)
 
 for k, v in pairs(Config.Commands) do
     RegisterCommand(k, v.Func)
-    --log("Created /"..k.." ("..v.Desc..")") -- Useful for  _U checking.
+    --log("Created /"..k.." ("..v.Desc..")") -- Useful for  TranslateCap checking.
     TriggerEvent("chat:addSuggestion", "/" .. k, v.Desc)
 end
 
 if Config.ExtrasEnabled then
     for k, v in pairs(Config.ExtraCommands) do
         RegisterCommand(k, v.Func)
-        --log("Created /"..k.." ("..v.Desc..")") -- Useful for  _U checking.
+        --log("Created /"..k.." ("..v.Desc..")") -- Useful for  TranslateCap checking.
         TriggerEvent("chat:addSuggestion", "/" .. k, v.Desc)
     end
 end

server-data/resources/[esx_addons]/esx-radialmenu/client/main.lua

@@ -1,11 +1,7 @@
 PlayerData = ESX.GetPlayerData() -- Setting this for when you restart the resource in game
 local inRadialMenu = false
-
-local jobIndex = nil
-local vehicleIndex = nil
-
-local DynamicMenuItems = {}
-local FinalMenuItems = {}
+local jobIndex, vehicleIndex = nil, nil
+local DynamicMenuItems, FinalMenuItems = {}, {}
 local controlsToToggle = { 24, 0, 1, 2, 142, 257, 346 } -- if not using toggle
 
 -- Functions
@@ -117,18 +113,18 @@ local function SetupVehicleMenu()
             VehicleMenu.items[seatIndex] = deepcopy(Config.VehicleSeats)
 
             local seatTable = {
-                [1] = _U("driver_seat"),
-                [2] = _U("passenger_seat"),
-                [3] = _U("rear_left_seat"),
-                [4] = _U("rear_right_seat"),
+                [1] = TranslateCap("driver_seat"),
+                [2] = TranslateCap("passenger_seat"),
+                [3] = TranslateCap("rear_left_seat"),
+                [4] = TranslateCap("rear_right_seat"),
             }
 
             local AmountOfSeats = GetVehicleModelNumberOfSeats(GetEntityModel(Vehicle))
             for i = 1, AmountOfSeats do
                 local newIndex = #VehicleMenu.items[seatIndex].items + 1
                 VehicleMenu.items[seatIndex].items[newIndex] = {
                     id = i - 2,
-                    title = seatTable[i] or _U("other_seats"),
+                    title = seatTable[i] or TranslateCap("other_seats"),
                     icon = "caret-up",
                     type = "client",
                     event = "esx-radialmenu:client:ChangeSeat",
@@ -183,7 +179,7 @@ local function SetupRadialMenu()
         FinalMenuItems = {
             [1] = {
                 id = "emergencybutton2",
-                title = _U("emergency_button"),
+                title = TranslateCap("emergency_button"),
                 icon = "circle-exclamation",
                 type = "client",
                 event = "police:client:SendPoliceEmergencyAlert",
@@ -255,7 +251,7 @@ RegisterCommand("radialmenu", function()
     end
 end)
 
-RegisterKeyMapping("radialmenu", _U("command_description"), "keyboard", Config.Keybind)
+RegisterKeyMapping("radialmenu", TranslateCap("command_description"), "keyboard", Config.Keybind)
 
 -- Events
 
@@ -305,7 +301,7 @@ RegisterNetEvent("esx-radialmenu:client:openDoor", function(data)
             end
         end
     else
-        ESX.ShowNotification(_U("no_vehicle_found"), "error", 2500)
+        ESX.ShowNotification(TranslateCap("no_vehicle_found"), "error", 2500)
     end
 end)
 
@@ -321,16 +317,16 @@ RegisterNetEvent("esx-radialmenu:client:setExtra", function(data)
             if DoesExtraExist(veh, extra) then
                 if IsVehicleExtraTurnedOn(veh, extra) then
                     SetVehicleExtra(veh, extra, 1)
-                    ESX.ShowNotification(_U("extra_deactivated", { extra = extra }), "error", 2500)
+                    ESX.ShowNotification(TranslateCap("extra_deactivated", { extra = extra }), "error", 2500)
                 else
                     SetVehicleExtra(veh, extra, 0)
-                    ESX.ShowNotification(_U("extra_activated", { extra = extra }), "success", 2500)
+                    ESX.ShowNotification(TranslateCap("extra_activated", { extra = extra }), "success", 2500)
                 end
             else
-                ESX.ShowNotification(_U("extra_not_present", { extra = extra }), "error", 2500)
+                ESX.ShowNotification(TranslateCap("extra_not_present", { extra = extra }), "error", 2500)
             end
         else
-            ESX.ShowNotification(_U("not_driver"), "error", 2500)
+            ESX.ShowNotification(TranslateCap("not_driver"), "error", 2500)
         end
     end
 end)
@@ -358,15 +354,15 @@ RegisterNetEvent("esx-radialmenu:client:ChangeSeat", function(data)
         if IsSeatFree then
             if kmh <= 100.0 then
                 SetPedIntoVehicle(PlayerPedId(), Veh, data.id)
-                ESX.ShowNotification(_U("switched_seats", { seat = data.title }))
+                ESX.ShowNotification(TranslateCap("switched_seats", { seat = data.title }))
             else
-                ESX.ShowNotification(_U("vehicle_driving_fast"), "error")
+                ESX.ShowNotification(TranslateCap("vehicle_driving_fast"), "error")
             end
         else
-            ESX.ShowNotification(_U("seat_occupied"), "error")
+            ESX.ShowNotification(TranslateCap("seat_occupied"), "error")
         end
     else
-        ESX.ShowNotification(_U("race_harness_on"), "error")
+        ESX.ShowNotification(TranslateCap("race_harness_on"), "error")
     end
 end)