Revert "iy6ggh"

This reverts commit d4fe71a0263f53a8b407a2a790fc34fbb0e36406.

components.json

@@ -22,6 +22,7 @@
   "scripting:server",
   "svadhesive",
   "citizen:scripting:mono",
+  "citizen:scripting:mono-v2",
   "citizen:scripting:v8node",
   "voip-server:mumble",
   "http-client",

resources/Commands/__resource.lua

@@ -1,9 +1,3 @@
-description 'Enables use of /ooc for out of character chat.'
-server_script 'ooc.lua'
-server_script 'dispatch.lua'
-server_script 'me.lua'
-server_script 'tweet.lua'
-server_script 'darkweb.lua'
-server_script 'drugdeal.lua'
-server_script 'serveradmin.lua'
-server_script 'atc.lua'
+description 'Custom made commands script by ThatGuyJacobee'
+client_script 'client.lua'
+server_script 'server.lua'

resources/Commands/client.lua

@@ -0,0 +1,10 @@
+Citizen.CreateThread(function()
+	TriggerEvent('chat:addSuggestion', '/ooc', 'Type in Out-Of-Character mode', { })
+    TriggerEvent('chat:addSuggestion', '/911', 'Submit a public 911 call', { })
+    TriggerEvent('chat:addSuggestion', '/ad', 'Send an ad into the chat', { })
+    TriggerEvent('chat:addSuggestion', '/atc', 'To be used for Air Trafic Control', { })
+    TriggerEvent('chat:addSuggestion', '/darkweb', 'Send sketchy ads in here :)', { })
+    TriggerEvent('chat:addSuggestion', '/dispatch', 'To be used by dispatch for first responders', { })
+    TriggerEvent('chat:addSuggestion', '/drugdeal', 'Used to ad your drugdeal', { })
+    TriggerEvent('chat:addSuggestion', '/me', 'Used to mention personal actions', { })
+end)

resources/Commands/ooc.lua

@@ -1,19 +0,0 @@
-AddEventHandler('chatMessage', function(source, name, msg)
-	sm = stringsplit(msg, " ");
-	if sm[1] == "/ooc" then
-		CancelEvent()
-		TriggerClientEvent('chatMessage', -1, "OOC | " .. name, { 128, 128, 128 }, string.sub(msg,5))
-	end
-end)
-
-function stringsplit(inputstr, sep)
-    if sep == nil then
-        sep = "%s"
-    end
-    local t={} ; i=1
-    for str in string.gmatch(inputstr, "([^"..sep.."]+)") do
-        t[i] = str
-        i = i + 1
-    end
-    return t
-end

resources/Commands/server.lua

@@ -0,0 +1,81 @@
+--[[AddEventHandler('chatMessage', function(source, name, msg)
+	sm = stringsplit(msg, " ");
+	if sm[1] == "/ooc" then
+		CancelEvent()
+		TriggerClientEvent('chatMessage', -1, "OOC | " .. name, { 128, 128, 128 }, string.sub(msg,5))
+	end
+end)]]--
+
+--local cmds = {{"ooc", "🔇OOC", "128, 128, 128"}, {"911", "📲 911", "30, 144, 255"}, {"ad", "📡 Advertisement", "255, 255, 51"}, {"", ""}, {"", ""}, {"", ""}, {"", ""}, {"", ""}}
+
+--[[for c, v in pairs(cmds) do
+    RegisterCommand("ooc", function(source, args, raw)
+        local arg = args[1]
+        
+        if (source > 0) then
+            TriggerClientEvent('chatMessage', -1, "OOC | " .. GetPlayerName(source), { 128, 128, 128 }, string.sub(raw, 5))
+        end
+    end, false)
+end]]--
+
+-- Ignore above, under development
+
+RegisterCommand("ooc", function(source, args, raw)
+    if (source > 0) then
+	    TriggerClientEvent('chatMessage', -1, "🔇OOC | " .. GetPlayerName(source), { 128, 128, 128 }, string.sub(raw, 5))
+	end
+end, false)
+
+RegisterCommand("911", function(source, args, raw)
+    if (source > 0) then
+	    TriggerClientEvent('chatMessage', -1, "📲 911 | " .. GetPlayerName(source), { 30, 144, 255 }, string.sub(raw, 5))
+	end
+end, false)
+
+RegisterCommand("ad", function(source, args, raw)
+    if (source > 0) then
+	    TriggerClientEvent('chatMessage', -1, "📡 Advertisement | " .. GetPlayerName(source), { 255, 255, 51 }, string.sub(raw, 4))
+	end
+end, false)
+
+RegisterCommand("atc", function(source, args, raw)
+    if (source > 0) then
+	    TriggerClientEvent('chatMessage', -1, "👨‍✈️ ATC | " .. GetPlayerName(source), { 255, 140, 0 }, string.sub(raw, 5))
+	end
+end, false)
+
+RegisterCommand("darkweb", function(source, args, raw)
+    if (source > 0) then
+	    TriggerClientEvent('chatMessage', -1, "👨‍💻 Dark Web | " .. GetPlayerName(source), { 0, 0, 0 }, string.sub(raw, 9))
+	end
+end, false)
+
+RegisterCommand("dispatch", function(source, args, raw)
+    if (source > 0) then
+	    TriggerClientEvent('chatMessage', -1, "📲 Dispatch | " .. GetPlayerName(source), { 30, 144, 255 }, string.sub(raw, 10))
+	end
+end, false)
+
+RegisterCommand("drugdeal", function(source, args, raw)
+    if (source > 0) then
+	    TriggerClientEvent('chatMessage', -1, "💊 Drug Deal | " .. GetPlayerName(source), { 0, 100, 0 }, string.sub(raw, 10))
+	end
+end, false)
+
+RegisterCommand("me", function(source, args, raw)
+    if (source > 0) then
+	    TriggerClientEvent('chatMessage', -1, "Me | " .. GetPlayerName(source), { 255, 0, 0 }, string.sub(raw, 4))
+	end
+end, false)
+
+--[[function stringsplit(inputstr, sep)
+    if sep == nil then
+        sep = "%s"
+    end
+    local t={} ; i=1
+    for str in string.gmatch(inputstr, "([^"..sep.."]+)") do
+        t[i] = str
+        i = i + 1
+    end
+    return t
+end]]--

