diff --git a/Moose Development/Moose/Core/Database.lua b/Moose Development/Moose/Core/Database.lua index 504a861b4..7babe2481 100644 --- a/Moose Development/Moose/Core/Database.lua +++ b/Moose Development/Moose/Core/Database.lua @@ -1253,7 +1253,7 @@ end -- @param #DATABASE self -- @param Ops.FlightGroup#FLIGHTGROUP flightgroup function DATABASE:AddFlightGroup(flightgroup) - self:I({NewFlightGroup=flightgroup.groupname}) + self:T({NewFlightGroup=flightgroup.groupname}) self.FLIGHTGROUPS[flightgroup.groupname]=flightgroup end diff --git a/Moose Development/Moose/Functional/Range.lua b/Moose Development/Moose/Functional/Range.lua index 6810783c8..0f4b164fe 100644 --- a/Moose Development/Moose/Functional/Range.lua +++ b/Moose Development/Moose/Functional/Range.lua @@ -1916,8 +1916,35 @@ end -- @param #string To To state. function RANGE:onafterStatus(From, Event, To) + local fsmstate=self:GetState() + + local text=string.format("Range status: %s", fsmstate) + + if self.instructor then + local alive="N/A" + if self.instructorrelayname then + local relay=UNIT:FindByName(self.instructorrelayname) + if relay then + alive=tostring(relay:IsAlive()) + end + end + text=text..string.format(", Instructor %.3f MHz (Relay=%s alive=%s)", self.instructorfreq, tostring(self.instructorrelayname), alive) + end + + if self.rangecontrol then + local alive="N/A" + if self.rangecontrolrelayname then + local relay=UNIT:FindByName(self.rangecontrolrelayname) + if relay then + alive=tostring(relay:IsAlive()) + end + end + text=text..string.format(", Control %.3f MHz (Relay=%s alive=%s)", self.rangecontrolfreq, tostring(self.rangecontrolrelayname), alive) + end + + -- Check range status. - self:I(self.id..string.format("Range status: %s", self:GetState())) + self:I(self.id..text) -- Check player status. self:_CheckPlayers() diff --git a/Moose Development/Moose/Functional/Warehouse.lua b/Moose Development/Moose/Functional/Warehouse.lua index 940251cec..bf027907c 100644 --- a/Moose Development/Moose/Functional/Warehouse.lua +++ b/Moose Development/Moose/Functional/Warehouse.lua @@ -4280,10 +4280,12 @@ end function WAREHOUSE:onafterRequest(From, Event, To, Request) -- Info message. - local text=string.format("Warehouse %s: Processing request id=%d from warehouse %s.\n", self.alias, Request.uid, Request.warehouse.alias) - text=text..string.format("Requested %s assets of %s=%s.\n", tostring(Request.nasset), Request.assetdesc, Request.assetdesc==WAREHOUSE.Descriptor.ASSETLIST and "Asset list" or Request.assetdescval) - text=text..string.format("Transports %s of type %s.", tostring(Request.ntransport), tostring(Request.transporttype)) - self:_InfoMessage(text, 5) + if self.verbosity>=1 then + local text=string.format("Warehouse %s: Processing request id=%d from warehouse %s.\n", self.alias, Request.uid, Request.warehouse.alias) + text=text..string.format("Requested %s assets of %s=%s.\n", tostring(Request.nasset), Request.assetdesc, Request.assetdesc==WAREHOUSE.Descriptor.ASSETLIST and "Asset list" or Request.assetdescval) + text=text..string.format("Transports %s of type %s.", tostring(Request.ntransport), tostring(Request.transporttype)) + self:_InfoMessage(text, 5) + end ------------------------------------------------------------------------------------------------------------------------------------ -- Cargo assets. @@ -5156,7 +5158,7 @@ end -- @param #WAREHOUSE.Pendingitem request The request of the dead asset. function WAREHOUSE:onafterAssetSpawned(From, Event, To, group, asset, request) local text=string.format("Asset %s from request id=%d was spawned!", asset.spawngroupname, request.uid) - self:I(self.lid..text) + self:T(self.lid..text) -- Sete asset state to spawned. asset.spawned=true @@ -6281,10 +6283,12 @@ function WAREHOUSE:_OnEventArrived(EventData) local dt=10*(nunits-1)+1 -- one unit = 1 sec, two units = 11 sec, three units = 21 sec before we call the group arrived. -- Debug info. - local text=string.format("Air asset group %s from warehouse %s arrived at its destination. Trigger Arrived event in %d sec", group:GetName(), self.alias, dt) - self:_InfoMessage(text) - + if self.verbosity>=1 then + local text=string.format("Air asset group %s from warehouse %s arrived at its destination. Trigger Arrived event in %d sec", group:GetName(), self.alias, dt) + self:_InfoMessage(text) + end + -- Arrived event. self:__Arrived(dt, group) end diff --git a/Moose Development/Moose/Ops/FlightGroup.lua b/Moose Development/Moose/Ops/FlightGroup.lua index 2cd3fc699..448667244 100644 --- a/Moose Development/Moose/Ops/FlightGroup.lua +++ b/Moose Development/Moose/Ops/FlightGroup.lua @@ -1177,7 +1177,7 @@ function FLIGHTGROUP:onafterElementSpawned(From, Event, To, Element) else -- TODO: This can happen if spawned on deck of a carrier! - self:E(self.lid..string.format("Element spawned not in air but not on any parking spot.")) + self:T(self.lid..string.format("Element spawned not in air but not on any parking spot.")) self:__ElementParking(0.11, Element) end end diff --git a/Moose Development/Moose/Ops/Target.lua b/Moose Development/Moose/Ops/Target.lua index 0e8909566..7f8cdd7cb 100644 --- a/Moose Development/Moose/Ops/Target.lua +++ b/Moose Development/Moose/Ops/Target.lua @@ -341,7 +341,7 @@ end -- @param #TARGET.Object Target Target object. function TARGET:onafterObjectDamaged(From, Event, To, Target) - self:I(self.lid..string.format("Object %s damaged", Target.Name)) + self:T(self.lid..string.format("Object %s damaged", Target.Name)) end @@ -353,7 +353,7 @@ end -- @param #TARGET.Object Target Target object. function TARGET:onafterObjectDestroyed(From, Event, To, Target) - self:I(self.lid..string.format("Object %s destroyed", Target.Name)) + self:T(self.lid..string.format("Object %s destroyed", Target.Name)) -- Set target status. Target.Status=TARGET.ObjectStatus.DEAD @@ -381,7 +381,7 @@ end -- @param #string To To state. function TARGET:onafterDamaged(From, Event, To) - self:I(self.lid..string.format("Target damaged")) + self:T(self.lid..string.format("Target damaged")) end diff --git a/Moose Development/Moose/Wrapper/Airbase.lua b/Moose Development/Moose/Wrapper/Airbase.lua index 979368b0e..693428891 100644 --- a/Moose Development/Moose/Wrapper/Airbase.lua +++ b/Moose Development/Moose/Wrapper/Airbase.lua @@ -1384,7 +1384,7 @@ function AIRBASE:GetRunwayData(magvar, mark) runway.endpoint=c2 -- Debug info. - self:I(string.format("Airbase %s: Adding runway id=%s, heading=%03d, length=%d m i=%d j=%d", self:GetName(), runway.idx, runway.heading, runway.length, i, j)) + --self:I(string.format("Airbase %s: Adding runway id=%s, heading=%03d, length=%d m i=%d j=%d", self:GetName(), runway.idx, runway.heading, runway.length, i, j)) -- Debug mark if mark then