Merge pull request #841 from bitpredator/dev

refactor: removal of port map and relocation of fish processing
bitpredator · Sep 24, 2024 · d5827b6 · d5827b6
2 parents 1938aba + 23808de
commit d5827b6
Show file tree

Hide file tree

Showing 31 changed files with 10,091 additions and 11,770 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
@@ -56,5 +56,6 @@ INSERT INTO `bpt_items` (`name`, `label`) VALUES
 	('diamond_tip', 'Diamond tip'),
 	('diamond', 'Diamond'),
 	('marijuana_extract', 'Marijuana extract'),
-	('medikit', 'Medikit')
+	('medikit', 'Medikit'),
+	('salmon_fillet', 'Salmon Fillet')
 ;
diff --git a/server-data/resources/[bpt_addons]/bpt_crafting/config.lua b/server-data/resources/[bpt_addons]/bpt_crafting/config.lua
@@ -58,7 +58,7 @@ Config = {
         ["fisherman"] = {
             Label = "fisherman",
             Image = "fisherman",
-            Jobs = { "fisherman" },
+            Jobs = { "unicorn" },
         },
         ["ammunation"] = {
             Label = "Munizioni",
@@ -490,7 +490,7 @@ Config = {
             Level = 0,
             Category = "fisherman",
             isGun = false,
-            Jobs = { "fisherman" },
+            Jobs = { "unicorn" },
             JobGrades = {},
             Amount = 2,
             SuccessRate = 100,
@@ -567,7 +567,7 @@ Config = {
             coords = vector3(129.217590, -1283.802246, 29.263062),
             jobs = { "unicorn" },
             blip = false,
-            recipes = { "almondmilk", "slicedchips", "bread_deer" },
+            recipes = { "almondmilk", "slicedchips", "bread_deer", "salmon_fillet" },
             radius = 1.0,
         },
         {
@@ -584,13 +584,6 @@ Config = {
             recipes = { "flour", "bread" },
             radius = 1.0,
         },
-        {
-            coords = vector3(-316.549438, -2781.217529, 4.982422),
-            jobs = { "fisherman" },
-            blip = false,
-            recipes = { "salmon_fillet" },
-            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
@@ -56,5 +56,6 @@ INSERT INTO `bpt_items` (`name`, `label`) VALUES
 	('diamond_tip', 'Punta di diamante'),
 	('diamond', 'Diamond'),
 	('marijuana_extract', 'Estratto di marijuana'),
-	('medikit', 'Medikit')
+	('medikit', 'Medikit'),
+	('salmon_fillet', 'Filetto di salmone')
 ;
diff --git a/server-data/resources/[bpt_addons]/bpt_fisherman/LICENSE b/server-data/resources/[bpt_addons]/bpt_fisherman/LICENSE
diff --git a/server-data/resources/[bpt_addons]/bpt_fisherman/README.md b/server-data/resources/[bpt_addons]/bpt_fisherman/README.md
diff --git a/server-data/resources/[bpt_addons]/bpt_fisherman/bpt_fishermanjob.sql b/server-data/resources/[bpt_addons]/bpt_fisherman/bpt_fishermanjob.sql