Merge pull request #863 from bitpredator/dev

Refactor es_extended 1.0.2
bitpredator · Oct 24, 2024 · 458a34d · 458a34d
2 parents 5bfd7b1 + 9fa7f61
commit 458a34d
Show file tree

Hide file tree

Showing 37 changed files with 6,380 additions and 988 deletions.
diff --git a/server-data/resources/[bpt_addons]/bpt_crafting/bpt_crafting.sql b/server-data/resources/[bpt_addons]/bpt_crafting/bpt_crafting.sql
@@ -60,4 +60,5 @@ INSERT INTO `bpt_items` (`name`, `label`) VALUES
 	('medikit', 'Medikit'),
 	('salmon_fillet', 'Salmon Fillet'),
 	('armour', 'armour'),
+	('WEAPON_FLASHLIGHT', 'WEAPON FLASHLIGHT')
 ;
diff --git a/server-data/resources/[bpt_addons]/bpt_crafting/config.lua b/server-data/resources/[bpt_addons]/bpt_crafting/config.lua
@@ -440,6 +440,24 @@ Config = {
             },
         },
 
+        ["WEAPON_FLASHLIGHT"] = {
+            Level = 10,
+            Category = "ammu",
+            isGun = false,
+            Jobs = { "ammu" },
+            JobGrades = {},
+            Amount = 1,
+            SuccessRate = 100,
+            requireBlueprint = false,
+            Time = 60,
+            Ingredients = {
+                ["diamond"] = 1,
+                ["copper"] = 1,
+                ["hammer"] = 1,
+                ["recycled_plastic"] = 1,
+            },
+        },
+
         ["WEAPON_NIGHTSTICK"] = {
             Level = 10,
             Category = "ammu",
@@ -596,6 +614,7 @@ Config = {
                 "WEAPON_NIGHTSTICK",
                 "WEAPON_PISTOL",
                 "armour",
+                "WEAPON_FLASHLIGHT",
             },
             radius = 1.0,
         },

diff --git a/server-data/resources/[bpt_addons]/bpt_crafting/localization/bpt_crafting_it.sql b/server-data/resources/[bpt_addons]/bpt_crafting/localization/bpt_crafting_it.sql
@@ -59,5 +59,6 @@ INSERT INTO `bpt_items` (`name`, `label`) VALUES
 	('marijuana_extract', 'Estratto di marijuana'),
 	('medikit', 'Medikit'),
 	('salmon_fillet', 'Filetto di salmone'),
-	('armour', 'giubbotto antiproiettile')
+	('armour', 'giubbotto antiproiettile'),
+	('WEAPON_FLASHLIGHT', 'Torcia')
 ;
diff --git a/server-data/resources/[esx]/es_extended/README.md b/server-data/resources/[esx]/es_extended/README.md
@@ -0,0 +1,13 @@
+<h1 align='center'>es_extended</a></h1><p align='center'><b><a href='https://discord.gg/ksGfNvDEfq'>Discord</a> - <a href='https://bitpredator.github.io/bptdevelopment/docs/FiveM/es_extended/'>Documentation</a></b></h5>
+
+## Legal
+
+es_extended
+
+Copyright (C) 2015-2024
+
+This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.
+
+This program Is distributed In the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty Of MERCHANTABILITY Or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License For more details.
+
+You should have received a copy Of the GNU General Public License along with this program. If Not, see <http://www.gnu.org/licenses/>.
diff --git a/server-data/resources/[esx]/es_extended/client/common.lua b/server-data/resources/[esx]/es_extended/client/common.lua
@@ -4,5 +4,5 @@ end)
 
 AddEventHandler("esx:getSharedObject", function()
     local Invoke = GetInvokingResource()
-    print(("[^1ERROR^7] Resource ^5%s^7 Used the ^5getSharedObject^7 Event, this event ^1no longer exists!^7 Visit https://bitpredator.github.io/bptdevelopment/docs/esx-tutorial/sharedevent for how to fix!"):format(Invoke))
+    error(("Resource ^5%s^7 Used the ^5getSharedObject^7 Event, this event ^1no longer exists!^7 Visit https://bitpredator.github.io/bptdevelopment/docs/FiveM/sharedevent/ for how to fix!"):format(Invoke))
 end)