Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion resources/[mercy]/mercy-housing/client/cl_main.lua
Original file line number Diff line number Diff line change
Expand Up @@ -450,4 +450,8 @@ exports("IsNearHouse", function()
end

return false
end)
end)

exports("IsPlayerInHouse", function()
return InsideHouse
end)
83 changes: 82 additions & 1 deletion resources/[mercy]/mercy-illegal/client/cl_zones.lua
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,87 @@ function InitZones()
}
})

exports['mercy-ui']:AddEyeEntry(GetHashKey("v_res_tre_mixer"), {
Type = 'Model',
Model = 'v_res_tre_mixer',
SpriteDistance = 5.0,
Options = {
{
Name = 'housing_meth_1',
Icon = 'fas fa-circle',
Label = 'Create the mix',
EventType = 'Client',
EventName = 'mercy-illegal/client/methLabs/cook-meth',
EventParams = { Id = 10, Item = "xmadde", Amount = 1, RequestItem = { {Name = "cleaningproduct", Amount = 3}, }, Animation = "base_a_m_y_vinewood_01", AnimDict = "anim@amb@casino@valet_scenario@pose_d@", ProgressText = "Mixing..." },
Enabled = function(Entity)
if exports['mercy-housing']:IsPlayerInHouse() then
return true
end
end,
},
}
})
exports['mercy-ui']:AddEyeEntry(GetHashKey("prop_cooker_03"), {
Type = 'Model',
Model = 'prop_cooker_03',
SpriteDistance = 5.0,
Options = {
{
Name = 'housing_meth_2',
Icon = 'fas fa-circle',
Label = 'Cook the mixture',
EventType = 'Client',
EventName = 'mercy-illegal/client/methLabs/cook-meth',
EventParams = { Id = 10, Item = "methbrick", Amount = 1, RequestItem = { {Name = "xmadde", Amount = 3}, }, Animation = "fixing_a_player", AnimDict = "mini@repair", ProgressText = "Cooking..." },
Enabled = function(Entity)
if exports['mercy-housing']:IsPlayerInHouse() then
return true
end
end,
},
}
})
exports['mercy-ui']:AddEyeEntry(GetHashKey("v_ret_fh_pot01"), {
Type = 'Model',
Model = 'v_ret_fh_pot01',
SpriteDistance = 5.0,
Options = {
{
Name = 'housing_meth_3',
Icon = 'fas fa-circle',
Label = 'Cool the mixture',
EventType = 'Client',
EventName = 'mercy-illegal/client/methLabs/cook-meth',
EventParams = { Id = 10, Item = "methcured", Amount = 3, RequestItem = { {Name = "methbrick", Amount = 1}, }, Animation = "fixing_a_player", AnimDict = "mini@repair", ProgressText = "Cooling Methbrick..." },
Enabled = function(Entity)
if exports['mercy-housing']:IsPlayerInHouse() then
return true
end
end,
},
}
})
exports['mercy-ui']:AddEyeEntry(GetHashKey("v_res_fa_chopbrd"), {
Type = 'Model',
Model = 'v_res_fa_chopbrd',
SpriteDistance = 5.0,
Options = {
{
Name = 'housing_meth_4',
Icon = 'fas fa-circle',
Label = 'Crystallize the mixture',
EventType = 'Client',
EventName = 'mercy-illegal/client/methLabs/cook-meth',
EventParams = { Id = 10, Item = "methbatch", Amount = 1, RequestItem = { {Name = "methcured", Amount = 1}, {Name = 'emptybaggies', Amount = 1}, }, Animation = "urinal_sink_loop", AnimDict = "missheist_agency3aig_23", ProgressText = "Crystallize Meth..." },
Enabled = function(Entity)
if exports['mercy-housing']:IsPlayerInHouse() then
return true
end
end,
},
}
})

exports['mercy-ui']:AddEyeEntry("weed-dry-rack", {
Type = 'Zone',
SpriteDistance = 5.0,
Expand Down Expand Up @@ -191,4 +272,4 @@ function InitZones()
})
end
end)
end
end
3 changes: 2 additions & 1 deletion resources/[mercy]/mercy-illegal/shared/sh_config.lua
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ Config.LabsState = {
[1] = false,
[2] = false,
[3] = false,
[4] = false
[4] = false,
[10] = true
}

Config.GrowthObjects = {
Expand Down