From 2c1401f9a3a24a3f659526bfa6e34c2b1f1784dc Mon Sep 17 00:00:00 2001 From: Mustache Dom <123716453+Mustachedom@users.noreply.github.com> Date: Thu, 9 Oct 2025 02:53:40 -0600 Subject: [PATCH] - add weed prop allowance for MakeButter and MakeOil --- client/weed.lua | 17 +++++++++++++++++ server/weed.lua | 4 ++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/client/weed.lua b/client/weed.lua index 94b8aaa..0500237 100644 --- a/client/weed.lua +++ b/client/weed.lua @@ -150,4 +150,21 @@ for k, v in pairs (locations.WeedSalesman) do } }) end +local props = {} +for locationKey, locationData in pairs (locations.MakeButter) do + if locationData.prop then + ps.requestModel(locationData.prop) + props[#props+1] = CreateObject(locationData.prop, locationData.loc.x, locationData.loc.y, locationData.loc.z - 1.0, false, false, false) + FreezeEntityPosition(props[#props], true) + SetEntityHeading(props[#props], locationData.loc.w) + end +end +for locationKey, locationData in pairs (locations.MakeOil) do + if locationData.prop then + ps.requestModel(locationData.prop) + props[#props+1] = CreateObject(locationData.prop, locationData.loc.x, locationData.loc.y, locationData.loc.z - 1.0, false, false, false) + FreezeEntityPosition(props[#props], true) + SetEntityHeading(props[#props], locationData.loc.w) + end +end \ No newline at end of file diff --git a/server/weed.lua b/server/weed.lua index 7e974f7..9f583ab 100644 --- a/server/weed.lua +++ b/server/weed.lua @@ -3,10 +3,10 @@ local weedLocs = { {inside = vector3(1066.31, -3183.36, -39.16), outside = vector3(244.74, 374.54, 105.74), l = 1.0, w = 1.0, rot = 45.0, gang = ""}, }, MakeButter = { - {loc = vector3(1045.48, -3198.49, -38.22), checks = {}}, + {loc = vector4(1045.43, -3198.75, -38.15, 270.0), prop = 'prop_cooker_03', checks = {}}, }, MakeOil = { - {loc = vector3(1038.90, -3198.66, -38.17), checks = {}}, + {loc = vector4(1038.8, -3198.68, -38.17, 90.0), prop = 'prop_cooker_03', checks = {}}, }, WeedDry = { {loc = vector3(1043.0, -3191.59, -38.39),},