diff --git a/Moose Development/Moose/AI/AI_A2G_Dispatcher.lua b/Moose Development/Moose/AI/AI_A2G_Dispatcher.lua index bdf05b150..91d990afc 100644 --- a/Moose Development/Moose/AI/AI_A2G_Dispatcher.lua +++ b/Moose Development/Moose/AI/AI_A2G_Dispatcher.lua @@ -4591,10 +4591,10 @@ do -- AI_A2G_DISPATCHER Report:Add( string.format( " - %s - %s", DefenseQueueItem.SquadronName, DefenseQueueItem.DefenderSquadron.TakeoffTime, DefenseQueueItem.DefenderSquadron.TakeoffInterval) ) end - + Report:Add( string.format( "\n - Squadron Resources: ", #self.DefenseQueue ) ) for DefenderSquadronName, DefenderSquadron in pairs( self.DefenderSquadrons ) do - Report:Add( string.format( " - %s - %d", DefenderSquadronName, DefenderSquadron.ResourceCount and DefenderSquadron.ResourceCount or "n/a" ) ) + Report:Add( string.format( " - %s - %s", DefenderSquadronName, DefenderSquadron.ResourceCount and tostring(DefenderSquadron.ResourceCount) or "n/a" ) ) end self:F( Report:Text( "\n" ) ) diff --git a/Moose Development/Moose/Core/UserFlag.lua b/Moose Development/Moose/Core/UserFlag.lua index aac0c78ea..6d8bdd719 100644 --- a/Moose Development/Moose/Core/UserFlag.lua +++ b/Moose Development/Moose/Core/UserFlag.lua @@ -69,7 +69,8 @@ do -- UserFlag if Delay and Delay>0 then self:ScheduleOnce(Delay, USERFLAG.Set, self, Number) - else + else + --env.info(string.format("Setting flag \"%s\" to %d at T=%.1f", self.UserFlagName, Number, timer.getTime())) trigger.action.setUserFlag( self.UserFlagName, Number ) end diff --git a/Moose Development/Moose/Utilities/Enums.lua b/Moose Development/Moose/Utilities/Enums.lua index da73fd4b6..eaef38b47 100644 --- a/Moose Development/Moose/Utilities/Enums.lua +++ b/Moose Development/Moose/Utilities/Enums.lua @@ -242,4 +242,52 @@ ENUMS.FormationOld.RotaryWing={} ENUMS.FormationOld.RotaryWing.Wedge=8 ENUMS.FormationOld.RotaryWing.Echelon=9 ENUMS.FormationOld.RotaryWing.Front=10 -ENUMS.FormationOld.RotaryWing.Column=11 \ No newline at end of file +ENUMS.FormationOld.RotaryWing.Column=11 + + +--- Morse Code. See the [Wikipedia](https://en.wikipedia.org/wiki/Morse_code). +-- +-- * Short pulse "*" +-- * Long pulse "-" +-- +-- Pulses are separated by a blank character " ". +-- +-- @type ENUMS.Morse +ENUMS.Morse={} +ENUMS.Morse.A="* -" +ENUMS.Morse.B="- * * *" +ENUMS.Morse.C="- * - *" +ENUMS.Morse.D="- * *" +ENUMS.Morse.E="*" +ENUMS.Morse.F="* * - *" +ENUMS.Morse.G="- - *" +ENUMS.Morse.H="* * * *" +ENUMS.Morse.I="* *" +ENUMS.Morse.J="* - - -" +ENUMS.Morse.K="- * -" +ENUMS.Morse.L="* - * *" +ENUMS.Morse.M="- -" +ENUMS.Morse.N="- *" +ENUMS.Morse.O="- - -" +ENUMS.Morse.P="* - - *" +ENUMS.Morse.Q="- - * -" +ENUMS.Morse.R="* - *" +ENUMS.Morse.S="* * *" +ENUMS.Morse.T="-" +ENUMS.Morse.U="* * -" +ENUMS.Morse.V="* * * -" +ENUMS.Morse.W="* - -" +ENUMS.Morse.X="- * * -" +ENUMS.Morse.Y="- * - -" +ENUMS.Morse.Z="- - * *" +ENUMS.Morse.N1="* - - - -" +ENUMS.Morse.N2="* * - - -" +ENUMS.Morse.N3="* * * - -" +ENUMS.Morse.N4="* * * * -" +ENUMS.Morse.N5="* * * * *" +ENUMS.Morse.N6="- * * * *" +ENUMS.Morse.N7="- - * * *" +ENUMS.Morse.N8="- - - * *" +ENUMS.Morse.N9="- - - - *" +ENUMS.Morse.N0="- - - - -" +ENUMS.Morse[" "]=" " \ No newline at end of file