Merge tag 'v2.9.1-dev10'

# Conflicts:
#	ext/Shared/Registry/Registry.lua
#	mod.json

Author: Joe91

.github/CHANGELOG.md

@@ -29,6 +29,11 @@ This is the changelog for the version V2.9 Don't forget to [join us on Discord](
 * Option to disable defend-mode (by tanger-noisu)
 * Better handling for Light AA (by tanger-noisu)
 * Option for Bots to spawn in Gunship-Vehicle (by tanger-noisu)
+* improve general attacking-logic by fixing some issues
+* improve speed on save of traces (by tanger-noisu)
+* improve general behavior
+* fix modlist.realoadextension
+* Priority-System on attack (by tanger-noisu)
 
 ### Bug fixes
 * Merged pull request #323 from tagener-noisu Path-Switcher fixes
@@ -56,6 +61,7 @@ This is the changelog for the version V2.9 Don't forget to [join us on Discord](
 * Conquest Small MP_007 by IgorUA
 * Conquest Small MP_011 by IgorUA
 * Conquest Small MP_012 by IgorUA
+* Conquest Large MP_012 by IgorUA
 * Conquest Small MP_013 by IgorUA
 * Conquest Small MP_017 by IgorUA
 * Conquest Small MP_018 by IgorUA

ext/Client/ClientBotManager.lua

@@ -19,6 +19,7 @@ function ClientBotManager:RegisterVars()
 	self.m_LastIndex = 0
 	self.m_Player = nil
 	self.m_ReadyToUpdate = false
+	---@type RaycastRequests[]
 	self.m_BotBotRaycastsToDo = {}
 
 	-- Inputs for change of seats (1-8).
@@ -103,6 +104,11 @@ function ClientBotManager:OnEngineMessage(p_Message)
 	end
 end
 
+---@param p_Pos1 Vec3
+---@param p_Pos2 Vec3
+---@param p_InObjectPos1 boolean
+---@param p_InObjectPos2 boolean
+---@return boolean
 function ClientBotManager:DoRaycast(p_Pos1, p_Pos2, p_InObjectPos1, p_InObjectPos2)
 	if Registry.COMMON.USE_COLLISION_RAYCASTS then
 		local s_DeltaPos = p_Pos2 - p_Pos1