resources/Hands-Up/client.lua

@@ -1,22 +1,23 @@
-Citizen.CreateThread(function()
+RegisterCommand("handsup", function(source, args, raw)
+	--local arg = args[1]
 	local dict = "missminuteman_1ig_2"
 	
+	if not IsEntityPlayingAnim(GetPlayerPed(-1), dict, "handsup_enter", 3) then
+		--Citizen.Trace("Not active\n")
 		RequestAnimDict(dict)
+		
 		while not HasAnimDictLoaded(dict) do
 			Citizen.Wait(100)
 		end
-    local handsup = false
-	while true do
-		Citizen.Wait(0)
-		if IsControlJustPressed(1, 323) then --Start holding X
-            if not handsup then
+		
 		TaskPlayAnim(GetPlayerPed(-1), dict, "handsup_enter", 8.0, 8.0, -1, 50, 0, false, false, false)
-                handsup = true
 	else
-                handsup = false
+		--Citizen.Trace("Active\n")
 		ClearPedTasks(GetPlayerPed(-1))
 	end
-        end
-    end
-end)
+end, false)
 
+Citizen.CreateThread(function()
+	TriggerEvent('chat:addSuggestion', '/handsup', 'Put your hands up', { })
+	--TriggerEvent('chat:addSuggestion', '/handsup', 'Put your hands up', { { name = "emotename", help = "dance, camera, sit or any valid emote." } })
+end)

resources/Point-Finger/client.lua

