Merge pull request #95 from acidlabsdev/main

fix(Python): normalize line endings

Author: xesdoog

.github/workflows/translations.yml

@@ -37,6 +37,5 @@ jobs:
         git config user.name "github-actions[bot]"
         git config user.email "github-actions[bot]@users.noreply.github.com"
         git add SSV2/includes/lib/translations/
-        git add scripts/translations/hashmap.json || true
         git diff --cached --quiet || git commit -m "feat(Translations): update translations"
         git push

SSV2/includes/classes/Set.lua

@@ -49,12 +49,16 @@ function Set:Push(element)
 		return
 	end
 
+	if (self.m_data[element] == true) then
+		return
+	end
+
 	local __type = type(element)
 	if (not self.m_data_type) then
 		self.m_data_type = __type
 	elseif (__type ~= self.m_data_type) then
 		error(_F(
-			"[Set]: Data type mismatch! A set can only be created with same-type objects. %s expected, got %s instead.",
+			"[Set]: Data type mismatch! A set can only contain unique same-type objects. %s expected, got %s instead.",
 			self.m_data_type,
 			__type
 		))

SSV2/includes/classes/gta/atArray.lua

@@ -19,7 +19,7 @@
 ---@field private m_count uint16_t
 ---@field private m_data array<pointer>
 ---@field private m_data_type any
----@field private m_last_update_time Time.TimePoint
+---@field private m_last_update_time TimePoint
 ---@overload fun(address: pointer, data_type?: any): atArray
 atArray = {}
 atArray.__index = atArray

SSV2/includes/data/config.lua