@@ -173,6 +179,7 @@ function ClientBotManager:DoRaycast(p_Pos1, p_Pos2, p_InObjectPos1, p_InObjectPo
 	end
 end
 
+---@param p_RaycastResultsToSend RaycastResults
 function ClientBotManager:SendRaycastResults(p_RaycastResultsToSend)
 	NetEvents:SendLocal("Botmanager:RaycastResults", p_RaycastResultsToSend)
 end
@@ -203,10 +210,11 @@ function ClientBotManager:OnUpdateManagerUpdate(p_DeltaTime, p_UpdatePass)
 
 		for i = 1, s_MaxRaycastsBotBot do
 			if (#self.m_BotBotRaycastsToDo > 0) then
+				---@type RaycastRequests
 				local s_RaycastCheckEntry = table.remove(self.m_BotBotRaycastsToDo, 1)
 				s_RaycastEntriesDone = s_RaycastEntriesDone + 1
-				local s_Bot1 = PlayerManager:GetPlayerByName(s_RaycastCheckEntry.Bot1)
-				local s_Bot2 = PlayerManager:GetPlayerByName(s_RaycastCheckEntry.Bot2)
+				local s_Bot1 = PlayerManager:GetPlayerById(s_RaycastCheckEntry.Bot1)
+				local s_Bot2 = PlayerManager:GetPlayerById(s_RaycastCheckEntry.Bot2)
 
 				if s_Bot1 and s_Bot2 and s_Bot1.soldier and s_Bot2.soldier then
 					local s_StartPos = nil
@@ -226,7 +234,7 @@ function ClientBotManager:OnUpdateManagerUpdate(p_DeltaTime, p_UpdatePass)
 					s_EndPos.y = s_EndPos.y + 1.4
 					if self:DoRaycast(s_StartPos, s_EndPos, s_RaycastCheckEntry.Bot1InVehicle, s_RaycastCheckEntry.Bot2InVehicle) then
 						table.insert(s_RaycastResultsToSend, {
-							Mode = "ShootAtBot",
+							Mode = RaycastResultModes.ShootAtBot,
 							Bot1 = s_RaycastCheckEntry.Bot1,
 							Bot2 = s_RaycastCheckEntry.Bot2,
 							IgnoreYaw = false,
@@ -320,9 +328,9 @@ function ClientBotManager:OnUpdateManagerUpdate(p_DeltaTime, p_UpdatePass)
 					end
 
 					table.insert(s_RaycastResultsToSend, {
-						Mode = "ShootAtPlayer",
-						Bot1 = s_Bot.name,
-						Bot2 = "",
+						Mode = RaycastResultModes.ShootAtPlayer,
+						Bot1 = s_Bot.id,
+						Bot2 = 0,
 						IgnoreYaw = s_IgnoreYaw,
 					})
 				end
@@ -372,9 +380,9 @@ function ClientBotManager:OnUpdateManagerUpdate(p_DeltaTime, p_UpdatePass)
 				if self:DoRaycast(s_PlayerPosition, s_Target, false, false) then
 					-- We found a valid bot in Sight (either no hit, or player-hit). Signal Server with players.
 					table.insert(s_RaycastResultsToSend, {
-						Mode = "RevivePlayer",
-						Bot1 = s_Bot.name,
-						Bot2 = "",
+						Mode = RaycastResultModes.RevivePlayer,
+						Bot1 = s_Bot.id,
+						Bot2 = 0,
 						IgnoreYaw = false,
 					})
 				end
@@ -411,7 +419,8 @@ end
 -- =============================================
 -- NetEvents
 -- =============================================
-
+---@param p_NewConfig table<string,integer|number>
+---@param p_UpdateWeaponSets boolean
 function ClientBotManager:OnWriteClientSettings(p_NewConfig, p_UpdateWeaponSets)
 	for l_Key, l_Value in pairs(p_NewConfig) do
 		Config[l_Key] = l_Value

ext/Client/ClientNodeEditor.lua

@@ -54,26 +54,26 @@ function ClientNodeEditor:__init()
 		['Purple'] = Vec4(0.5, 0, 1, 1),
 		['Ray'] = { Node = Vec4(1, 1, 1, 0.2), Line = { Vec4(1, 1, 1, 1), Vec4(0, 0, 0, 1) } },
 		['Orphan'] = { Node = Vec4(0, 0, 0, 0.5), Line = Vec4(0, 0, 0, 1) },
-		{ Node = Vec4(1, 0, 0, 0.25), Line = Vec4(1, 0, 0, 1) },
-		{ Node = Vec4(1, 0.55, 0, 0.25), Line = Vec4(1, 0.55, 0, 1) },
-		{ Node = Vec4(1, 1, 0, 0.25), Line = Vec4(1, 1, 0, 1) },
-		{ Node = Vec4(0, 0.5, 0, 0.25), Line = Vec4(0, 0.5, 0, 1) },
-		{ Node = Vec4(0, 0, 1, 0.25), Line = Vec4(0, 0, 1, 1) },
-		{ Node = Vec4(0.29, 0, 0.51, 0.25), Line = Vec4(0.29, 0, 0.51, 1) },
-		{ Node = Vec4(1, 0, 1, 0.25), Line = Vec4(1, 0, 1, 1) },
-		{ Node = Vec4(0.55, 0, 0, 0.25), Line = Vec4(0.55, 0, 0, 1) },
-		{ Node = Vec4(1, 0.65, 0, 0.25), Line = Vec4(1, 0.65, 0, 1) },
-		{ Node = Vec4(0.94, 0.9, 0.55, 0.25), Line = Vec4(0.94, 0.9, 0.55, 1) },
-		{ Node = Vec4(0.5, 1, 0, 0.25), Line = Vec4(0.5, 1, 0, 1) },
+		{ Node = Vec4(1, 0, 0, 0.25),          Line = Vec4(1, 0, 0, 1) },
+		{ Node = Vec4(1, 0.55, 0, 0.25),       Line = Vec4(1, 0.55, 0, 1) },
+		{ Node = Vec4(1, 1, 0, 0.25),          Line = Vec4(1, 1, 0, 1) },
+		{ Node = Vec4(0, 0.5, 0, 0.25),        Line = Vec4(0, 0.5, 0, 1) },
+		{ Node = Vec4(0, 0, 1, 0.25),          Line = Vec4(0, 0, 1, 1) },
+		{ Node = Vec4(0.29, 0, 0.51, 0.25),    Line = Vec4(0.29, 0, 0.51, 1) },
+		{ Node = Vec4(1, 0, 1, 0.25),          Line = Vec4(1, 0, 1, 1) },
+		{ Node = Vec4(0.55, 0, 0, 0.25),       Line = Vec4(0.55, 0, 0, 1) },
+		{ Node = Vec4(1, 0.65, 0, 0.25),       Line = Vec4(1, 0.65, 0, 1) },
+		{ Node = Vec4(0.94, 0.9, 0.55, 0.25),  Line = Vec4(0.94, 0.9, 0.55, 1) },
+		{ Node = Vec4(0.5, 1, 0, 0.25),        Line = Vec4(0.5, 1, 0, 1) },
 		{ Node = Vec4(0.39, 0.58, 0.93, 0.25), Line = Vec4(0.39, 0.58, 0.93, 1) },
 		{ Node = Vec4(0.86, 0.44, 0.58, 0.25), Line = Vec4(0.86, 0.44, 0.58, 1) },
 		{ Node = Vec4(0.93, 0.51, 0.93, 0.25), Line = Vec4(0.93, 0.51, 0.93, 1) },
-		{ Node = Vec4(1, 0.63, 0.48, 0.25), Line = Vec4(1, 0.63, 0.48, 1) },
-		{ Node = Vec4(0.5, 0.5, 0, 0.25), Line = Vec4(0.5, 0.5, 0, 1) },
-		{ Node = Vec4(0, 0.98, 0.6, 0.25), Line = Vec4(0, 0.98, 0.6, 1) },
+		{ Node = Vec4(1, 0.63, 0.48, 0.25),    Line = Vec4(1, 0.63, 0.48, 1) },
+		{ Node = Vec4(0.5, 0.5, 0, 0.25),      Line = Vec4(0.5, 0.5, 0, 1) },
+		{ Node = Vec4(0, 0.98, 0.6, 0.25),     Line = Vec4(0, 0.98, 0.6, 1) },
 		{ Node = Vec4(0.18, 0.31, 0.31, 0.25), Line = Vec4(0.18, 0.31, 0.31, 1) },
-		{ Node = Vec4(0, 1, 1, 0.25), Line = Vec4(0, 1, 1, 1) },
-		{ Node = Vec4(1, 0.08, 0.58, 0.25), Line = Vec4(1, 0.08, 0.58, 1) },
+		{ Node = Vec4(0, 1, 1, 0.25),          Line = Vec4(0, 1, 1, 1) },
+		{ Node = Vec4(1, 0.08, 0.58, 0.25),    Line = Vec4(1, 0.08, 0.58, 1) },
 	}
 
 	self.m_EventsReady = false
@@ -108,7 +108,7 @@ function ClientNodeEditor:OnRegisterEvents()
 	Console:Register('Unlink', 'Unlink two waypoints', self, self._onUnlinkNode)
 	Console:Register('Merge', 'Merge selected waypoints', self, self._onMergeNode)
 	Console:Register('SelectPrevious', 'Extend selection to previous waypoint', self, self._onSelectPrevious) -- Done
-	Console:Register('ClearSelection', 'Clear selection', self, self._onClearSelection) -- Done
+	Console:Register('ClearSelection', 'Clear selection', self, self._onClearSelection)                    -- Done
 	Console:Register('Move', 'toggle move mode on selected waypoints', self, self._onToggleMoveNode)
 
 	-- Add these Events to NodeEditor.
@@ -219,7 +219,6 @@ function ClientNodeEditor:_OnDrawNodes(p_NodesToDraw, p_UpdateView)
 		-- Clear last node.
 		self.m_LastDataPoint = nil
 	end
-
 end
 
 function ClientNodeEditor:_DrawData(p_DataPoint)
@@ -391,6 +390,8 @@ function ClientNodeEditor:GetDistance(p_Position1, p_Position2)
 	end
 end
 
+---@param p_Position Vec3
+---@return nil
 function ClientNodeEditor:FindNode(p_Position)
 	local s_ClosestNode = nil
 	local s_ClosestDistance = 0.6 -- Maximum 0.6 meter.
@@ -499,8 +500,8 @@ function ClientNodeEditor:_onToggleMoveNode(p_Args)
 			},
 			Other = {
 				{ Key = 'F12', Name = 'Settings' },
-				{ Key = 'Q', Name = 'Quick Select' },
-				{ Key = 'BS', Name = 'Clear Select' },
+				{ Key = 'Q',   Name = 'Quick Select' },
+				{ Key = 'BS',  Name = 'Clear Select' },
 				{ Key = 'INS', Name = 'Spawn Bot' }
 			}
 		})
