Merge pull request #112 from acidlabsdev/main

fix(Misc): miscellaneous fixes

Author: xesdoog

SSV2/includes/features/EntityForge.lua

@@ -1322,7 +1322,7 @@ end
 
 ---@param data any Base64 XOR-encrypted json
 function EntityForge:ImportCreation(data)
-	if (not data or not Serializer:IsBase64(data)) then
+	if (not data or not Serializer:IsEncrypted(data)) then
 		Notifier:ShowError(
 			"EntityForge",
 			"Import Error: Incorrect data type!",

SSV2/includes/features/Mastermind.lua

@@ -116,7 +116,7 @@ end
 
 function Mastermind:ReadPropertyData()
 	ThreadManager:Run(function()
-		while (Game.IsInTransition()) do
+		while (Game.IsInNetworkTransition()) do
 			yield()
 		end
 

SSV2/includes/frontend/casino_ui.lua

@@ -398,8 +398,13 @@ local function drawHeistTab()
 end
 
 local function DrawDunk()
-	if (not Game.IsOnline() or not Backend:IsUpToDate()) then
-		ImGui.Text(_T("GENERIC_OFFLINE_OR_OUTDATED"))
+	if (not Game.IsOnline()) then
+		ImGui.Text(_T("GENERIC_UNAVAILABLE_SP"))
+		return
+	end
+
+	if (not Backend:IsUpToDate()) then
+		ImGui.Text(_T("GENERIC_OUTDATED"))
 		return
 	end
 

SSV2/includes/frontend/mastermind_ui.lua

@@ -7,24 +7,24 @@
 --	* Provide a copy of or a link to the original license (GPL-3.0 or later); see LICENSE.md or <https://www.gnu.org/licenses/>.
 
 
-local Mastermind         = require("SSV2.includes.features.Mastermind"):init()
+local Mastermind         = require("includes.features.Mastermind"):init()
 local SGSL               = require("includes.services.SGSL")
 local secondary_targets  = { "Cash", "Weed", "Coke", "Gold" }
 local cayo_secondary_target_i, cayo_secondary_target_c
 
 local heistNames <const> = { -- https://github.com/root-cause/v-labels/blob/master/labels.json
-	CluckinBellFarmRaid = "AWT_1026",
-	KnoWayOut = "DLCC_AVIM",
-	DontFuckWithDre = "AWT_973",
+	CluckinBellFarmRaid   = "AWT_1026",
+	KnoWayOut             = "DLCC_AVIM",
+	DontFuckWithDre       = "AWT_973",
 	OscarGuzmanFliesAgain = "HACK24_MFM_STR",
-	FleecaJob = "HTITLE_TUT",
-	PrisonBreak = "HTITLE_PRISON",
-	HumaneLabsRaid = "HTITLE_HUMANE",
-	SeriesAFunding = "HTITLE_NARC",
-	PacificStandardJob = "HTITLE_ORNATE",
-	DataBreaches = "HPSTRAND_IAAb",
-	BogdanProblem = "HPSTRAND_SUBb",
-	DoomsdayScenario = "HPSTRAND_MSILb",
+	FleecaJob             = "HTITLE_TUT",
+	PrisonBreak           = "HTITLE_PRISON",
+	HumaneLabsRaid        = "HTITLE_HUMANE",
+	SeriesAFunding        = "HTITLE_NARC",
+	PacificStandardJob    = "HTITLE_ORNATE",
+	DataBreaches          = "HPSTRAND_IAAb",
+	BogdanProblem         = "HPSTRAND_SUBb",
+	DoomsdayScenario      = "HPSTRAND_MSILb",
 }
 local tabNames <const>   = { --
 	"YH_BASIC_TAB",          -- Basic
@@ -152,8 +152,8 @@ local function drawCayoTab()
 	end
 
 	local request_kosatka = SGSL:Get(SGSL.data.request_services_global):AsGlobal():At(613)
-	local sub_requested = request_kosatka:ReadInt() == 1
-	local sub_spawned = not sub.coords:is_zero()
+	local sub_requested   = request_kosatka:ReadInt() == 1
+	local sub_spawned     = not sub.coords:is_zero()
 
 	ImGui.BeginDisabled(not sub_spawned)
 	if (GUI:Button(_T("GENERIC_TELEPORT"))) then
@@ -191,7 +191,6 @@ local function drawCayoTab()
 	local cayo_heist_weapons         = stats.get_int("MPX_H4CNF_WEAPONS")
 	local cayo_cooldown              = stats.get_int("MPX_H4_COOLDOWN")
 	local cayo_cooldown_hard         = stats.get_int("MPX_H4_COOLDOWN_HARD")
-
 	local posix_now                  = Time.Epoch()
 	local cooldown_seconds_left      = cayo_cooldown - posix_now
 	local cooldown_hard_seconds_left = cayo_cooldown_hard - posix_now
@@ -330,7 +329,6 @@ local function drawDDayTab()
 
 	local dday_status           = stats.get_int("MPX_GANGOPS_HEIST_STATUS")
 	local dday_cooldown         = stats.get_int("MPX_GANGOPS_LAUNCH_TIME")
-
 	local posix_now             = Time.Epoch()
 	local cooldown_seconds_left = dday_cooldown - posix_now
 	local on_cooldown           = cooldown_seconds_left > 0
@@ -401,25 +399,26 @@ local tabCallbacks <const> = {
 }
 
 local function HeistUI()
-	if (not Game.IsOnline() or not Backend:IsUpToDate()) then
+	if (not Game.IsOnline()) then
 		ImGui.Text(_T("GENERIC_UNAVAILABLE_SP"))
 		return
 	end
 
-	cayo_secondary_target_i, cayo_secondary_target_c = Mastermind:GetCayoSecTargets()
+	if (not Backend:IsUpToDate()) then
+		ImGui.Text(_T("GENERIC_OUTDATED"))
+		return
+	end
 
-	if (ImGui.BeginTabBar("##funkBar")) then
-		ImGui.PushStyleVar(ImGuiStyleVar.ItemSpacing, 10, 10)
+	cayo_secondary_target_i, cayo_secondary_target_c = Mastermind:GetCayoSecTargets()
 
+	if (ImGui.BeginTabBar("##mastermind")) then
 		for i = 1, #tabNames do
 			local name = tabNames[i]
 			if ImGui.BeginTabItem(name) then
 				tabCallbacks[i]()
 				ImGui.EndTabItem()
 			end
 		end
-
-		ImGui.PopStyleVar()
 		ImGui.EndTabBar()
 	end
 end

SSV2/includes/lib/utils.lua

@@ -931,9 +931,34 @@ table.copy = function(t, seen)
 	return out
 end
 
+---@param src table
+---@param dest table
+---@param path string?
+---@param seen table?
+function table.merge(src, dest, path, seen)
+	seen = seen or {}
+	if (seen[src]) then
+		return
+	end
+	seen[src] = true
+
+	for k, v in pairs(src) do
+		if (dest[k] == nil) then
+			dest[k] = v
+		elseif (type(v) == "table" and type(dest[k]) == "table") then
+			local current_path = path and (path .. "." .. tostring(k)) or tostring(k)
+			table.merge(v, dest[k], current_path, seen)
+		end
+	end
+end
+
 ---@param inTable table
 ---@param outTable table
 function table.swap(inTable, outTable)
+	if (inTable == outTable) then
+		return
+	end
+
 	local temp = {}
 
 	for k, v in pairs(inTable) do
@@ -960,11 +985,16 @@ function table.overwrite(t, src, seen)
 	seen[src] = true
 
 	for k in pairs(t) do
-		t[k] = nil
+		if (src[k] == nil) then
+			t[k] = nil
+		end
 	end
 
 	for k, v in pairs(src) do
-		if (type(v) == "table" and type(t[k]) == "table") then
+		if (type(v) == "table") then
+			if (type(t[k]) ~= "table") then
+				t[k] = {}
+			end
 			table.overwrite(t[k], v, seen)
 		else
 			t[k] = v
@@ -1228,6 +1258,16 @@ string.isvalid = function(str)
 		and not str:iswhitespace()
 end
 
+---@param str string
+---@return boolean
+function string.is_base64(str)
+	if (not string.isvalid(str)) then
+		return false
+	end
+
+	return (#str % 4 == 0) and (str:match("^[A-Za-z0-9+/]+=?=?$") ~= nil)
+end
+
 -- Returns whether a string starts with the provided prefix.
 ---@param str string
 ---@param prefix string

SSV2/includes/modules/Game.lua

@@ -105,13 +105,14 @@ function Game.IsEnhanced()
 end
 
 ---@return boolean
-function Game.IsInTransition()
-	return NETWORK.NETWORK_IS_IN_TRANSITION() or Backend:IsPlayerSwitchInProgress()
+function Game.IsInNetworkTransition()
+	-- PlayerSwitch is invalid here as it will return true in Single Player
+	return script.is_active("maintransition")
 end
 
 ---@return boolean
 function Game.IsOnline()
-	return network.is_session_started() and not Game.IsInTransition()
+	return network.is_session_started() and not Game.IsInNetworkTransition()
 end
 
 ---@param handle integer