Stress, Armor, Heal, Screen effects testing

client/client.lua

@@ -7,6 +7,7 @@ local drugCount = 0
 
 local function loadAnimDict(dict) while (not HasAnimDictLoaded(dict)) do RequestAnimDict(dict) Wait(5) end end
 
+--Alcohol Effects
 function AlienEffect()
     StartScreenEffect("DrugsMichaelAliensFightIn", 3.0, 0)
     Wait(math.random(5000, 8000))
@@ -40,14 +41,31 @@ function AlienEffect()
     StopScreenEffect("DrugsMichaelAliensFight")
     StopScreenEffect("DrugsMichaelAliensFightOut")
 end
-
+--Weed Effects
---[[function HealDrug()
+function WeedEffect()
-    if not healing then
+    StartScreenEffect("DrugsMichaelAliensFightIn", 3.0, 0)
-        healing = true
+    Wait(math.random(3000, 20000))
-    else
+    StartScreenEffect("DrugsMichaelAliensFight", 3.0, 0)
-        return
+    Wait(math.random(15000, 20000))
+    StartScreenEffect("DrugsMichaelAliensFightOut", 3.0, 0)
+    StopScreenEffect("DrugsMichaelAliensFightIn")
+    StopScreenEffect("DrugsMichaelAliensFight")
+    StopScreenEffect("DrugsMichaelAliensFightOut")
+end
+--Other Effects
+function TrevorEffect()
+    StartScreenEffect("DrugsTrevorClownsFightIn", 3.0, 0)
+    Wait(3000)
+    StartScreenEffect("DrugsTrevorClownsFight", 3.0, 0)
+    Wait(30000)
+	StartScreenEffect("DrugsTrevorClownsFightOut", 3.0, 0)
+	StopScreenEffect("DrugsTrevorClownsFight")
+	StopScreenEffect("DrugsTrevorClownsFightIn")
+	StopScreenEffect("DrugsTrevorClownsFightOut")
 end
 
+function HealEffect()
+    if not healing then healing = true else return end
     local count = 9
     while count > 0 do
         Wait(1000)
@@ -57,36 +75,22 @@ end
     healing = false
 end
 
-function MethBagEffect()
+function StaminaEffect()
     local startStamina = 8
-    --TrevorEffect()
     SetRunSprintMultiplierForPlayer(PlayerId(), 1.49)
     while startStamina > 0 do
         Wait(1000)
-        if math.random(5, 100) < 10 then
+        if math.random(5, 100) < 10 then RestorePlayerStamina(PlayerId(), 1.0) end
-            RestorePlayerStamina(PlayerId(), 1.0)
-        end
         startStamina = startStamina - 1
-        if math.random(5, 100) < 51 then
+        if math.random(5, 100) < 51 then end
-            --TrevorEffect()
-        end
     end
     startStamina = 0
     SetRunSprintMultiplierForPlayer(PlayerId(), 1.0)
 end
 
-function TrevorEffect()
-    StartScreenEffect("DrugsTrevorClownsFightIn", 3.0, 0)
-    Wait(3000)
-    StartScreenEffect("DrugsTrevorClownsFight", 3.0, 0)
-    Wait(3000)
-	StartScreenEffect("DrugsTrevorClownsFightOut", 3.0, 0)
-	StopScreenEffect("DrugsTrevorClownsFight")
-	StopScreenEffect("DrugsTrevorClownsFightIn")
-	StopScreenEffect("DrugsTrevorClownsFightOut")
-end
 
-function EcstasyEffect()
+
+--[[function EcstasyEffect()
     local startStamina = 30
     SetFlash(0, 0, 500, 7000, 500)
     while startStamina > 0 do
@@ -105,27 +109,6 @@ function EcstasyEffect()
     startStamina = 0
 end
 
-function JointEffect()
-    -- if not onWeed then
-    --     local RelieveOdd = math.random(35, 45)
-    --     onWeed = true
-    --     local weedTime = Config.JointEffectTime
-    --     CreateThread(function()
-    --         while onWeed do
-    --             SetPlayerHealthRechargeMultiplier(PlayerId(), 1.8)
-    --             Wait(1000)
-    --             weedTime = weedTime - 1
-    --             if weedTime == RelieveOdd then
-    --                 TriggerServerEvent('hud:Server:RelieveStress', math.random(14, 18))
-    --             end
-    --             if weedTime <= 0 then
-    --                 onWeed = false
-    --             end
-    --         end
-    --     end)
-    -- end
-end
-
 function CrackBaggyEffect()
     local startStamina = 8
     local ped = PlayerPedId()
@@ -183,12 +166,12 @@ end]]
 local consuming = false
 local cancelled = false
 
-RegisterNetEvent('jim-consumables:Consume', function(itemName, type)
+RegisterNetEvent('jim-consumables:Consume', function(itemName)
 	local Player = PlayerPedId()
 	local emote = Config.Emotes[Config.Consumables[itemName].emote]
 	local animDict = tostring(emote[1])
 	local anim = tostring(emote[2])
-	local model, bone, drugeffect = nil
+	local model, bone, drugeffect, stress = nil
 	local P1, P2, P3, P4, P5, P6 = table.unpack({0.0, 0.0, 0.0, 0.0, 0.0, 0.0})
 	if emote.AnimationOptions.Prop then
 		model = tostring(emote.AnimationOptions.Prop)
@@ -196,7 +179,9 @@ RegisterNetEvent('jim-consumables:Consume', function(itemName, type)
 		P1, P2, P3, P4, P5, P6 = table.unpack(emote.AnimationOptions.PropPlacement)
 	end
 	local type = Config.Consumables[itemName].type
-	
+	local stress = Config.Consumables[itemName].stress
+	local heal = Config.Consumables[itemName].heal
+	local armor = Config.Consumables[itemName].armor
 	if type == "drink" or type == "alcohol" then string = "Drinking " end
 	if type == "food" then string = "Eating " end
 	if type == "drug" then string = "Using " end
@@ -235,7 +220,7 @@ RegisterNetEvent('jim-consumables:Consume', function(itemName, type)
 	
 	consuming = true
 	while consuming do
-		if time <= 0 then consuming = false print("complete") end
+		if time <= 0 then consuming = false end
 		if IsControlJustPressed(0, 21) then
 			consuming = false
 			cancelled = true
@@ -261,7 +246,11 @@ RegisterNetEvent('jim-consumables:Consume', function(itemName, type)
 			if type == "drink" then TriggerServerEvent("QBCore:Server:SetMetaData", "thirst", QBCore.Functions.GetPlayerData().metadata["thirst"] + math.random(10,20)) end
 		end
 		
-        if stress then TriggerServerEvent('hud:server:RelieveStress', math.random(2, 4)) end
+        if stress then TriggerServerEvent('hud:server:RelieveStress', stress) end
+		
+		if heal then SetEntityHealth(Player, GetEntityHealth(Player) + heal) end
+				
+		if armor then TriggerServerEvent('hospital:server:SetArmor', (GetPedArmour(Player) + armor)) SetPedArmour(Player, (GetPedArmour(Player) + armor)) end
 
 		if type == "alcohol" then
 			alcoholCount = alcoholCount + 1
@@ -273,34 +262,37 @@ RegisterNetEvent('jim-consumables:Consume', function(itemName, type)
 			end
         end
 		
-		--[[drugeffect = Config.Consumables[itemName].drugeffect
+		effect = Config.Consumables[itemName].effect
 
-		if drugeffect ~= nil then
+		if effect ~= nil then
-			if drugeffect.canOD then
+			if effect.canOD then
-				drugCount = drugCount + 2
+				drugCount = drugCount + 1
 				if drugCount >= 4 then
-					SetEntityHealth(PlayerPedId(), GetEntityHealth(PlayerPedId()) - math.random(20,40))
+					SetEntityHealth(PlayerPedId(), GetEntityHealth(PlayerPedId()) - math.random(10,15))
 					if drugCount >= 6 then
 						AlienEffect()
 					end
 				end
 			end
-			if drugeffect.armour then 
+			if effect.effect == "weed" then
+				if drugCount >= 2 then
+					TrevorEffect()
 				end
-			if drugeffect.health then
-				HealDrug()
 			end
-			if drugeffect.stamina then
+			if effect.effect == "heal" then
-				MethBagEffect()
+				HealEffect()
+			end
+			if effect.effect == "stamina" then
+				StaminaEffect()
 				if drugCount >= 4 then
 					TrevorEffect()
 				end
 			end
-			if drugeffect.widepupils then
+			if effect.widepupils then
 				TriggerEvent("evidence:client:SetStatus", "widepupils", 200)
-				EcstasyEffect()
+				--EcstasyEffect()
+			end
 		end
-		end]]
 
 	end
 	cancelled = false
@@ -318,7 +310,7 @@ CreateThread(function()
         end
 	end
 end)
---[[CreateThread(function()
+CreateThread(function()
 	while true do
         Wait(10)
         if drugCount > 0 then
@@ -328,4 +320,4 @@ end)
             Wait(2000)
         end
     end
-end)]]
+end)

config.lua

@@ -9,36 +9,42 @@ Config = {}
 Config.Debug = false  -- false to remove green boxes
 
 Config.Consumables = {
-	--Normal Drinks
-	["cranberry"] = { 		emote = "wine", 	stress = true, type = "drink", },
-	["pinejuice"] = { 		emote = "coffee", 	stress = true, type = "drink", },
-	
 	-- Default QB food item override
-	["vodka"] = { 			emote = "vodkab", 	stress = true, type = "alcohol", },
+	["vodka"] = { 			emote = "vodkab", 	stress = math.random(2, 4), heal = 0, armor = 0, type = "alcohol", },
-	["beer"] = { 			emote = "beer", 	stress = true, type = "alcohol", },
+	["beer"] = { 			emote = "beer", 	stress = math.random(2, 4), heal = 0, armor = 0, type = "alcohol", },
-	["whiskey"] = { 		emote = "whiskey", 	stress = true, type = "alcohol", },
+	["whiskey"] = { 		emote = "whiskey", 	stress = math.random(2, 4), heal = 0, armor = 0, type = "alcohol", },
 	
-	["sandwich"] = { 		emote = "sandwich", stress = true, type = "food", },
+	["sandwich"] = { 		emote = "sandwich", stress = math.random(2, 4), heal = 0, armor = 0, type = "food", },
-	["twerks_candy"] = { 	emote = "egobar", 	stress = true, type = "food", },
+	["twerks_candy"] = { 	emote = "egobar", 	stress = math.random(2, 4), heal = 0, armor = 0, type = "food", },
-	["snikkel_candy"] = { 	emote = "egobar", 	stress = true, type = "food", },
+	["snikkel_candy"] = { 	emote = "egobar", 	stress = math.random(2, 4), heal = 0, armor = 0, type = "food", },
-	["tosti"] = { 			emote = "sandwich", stress = true, type = "food", },
+	["tosti"] = { 			emote = "sandwich", stress = math.random(2, 4), heal = 0, armor = 0, type = "food", },
+	
+	["coffee"] = { 			emote = "coffee", 	stress = math.random(2, 4), heal = 0, armor = 0, type = "drink", },
+	["water_bottle"] = { 	emote = "drink", 	stress = math.random(2, 4), heal = 0, armor = 0, type = "drink", },
+	["kurkakola"] = { 		emote = "ecola", 	stress = math.random(2, 4), heal = 0, armor = 0, type = "drink", },
+
+--Testing these but they may be best left handled by default scripts	
+	["ifaks"] = { 			emote = "oxy", 		stress = math.random(12, 24), heal = 10, armor = 0, type = "drug", },
+	["bandage"] = { 		emote = "oxy", 		stress = 0, heal = 10, armor = 0, type = "drug", },
+	
+--Testing effects & armor with small functionality to drugs
+	["joint"] = { 			emote = "smoke3",	stress = math.random(12, 24), heal = 0, armor = 10, type = "drug", effect = { effect = "weed", stamina = false, widepupils = false, canOD = true } },
 	
-	["coffee"] = { 			emote = "coffee", 	stress = true, type = "drink", },
-	["water_bottle"] = { 	emote = "drink", 	stress = true, type = "drink", },
-	["kurkakola"] = { 		emote = "ecola", 	stress = true, type = "drink", },
 	
 --[[ Not working yet
 	--Drugs
-	["cokebaggy"] = {		emote = "coke", 	stress = true, type = "drug", effect = { armor = false, health = false, stamina = false, widepupils = false, canOD = true, screen = 1 } },
+	["cokebaggy"] = {		emote = "coke", 	stress = math.random(2, 4), heal = 0, armor = 0, type = "drug", effect = { armor = false, health = false, stamina = false, widepupils = false, canOD = true, screen = 1 } },
-	["crackbaggy"] = {		emote = "coke", 	stress = true, type = "drug", effect = { armor = false, health = false, stamina = false, widepupils = false, canOD = true, screen = 1  } },
+	["crackbaggy"] = {		emote = "coke", 	stress = math.random(2, 4), heal = 0, armor = 0, type = "drug", effect = { armor = false, health = false, stamina = false, widepupils = false, canOD = true, screen = 1  } },
-	["xtcbaggy"] = {		emote = "oxy", 		stress = true, type = "drug", effect = { armor = false, health = false, stamina = true, widepupils = false, canOD = true, screen = 1  } },
+	["xtcbaggy"] = {		emote = "oxy", 		stress = math.random(2, 4), heal = 0, armor = 0, type = "drug", effect = { armor = false, health = false, stamina = true, widepupils = false, canOD = true, screen = 1  } },
-	["oxy"] = {				emote = "oxy", 		stress = true, type = "drug", effect = { armor = false, health = true,  stamina = false, widepupils = false, canOD = false, screen = 1  } },
+	["oxy"] = {				emote = "oxy", 		stress = math.random(2, 4), heal = 0, armor = 0, type = "drug", effect = { armor = false, health = true,  stamina = false, widepupils = false, canOD = false, screen = 1  } },
-	["meth"] = {			emote = "coke", 	stress = true, type = "drug", effect = { armor = false, health = false, stamina = true, widepupils = false, canOD = true, screen = 1  } },
+	["meth"] = {			emote = "coke", 	stress = math.random(2, 4), heal = 0, armor = 0, type = "drug", effect = { armor = false, health = false, stamina = true, widepupils = false, canOD = true, screen = 1  } },
-	["joint"] = {			emote = "joint", 	stress = true, type = "drug", effect = { armor = true, health = false, stamina = false, widepupils = false, canOD = true, screen = 1  } },
+	--["joint"] = {			emote = "joint", 	stress = math.random(2, 4), heal = 0, armor = 0, type = "drug", effect = { armor = true, health = false, stamina = false, widepupils = false, canOD = true, screen = 1  } },
 ]]
 }
 
 Config.Emotes = {
+	["drink"] = {"mp_player_inteat@pnq", "loop", "Drink", AnimationOptions =
+		{ EmoteMoving = true, EmoteDuration = 2500,	}},
 	["whiskeyb"] = {"anim@amb@nightclub@mini@drinking@drinking_shots@ped_b@normal@", "glass_hold", "Whiskey Bottle", AnimationOptions =
 		{ Prop = "prop_cs_whiskey_bottle", PropBone = 60309, PropPlacement = {0.08, 0.0, 0.05, 240.0, -60.0}, 
 			EmoteMoving = true, EmoteLoop = true }}, 
@@ -81,7 +87,6 @@ Config.Emotes = {
 	["sprunk"] = {"mp_player_intdrink", "loop_bottle", "Sprunk", AnimationOptions =
 		{ Prop = "v_res_tt_can03", PropBone = 18905, PropPlacement = {0.12, 0.008, 0.03, 240.0, -60.0},
 			EmoteMoving = true, EmoteLoop = true, }},
-	
 	--Jim-BeanMachine
 	["bmcoffee1"] = {"amb@world_human_drinking@coffee@male@idle_a", "idle_c", "Coffee2", AnimationOptions =
 		{ Prop = 'prop_fib_coffee', PropBone = 28422, PropPlacement = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0},
@@ -94,7 +99,6 @@ Config.Emotes = {
 	["bmcoffee3"] = {"amb@world_human_drinking@coffee@male@idle_a", "idle_c", "Coffee3", AnimationOptions =
 		{ Prop = 'v_club_vu_coffeecup', PropBone = 28422, PropPlacement = {0.0, 0.0, -0.06, 0.0, 0.0, 0.0},
 			EmoteLoop = true, EmoteMoving = true, }},
-	   
 	--Jim-PizzaThis
 	["redwine"] = {"mp_player_intdrink", "loop_bottle", "Red Wine Bottle", AnimationOptions =
 		{ Prop = "prop_wine_rose", PropBone = 18905, PropPlacement = {0.00, -0.26, 0.10, 240.0, -60.0},
@@ -114,7 +118,6 @@ Config.Emotes = {
 	["foodbowl"] = {"amb@world_human_drinking@coffee@male@idle_a", "idle_c", "bowl", AnimationOptions =
 		{ Prop = "prop_cs_bowl_01", PropBone = 28422, PropPlacement = {0.0, 0.0, 0.050, 0.0, 0.0, 0.0},
 			EmoteMoving = true, EmoteLoop = true, }},   
-
 	--Jim-BurgerShot
 	["milk"] = {"mp_player_intdrink", "loop_bottle", "Milk", AnimationOptions =
 		{ Prop = "v_res_tt_milk", PropBone = 18905, PropPlacement = {0.10, 0.008, 0.07, 240.0, -60.0},
@@ -172,11 +175,9 @@ Config.Emotes = {
 	["vodkab"] = {"anim@amb@nightclub@mini@drinking@drinking_shots@ped_b@normal@", "glass_hold", "Vodka Bottle", AnimationOptions =
 		{ Prop = 'prop_vodka_bottle', PropBone = 60309, PropPlacement = {-0.04, -0.18, 0.12, 240.0, -60.0}, 
 			EmoteMoving = true, EmoteLoop = true }},
-		
 	["browncup"] = {"amb@world_human_drinking@coffee@male@idle_a", "idle_c", "Brown Cup", AnimationOptions =
 		{ Prop = 'v_serv_bs_mug', PropBone = 28422, PropPlacement = {0.03, -0.02, 0.0, 0.0, 0.0, 0.0},
 			EmoteLoop = true, EmoteMoving = true, }},
-   
 	["crisps"] = {"amb@world_human_drinking@coffee@male@idle_a", "idle_c", "Crisps", AnimationOptions =
 		{ Prop = 'v_ret_ml_chips2', PropBone = 28422, PropPlacement = {0.01, -0.05, -0.1, 0.0, 0.0, 90.0},
 			EmoteLoop = true, EmoteMoving = true, }}, 
@@ -187,161 +188,66 @@ Config.Emotes = {
 		{ Prop = 'prop_cs_ciggy_01', PropBone = 28422, PropPlacement = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0},
 			EmoteLoop = true, EmoteMoving = true, }},
 	["smoke4"] = {"amb@world_human_smoking@female@idle_a", "idle_b", "Smoke 4", AnimationOptions =
-   {
+		{ Prop = 'prop_cs_ciggy_01', PropBone = 28422, PropPlacement = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0},
-       Prop = 'prop_cs_ciggy_01',
+			EmoteLoop = true, EmoteMoving = true, }},
-       PropBone = 28422,
-       PropPlacement = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0},
-       EmoteLoop = true,
-       EmoteMoving = true,
-   }},
 	["bong"] = {"anim@safehouse@bong", "bong_stage3", "Bong", AnimationOptions =
-   {
+		{ Prop = 'hei_heist_sh_bong_01', PropBone = 18905, PropPlacement = {0.10,-0.25,0.0,95.0,190.0,180.0}, }},
-       Prop = 'hei_heist_sh_bong_01',
-       PropBone = 18905,
-       PropPlacement = {0.10,-0.25,0.0,95.0,190.0,180.0},
-   }},
 	["coffee"] = {"amb@world_human_drinking@coffee@male@idle_a", "idle_c", "Coffee", AnimationOptions =
-   {
+		{ Prop = 'p_amb_coffeecup_01', PropBone = 28422, PropPlacement = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0},
-       Prop = 'p_amb_coffeecup_01',
+			EmoteLoop = true, EmoteMoving = true, }},
-       PropBone = 28422,
-       PropPlacement = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0},
-       EmoteLoop = true,
-       EmoteMoving = true,
-   }},
 	["whiskey"] = {"amb@world_human_drinking@coffee@male@idle_a", "idle_c", "Whiskey", AnimationOptions =
-   {
+		{ Prop = 'prop_drink_whisky', PropBone = 28422, PropPlacement = {0.01, -0.01, -0.06, 0.0, 0.0, 0.0},
-       Prop = 'prop_drink_whisky',
+			EmoteLoop = true, EmoteMoving = true, }},
-       PropBone = 28422,
-       PropPlacement = {0.01, -0.01, -0.06, 0.0, 0.0, 0.0},
-       EmoteLoop = true,
-       EmoteMoving = true,
-   }},
 	["beer"] = {"amb@world_human_drinking@coffee@male@idle_a", "idle_c", "Beer", AnimationOptions =
-   {
+		{ Prop = 'prop_amb_beer_bottle', PropBone = 28422, PropPlacement = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0},
-       Prop = 'prop_amb_beer_bottle',
+			EmoteLoop = true, EmoteMoving = true, }},
-       PropBone = 28422,
-       PropPlacement = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0},
-       EmoteLoop = true,
-       EmoteMoving = true,
-   }},
 	["cup"] = {"amb@world_human_drinking@coffee@male@idle_a", "idle_c", "Cup", AnimationOptions =
-   {
+		{ Prop = 'prop_plastic_cup_02', PropBone = 28422, PropPlacement = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0},
-       Prop = 'prop_plastic_cup_02',
+			EmoteLoop = true, EmoteMoving = true, }},
-       PropBone = 28422,
-       PropPlacement = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0},
-       EmoteLoop = true,
-       EmoteMoving = true,
-   }},
 	["donut"] = {"mp_player_inteat@burger", "mp_player_int_eat_burger", "Donut", AnimationOptions =
-   {
+		{ Prop = 'prop_amb_donut', PropBone = 18905, PropPlacement = {0.13, 0.05, 0.02, -50.0, 16.0, 60.0},
-       Prop = 'prop_amb_donut',
+			EmoteMoving = true, }},
-       PropBone = 18905,
-       PropPlacement = {0.13, 0.05, 0.02, -50.0, 16.0, 60.0},
-       EmoteMoving = true,
-   }},
 	["burger"] = {"mp_player_inteat@burger", "mp_player_int_eat_burger", "Burger", AnimationOptions =
-   {
+		{ Prop = 'prop_cs_burger_01', PropBone = 18905, PropPlacement = {0.13, 0.05, 0.02, -50.0, 16.0, 60.0},
-       Prop = 'prop_cs_burger_01',
+			EmoteMoving = true, }},
-       PropBone = 18905,
-       PropPlacement = {0.13, 0.05, 0.02, -50.0, 16.0, 60.0},
-       EmoteMoving = true,
-   }},
 	["sandwich"] = {"mp_player_inteat@burger", "mp_player_int_eat_burger", "Sandwich", AnimationOptions =
-   {
+		{ Prop = 'prop_sandwich_01', PropBone = 18905, PropPlacement = {0.13, 0.05, 0.02, -50.0, 16.0, 60.0},
-       Prop = 'prop_sandwich_01',
+			EmoteMoving = true, }},
-       PropBone = 18905,
-       PropPlacement = {0.13, 0.05, 0.02, -50.0, 16.0, 60.0},
-       EmoteMoving = true,
-   }},
 	["soda"] = {"amb@world_human_drinking@coffee@male@idle_a", "idle_c", "Soda", AnimationOptions =
-   {
+		{ Prop = 'prop_ecola_can', PropBone = 28422, PropPlacement = {0.0, 0.0, 0.0, 0.0, 0.0, 130.0},
-       Prop = 'prop_ecola_can',
+			EmoteLoop = true, EmoteMoving = true, }},
-       PropBone = 28422,
-       PropPlacement = {0.0, 0.0, 0.0, 0.0, 0.0, 130.0},
-       EmoteLoop = true,
-       EmoteMoving = true,
-   }},
 	["egobar"] = {"mp_player_inteat@burger", "mp_player_int_eat_burger", "Ego Bar", AnimationOptions =
-   {
+		{ Prop = 'prop_choc_ego', PropBone = 60309, PropPlacement = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0},
-       Prop = 'prop_choc_ego',
+			EmoteMoving = true, }},
-       PropBone = 60309,
-       PropPlacement = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0},
-       EmoteMoving = true,
-   }},
 	["wine"] = {"anim@heists@humane_labs@finale@keycards", "ped_a_enter_loop", "Wine", AnimationOptions =
-   {
+		{ Prop = 'prop_drink_redwine', PropBone = 18905, PropPlacement = {0.10, -0.03, 0.03, -100.0, 0.0, -10.0},
-       Prop = 'prop_drink_redwine',
+			EmoteMoving = true, EmoteLoop = true }},
-       PropBone = 18905,
-       PropPlacement = {0.10, -0.03, 0.03, -100.0, 0.0, -10.0},
-       EmoteMoving = true,
-       EmoteLoop = true
-   }},
 	["flute"] = {"anim@heists@humane_labs@finale@keycards", "ped_a_enter_loop", "Flute", AnimationOptions =
-   {
+		{ Prop = 'prop_champ_flute', PropBone = 18905, PropPlacement = {0.10, -0.03, 0.03, -100.0, 0.0, -10.0},
-       Prop = 'prop_champ_flute',
+			EmoteMoving = true, EmoteLoop = true }},
-       PropBone = 18905,
-       PropPlacement = {0.10, -0.03, 0.03, -100.0, 0.0, -10.0},
-       EmoteMoving = true,
-       EmoteLoop = true
-   }},
 	["champagne"] = {"anim@heists@humane_labs@finale@keycards", "ped_a_enter_loop", "Champagne", AnimationOptions =
-   {
+		{ Prop = 'prop_drink_champ', PropBone = 18905, PropPlacement = {0.10, -0.03, 0.03, -100.0, 0.0, -10.0},
-       Prop = 'prop_drink_champ',
+			EmoteMoving = true, EmoteLoop = true }},
-       PropBone = 18905,
-       PropPlacement = {0.10, -0.03, 0.03, -100.0, 0.0, -10.0},
-       EmoteMoving = true,
-       EmoteLoop = true
-   }},
 	["cigar"] = {"amb@world_human_smoking@male@male_a@enter", "enter", "Cigar", AnimationOptions =
-   {
+		{ Prop = 'prop_cigar_02', PropBone = 47419, PropPlacement = {0.010, 0.0, 0.0, 50.0, 0.0, -80.0},
-       Prop = 'prop_cigar_02',
+			EmoteMoving = true, EmoteDuration = 2600 }},
-       PropBone = 47419,
-       PropPlacement = {0.010, 0.0, 0.0, 50.0, 0.0, -80.0},
-       EmoteMoving = true,
-       EmoteDuration = 2600
-   }},
 	["cigar2"] = {"amb@world_human_smoking@male@male_a@enter", "enter", "Cigar 2", AnimationOptions =
-   {
+		{ Prop = 'prop_cigar_01', PropBone = 47419, PropPlacement = {0.010, 0.0, 0.0, 50.0, 0.0, -80.0},
-       Prop = 'prop_cigar_01',
+			EmoteMoving = true, EmoteDuration = 2600 }},
-       PropBone = 47419,
-       PropPlacement = {0.010, 0.0, 0.0, 50.0, 0.0, -80.0},
-       EmoteMoving = true,
-       EmoteDuration = 2600
-   }},
 	["joint"] = {"amb@world_human_smoking@male@male_a@enter", "enter", "Joint", AnimationOptions =
-   {
+		{ Prop = 'p_cs_joint_02', PropBone = 47419, PropPlacement = {0.015, -0.009, 0.003, 55.0, 0.0, 110.0},
-       Prop = 'p_cs_joint_02',
+			EmoteMoving = true, EmoteDuration = 2600 }},
-       PropBone = 47419,
-       PropPlacement = {0.015, -0.009, 0.003, 55.0, 0.0, 110.0},
-       EmoteMoving = true,
-       EmoteDuration = 2600
-   }},
 	["cig"] = {"amb@world_human_smoking@male@male_a@enter", "enter", "Cig", AnimationOptions =
-   {
+		{ Prop = 'prop_amb_ciggy_01', PropBone = 47419, PropPlacement = {0.015, -0.009, 0.003, 55.0, 0.0, 110.0},
-       Prop = 'prop_amb_ciggy_01',
+			EmoteMoving = true, EmoteDuration = 2600 }},
-       PropBone = 47419,
-       PropPlacement = {0.015, -0.009, 0.003, 55.0, 0.0, 110.0},
-       EmoteMoving = true,
-       EmoteDuration = 2600
-   }},
 	["clean"] = {"timetable@floyd@clean_kitchen@base", "base", "Clean", AnimationOptions =
-   {
+		{ Prop = "prop_sponge_01", PropBone = 28422, PropPlacement = {0.0, 0.0, -0.01, 90.0, 0.0, 0.0},
-       Prop = "prop_sponge_01",
+			EmoteLoop = true, EmoteMoving = true, }},
-       PropBone = 28422,
-       PropPlacement = {0.0, 0.0, -0.01, 90.0, 0.0, 0.0},
-       EmoteLoop = true,
-       EmoteMoving = true,
-   }},
 	["clean2"] = {"amb@world_human_maid_clean@", "base", "Clean 2", AnimationOptions =
-   {
+		{ Prop = "prop_sponge_01", PropBone = 28422, PropPlacement = {0.0, 0.0, -0.01, 90.0, 0.0, 0.0},
-       Prop = "prop_sponge_01",
+			EmoteLoop = true, EmoteMoving = true, }},
-       PropBone = 28422,
+	["coke"] = { "switch@trevor@trev_smoking_meth", "trev_smoking_meth_loop", "Coke", AnimationOptions = 
-       PropPlacement = {0.0, 0.0, -0.01, 90.0, 0.0, 0.0},
+		{ EmoteLoop = true, EmoteMoving = true, }},
-       EmoteLoop = true,
+	["oxy"] = { "mp_suicide", "pill", "Oxy", AnimationOptions = 
-       EmoteMoving = true,
+		{ EmoteLoop = true, EmoteMoving = true, }},
-   }},
-	["coke"] = { "switch@trevor@trev_smoking_meth", "trev_smoking_meth_loop", "Coke",
-		AnimationOptions = { EmoteLoop = true, EmoteMoving = true, }},
-	["oxy"] = { "mp_suicide", "pill", "Oxy",
-		AnimationOptions = { EmoteLoop = true, EmoteMoving = true, }},
 }