@@ -543,10 +544,10 @@ function ClientNodeEditor:_onToggleMoveNode(p_Args)
 				{ Grid = 'K9', Key = '9', Name = 'Up' },
 			},
 			Other = {
-				{ Key = 'F12', Name = 'Settings' },
-				{ Key = 'Q', Name = 'Finish Move' },
-				{ Key = 'BS', Name = 'Cancel Move' },
-				{ Key = 'KP_PLUS', Name = 'Speed +' },
+				{ Key = 'F12',      Name = 'Settings' },
+				{ Key = 'Q',        Name = 'Finish Move' },
+				{ Key = 'BS',       Name = 'Cancel Move' },
+				{ Key = 'KP_PLUS',  Name = 'Speed +' },
 				{ Key = 'KP_MINUS', Name = 'Speed -' },
 			}
 		})
@@ -893,7 +894,6 @@ function ClientNodeEditor:OnUpdateManagerUpdate(p_DeltaTime, p_UpdatePass)
 
 				-- Perform raycast to get where player is looking.
 				if self.m_EditMode == 'move' then
-
 					local s_Selection = self:GetSelectedNodes()
 
 					if #s_Selection > 0 then
@@ -915,7 +915,6 @@ function ClientNodeEditor:OnUpdateManagerUpdate(p_DeltaTime, p_UpdatePass)
 						local s_UpdateData = {}
 
 						for i = 1, #s_Selection do
