Merge branch 'master' of https://git.evolution-state-life.de/Evolution-State-Life/Main

resources/[inventory]/cs_shops/config/config.lua

@@ -628,10 +628,10 @@ CodeStudio.Products = {
                 itemPrice = 800,
                 itemInfo = "",
             },  
-            ['Steinbohrer'] = {
+            ['stonedrill'] = {
                 itemName = "Steinbohrer",
                 itemStock = 150,
-                itemPrice = 60,
+                itemPrice = 40,
                 itemInfo = "",
             }, 
             ['knife'] = {
@@ -640,7 +640,18 @@ CodeStudio.Products = {
                 itemPrice = 600,
                 itemInfo = "",
             }, 
-
+            ['pump'] = {
+                itemName = "Akku Pumpe",
+                itemStock = 150,
+                itemPrice = 600,
+                itemInfo = "",
+            }, 
+            ['kanister'] = {
+                itemName = "leerer Kanister",
+                itemStock = 150,
+                itemPrice = 20,
+                itemInfo = "",
+            }, 
 
 
 

resources/[inventory]/mr-consumables/config/sh_config.lua

@@ -1811,7 +1811,7 @@ Config = {
                 }
             },                        
             ["cottoncandy"] = {
-                PropModel = "natty_lollipop_spiral01",
+                PropModel = "bzzz_candy_cotton_pink",
                 UsesAmount = 1,
                 Actions = {
                     Enter = {
@@ -2956,7 +2956,7 @@ Config = {
             }
             }, 
             ["jelly_beans"] = {
-                PropModel = "prop_candy_pqs",
+                PropModel = "bzzz_sugary_candy_a",
                 UsesAmount = 2,
                 Actions = {
                     Enter = {
@@ -3355,7 +3355,7 @@ Config = {
                 }
             },  
             ["scookie"] = {
-                PropModel = "prop_sandwich_01",
+                PropModel = "bzzz_sugary_cookie_a",
                 UsesAmount = 2,
                 Actions = {
                     Enter = {
@@ -4868,7 +4868,7 @@ Config = {
                 }
             },                
             ["spazi_limo"] = {
-                PropModel = "prop_ld_can_01",
+                PropModel = "bzzz_new_snacks_pepsiloca_a",
                 UsesAmount = 2, -- The Amount Of Times This Item Can Be Eaten / Drinked
                 Actions = {
                     Enter = {   -- I Won't Recomenned Replacing The Animation Because Stuff Related To This Are Hardcoded (Will Be Support For Customs Soon)
@@ -5078,7 +5078,7 @@ Config = {
                                 }, 
             },
             ["spazi"] = {
-                PropModel = "prop_ld_can_01",
+                PropModel = "bzzz_new_snacks_pepsiloca_b",
                 UsesAmount = 2, -- The Amount Of Times This Item Can Be Eaten / Drinked
                 Actions = {
                     Enter = {   -- I Won't Recomenned Replacing The Animation Because Stuff Related To This Are Hardcoded (Will Be Support For Customs Soon)

resources/[props]/bzzz_addon_props_powerhouse/fxmanifest.lua

@@ -0,0 +1,37 @@
+fx_version 'adamant'
+games { 'gta5' }
+
+
+description 'Addon Props - Powehouse'
+made_by 'BzZz'
+
+
+
+data_file 'DLC_ITYP_REQUEST' 'stream/prop_bzzz_elektro_powerhouse001.ytyp'
+
+
+
+
+
+
+
+--[[
+CODE FOR ANIMATION DPEMOTES:
+--------------------------------------------------
+
+
+["power"] = {"move_weapon@jerrycan@generic", "idle", "Power House", AnimationOptions =
+   {
+      Prop = "prop_bzzz_elektro_powerhouse001",
+      PropBone = 57005,
+      PropPlacement = {0.11, 0.06, 0.0, 98.0, 12.0, -99.0},
+      EmoteLoop = true,
+      EmoteMoving = true,
+   }},
+   
+--------------------------------------------------
+
+If you put the props in another folder, you must edit the fxmanifest:
+data_file 'DLC_ITYP_REQUEST' 'stream/prop_bzzz_elektro_powerhouse001.ytyp'
+
+]]--

resources/[props]/bzzz_apple_trees/data/coords_for_animation.lua

@@ -0,0 +1,68 @@
+
+-- template for dpemotes/rpemotes
+-- Coordinates may not work the same for other scripts. If the coordinates don't match, you need to use the tool to find new coordinates.
+
+["apple_red2"] = {"mp_player_inteat@burger", "mp_player_int_eat_burger", "Eat Red Apple", AnimationOptions =
+   {
+       Prop = 'bzzz_tree_apple_red2',
+       PropBone = 18905,
+       PropPlacement = {0.15, 0.07, 0.03, 0.0, -275.0, 55.0,},
+	   EmoteLoop = true,
+       EmoteMoving = true,
+   }},
+	["apple_green2"] = {"mp_player_inteat@burger", "mp_player_int_eat_burger", "Eat Green Apple", AnimationOptions =
+   {
+       Prop = 'bzzz_tree_apple_green2',
+       PropBone = 18905,
+       PropPlacement = {0.15, 0.07, 0.03, 0.0, -275.0, 55.0,},
+	   EmoteLoop = true,
+       EmoteMoving = true,
+   }}, 
+	["apple_red"] = {"mp_player_inteat@burger", "mp_player_int_eat_burger", "Eat Red Apple", AnimationOptions =
+   {
+       Prop = 'bzzz_tree_apple_red',
+       PropBone = 18905,
+       PropPlacement = {0.15, 0.07, 0.03, 0.0, -275.0, 55.0,},
+	   EmoteLoop = true,
+       EmoteMoving = true,
+   }},
+	["apple_green"] = {"mp_player_inteat@burger", "mp_player_int_eat_burger", "Eat Green Apple", AnimationOptions =
+   {
+       Prop = 'bzzz_tree_apple_green',
+       PropBone = 18905,
+       PropPlacement = {0.15, 0.07, 0.03, 0.0, -275.0, 55.0,},
+	   EmoteLoop = true,
+       EmoteMoving = true,
+   }}, 
+   ["green_box"] = {"anim@heists@box_carry@", "idle", "Apple Green Box", AnimationOptions =
+   {
+       Prop = "bzzz_tree_box_green",
+       PropBone = 24816,
+       PropPlacement = {-0.01, 0.39, 0.08, 77.0, 16.0, 122.0},
+       EmoteLoop = true,
+       EmoteMoving = true,
+   }},   
+   ["red_box"] = {"anim@heists@box_carry@", "idle", "Apple Red Box", AnimationOptions =
+   {
+       Prop = "bzzz_tree_box_red",
+       PropBone = 24816,
+       PropPlacement = {-0.01, 0.39, 0.08, 77.0, 16.0, 122.0},
+       EmoteLoop = true,
+       EmoteMoving = true,
+   }},
+   ["green_juice"] = {"mp_player_intdrink", "loop_bottle", "Drink Apple Green Juice", AnimationOptions =
+   {
+      Prop = 'bzzz_tree_juice_green',
+       PropBone = 18905,
+       PropPlacement = {-0.04, -0.07, 0.15, 77.0, 48.0, 126.0},
+       EmoteLoop = true,
+       EmoteMoving = true,
+   }},
+   ["red_juice"] = {"mp_player_intdrink", "loop_bottle", "Drink Apple Red Juice", AnimationOptions =
+   {
+      Prop = 'bzzz_tree_juice_red',
+       PropBone = 18905,
+       PropPlacement = {-0.04, -0.07, 0.15, 77.0, 48.0, 126.0},
+       EmoteLoop = true,
+       EmoteMoving = true,
+   }},

resources/[props]/bzzz_apple_trees/fxmanifest.lua

@@ -0,0 +1,16 @@
+fx_version 'cerulean'
+game { 'gta5' }
+author 'BzZz'
+description 'Bzzz - Apple Trees'
+version '2.1.0'
+
+
+
+data_file 'DLC_ITYP_REQUEST' 'stream/*.ytyp'
+
+files {
+    'stream/*.ytyp',
+}
+
+
+

resources/[props]/bzzz_apple_trees/readme.txt

@@ -0,0 +1,37 @@
+Hi,
+thank you for your purchase.
+
+--------------------------------------------------
+
+YMAP COORDS: x = 1858, y = 4871, z = 43
+
+--------------------------------------------------
+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_apple_trees" 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_tree_pack.ytyp'
+
+Then the server must be restarted. 
+YTYP loads properties of props.
+
+If you are streaming files in this original resource, do nothing.
+
+Then you can use props in the same way as GTA props. (File name = prop name)
+--------------------------------------------------

resources/[props]/bzzz_beer_machine/data/coords_for_animations.lua

@@ -0,0 +1,16 @@
+["star_beer1"] = {"mp_player_intdrink", "loop_bottle", "Drink Liquid Beer", AnimationOptions =
+   {   
+    Prop = 'bzzz_prop_beer_original',
+       PropBone = 18905,
+       PropPlacement = {0.12, 0.0, 0.04, -60.0, 89.0, -5.0},
+       EmoteLoop = true,
+       EmoteMoving = true,
+   }},
+   
+--[[ The coordinates are the same for all cans.
+bzzz_prop_beer_apple
+bzzz_prop_beer_blueberry
+bzzz_prop_beer_kiwi
+bzzz_prop_beer_plum
+bzzz_prop_beer_raspberry
+--]]

resources/[props]/bzzz_beer_machine/data/ox_inventory.txt

@@ -0,0 +1 @@
+https://github.com/Mrs-BzZz/food_coords/blob/main/ox_inventory/bzzz_beer_machine.lua

resources/[props]/bzzz_beer_machine/data/qb-smallresources.txt

@@ -0,0 +1 @@
+https://github.com/Mrs-BzZz/food_coords/blob/main/qb-smallresources/bzzz_beer_machine.lua

resources/[props]/bzzz_beer_machine/fxmanifest.lua

@@ -0,0 +1,11 @@
+fx_version 'cerulean'
+game { 'gta5' }
+author 'BzZz'
+description 'Bzzz - Beer machine'
+version '1.1.0'
+
+
+
+data_file 'DLC_ITYP_REQUEST' 'stream/bzzz_prop_beer_machine.ytyp'
+
+

resources/[props]/bzzz_beer_machine/readme.txt

@@ -0,0 +1,33 @@
+Hi,
+thank you for your purchase.
+Please don't release my work any longer.
+
+--------------------------------------------------
+
+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_beer_machine" to resources folder
+2) Add to server.cfg
+3) Restart server
+
+You can then use the props as GTA props.
+
+
+--------------------------------------------------
+If you stream props in another resource, you must edit the fxmanifest.
+Add this line:
+data_file 'DLC_ITYP_REQUEST' 'stream/bzzz_prop_beer_machine.ytyp'
+
+Then the server must be restarted. 
+YTYP loads properties of props.
+--------------------------------------------------
+
+Textures can be easily changed in OpenIV.
+Keep the original texture dimensions.

resources/[props]/bzzz_cotton_candy/data/animations_coord.lua

@@ -0,0 +1,19 @@
+-- Template
+
+	["cotton_candy_yellow"] = {"mp_player_inteat@burger", "mp_player_int_eat_burger", "Eat cotton candy yellow", AnimationOptions =
+   {
+      Prop = "bzzz_candy_cotton_yellow", --or bzzz_candy_cotton_pink, bzzz_candy_cotton_blue, bzzz_candy_cotton_red, bzzz_candy_cotton_stick
+      PropBone = 18905,
+      PropPlacement = {0.15, 0.07, 0.0, -50.0, 150.0, 0.0},
+      EmoteLoop = true,
+      EmoteMoving = true,
+   }}, 
+   
+   ["making_cotton_candy"] = {"anim@heists@humane_labs@finale@keycards", "ped_a_enter_loop", "Making cotton candy", AnimationOptions =
+   {
+       Prop = 'bzzz_candy_cotton_yellow', --or bzzz_candy_cotton_pink, bzzz_candy_cotton_blue, bzzz_candy_cotton_red, bzzz_candy_cotton_stick
+       PropBone = 18905,
+       PropPlacement = {0.27, -0.04, -0.02, 24.0, 110.0, 0.0},
+       EmoteMoving = true,
+       EmoteLoop = true
+   }},

resources/[props]/bzzz_cotton_candy/data/code_for_bzzz_usableitems.lua

@@ -0,0 +1,43 @@
+-- copy and paste into the food section
+
+
+		["bzzz_candy_cotton_yellow"] = {
+            basicInfo = {
+                amountToAdd = 200000, 
+                animationDict = "mp_player_inteat@burger", animationName = "mp_player_int_eat_burger"},
+            firstProp = {
+                boneIndex = 18905, 
+                propName = "bzzz_candy_cotton_yellow", 
+                xPos = 0.15, yPos = 0.07, zPos = 0.00, xRot = -50.0, yRot = 150.0, zRot = 10.0
+            }
+        },
+		["bzzz_candy_cotton_red"] = {
+            basicInfo = {
+                amountToAdd = 200000, 
+                animationDict = "mp_player_inteat@burger", animationName = "mp_player_int_eat_burger"},
+            firstProp = {
+                boneIndex = 18905, 
+                propName = "bzzz_candy_cotton_red", 
+                xPos = 0.15, yPos = 0.07, zPos = 0.00, xRot = -50.0, yRot = 150.0, zRot = 10.0
+            }
+        },
+		["bzzz_candy_cotton_blue"] = {
+            basicInfo = {
+                amountToAdd = 200000, 
+                animationDict = "mp_player_inteat@burger", animationName = "mp_player_int_eat_burger"},
+            firstProp = {
+                boneIndex = 18905, 
+                propName = "bzzz_candy_cotton_blue", 
+                xPos = 0.15, yPos = 0.07, zPos = 0.00, xRot = -50.0, yRot = 150.0, zRot = 10.0
+            }
+        },
+		["bzzz_candy_cotton_pink"] = {
+            basicInfo = {
+                amountToAdd = 200000, 
+                animationDict = "mp_player_inteat@burger", animationName = "mp_player_int_eat_burger"},
+            firstProp = {
+                boneIndex = 18905, 
+                propName = "bzzz_candy_cotton_pink", 
+                xPos = 0.15, yPos = 0.07, zPos = 0.00, xRot = -50.0, yRot = 150.0, zRot = 10.0
+            }
+        },

resources/[props]/bzzz_cotton_candy/data/code_for_ox_inventory.lua

@@ -0,0 +1,50 @@
+--copy and paste into the ox_inventory/data/items.lua
+
+['bzzz_candy_cotton_yellow'] = {
+		label = 'Yellow candy cotton',
+		weight = 500,
+		client = {
+			status = { thirst = 200000 },
+			anim = { dict = 'mp_player_inteat@burger', clip = 'mp_player_int_eat_burger' },
+			prop = { model = `bzzz_candy_cotton_yellow`, pos = vec3(-0.02, 0.01, -0.01), rot = vec3(0.0, -90.0, 0.0) },
+			usetime = 2500,
+			cancel = true,
+			notification = 'Bon appétit'
+		}
+	},
+['bzzz_candy_cotton_pink'] = {
+		label = 'Pink candy cotton',
+		weight = 500,
+		client = {
+			status = { thirst = 200000 },
+			anim = { dict = 'mp_player_inteat@burger', clip = 'mp_player_int_eat_burger' },
+			prop = { model = `bzzz_candy_cotton_pink`, pos = vec3(-0.02, 0.01, -0.01), rot = vec3(0.0, -90.0, 0.0) },
+			usetime = 2500,
+			cancel = true,
+			notification = 'Bon appétit'
+		}
+	},
+['bzzz_candy_cotton_red'] = {
+		label = 'Red candy cotton',
+		weight = 500,
+		client = {
+			status = { thirst = 200000 },
+			anim = { dict = 'mp_player_inteat@burger', clip = 'mp_player_int_eat_burger' },
+			prop = { model = `bzzz_candy_cotton_red`, pos = vec3(-0.02, 0.01, -0.01), rot = vec3(0.0, -90.0, 0.0) },
+			usetime = 2500,
+			cancel = true,
+			notification = 'Bon appétit'
+		}
+	},
+['bzzz_candy_cotton_blue'] = {
+		label = 'Blue candy cotton',
+		weight = 500,
+		client = {
+			status = { thirst = 200000 },
+			anim = { dict = 'mp_player_inteat@burger', clip = 'mp_player_int_eat_burger' },
+			prop = { model = `bzzz_candy_cotton_blue`, pos = vec3(-0.02, 0.01, -0.01), rot = vec3(0.0, -90.0, 0.0) },
+			usetime = 2500,
+			cancel = true,
+			notification = 'Bon appétit'
+		}
+	},

resources/[props]/bzzz_cotton_candy/data/qb-smallresources.txt

@@ -0,0 +1 @@
+https://github.com/Mrs-BzZz/food_coords/blob/main/qb-smallresources/bzzz_cotton_candy.lua

resources/[props]/bzzz_cotton_candy/data/sql_if_you_need.sql

@@ -0,0 +1,6 @@
+INSERT INTO `items` (`name`, `label`, `weight`) VALUES
+	('bzzz_candy_cotton_yellow', 'Yellow candy cotton', 1),
+	('bzzz_candy_cotton_red', 'Red candy cotton', 1),
+    ('bzzz_candy_cotton_blue', 'Blue candy cotton', 1),
+	('bzzz_candy_cotton_pink', 'Pink candy cotton', 1)
+;

resources/[props]/bzzz_cotton_candy/fxmanifest.lua

@@ -0,0 +1,11 @@
+fx_version 'cerulean'
+game { 'gta5' }
+author 'BzZz'
+description 'Bzzz - Cotton candy'
+version '1.1.0'
+
+
+
+data_file 'DLC_ITYP_REQUEST' 'stream/bzzz_candy_cotton.ytyp'
+
+