Merge pull request #743 from bitpredator/dev

delete: removed iak_ammunation map
bitpredator · Jul 4, 2024 · 396c110 · 396c110
2 parents 4acb130 + 5c74e17
commit 396c110
Show file tree

Hide file tree

Showing 19 changed files with 753 additions and 733 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
@@ -42,5 +42,6 @@ INSERT INTO `bpt_items` (`name`, `label`) VALUES
 	('ammo-sniper', '7.62 NATO'),
 	('grain', 'grain'),
 	('flour', 'flour'),
-	('bread', 'empty sandwich')
+	('bread', 'empty sandwich'),
+	('ammo-9', '9mm')
 ;
diff --git a/server-data/resources/[bpt_addons]/bpt_crafting/config.lua b/server-data/resources/[bpt_addons]/bpt_crafting/config.lua
@@ -265,6 +265,24 @@ Config = {
 			},
 		},
 
+		["ammo-9"] = {
+			Level = 10,
+			Category = "ammu",
+			isGun = false,
+			Jobs = { "ammu" },
+			JobGrades = {},
+			Amount = 1,
+			SuccessRate = 100,
+			requireBlueprint = false,
+			Time = 30,
+			Ingredients = {
+				["copper"] = 1,
+				["iron"] = 1,
+				["gunpowder"] = 1,
+				["gold"] = 1,
+			},
+		},
+
 		["bread"] = {
 			Level = 0,
 			Category = "baker",
@@ -350,10 +368,10 @@ Config = {
 			radius = 1.0,
 		},
 		{
-			coords = vector3(809.090088, -2172.923096, 29.616821),
+			coords = vector3(808.984619, -2159.630859, 29.616821),
 			jobs = { "ammu" },
 			blip = false,
-			recipes = { "WEAPON_APPISTOL", "ammo-sniper" },
+			recipes = { "WEAPON_APPISTOL", "ammo-sniper", "ammo-9" },
 			radius = 1.0,
 		},
 		{

diff --git a/server-data/resources/[bpt_addons]/bpt_crafting/html/img/ammo-9.png b/server-data/resources/[bpt_addons]/bpt_crafting/html/img/ammo-9.png
diff --git a/server-data/resources/[bpt_addons]/bpt_crafting/html/img/ammu.png b/server-data/resources/[bpt_addons]/bpt_crafting/html/img/ammu.png
diff --git a/server-data/resources/[maps]/iak_ammunation/fxmanifest.lua b/server-data/resources/[maps]/iak_ammunation/fxmanifest.lua
diff --git a/server-data/resources/[maps]/iak_ammunation/stream/_manifest.ymf b/server-data/resources/[maps]/iak_ammunation/stream/_manifest.ymf
diff --git a/server-data/resources/[maps]/iak_ammunation/stream/bkr_id1_09_strm_0.ymap b/server-data/resources/[maps]/iak_ammunation/stream/bkr_id1_09_strm_0.ymap
diff --git a/server-data/resources/[maps]/iak_ammunation/stream/ch_prop_ch_penthousedoor_01a.ydr b/server-data/resources/[maps]/iak_ammunation/stream/ch_prop_ch_penthousedoor_01a.ydr
diff --git a/server-data/resources/[maps]/iak_ammunation/stream/hei_dt1_rd1_strm_1.ymap b/server-data/resources/[maps]/iak_ammunation/stream/hei_dt1_rd1_strm_1.ymap
diff --git a/server-data/resources/[maps]/iak_ammunation/stream/hi@v_gun.ybn b/server-data/resources/[maps]/iak_ammunation/stream/hi@v_gun.ybn
diff --git a/server-data/resources/[maps]/iak_ammunation/stream/v_7_gc_shell+hidr.ytd b/server-data/resources/[maps]/iak_ammunation/stream/v_7_gc_shell+hidr.ytd
diff --git a/server-data/resources/[maps]/iak_ammunation/stream/v_7_gc_shell.ydr b/server-data/resources/[maps]/iak_ammunation/stream/v_7_gc_shell.ydr
diff --git a/server-data/resources/[maps]/iak_ammunation/stream/v_7_rangemisc+hidr.ytd b/server-data/resources/[maps]/iak_ammunation/stream/v_7_rangemisc+hidr.ytd
diff --git a/server-data/resources/[maps]/iak_ammunation/stream/v_7_rangemisc.ydr b/server-data/resources/[maps]/iak_ammunation/stream/v_7_rangemisc.ydr
diff --git a/server-data/resources/[maps]/iak_ammunation/stream/v_7_rangeovrlys+hidr.ytd b/server-data/resources/[maps]/iak_ammunation/stream/v_7_rangeovrlys+hidr.ytd
diff --git a/server-data/resources/[maps]/iak_ammunation/stream/v_7_rangeovrlys.ydr b/server-data/resources/[maps]/iak_ammunation/stream/v_7_rangeovrlys.ydr
diff --git a/server-data/resources/[maps]/iak_ammunation/stream/v_gun.ybn b/server-data/resources/[maps]/iak_ammunation/stream/v_gun.ybn
diff --git a/server-data/resources/[maps]/iak_ammunation/stream/v_int_7.ytyp b/server-data/resources/[maps]/iak_ammunation/stream/v_int_7.ytyp