-
 							local s_AdjustedPosition = self.m_EditNodeStartPos[s_Selection[i].Node.ID] + self.m_EditModeManualOffset
 
 							if self.m_EditPositionMode == 'relative' then
@@ -1024,6 +1023,9 @@ function ClientNodeEditor:DrawOBB(p_Aab, p_Transform, p_Color)
 end
 
 -- Stolen't https://github.com/EmulatorNexus/VEXT-Samples/blob/80cddf7864a2cdcaccb9efa810e65fae1baeac78/no-headglitch-raycast/ext/Client/__init__.lua
+---@param p_MaxDistance number|nil
+---@param p_UseAsync boolean|nil
+---@return RayCastHit|nil
 function ClientNodeEditor:Raycast(p_MaxDistance, p_UseAsync)
 	local s_Player = PlayerManager:GetLocalPlayer()
 	if not s_Player then
@@ -1035,6 +1037,9 @@ function ClientNodeEditor:Raycast(p_MaxDistance, p_UseAsync)
 	-- We get the camera transform, from which we will start the raycast. We get the direction from the forward vector. Camera transform
 	-- is inverted, so we have to invert this vector.
 	local s_Transform = ClientUtils:GetCameraTransform()
+	if s_Transform == nil then
+		return
+	end
 	local s_Direction = Vec3(-s_Transform.forward.x, -s_Transform.forward.y, -s_Transform.forward.z)
 
 	if s_Transform.trans == Vec3.zero then
