Merge pull request #898 from FlightControl-Master/FF/Develop

Added Big Smoke Effect

Moose Development/Moose/Core/Point.lua

@@ -1013,6 +1013,88 @@ do -- COORDINATE
     self:Smoke( SMOKECOLOR.Blue )
   end
 
+  --- Big smoke and fire at the coordinate.
+  -- @param #COORDINATE self
+  -- @param Utilities.Utils#BIGSMOKEPRESET preset Smoke preset (0=small smoke and fire, 1=medium smoke and fire, 2=large smoke and fire, 3=huge smoke and fire, 4=small smoke, 5=medium smoke, 6=large smoke, 7=huge smoke).
+  -- @param #number density (Optional) Smoke density. Number in [0,...,1]. Default 0.5.
+  function COORDINATE:BigSmokeAndFire( preset, density )
+    self:F2( { preset=preset, density=density } )
+    density=density or 0.5
+    trigger.action.effectSmokeBig( self:GetVec3(), preset, density )
+  end
+
+  --- Small smoke and fire at the coordinate.
+  -- @param #COORDINATE self
+  -- @number density (Optional) Smoke density. Number between 0 and 1. Default 0.5.
+  function COORDINATE:BigSmokeAndFireSmall( density )
+    self:F2( { density=density } )
+    density=density or 0.5
+    self:BigSmokeAndFire(BIGSMOKEPRESET.SmallSmokeAndFire, density)
+  end
+
+  --- Medium smoke and fire at the coordinate.
+  -- @param #COORDINATE self
+  -- @number density (Optional) Smoke density. Number between 0 and 1. Default 0.5.
+  function COORDINATE:BigSmokeAndFireMedium( density )
+    self:F2( { density=density } )
+    density=density or 0.5
+    self:BigSmokeAndFire(BIGSMOKEPRESET.MediumSmokeAndFire, density)
+  end
+  
+  --- Large smoke and fire at the coordinate.
+  -- @param #COORDINATE self
+  -- @number density (Optional) Smoke density. Number between 0 and 1. Default 0.5.
+  function COORDINATE:BigSmokeAndFireLarge( density )
+    self:F2( { density=density } )
+    density=density or 0.5
+    self:BigSmokeAndFire(BIGSMOKEPRESET.LargeSmokeAndFire, density)
+  end
+
+  --- Huge smoke and fire at the coordinate.
+  -- @param #COORDINATE self
+  -- @number density (Optional) Smoke density. Number between 0 and 1. Default 0.5.
+  function COORDINATE:BigSmokeAndFireHuge( density )
+    self:F2( { density=density } )
+    density=density or 0.5
+    self:BigSmokeAndFire(BIGSMOKEPRESET.HugeSmokeAndFire, density)
+  end
+  
+  --- Small smoke at the coordinate.
+  -- @param #COORDINATE self
+  -- @number density (Optional) Smoke density. Number between 0 and 1. Default 0.5.
+  function COORDINATE:BigSmokeSmall( density )
+    self:F2( { density=density } )
+    density=density or 0.5
+    self:BigSmokeAndFire(BIGSMOKEPRESET.SmallSmoke, density)
+  end
+  
+  --- Medium smoke at the coordinate.
+  -- @param #COORDINATE self
+  -- @number density (Optional) Smoke density. Number between 0 and 1. Default 0.5.
+  function COORDINATE:BigSmokeMedium( density )
+    self:F2( { density=density } )
+    density=density or 0.5
+    self:BigSmokeAndFire(BIGSMOKEPRESET.MediumSmoke, density)
+  end
+
+  --- Large smoke at the coordinate.
+  -- @param #COORDINATE self
+  -- @number density (Optional) Smoke density. Number between 0 and 1. Default 0.5.
+  function COORDINATE:BigSmokeLarge( density )
+    self:F2( { density=density } )
+    density=density or 0.5
+    self:BigSmokeAndFire(BIGSMOKEPRESET.LargeSmoke, density)
+  end
+  
+  --- Huge smoke at the coordinate.
+  -- @param #COORDINATE self
+  -- @number density (Optional) Smoke density. Number between 0 and 1. Default 0.5.
+  function COORDINATE:BigSmokeHuge( density )
+    self:F2( { density=density } )
+    density=density or 0.5
+    self:BigSmokeAndFire(BIGSMOKEPRESET.HugeSmoke, density)
+  end  
+
   --- Flares the point in a color.
   -- @param #COORDINATE self
   -- @param Utilities.Utils#FLARECOLOR FlareColor

Moose Development/Moose/Functional/Artillery.lua

@@ -936,9 +936,9 @@ function ARTY:_OnEventShot(EventData)
         self.Nshots=self.Nshots+1
         
         -- Debug output.
-        local text=string.format("Group %s fired shot %d of %d with weapon %s on target %s.", self.Controllable:GetName(), self.Nshots, self.currentTarget.nshells, _weaponName, self.currentTarget.name)
+        local text=string.format("%s, fired shot %d of %d with weapon %s on target %s.", self.Controllable:GetName(), self.Nshots, self.currentTarget.nshells, _weaponName, self.currentTarget.name)
         self:T(ARTY.id..text)
-        MESSAGE:New(text, 5):ToAllIf(self.Debug)
+        MESSAGE:New(text, 5):ToAllIf(self.report or self.Debug)
         
         -- Get current ammo.
         local _nammo,_nshells,_nrockets,_nmissiles=self:GetAmmo()

Moose Development/Moose/Utilities/Utils.lua

@@ -29,6 +29,19 @@ SMOKECOLOR = trigger.smokeColor -- #SMOKECOLOR
 
 FLARECOLOR = trigger.flareColor -- #FLARECOLOR
 
+--- Big smoke preset enum.
+-- @type BIGSMOKEPRESET
+BIGSMOKEPRESET = {
+  SmallSmokeAndFire=0,
+  MediumSmokeAndFire=1,
+  LargeSmokeAndFire=2,
+  HugeSmokeAndFire=3,
+  SmallSmoke=4,
+  MediumSmoke=5,
+  LargeSmoke=6,
+  HugeSmoke=7,
+}
+
 --- Utilities static class.
 -- @type UTILS
 UTILS = {