@@ -31,6 +31,19 @@ local oldval = false
 local oldvalped = false
 
 Citizen.CreateThread(function()
+	RegisterCommand("point", function(source, args, raw)
+		if keyPressed == false then
+			keyPressed = true
+			startPointing()
+			mp_pointing = true
+			
+		else
+			keyPressed = false
+			mp_pointing = false
+			stopPointing()
+		end
+	end, false)
+
     while true do
         Wait(0)
 
@@ -38,7 +51,7 @@ Citizen.CreateThread(function()
             once = false
         end
 		
-        if not keyPressed then
+		--[[if not keyPressed then
             if IsControlPressed(0, 29) and not mp_pointing and IsPedOnFoot(PlayerPedId()) then
                 Wait(200)
                 if not IsControlPressed(0, 29) then
@@ -62,7 +75,7 @@ Citizen.CreateThread(function()
             if not IsControlPressed(0, 29) then
                 keyPressed = false
             end
-        end
+        end--]]
         if Citizen.InvokeNative(0x921CE12C489C4C41, PlayerPedId()) and not mp_pointing then
             stopPointing()
         end

resources/[EGRP-CarPacks]/EGRP-Emergency/data/LSCSO/handling.meta

@@ -4,55 +4,55 @@
   <HandlingData>
     <Item type="CHandlingData">
       <handlingName>trchar</handlingName>
-      <fMass value="2400.000000" />
-      <fInitialDragCoeff value="10.000000" />
+      <fMass value="2550.000000" />
+		<fInitialDragCoeff value="6.500000" />
 		<fPercentSubmerged value="85.000000" />
-      <vecCentreOfMassOffset x="0.000000" y="0.000000" z="0.000000" />
-      <vecInertiaMultiplier x="1.200000" y="1.600000" z="2.000000" />
-      <fDriveBiasFront value="0.250000" />
-      <nInitialDriveGears value="6" />
-      <fInitialDriveForce value="6.400000" />
-      <fDriveInertia value="3.900000" />
-      <fClutchChangeRateScaleUpShift value="2.400000" />
-      <fClutchChangeRateScaleDownShift value="2.200000" />
-      <fInitialDriveMaxFlatVel value="350.000000" />
-      <fBrakeForce value=".850000" />
-      <fBrakeBiasFront value="0.50000" />
+		<vecCentreOfMassOffset x="0.000000" y="0.000000" z="-0.100000" />
+		<vecInertiaMultiplier x="1.000000" y="1.000000" z="1.000000" />
+		<fDriveBiasFront value="0.000000" />
+		<nInitialDriveGears value="5" />
+		<fInitialDriveForce value="0.350000" />
+		<fDriveInertia value="1.200000" />
+		<fClutchChangeRateScaleUpShift value="6.100000" />
+		<fClutchChangeRateScaleDownShift value="6.100000" />
+		<fInitialDriveMaxFlatVel value="250.000000" />
+		<fBrakeForce value="1.200000" />
+		<fBrakeBiasFront value="0.425000" />
 		<fHandBrakeForce value="0.600000" />
-      <fSteeringLock value="49.000000" />
-      <fTractionCurveMax value="3.900000" />
-      <fTractionCurveMin value="3.700000" />
-      <fTractionCurveLateral value="250.500000" />
-      <fTractionSpringDeltaMax value="0.130000" />
-      <fLowSpeedTractionLossMult value="0.300000" />
+		<fSteeringLock value="40.000000" />
+		<fTractionCurveMax value="2.800000" />
+		<fTractionCurveMin value="2.500000" />
+		<fTractionCurveLateral value="23.000000" />
+		<fTractionSpringDeltaMax value="0.080000" />
+		<fLowSpeedTractionLossMult value="0.8200000" />
 		<fCamberStiffnesss value="0.000000" />
-      <fTractionBiasFront value="0.470000" />
-      <fTractionLossMult value="0.300000" />
-      <fSuspensionForce value="2.800000" />
-      <fSuspensionCompDamp value="1.400000" />
-      <fSuspensionReboundDamp value="3.000000" />
-      <fSuspensionUpperLimit value="0.100000" />
+		<fTractionBiasFront value="0.485000" />
+		<fTractionLossMult value="1.000000" />
+		<fSuspensionForce value="2.500000" />
+		<fSuspensionCompDamp value="1.700000" />
+		<fSuspensionReboundDamp value="2.00000" />
+		<fSuspensionUpperLimit value="0.070000" />
 		<fSuspensionLowerLimit value="-0.120000" />
 		<fSuspensionRaise value="0.000000" />
-      <fSuspensionBiasFront value="0.470000" />
-      <fAntiRollBarForce value="0.950000" />
-      <fAntiRollBarBiasFront value="0.470000" />
-      <fRollCentreHeightFront value="0.550000" />
-      <fRollCentreHeightRear value="0.350000" />
-      <fCollisionDamageMult value="1.000000" />
+		<fSuspensionBiasFront value="0.55000" />
+		<fAntiRollBarForce value="1.000000" />
+		<fAntiRollBarBiasFront value="0.610000" />
+		<fRollCentreHeightFront value="0.370000" />
+		<fRollCentreHeightRear value="0.370000" />
+		<fCollisionDamageMult value="0.700000" />
 		<fWeaponDamageMult value="1.000000" />
-      <fDeformationDamageMult value="1.000000" />
-      <fEngineDamageMult value="1.600000" />
+		<fDeformationDamageMult value="0.700000" />
+		<fEngineDamageMult value="1.500000" />
 		<fPetrolTankVolume value="65.000000" />
 		<fOilVolume value="5.000000" />
 		<fSeatOffsetDistX value="0.000000" />
 		<fSeatOffsetDistY value="0.000000" />
 		<fSeatOffsetDistZ value="0.000000" />
-      <nMonetaryValue value="50000" />
+		<nMonetaryValue value="25000" />
 		<strModelFlags>440010</strModelFlags>
-      <strHandlingFlags>0</strHandlingFlags>
+		<strHandlingFlags>20000</strHandlingFlags>
 		<strDamageFlags>0</strDamageFlags>
-      <AIHandling>AVERAGE</AIHandling>
+		<AIHandling>SPORTS_CAR</AIHandling>
 		<SubHandlingData>
 			<Item type="CCarHandlingData">
 				<fBackEndPopUpCarImpulseMult value="0.100000" />
@@ -60,6 +60,7 @@
 				<fBackEndPopUpMaxDeltaSpeed value="0.600000" />
 			</Item>
 			<Item type="NULL" />
+			<Item type="NULL" />
 		</SubHandlingData>
     </Item>
     <Item type="CHandlingData">