weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-08-15 10:47:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2308 from shaji-Dev/master

Browse Source 
[FIXED] Velocity is taking into account dead units for GROUP
This commit is contained in:
Thomas 2025-05-25 09:12:04 +02:00 committed by GitHub
commit 1889df4952
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Moose Development/Moose/Wrapper/Group.lua
View File

@ -912,15 +912,18 @@ function GROUP:GetVelocityVec3()
if DCSGroup and DCSGroup:isExist() then if DCSGroup and DCSGroup:isExist() then
local GroupUnits = DCSGroup:getUnits() local GroupUnits = DCSGroup:getUnits()
local GroupCount = #GroupUnits local GroupCount = 0
local VelocityVec3 = { x = 0, y = 0, z = 0 } local VelocityVec3 = { x = 0, y = 0, z = 0 }
for _, DCSUnit in pairs( GroupUnits ) do for _, DCSUnit in pairs( GroupUnits ) do
local UnitVelocityVec3 = DCSUnit:getVelocity() if DCSUnit:isExist() and DCSUnit:isActive() then
VelocityVec3.x = VelocityVec3.x + UnitVelocityVec3.x local UnitVelocityVec3 = DCSUnit:getVelocity()
VelocityVec3.y = VelocityVec3.y + UnitVelocityVec3.y VelocityVec3.x = VelocityVec3.x + UnitVelocityVec3.x
VelocityVec3.z = VelocityVec3.z + UnitVelocityVec3.z VelocityVec3.y = VelocityVec3.y + UnitVelocityVec3.y
VelocityVec3.z = VelocityVec3.z + UnitVelocityVec3.z
GroupCount = GroupCount + 1
end
end end
VelocityVec3.x = VelocityVec3.x / GroupCount VelocityVec3.x = VelocityVec3.x / GroupCount
@ -1754,11 +1757,13 @@ function GROUP:GetMaxVelocity()
for Index, UnitData in pairs( DCSGroup:getUnits() ) do for Index, UnitData in pairs( DCSGroup:getUnits() ) do
local UnitVelocityVec3 = UnitData:getVelocity() if UnitData:isExist() and UnitData:isActive() then
local UnitVelocity = math.abs( UnitVelocityVec3.x ) + math.abs( UnitVelocityVec3.y ) + math.abs( UnitVelocityVec3.z ) local UnitVelocityVec3 = UnitData:getVelocity()
local UnitVelocity = math.abs( UnitVelocityVec3.x ) + math.abs( UnitVelocityVec3.y ) + math.abs( UnitVelocityVec3.z )
if UnitVelocity > GroupVelocityMax then if UnitVelocity > GroupVelocityMax then
GroupVelocityMax = UnitVelocity GroupVelocityMax = UnitVelocity
end
end end
end end