From db35a67bd7e2c5c2ba94a90254cffa94af74c12e Mon Sep 17 00:00:00 2001 From: Thomas <72444570+Applevangelist@users.noreply.github.com> Date: Wed, 24 Apr 2024 10:40:54 +0200 Subject: [PATCH 1/8] Update Triangle.lua (#2121) --- Moose Development/Moose/Shapes/Triangle.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/Moose Development/Moose/Shapes/Triangle.lua b/Moose Development/Moose/Shapes/Triangle.lua index e0e752ce8..747407d2e 100644 --- a/Moose Development/Moose/Shapes/Triangle.lua +++ b/Moose Development/Moose/Shapes/Triangle.lua @@ -5,6 +5,7 @@ -- -- === -- @module Shapes.TRIANGLE +-- @image MOOSE.JPG --- LINE class. -- @type CUBE From b883bb1e62b492ddf6834b2f1f194da23be670e4 Mon Sep 17 00:00:00 2001 From: Thomas <72444570+Applevangelist@users.noreply.github.com> Date: Wed, 24 Apr 2024 10:41:19 +0200 Subject: [PATCH 2/8] Update Polygon.lua (#2120) --- Moose Development/Moose/Shapes/Polygon.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/Moose Development/Moose/Shapes/Polygon.lua b/Moose Development/Moose/Shapes/Polygon.lua index 0d0707570..d0253fa04 100644 --- a/Moose Development/Moose/Shapes/Polygon.lua +++ b/Moose Development/Moose/Shapes/Polygon.lua @@ -4,6 +4,7 @@ -- -- === -- @module Shapes.POLYGON +-- @image MOOSE.JPG --- POLYGON class. -- @type POLYGON From 44003a8fdabcea1ca9ff90ebbd6df4157bccf890 Mon Sep 17 00:00:00 2001 From: Thomas <72444570+Applevangelist@users.noreply.github.com> Date: Wed, 24 Apr 2024 10:41:33 +0200 Subject: [PATCH 3/8] Update Oval.lua (#2119) --- Moose Development/Moose/Shapes/Oval.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/Moose Development/Moose/Shapes/Oval.lua b/Moose Development/Moose/Shapes/Oval.lua index d1a65b58d..40ddc3317 100644 --- a/Moose Development/Moose/Shapes/Oval.lua +++ b/Moose Development/Moose/Shapes/Oval.lua @@ -4,6 +4,7 @@ -- -- === -- @module Shapes.OVAL +-- @image MOOSE.JPG --- OVAL class. -- @type OVAL From 8dea86b921bb3796a0837486fe953cf462357993 Mon Sep 17 00:00:00 2001 From: Thomas <72444570+Applevangelist@users.noreply.github.com> Date: Wed, 24 Apr 2024 10:41:49 +0200 Subject: [PATCH 4/8] Update Line.lua (#2118) --- Moose Development/Moose/Shapes/Line.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/Moose Development/Moose/Shapes/Line.lua b/Moose Development/Moose/Shapes/Line.lua index 9b860000d..ef321ce32 100644 --- a/Moose Development/Moose/Shapes/Line.lua +++ b/Moose Development/Moose/Shapes/Line.lua @@ -4,6 +4,7 @@ -- -- === -- @module Shapes.LINE +-- @image MOOSE.JPG --- LINE class. -- @type LINE From ae213c4cf100f18ba627ba53376a96205c0b9bf5 Mon Sep 17 00:00:00 2001 From: Thomas <72444570+Applevangelist@users.noreply.github.com> Date: Wed, 24 Apr 2024 10:42:04 +0200 Subject: [PATCH 5/8] Update Cube.lua (#2117) --- Moose Development/Moose/Shapes/Cube.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/Moose Development/Moose/Shapes/Cube.lua b/Moose Development/Moose/Shapes/Cube.lua index 18448fe85..f030ebeae 100644 --- a/Moose Development/Moose/Shapes/Cube.lua +++ b/Moose Development/Moose/Shapes/Cube.lua @@ -4,6 +4,7 @@ -- -- === -- @module Shapes.CUBE +-- @image MOOSE.JPG --- LINE class. -- @type CUBE From a0b49fbd6731d4a79cc40bf28152c9f23c9eca44 Mon Sep 17 00:00:00 2001 From: Thomas <72444570+Applevangelist@users.noreply.github.com> Date: Wed, 24 Apr 2024 10:42:19 +0200 Subject: [PATCH 6/8] Update Circle.lua (#2116) --- Moose Development/Moose/Shapes/Circle.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/Moose Development/Moose/Shapes/Circle.lua b/Moose Development/Moose/Shapes/Circle.lua index 3c4efc10c..39461c522 100644 --- a/Moose Development/Moose/Shapes/Circle.lua +++ b/Moose Development/Moose/Shapes/Circle.lua @@ -4,6 +4,7 @@ -- -- === -- @module Shapes.CIRCLE +-- @image MOOSE.JPG --- CIRCLE class. -- @type CIRCLE From f9dcc9d95cb634584d108fa0360dee6ffc301975 Mon Sep 17 00:00:00 2001 From: Thomas <72444570+Applevangelist@users.noreply.github.com> Date: Wed, 24 Apr 2024 13:21:24 +0200 Subject: [PATCH 7/8] Update build-includes.yml --- .github/workflows/build-includes.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-includes.yml b/.github/workflows/build-includes.yml index 0925e3892..1d7e6e969 100644 --- a/.github/workflows/build-includes.yml +++ b/.github/workflows/build-includes.yml @@ -47,6 +47,7 @@ jobs: - name: Update apt-get (needed for act docker image) run: | + sudo rm /etc/apt/sources.list.d/microsoft-prod.list sudo apt-get -qq update - name: Install tree From d3419d218ac5c44529641dd70e5f968ffa719416 Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Sat, 27 Apr 2024 17:28:32 +0200 Subject: [PATCH 8/8] #WEAPON - Added `IsFoxOne()`.. `IsFoxThree()` --- Moose Development/Moose/Wrapper/Weapon.lua | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/Moose Development/Moose/Wrapper/Weapon.lua b/Moose Development/Moose/Wrapper/Weapon.lua index 5c9ebc53d..3e75d8672 100644 --- a/Moose Development/Moose/Wrapper/Weapon.lua +++ b/Moose Development/Moose/Wrapper/Weapon.lua @@ -40,6 +40,7 @@ -- @field #number coalition Coalition ID. -- @field #number country Country ID. -- @field DCS#Desc desc Descriptor table. +-- @field DCS#Desc guidance Missile guidance descriptor. -- @field DCS#Unit launcher Launcher DCS unit. -- @field Wrapper.Unit#UNIT launcherUnit Launcher Unit. -- @field #string launcherName Name of launcher unit. @@ -196,6 +197,9 @@ function WEAPON:New(WeaponObject) if self:IsMissile() and self.desc.missileCategory then self.categoryMissile=self.desc.missileCategory + if self.desc.guidance then + self.guidance = self.desc.guidance + end end -- Get type name. @@ -667,6 +671,26 @@ function WEAPON:IsTorpedo() return self.category==Weapon.Category.TORPEDO end +--- Check if weapon is a Fox One missile (Radar Semi-Active). +-- @param #WEAPON self +-- @return #boolean If `true`, is a Fox One. +function WEAPON:IsFoxOne() + return self.guidance==Weapon.GuidanceType.RADAR_SEMI_ACTIVE +end + +--- Check if weapon is a Fox Two missile (IR guided). +-- @param #WEAPON self +-- @return #boolean If `true`, is a Fox Two. +function WEAPON:IsFoxTwo() + return self.guidance==Weapon.GuidanceType.IR +end + +--- Check if weapon is a Fox Three missile (Radar Active). +-- @param #WEAPON self +-- @return #boolean If `true`, is a Fox Three. +function WEAPON:IsFoxThree() + return self.guidance==Weapon.GuidanceType.RADAR_ACTIVE +end --- Destroy the weapon object. -- @param #WEAPON self