@@ -300,6 +300,7 @@ local Config <const> = {
 			sy_always_max_income = false,
 			sy_disable_rob_cd = false,
 			sy_disable_rob_weekly_cd = false,
+			sy_disable_tow_cd = false,
 			safe_loop_warn_ack = false,
 		},
 		bsv2 = {

SSV2/includes/data/yrv3_data.lua

@@ -257,6 +257,17 @@ local RawBusinessData <const> = {
 				end
 			end
 		},
+		["sy_disable_tow_cd"] = {
+			dirty = false,
+			gstate = function()
+				return GVars.features.yrv3.sy_disable_tow_cd
+			end,
+			onEnable = function()
+				if (tunables.get_int(1521767918) > 0) then -- 120000ms
+					tunables.set_int(1521767918, 0)
+				end
+			end
+		},
 	},
 	SellScripts = {
 		["gb_smuggler"] = { -- air
@@ -483,10 +494,10 @@ local RawBusinessData <const> = {
 		{ gxt = "MP_PROP_CLUBH12", coords = vec3:new(-1138.0574, -1572.1804, 3.4157) },
 	},
 	SalvageYards = {
-		{ gxt = "CELL_SLVG_YRD", coords = vec3:new(-195.6784, 6266.2856, 31.4892) }, -- func_3737 // case 162:
+		{ gxt = "CELL_SLVG_YRD", coords = vec3:new(-195.0317, 6269.1601, 31.4892) }, -- func_3737 // case 162:
 		{ gxt = "CELL_SLVG_YRD", coords = vec3:new(2508.7229, 4110.6401, 38.3481) },
 		{ gxt = "CELL_SLVG_YRD", coords = vec3:new(-509.6919, -1735.85, 19.1262) },
-		{ gxt = "CELL_SLVG_YRD", coords = vec3:new(-12.9673, -1309.9194, 29.2606) },
+		{ gxt = "CELL_SLVG_YRD", coords = vec3:new(-15.3909, -1307.951, 29.2440) },
 		{ gxt = "CELL_SLVG_YRD", coords = vec3:new(1194.7052, -1263.8588, 35.2128) },
 	},
 	-- index + 127

SSV2/includes/features/CasinoPacino.lua

@@ -112,7 +112,7 @@ function CasinoPacino:GetCardNameFromIndex(card_index)
 end
 
 function CasinoPacino:ForceDealerBust()
-	script.run_in_fiber(function(script)
+	ThreadManager:Run(function(s)
 		local player_id                    = Self:GetPlayerID()
 		local bjc_obj                      = SGSL:Get(SGSL.data.blackjack_cards)
 		local btp_obj                      = SGSL:Get(SGSL.data.blackjack_table_players)
@@ -130,16 +130,22 @@ function CasinoPacino:ForceDealerBust()
 			return
 		end
 
-		while (
-				(NETWORK.NETWORK_GET_HOST_OF_SCRIPT("blackjack", -1, 0) ~= player_id)
-				and (NETWORK.NETWORK_GET_HOST_OF_SCRIPT("blackjack", 0, 0) ~= player_id)
-				and (NETWORK.NETWORK_GET_HOST_OF_SCRIPT("blackjack", 1, 0) ~= player_id)
-				and (NETWORK.NETWORK_GET_HOST_OF_SCRIPT("blackjack", 2, 0) ~= player_id)
-				and (NETWORK.NETWORK_GET_HOST_OF_SCRIPT("blackjack", 3, 0) ~= player_id)
-			) do
+		local giveupTimer = Timer.new(3e4)
+		local success     = true
+		Notifier:ShowMessage("Casino Pacino", _T("CP_BLACKJACK_SCRIPT_CONTROL"))
+		while (not Self:IsHostOfScript("blackjack")) do
+			if (giveupTimer:is_done()) then
+				success = false
+				break
+			end
+
 			network.force_script_host("blackjack")
-			Notifier:ShowMessage("CasinoPacino", _T("CP_BLACKJACK_SCRIPT_CONTROL")) --If you see this spammed, someone is fighting you for control.
-			script:yield()
+			s:yield()
+		end
+
+		if (not success) then
+			Notifier:ShowError("Casino Pacino", _T("GENERIC_SCRIPT_CTRL_FAIL"))
+			return
 		end
 
 		local blackjack_table = locals.get_int("blackjack",

SSV2/includes/features/YimActionsV3.lua

@@ -893,7 +893,7 @@ end
 -----------------------------------------------------
 -- Handles sound and visual effects.
 ---@class YimActions.FXManager
----@field SFXTimers table<handle, Time.Timer>
+---@field SFXTimers table<handle, Timer>
 YimActions.FXManager = { Fx = {} }
 YimActions.FXManager.__index = YimActions.FXManager
 YimActions.FXManager.SFXTimers = {}

SSV2/includes/features/YimResupplierV3.lua

@@ -796,16 +796,13 @@ function YRV3:FinishSale()
 
 	self.m_has_triggered_autosell = true
 	script.execute_as_script(sn, function()
-		if not self.m_raw_data.SellScripts[sn].b then -- gb_*
+		if (not self.m_raw_data.SellScripts[sn].b) then
 			for _, data in pairs(self.m_raw_data.SellScripts[sn]) do
 				locals.set_int(sn, data.l + data.o, data.v)
 			end
-		else -- fm_content_*
-			if (NETWORK.NETWORK_GET_HOST_OF_THIS_SCRIPT() ~= Self:GetPlayerID()) then
-				Notifier:ShowWarning(
-					"YRV3",
-					"Unable to finish sale mission. You are not host of this script."
-				)
+		else
+			if (not Self:IsHostOfScript(sn)) then
+				Notifier:ShowError("YRV3", _T("YRV3_SCRIPT_HOST_ERR"))
 				return
 			end
 
@@ -821,38 +818,34 @@ function YRV3:FinishSale()
 end
 
 function YRV3:FinishCEOCargoSourceMission()
-	if script.is_active("gb_contraband_buy") then
-		script.execute_as_script("gb_contraband_buy", function()
-			if (not NETWORK.NETWORK_IS_HOST_OF_THIS_SCRIPT()) then
-				Notifier:ShowError("YRV3", "You are not host of this script.")
-				return
-			end
+	if (script.is_active("gb_contraband_buy")) then
+		if (not Self:IsHostOfScript("gb_contraband_buy")) then
+			Notifier:ShowError("YRV3", _T("YRV3_SCRIPT_HOST_ERR"))
+			return
+		end
 
-			local buyLocal = SGSL:Get(SGSL.data.gb_contraband_buy_local_1):AsLocal()
-			buyLocal:At(5):WriteInt(1) -- 1.71 b3568.0 -- case -1: return "INVALID - UNSET";
-			buyLocal:At(191):WriteInt(6) -- 1.71 b3568.0 -- Local_623.f_191 = iParam0;
-			buyLocal:At(192):WriteInt(4) -- 1.71 b3568.0 -- Local_623.f_192 = iParam0;
-		end)
-	elseif script.is_active("fm_content_cargo") then
-		script.execute_as_script("fm_content_cargo", function()
-			if not NETWORK.NETWORK_IS_HOST_OF_THIS_SCRIPT() then
-				Notifier:ShowError("YRV3", "You are not host of this script.")
-				return
-			end
+		local buyLocal = SGSL:Get(SGSL.data.gb_contraband_buy_local_1):AsLocal()
+		buyLocal:At(5):WriteInt(1)
+		buyLocal:At(191):WriteInt(6)
+		buyLocal:At(192):WriteInt(4)
+	elseif (script.is_active("fm_content_cargo")) then
+		if (not Self:IsHostOfScript("fm_content_cargo")) then
+			Notifier:ShowError("YRV3", _T("YRV3_SCRIPT_HOST_ERR"))
+			return
+		end
 
-			local fmccLocal2       = SGSL:Get(SGSL.data.gb_contraband_buy_local_2):AsLocal():At(1):At(0) -- GENERIC_BITSET_I_WON -- 1.71 b3568.0: var uLocal_5973 = 4;
-			local gbcb_obj         = SGSL:Get(SGSL.data.gb_contraband_buy_local_3)
-			local fmccLocal3       = gbcb_obj:AsLocal()
-			local fmccLocal3Offset = gbcb_obj:GetOffset(1)
-			local bs               = fmccLocal2:ReadInt()
+		local fmccLocal2       = SGSL:Get(SGSL.data.gb_contraband_buy_local_2):AsLocal():At(1):At(0)
+		local gbcb_obj         = SGSL:Get(SGSL.data.gb_contraband_buy_local_3)
+		local fmccLocal3       = gbcb_obj:AsLocal()
+		local fmccLocal3Offset = gbcb_obj:GetOffset(1)
+		local bs               = fmccLocal2:ReadInt()
 
-			if (not Bit.is_set(bs, 11)) then
-				bs = Bit.set(bs, 11)
-				fmccLocal2:WriteInt(bs)
-			end
+		if (not Bit.is_set(bs, 11)) then
+			bs = Bit.set(bs, 11)
+			fmccLocal2:WriteInt(bs)
+		end
 
-			fmccLocal3:At(fmccLocal3Offset):WriteInt(3) -- EndReason
-		end)
+		fmccLocal3:At(fmccLocal3Offset):WriteInt(3)
 	end
 end
 

SSV2/includes/features/vehicle/iv_style_exit.lua

@@ -12,8 +12,8 @@ local FeatureBase = require("includes.modules.FeatureBase")
 ---@class IVStyleExit : FeatureBase
 ---@field private m_entity PlayerVehicle
 ---@field private m_triggered boolean
----@field private m_timer Time.Timer
----@field private m_steering_timer Time.Timer
+---@field private m_timer Timer
+---@field private m_steering_timer Timer
 ---@field private m_pending_steering boolean
 ---@field private m_last_steer_angle float
 local IVStyleExit = setmetatable({}, FeatureBase)

SSV2/includes/features/vehicle/launch_control.lua

@@ -28,7 +28,7 @@ local eLaunchControlState <const> = {
 ---@field private m_is_active boolean
 ---@field private m_thread? Thread
 ---@field private m_state eLaunchControlState
----@field private m_timer Time.Timer
+---@field private m_timer Timer
 ---@field private m_last_pop_time milliseconds
 ---@field private m_default_pops_off boolean
 ---@field private m_shocking_event_handle? handle