From d7afe3459a6c63f994bfd36533c0811b6af6f52b Mon Sep 17 00:00:00 2001 From: Abdullah Kurt <61334539+abdllhkurt@users.noreply.github.com> Date: Tue, 5 Mar 2024 14:39:20 +0300 Subject: [PATCH 1/5] cooking meth at home Low-quality meth production at home --- .../[mercy]/mercy-illegal/client/cl_zones.lua | 83 ++++++++++++++++++- 1 file changed, 82 insertions(+), 1 deletion(-) diff --git a/resources/[mercy]/mercy-illegal/client/cl_zones.lua b/resources/[mercy]/mercy-illegal/client/cl_zones.lua index 18e9d65a..c9a30187 100644 --- a/resources/[mercy]/mercy-illegal/client/cl_zones.lua +++ b/resources/[mercy]/mercy-illegal/client/cl_zones.lua @@ -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 = 'Karışımı oluştur', + 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 = "Karıştırılıyor..." }, + 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 = 'Karışımı pişir', + 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 = "Pişiriliyor..." }, + 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 = 'Karışımı soğut', + 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 = "Soğutuluyor..." }, + 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 = 'Karışımı kristalize et', + 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 = "Kristalleniyor..." }, + 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, @@ -191,4 +272,4 @@ function InitZones() }) end end) -end \ No newline at end of file +end From 826b8afcd93e7e01304ccd8af1b54aabda8d8114 Mon Sep 17 00:00:00 2001 From: Abdullah Kurt <61334539+abdllhkurt@users.noreply.github.com> Date: Tue, 5 Mar 2024 14:40:08 +0300 Subject: [PATCH 2/5] cooking meth at home Low-quality meth production at home --- resources/[mercy]/mercy-housing/client/cl_main.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/resources/[mercy]/mercy-housing/client/cl_main.lua b/resources/[mercy]/mercy-housing/client/cl_main.lua index 59a72a5d..097cfda2 100644 --- a/resources/[mercy]/mercy-housing/client/cl_main.lua +++ b/resources/[mercy]/mercy-housing/client/cl_main.lua @@ -450,4 +450,8 @@ exports("IsNearHouse", function() end return false -end) \ No newline at end of file +end) + +exports("IsPlayerInHouse", function() + return InsideHouse +end) From 94d3d0ad6b109ac95e28a061dd6cc71c1856c68e Mon Sep 17 00:00:00 2001 From: Abdullah Kurt <61334539+abdllhkurt@users.noreply.github.com> Date: Tue, 5 Mar 2024 14:40:40 +0300 Subject: [PATCH 3/5] cooking meth at home Low-quality meth production at home --- resources/[mercy]/mercy-illegal/shared/sh_config.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/[mercy]/mercy-illegal/shared/sh_config.lua b/resources/[mercy]/mercy-illegal/shared/sh_config.lua index 8fcc1f8d..cf9173e6 100644 --- a/resources/[mercy]/mercy-illegal/shared/sh_config.lua +++ b/resources/[mercy]/mercy-illegal/shared/sh_config.lua @@ -75,7 +75,8 @@ Config.LabsState = { [1] = false, [2] = false, [3] = false, - [4] = false + [4] = false, + [10] = true } Config.GrowthObjects = { From fdb6365d176bd162721c78c2c5495eccb66c5427 Mon Sep 17 00:00:00 2001 From: Abdullah Kurt <61334539+abdllhkurt@users.noreply.github.com> Date: Tue, 5 Mar 2024 14:45:40 +0300 Subject: [PATCH 4/5] translate operations translate operations --- resources/[mercy]/mercy-illegal/client/cl_zones.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/[mercy]/mercy-illegal/client/cl_zones.lua b/resources/[mercy]/mercy-illegal/client/cl_zones.lua index c9a30187..de077085 100644 --- a/resources/[mercy]/mercy-illegal/client/cl_zones.lua +++ b/resources/[mercy]/mercy-illegal/client/cl_zones.lua @@ -70,7 +70,7 @@ function InitZones() Label = 'Karışımı oluştur', 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 = "Karıştırılıyor..." }, + 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 @@ -90,7 +90,7 @@ function InitZones() Label = 'Karışımı pişir', 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 = "Pişiriliyor..." }, + 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 @@ -110,7 +110,7 @@ function InitZones() Label = 'Karışımı soğut', 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 = "Soğutuluyor..." }, + 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 @@ -130,7 +130,7 @@ function InitZones() Label = 'Karışımı kristalize et', 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 = "Kristalleniyor..." }, + 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 From c53935964a7071193a3e3705566e892baf55aafd Mon Sep 17 00:00:00 2001 From: Abdullah Kurt <61334539+abdllhkurt@users.noreply.github.com> Date: Tue, 5 Mar 2024 14:49:04 +0300 Subject: [PATCH 5/5] translate operations translate operations --- resources/[mercy]/mercy-illegal/client/cl_zones.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/[mercy]/mercy-illegal/client/cl_zones.lua b/resources/[mercy]/mercy-illegal/client/cl_zones.lua index de077085..cf8e670d 100644 --- a/resources/[mercy]/mercy-illegal/client/cl_zones.lua +++ b/resources/[mercy]/mercy-illegal/client/cl_zones.lua @@ -67,7 +67,7 @@ function InitZones() { Name = 'housing_meth_1', Icon = 'fas fa-circle', - Label = 'Karışımı oluştur', + 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..." }, @@ -87,7 +87,7 @@ function InitZones() { Name = 'housing_meth_2', Icon = 'fas fa-circle', - Label = 'Karışımı pişir', + 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..." }, @@ -107,7 +107,7 @@ function InitZones() { Name = 'housing_meth_3', Icon = 'fas fa-circle', - Label = 'Karışımı soğut', + 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..." }, @@ -127,7 +127,7 @@ function InitZones() { Name = 'housing_meth_4', Icon = 'fas fa-circle', - Label = 'Karışımı kristalize et', + 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..." },