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

up

Browse Source
This commit is contained in:
Frank 2020-08-29 21:24:15 +02:00
parent 2d6092c114
commit a126906776
2 changed files with 3 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2245,45 +2245,6 @@ function GROUP:GetDCSDesc(n)
return nil return nil
end end
--- Get health of the group.
-- @param #GROUP self
-- @return #number Health in percent.
function GROUP:GetHealth()
local lp=0
local lp0=0
local units=self:GetUnits()
for _,_unit in pairs(units or {}) do
local unit=_unit --Wrapper.Unit#UNIT
if unit and unit:IsAlive() then
local life=unit:GetLife()
local life0=unit:GetLife0()
life0=math.max(life0, life) --Issue with ships
lp=lp+life
lp0=lp0+life
end
end
if lp0>0 then
return lp/lp0*100
else
return 0
end
end
--- Get damage of the group.
-- @param #GROUP self
-- @return #number Damage in percent.
function GROUP:GetDamage()
return 100-self:GetHealth()
end
--- Get the generalized attribute of a self. --- Get the generalized attribute of a self.
-- Note that for a heterogenious self, the attribute is determined from the attribute of the first unit! -- Note that for a heterogenious self, the attribute is determined from the attribute of the first unit!

6
Moose Development/Moose/Wrapper/Positionable.lua
View File

@ -304,8 +304,7 @@ function POSITIONABLE:GetPointVec3()
-- Get 3D vector. -- Get 3D vector.
local PositionableVec3 = self:GetPositionVec3() local PositionableVec3 = self:GetPositionVec3()
if self.pointvec3 then if false and self.pointvec3 then
--env.info("FF GetCoordinate GOT for "..tostring(self.PositionableName))
-- Update vector. -- Update vector.
self.pointvec3.x=PositionableVec3.x self.pointvec3.x=PositionableVec3.x
@ -313,9 +312,10 @@ function POSITIONABLE:GetPointVec3()
self.pointvec3.z=PositionableVec3.z self.pointvec3.z=PositionableVec3.z
else else
--env.info("FF GetCoordinate NEW for "..tostring(self.PositionableName))
-- Create a new POINT_VEC3 object.
self.pointvec3=POINT_VEC3:NewFromVec3(PositionableVec3) self.pointvec3=POINT_VEC3:NewFromVec3(PositionableVec3)
end end
return self.pointvec3 return self.pointvec3