diff --git a/resources/[inventory]/cs_shops/config/config.lua b/resources/[inventory]/cs_shops/config/config.lua index aafbd4625..f11849b86 100644 --- a/resources/[inventory]/cs_shops/config/config.lua +++ b/resources/[inventory]/cs_shops/config/config.lua @@ -580,6 +580,69 @@ CodeStudio.Products = { itemPrice = 100, itemInfo = "", }, + ['weapon_hatchet'] = { + itemName = "Beil", + itemStock = 150, + itemPrice = 600, + itemInfo = "", + }, + ['butcherknife'] = { + itemName = "Schlachtermesser", + itemStock = 150, + itemPrice = 400, + itemInfo = "", + }, + ['gussform'] = { + itemName = "Gussform", + itemStock = 150, + itemPrice = 1000, + itemInfo = "", + }, + ['shovel'] = { + itemName = "Schaufel", + itemStock = 150, + itemPrice = 600, + itemInfo = "", + }, + ['bucket'] = { + itemName = "Eimer", + itemStock = 150, + itemPrice = 60, + itemInfo = "", + }, + ['anglegrinder'] = { + itemName = "Flex", + itemStock = 150, + itemPrice = 800, + itemInfo = "", + }, + ['cuttingdisc'] = { + itemName = "Trennscheibe", + itemStock = 150, + itemPrice = 20, + itemInfo = "", + }, + ['drill'] = { + itemName = "Flex", + itemStock = 150, + itemPrice = 800, + itemInfo = "", + }, + ['Steinbohrer'] = { + itemName = "Steinbohrer", + itemStock = 150, + itemPrice = 60, + itemInfo = "", + }, + ['knife'] = { + itemName = "Messer", + itemStock = 150, + itemPrice = 600, + itemInfo = "", + }, + + + } }, diff --git a/resources/[inventory]/lusty94_smoking/shared/config.lua b/resources/[inventory]/lusty94_smoking/shared/config.lua index ef2080e22..6bc8d197d 100644 --- a/resources/[inventory]/lusty94_smoking/shared/config.lua +++ b/resources/[inventory]/lusty94_smoking/shared/config.lua @@ -104,7 +104,7 @@ Config.Consumables = { dict = 'amb@prop_human_parking_meter@female@base', anim = 'base_female', flags = 49, - prop = 'v_ret_ml_cigs', + prop = 'bzzz_cigarpack_cig003', bone = 57005, pos = vec3(0.14, 0.01, -0.03), rot = vec3(2.0, 68.0, -32.0), diff --git a/resources/[inventory]/mr-consumables/config/sh_config.lua b/resources/[inventory]/mr-consumables/config/sh_config.lua index 0908caa34..ffd25ea6f 100644 --- a/resources/[inventory]/mr-consumables/config/sh_config.lua +++ b/resources/[inventory]/mr-consumables/config/sh_config.lua @@ -3351,7 +3351,7 @@ Config = { } }, Rewards = { - hunger = 10, + hunger = 15, } }, ["scookie"] = { @@ -4934,7 +4934,7 @@ Config = { } }, Rewards = { -- The Reward Will Set Metadata And Will Be Set When Item Is Used (When Drinked Or Eaten Once) - thirst = 100, + thirst = 20, }, }, ["slushi"] = { @@ -5144,7 +5144,7 @@ Config = { } }, Rewards = { -- The Reward Will Set Metadata And Will Be Set When Item Is Used (When Drinked Or Eaten Once) - thirst = 50, + thirst = 20, }, }, ["ecola_zero_dose"] = { @@ -6928,7 +6928,7 @@ Config = { } }, Rewards = { - thirst = 20, + thirst = 25, } }, ["cerveza_barracho"] = { diff --git a/resources/[jobs]/[weapons]/weapons/stream/w_me_hatchet.ydr b/resources/[jobs]/[weapons]/weapons/stream/w_me_hatchet.ydr deleted file mode 100644 index a001be1e9..000000000 Binary files a/resources/[jobs]/[weapons]/weapons/stream/w_me_hatchet.ydr and /dev/null differ diff --git a/resources/[jobs]/[weapons]/weapons/stream/w_me_hatchet.ytd b/resources/[jobs]/[weapons]/weapons/stream/w_me_hatchet.ytd index 468d869c4..64bd6257a 100644 Binary files a/resources/[jobs]/[weapons]/weapons/stream/w_me_hatchet.ytd and b/resources/[jobs]/[weapons]/weapons/stream/w_me_hatchet.ytd differ diff --git a/resources/[props]/bzzz_garden_grill/fxmanifest.lua b/resources/[props]/bzzz_garden_grill/fxmanifest.lua new file mode 100644 index 000000000..c7ac98319 --- /dev/null +++ b/resources/[props]/bzzz_garden_grill/fxmanifest.lua @@ -0,0 +1,11 @@ +fx_version 'cerulean' +game { 'gta5' } +author 'BzZz' +description 'Bzzz - Garden grill' +version '1.1.0' + + + +data_file 'DLC_ITYP_REQUEST' 'stream/bzzz_grill_a.ytyp' + + diff --git a/resources/[props]/bzzz_garden_grill/images/20230616191337_1.jpg b/resources/[props]/bzzz_garden_grill/images/20230616191337_1.jpg new file mode 100644 index 000000000..5194bc09e Binary files /dev/null and b/resources/[props]/bzzz_garden_grill/images/20230616191337_1.jpg differ diff --git a/resources/[props]/bzzz_garden_grill/images/20230616191353_1.jpg b/resources/[props]/bzzz_garden_grill/images/20230616191353_1.jpg new file mode 100644 index 000000000..4e0f16d2f Binary files /dev/null and b/resources/[props]/bzzz_garden_grill/images/20230616191353_1.jpg differ diff --git a/resources/[props]/bzzz_garden_grill/images/20230616191427_1.jpg b/resources/[props]/bzzz_garden_grill/images/20230616191427_1.jpg new file mode 100644 index 000000000..0c6f246df Binary files /dev/null and b/resources/[props]/bzzz_garden_grill/images/20230616191427_1.jpg differ diff --git a/resources/[props]/bzzz_garden_grill/images/20230616191454_1.jpg b/resources/[props]/bzzz_garden_grill/images/20230616191454_1.jpg new file mode 100644 index 000000000..ff302d07e Binary files /dev/null and b/resources/[props]/bzzz_garden_grill/images/20230616191454_1.jpg differ diff --git a/resources/[props]/bzzz_garden_grill/images/20230616191536_1.jpg b/resources/[props]/bzzz_garden_grill/images/20230616191536_1.jpg new file mode 100644 index 000000000..07b81034e Binary files /dev/null and b/resources/[props]/bzzz_garden_grill/images/20230616191536_1.jpg differ diff --git a/resources/[props]/bzzz_garden_grill/images/20230616191553_1.jpg b/resources/[props]/bzzz_garden_grill/images/20230616191553_1.jpg new file mode 100644 index 000000000..4b823993e Binary files /dev/null and b/resources/[props]/bzzz_garden_grill/images/20230616191553_1.jpg differ diff --git a/resources/[props]/bzzz_garden_grill/readme.txt b/resources/[props]/bzzz_garden_grill/readme.txt new file mode 100644 index 000000000..6551ae4ed --- /dev/null +++ b/resources/[props]/bzzz_garden_grill/readme.txt @@ -0,0 +1,30 @@ +Hi, +thank you for your purchase. + + +-------------------------------------------------- + +My contact: +Cfx forum: https://forum.cfx.re/u/bzzzi/summary +Tebex: https://bzzz.tebex.io/ +Discord: https://discord.gg/PpAHBCMW97 +-------------------------------------------------- + + + +Installation: +1) Insert folder "bzzz_garden_grill" to resources folder +2) Add to server.cfg +3) Restart server + + + + +-------------------------------------------------- +If you stream props in another resource, you must edit the fxmanifest. +Add this line: +data_file 'DLC_ITYP_REQUEST' 'stream/bzzz_grill_a.ytyp' + +Then the server must be restarted. +YTYP loads properties of props. +-------------------------------------------------- diff --git a/resources/[props]/bzzz_garden_grill/stream/bzzz_grill_a.ydr b/resources/[props]/bzzz_garden_grill/stream/bzzz_grill_a.ydr new file mode 100644 index 000000000..8a23183ff Binary files /dev/null and b/resources/[props]/bzzz_garden_grill/stream/bzzz_grill_a.ydr differ diff --git a/resources/[props]/bzzz_garden_grill/stream/bzzz_grill_a.ytyp b/resources/[props]/bzzz_garden_grill/stream/bzzz_grill_a.ytyp new file mode 100644 index 000000000..053203d38 Binary files /dev/null and b/resources/[props]/bzzz_garden_grill/stream/bzzz_grill_a.ytyp differ diff --git a/resources/[props]/bzzz_milk_automat/data/anim_coords.lua b/resources/[props]/bzzz_milk_automat/data/anim_coords.lua new file mode 100644 index 000000000..0940c58e9 --- /dev/null +++ b/resources/[props]/bzzz_milk_automat/data/anim_coords.lua @@ -0,0 +1,8 @@ + ["box_milk"] = {"mp_player_intdrink", "loop_bottle", "Box milk", AnimationOptions = + { + Prop = "bzzz_machines_milk_box", + PropBone = 18905, + PropPlacement = {0.12, -0.04, 0.06, -65.0, 85.0, -20.0}, + EmoteLoop = true, + EmoteMoving = true, + }}, \ No newline at end of file diff --git a/resources/[props]/bzzz_milk_automat/data/bzzz_machines_milk_automat.png b/resources/[props]/bzzz_milk_automat/data/bzzz_machines_milk_automat.png new file mode 100644 index 000000000..c00397905 Binary files /dev/null and b/resources/[props]/bzzz_milk_automat/data/bzzz_machines_milk_automat.png differ diff --git a/resources/[props]/bzzz_milk_automat/data/bzzz_machines_milk_box.png b/resources/[props]/bzzz_milk_automat/data/bzzz_machines_milk_box.png new file mode 100644 index 000000000..3c541928b Binary files /dev/null and b/resources/[props]/bzzz_milk_automat/data/bzzz_machines_milk_box.png differ diff --git a/resources/[props]/bzzz_milk_automat/fxmanifest.lua b/resources/[props]/bzzz_milk_automat/fxmanifest.lua new file mode 100644 index 000000000..345185d36 --- /dev/null +++ b/resources/[props]/bzzz_milk_automat/fxmanifest.lua @@ -0,0 +1,15 @@ +fx_version 'cerulean' +game { 'gta5' } +author 'BzZz' +description 'Milk automat' +version '1.1.0' + + + + + +-- loading prop -- +data_file 'DLC_ITYP_REQUEST' 'stream/bzzz_machines_milk_automat.ytyp' + + + diff --git a/resources/[props]/bzzz_milk_automat/images/1.png b/resources/[props]/bzzz_milk_automat/images/1.png new file mode 100644 index 000000000..54c71d507 Binary files /dev/null and b/resources/[props]/bzzz_milk_automat/images/1.png differ diff --git a/resources/[props]/bzzz_milk_automat/images/2.png b/resources/[props]/bzzz_milk_automat/images/2.png new file mode 100644 index 000000000..2955d7300 Binary files /dev/null and b/resources/[props]/bzzz_milk_automat/images/2.png differ diff --git a/resources/[props]/bzzz_milk_automat/readme.txt b/resources/[props]/bzzz_milk_automat/readme.txt new file mode 100644 index 000000000..0e7076956 --- /dev/null +++ b/resources/[props]/bzzz_milk_automat/readme.txt @@ -0,0 +1,30 @@ +Hi, +thank you for your purchase. + +-------------------------------------------------- + +My contact: +Cfx forum: https://forum.cfx.re/u/bzzzi/summary +Tebex: https://bzzz.tebex.io/ +Discord: https://discord.gg/PpAHBCMW97 +Wiki: https://bzzz.wiki/ +-------------------------------------------------- + + + +Installation: +1) Insert folder "bzzz_milk_automat" to resources folder +2) Add to server.cfg +3) Restart server + + + + +-------------------------------------------------- +If you stream props in another resource, you must edit the fxmanifest. +Add this line: +data_file 'DLC_ITYP_REQUEST' 'stream/bzzz_machines_milk_automat.ytyp' + +Then the server must be restarted. +YTYP loads properties of props. +-------------------------------------------------- diff --git a/resources/[props]/bzzz_milk_automat/stream/bzzz_machines_milk_automat.ydr b/resources/[props]/bzzz_milk_automat/stream/bzzz_machines_milk_automat.ydr new file mode 100644 index 000000000..22b98b5e7 Binary files /dev/null and b/resources/[props]/bzzz_milk_automat/stream/bzzz_machines_milk_automat.ydr differ diff --git a/resources/[props]/bzzz_milk_automat/stream/bzzz_machines_milk_automat.ytyp b/resources/[props]/bzzz_milk_automat/stream/bzzz_machines_milk_automat.ytyp new file mode 100644 index 000000000..56b7ec35a Binary files /dev/null and b/resources/[props]/bzzz_milk_automat/stream/bzzz_machines_milk_automat.ytyp differ diff --git a/resources/[props]/bzzz_milk_automat/stream/bzzz_machines_milk_box.ydr b/resources/[props]/bzzz_milk_automat/stream/bzzz_machines_milk_box.ydr new file mode 100644 index 000000000..36226e880 Binary files /dev/null and b/resources/[props]/bzzz_milk_automat/stream/bzzz_machines_milk_box.ydr differ