V3 fxmanifest swap, added Commands & Misc modules and some updates

vrp/cfg/lang/en.lua

@@ -113,6 +113,9 @@ local lang = {
         kick = {
           title = "Kick",
           prompt = "Reason: "
+        },
+		spectate = {
+          title = "Spectate"
         },
         tptome = {
           title = "TpToMe"

vrp/cfg/modules.lua

@@ -9,6 +9,8 @@ local modules = {
   gui = true,
   map = true,
   weather = true,
+  misc = true,
+  command = true
 }
 
 return modules

vrp/client/admin.lua

@@ -11,6 +11,8 @@ function Admin:__construct()
   vRP.Extension.__construct(self)
 
   self.noclip = false
+  self.spectate = false
+  self.lastCoord = nil
   self.noclipEntity = nil
   self.noclip_speed = 1.0
 
@@ -69,6 +71,23 @@ function Admin:toggleNoclip()
   SetEntityRotation(self.noclipEntity, vx, nil, nil, 0, false)
 end
 
+function Admin:toggleSpectate(target)
+  self.spectate = not self.spectate
+  self.lastCoord = GetEntityCoords(user) 
+
+  local user = PlayerPedId()
+  local targetUser = GetPlayerFromServerId(target)
+  local tuser = GetPlayerPed(targetUser)
+
+  SetEntityCollision(user, not self.spectate, not self.spectate)
+  SetEntityInvincible(user, self.spectate)
+  SetEntityVisible(user, not self.spectate, false)
+  NetworkSetEntityInvisibleToNetwork(user, true)
+  NetworkSetInSpectatorMode(self.spectate, target)
+
+  SetEntityCoords(user, self.lastCoord)
+end
+
 -- ref: https://github.com/citizenfx/project-lambdamenu/blob/master/LambdaMenu/teleportation.cpp#L301
 function Admin:teleportToMarker()
   local ped = GetPlayerPed(-1)
@@ -113,6 +132,7 @@ end
 
 Admin.tunnel = {}
 Admin.tunnel.toggleNoclip = Admin.toggleNoclip
+Admin.tunnel.toggleSpectate = Admin.toggleSpectate
 Admin.tunnel.teleportToMarker = Admin.teleportToMarker
 
 vRP:registerExtension(Admin)

vrp/client/commands.lua

@@ -0,0 +1,13 @@
+-- https://github.com/ImagicTheCat/vRP
+-- MIT license (see LICENSE or vrp/vRPShared.lua)
+if not vRP.modules.command then return end
+
+local Command = class("Command", vRP.Extension)
+
+function Command:__construct()
+  vRP.Extension.__construct(self)
+
+end
+
+
+vRP:registerExtension(Command)

vrp/client/misc.lua

@@ -0,0 +1,82 @@
+-- https://github.com/ImagicTheCat/vRP
+-- MIT license (see LICENSE or vrp/vRPShared.lua)
+if not vRP.modules.misc then return end
+
+local Misc = class("Misc", vRP.Extension)
+
+function Misc:__construct()
+  vRP.Extension.__construct(self)
+end
+
+function Misc:getClosestPeds(radius) -- gets all nearby ped
+	local r = {}
+	local px,py,pz = table.unpack(GetEntityCoords(GetPlayerPed(-1)))
+
+	for _,pedAI in ipairs(GetGamePool('CPed')) do
+		if pedAI ~= GetPlayerPed(-1) then
+			local x,y,z = table.unpack(GetEntityCoords(pedAI))
+			local dist = GetDistanceBetweenCoords(x,y,z,px,py,pz,true)
+			if dist <= radius then
+				r[pedAI] = dist
+			end
+		end
+	end
+
+	return r
+end
+
+function Misc:getClosestPed(radius)	--gets closest ped
+	local p = nil
+
+	local ai = self:getClosestPeds(radius)
+	local min = radius+10.0
+	for k,v in pairs(ai) do
+		if v < min then
+		  min = v
+		  p = k
+		end
+	end
+
+	return p
+end
+
+function Misc:getClosestObjects(radius) -- gets all nearby objects
+	local r = {}
+	local px,py,pz = table.unpack(GetEntityCoords(GetPlayerPed(-1)))
+
+	for _,obj in ipairs(GetGamePool('CObject')) do
+		if obj ~= GetPlayerPed(-1) then
+			local x,y,z = table.unpack(GetEntityCoords(obj))
+			local dist = GetDistanceBetweenCoords(x,y,z,px,py,pz,true)
+			if dist <= radius then
+				r[obj] = dist
+			end
+		end
+	end
+
+	return r
+end
+
+function Misc:getClosestObject(radius)	--gets closest object
+	local p = nil
+
+	local obj = self:getClosestObjects(radius)
+	local min = radius+10.0
+	for k,v in pairs(obj) do
+		if v < min then
+		  min = v
+		  p = k
+		end
+	end
+
+	return p
+end
+
+Misc.tunnel = {}
+
+Misc.tunnel.getClosestObject = Misc.getClosestObject
+Misc.tunnel.getClosestObjects = Misc.getClosestObjects
+Misc.tunnel.getClosestPed = Misc.getClosestPed
+Misc.tunnel.getClosestPeds = Misc.getClosestPeds
+
+vRP:registerExtension(Misc)

vrp/client/weather.lua

@@ -89,6 +89,7 @@ end
 
 function Weather:toggleFreeze()
   self.freeze = not self.freeze
+  SetMillisecondsPerGameMinute(self.normal)
   local hours, minutes, seconds = GetClockHours(), GetClockMinutes(), GetClockSeconds()
 
   while self.freeze do

vrp/fxmanifest.lua

@@ -1,33 +1,35 @@
-fx_version "adamant"
-games {"gta5"}
+fx_version 'cerulean'
+games { 'gta5' }
 
 description "RP module/framework"
+version '3.0.1'
 
 ui_page "gui/index.html"
 
--- server scripts
-server_scripts{ 
-  "lib/utils.lua",
+shared_script {
+  "lib/utils.lua"
+}
+
+server_script {
   "base.lua",
   "modules/map.lua",
   "modules/gui.lua",
   "modules/admin.lua",
   "modules/group.lua",
-  "modules/weather.lua"
+  "modules/weather.lua",
+  "modules/commands.lua"
 }
 
--- client scripts
-client_scripts{
-  "lib/utils.lua",
+client_scripts {
   "client/base.lua",
   "client/map.lua",
   "client/gui.lua",
   "client/admin.lua",
-  "client/weather.lua"
+  "client/weather.lua",
+  "client/commands.lua"
 }
 
--- client files
-files{
+files {
   "lib/Luaoop.lua",
   "lib/Tunnel.lua",
   "lib/Proxy.lua",
@@ -38,7 +40,6 @@ files{
   "client/vRP.lua",
   "vRPShared.lua",
   "cfg/client.lua",
-  "cfg/control.lua",
   "cfg/modules.lua",
   "gui/index.html",
   "gui/design.css",
@@ -62,4 +63,4 @@ files{
   "gui/sounds/radio_off.ogg",
   "gui/sounds/eating.ogg",
   "gui/sounds/drinking.ogg"
-}
+}

vrp/gui/AudioEngine.js

@@ -144,7 +144,7 @@ function AudioEngine()
         var peer = channel.players[player];
         if(peer.speaking && time - peer.last_packet_time >= 500){ // event
           peer.speaking = false;
-          $.post("http://vrp/audio", JSON.stringify({act: "voice_channel_player_speaking_change", channel: peer.channel, player: peer.player, speaking: peer.speaking}));
+          $.post("https://vrp/audio", JSON.stringify({act: "voice_channel_player_speaking_change", channel: peer.channel, player: peer.player, speaking: peer.speaking}));
         }
       }
     }
@@ -445,7 +445,7 @@ AudioEngine.prototype.connectVoIP = function()
           peer.last_packet_time = new Date().getTime();
           if(!peer.speaking){
             peer.speaking = true;
-            $.post("http://vrp/audio", JSON.stringify({act: "voice_channel_player_speaking_change", channel: peer.channel, player: peer.player, speaking: peer.speaking}));
+            $.post("https://vrp/audio", JSON.stringify({act: "voice_channel_player_speaking_change", channel: peer.channel, player: peer.player, speaking: peer.speaking}));
           }
 
           peer.psamples.push(samples);
@@ -713,7 +713,7 @@ AudioEngine.prototype.disconnectVoice = function(data)
 
         if(peer.speaking){ // event
           peer.speaking = false;
-          $.post("http://vrp/audio", JSON.stringify({act: "voice_channel_player_speaking_change", channel: peer.channel, player: peer.player, speaking: peer.speaking}));
+          $.post("https://vrp/audio", JSON.stringify({act: "voice_channel_player_speaking_change", channel: peer.channel, player: peer.player, speaking: peer.speaking}));
         }
 
         // dereference channel
@@ -768,5 +768,5 @@ AudioEngine.prototype.channelTransmittingCheck = function(channel)
 
   // event
   if(channel.transmitting != old_transmitting)
-    $.post("http://vrp/audio", JSON.stringify({act: "voice_channel_transmitting_change", channel: channel.id, transmitting: channel.transmitting}));
+    $.post("https://vrp/audio", JSON.stringify({act: "voice_channel_transmitting_change", channel: channel.id, transmitting: channel.transmitting}));
 }

vrp/gui/index.html

@@ -4,7 +4,7 @@
     <meta charset="UTF-8">
     <script src="nui://game/ui/jquery.js" type="text/javascript"></script>
     <script type="text/javascript">
-      LIBOPUS_WASM_URL = "http://cdn.jsdelivr.net/gh/ImagicTheCat/libopusjs@7b92b296f24a5c9de57499db803df6bb7636a581/dist/libopus.wasm"; //fix for "nui://" fetch requests
+      LIBOPUS_WASM_URL = "https://cdn.jsdelivr.net/gh/ImagicTheCat/libopusjs@7b92b296f24a5c9de57499db803df6bb7636a581/dist/libopus.wasm"; //fix for "nui://" fetch requests
     </script>
     <script src="lib/libopus.wasm.js" type="text/javascript"></script>
     <script src="dynamic_classes.js" type="text/javascript"></script>

vrp/gui/main.js

@@ -10,18 +10,18 @@ window.addEventListener("load",function(){
   var radio_display = new RadioDisplay();
   var aengine = new AudioEngine();
 
-  requestmgr.onResponse = function(id,ok){ $.post("http://vrp/request",JSON.stringify({act: "response", id: id, ok: ok})); }
-  wprompt.onClose = function(){ $.post("http://vrp/prompt",JSON.stringify({act: "close", result: wprompt.result})); }
-  dynamic_menu.onValid = function(option,mod){ $.post("http://vrp/menu",JSON.stringify({act: "valid", option: option, mod: mod})); }
+  requestmgr.onResponse = function(id,ok){ $.post("https://vrp/request",JSON.stringify({act: "response", id: id, ok: ok})); }
+  wprompt.onClose = function(){ $.post("https://vrp/prompt",JSON.stringify({act: "close", result: wprompt.result})); }
+  dynamic_menu.onValid = function(option,mod){ $.post("https://vrp/menu",JSON.stringify({act: "valid", option: option, mod: mod})); }
   var select_event = false;
   dynamic_menu.onSelect = function(option){ 
     if(select_event){
-      $.post("http://vrp/menu",JSON.stringify({act: "select", option: option}));
+      $.post("https://vrp/menu",JSON.stringify({act: "select", option: option}));
     }
   }
 
   //init
-  $.post("http://vrp/init",""); 
+  $.post("https://vrp/init",""); 
 
   var pbars = {}
   var divs = {}