FlightControl-Master/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-10-29 16:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop-2

Browse Source
This commit is contained in:
Applevangelist 2023-02-02 09:38:32 +01:00
commit 35da50b67a
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Moose Development/Moose/Ops/AirWing.lua
View File

@ -524,7 +524,7 @@ function AIRWING:FetchPayloadFromStock(UnitType, MissionType, Payloads)
if a and b then -- I had the case that a or b were nil even though the self.payloads table was looking okay. Very strange! Seems to be solved by pre-selecting valid payloads. if a and b then -- I had the case that a or b were nil even though the self.payloads table was looking okay. Very strange! Seems to be solved by pre-selecting valid payloads.
local performanceA=self:GetPayloadPeformance(a, MissionType) local performanceA=self:GetPayloadPeformance(a, MissionType)
local performanceB=self:GetPayloadPeformance(b, MissionType) local performanceB=self:GetPayloadPeformance(b, MissionType)
return (performanceA>performanceB) or (performanceA==performanceB and a.unlimited==true) or (performanceA==performanceB and a.unlimited==true and b.unlimited==true and a.navail>b.navail) return (performanceA>performanceB) or (performanceA==performanceB and a.unlimited==true and b.unlimited~=true) or (performanceA==performanceB and a.unlimited==true and b.unlimited==true and a.navail>b.navail)
elseif not a then elseif not a then
self:I(self.lid..string.format("FF ERROR in sortpayloads: a is nil")) self:I(self.lid..string.format("FF ERROR in sortpayloads: a is nil"))
return false return false

16
Moose Development/Moose/Ops/PlayerRecce.lua
View File

@ -104,7 +104,7 @@ PLAYERRECCE = {
ClassName = "PLAYERRECCE", ClassName = "PLAYERRECCE",
verbose = true, verbose = true,
lid = nil, lid = nil,
version = "0.0.16", version = "0.0.17",
ViewZone = {}, ViewZone = {},
ViewZoneVisual = {}, ViewZoneVisual = {},
ViewZoneLaser = {}, ViewZoneLaser = {},
@ -149,7 +149,8 @@ PLAYERRECCE.LaserRelativePos = {
["SA342Mistral"] = { x = 1.7, y = 1.2, z = 0 }, ["SA342Mistral"] = { x = 1.7, y = 1.2, z = 0 },
["SA342Minigun"] = { x = 1.7, y = 1.2, z = 0 }, ["SA342Minigun"] = { x = 1.7, y = 1.2, z = 0 },
["SA342L"] = { x = 1.7, y = 1.2, z = 0 }, ["SA342L"] = { x = 1.7, y = 1.2, z = 0 },
["Ka-50"] = { x = 6.1, y = -0.85 , z = 0 } ["Ka-50"] = { x = 6.1, y = -0.85 , z = 0 },
["Ka-50_3"] = { x = 6.1, y = -0.85 , z = 0 }
} }
--- ---
@ -161,6 +162,7 @@ PLAYERRECCE.MaxViewDistance = {
["SA342Minigun"] = 8000, ["SA342Minigun"] = 8000,
["SA342L"] = 8000, ["SA342L"] = 8000,
["Ka-50"] = 8000, ["Ka-50"] = 8000,
["Ka-50_3"] = 8000,
} }
--- ---
@ -172,6 +174,7 @@ PLAYERRECCE.Cameraheight = {
["SA342Minigun"] = 2.85, ["SA342Minigun"] = 2.85,
["SA342L"] = 2.85, ["SA342L"] = 2.85,
["Ka-50"] = 0.5, ["Ka-50"] = 0.5,
["Ka-50_3"] = 0.5,
} }
--- ---
@ -183,6 +186,7 @@ PLAYERRECCE.CanLase = {
["SA342Minigun"] = false, -- no optics ["SA342Minigun"] = false, -- no optics
["SA342L"] = true, ["SA342L"] = true,
["Ka-50"] = true, ["Ka-50"] = true,
["Ka-50_3"] = true,
} }
--- ---
@ -338,10 +342,6 @@ function PLAYERRECCE:_GetClockDirection(unit, target)
clock = UTILS.Round(clock,0) clock = UTILS.Round(clock,0)
if clock > 12 then clock = clock-12 end if clock > 12 then clock = clock-12 end
end end
--if self.debug then
--local text = string.format("Heading = %d, Angle = %d, Hours= %d, Clock = %d",_heading,Angle,hours,clock)
--self:I(self.lid .. text)
--end
return clock return clock
end end
@ -411,7 +411,7 @@ function PLAYERRECCE:_CameraOn(client,playername)
if vivihorizontal < -0.7 or vivihorizontal > 0.7 then if vivihorizontal < -0.7 or vivihorizontal > 0.7 then
camera = false camera = false
end end
elseif typename == "Ka-50" then elseif typename == "Ka-50" or typename = "Ka-50_3" then
camera = true camera = true
end end
end end
@ -653,7 +653,7 @@ function PLAYERRECCE:_GetTargetSet(unit,camera,laser)
angle=10 angle=10
-- Model nod and actual TV view don't compute -- Model nod and actual TV view don't compute
maxview = self.MaxViewDistance[typename] or 5000 maxview = self.MaxViewDistance[typename] or 5000
elseif typename == "Ka-50" and camera then elseif string.find(typename,"Ka-50") and camera then
heading = unit:GetHeading() heading = unit:GetHeading()
nod,maxview,camon = 10,1000,true nod,maxview,camon = 10,1000,true
angle = 10 angle = 10