@@ -1051,6 +1056,7 @@ function ClientNodeEditor:Raycast(p_MaxDistance, p_UseAsync)
 
 	-- Perform raycast, returns a RayCastHit object.
 
+	---@type RayCastFlags
 	local s_Flags = RayCastFlags.DontCheckWater | RayCastFlags.DontCheckCharacter | RayCastFlags.DontCheckRagdoll |
 		RayCastFlags.CheckDetailMesh
 

ext/Client/ClientSpawnPointHelper.lua

@@ -57,7 +57,7 @@ function ClientSpawnPointHelper:OnUIDrawHud()
 	end
 
 	for _, l_Transform in pairs(self.m_SpawnPointTable) do
-		if l_Transform.trans:Distance(s_LocalPlayer.soldier.transform.trans) <= Config.SpawnPointRange then
+		if l_Transform.trans:Distance(s_LocalPlayer.soldier.worldTransform.trans) <= Config.SpawnPointRange then
 			self:DrawSpawnPoint(l_Transform)
 		end
 	end

ext/Client/__init__.lua

@@ -164,7 +164,8 @@ end
 -- =============================================
 -- NetEvents
 -- =============================================
-
+---@param p_NewConfig table
+---@param p_UpdateWeaponSets boolean
 function FunBotClient:OnWriteClientSettings(p_NewConfig, p_UpdateWeaponSets)
 	m_ClientBotManager:OnWriteClientSettings(p_NewConfig, p_UpdateWeaponSets)
 
@@ -175,14 +176,17 @@ function FunBotClient:OnWriteClientSettings(p_NewConfig, p_UpdateWeaponSets)
 	end
 end
 
+---@param p_RaycastData RaycastRequests
 function FunBotClient:CheckForBotBotAttack(p_RaycastData)
 	m_ClientBotManager:CheckForBotBotAttack(p_RaycastData)
 end
 
+---@param p_Data any
 function FunBotClient:OnUISettings(p_Data)
 	m_ClientNodeEditor:OnUISettings(p_Data)
 end
 
+---@param p_ConfigList table
 function FunBotClient:OnRegisterConsoleCommands(p_ConfigList)
 	m_ConsoleCommands:OnRegisterConsoleCommands(p_ConfigList)
 end

ext/Server/AirTargets.lua

@@ -1,9 +1,6 @@
 ---@class AirTargets
 ---@overload fun():AirTargets
 AirTargets = class('AirTargets')
-
----@type Utilities
-local m_Utilities = require('__shared/Utilities')
 ---@type Vehicles
 local m_Vehicles = require('Vehicles')
 
@@ -48,6 +45,8 @@ function AirTargets:OnPlayerDestroyed(p_Player)
 end
 
 -- Public functions
+---@param p_Player Player
+---@param p_MaxDistance number
 function AirTargets:GetTarget(p_Player, p_MaxDistance)
 	local s_Team = p_Player.teamId
 	local s_ClosestDistance = nil
@@ -90,17 +89,18 @@ function AirTargets:GetTarget(p_Player, p_MaxDistance)
 end
 
 -- Private functions
-
+---comment
+---@param p_Player Player
 function AirTargets:_CreateTarget(p_Player)
 	if p_Player.controlledEntryId == 0 then
-		local s_Vehicle = m_Vehicles:GetVehicle(p_Player, 0)
-
-		if m_Vehicles:IsAirVehicle(s_Vehicle) then
+		local s_Vehicle = m_Vehicles:GetVehicle(p_Player)
+		if s_Vehicle and m_Vehicles:IsAirVehicle(s_Vehicle) then
 			table.insert(self._Targets, p_Player.name)
 		end
 	end
 end
 
+---@param p_Player Player
 function AirTargets:_RemoveTarget(p_Player)
 	for l_Index, l_Target in pairs(self._Targets) do
 		if l_Target == p_Player.name then