From f3c4aea12fd60f99ce1f72386a4204ea190acf9b Mon Sep 17 00:00:00 2001 From: Applevangelist <72444570+Applevangelist@users.noreply.github.com> Date: Sun, 14 Nov 2021 12:59:24 +0100 Subject: [PATCH] Wrapper Unit fix missile count missile count for SAM and CRUISE types #1624 --- Moose Development/Moose/Wrapper/Unit.lua | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Moose Development/Moose/Wrapper/Unit.lua b/Moose Development/Moose/Wrapper/Unit.lua index 098508f56..01f7ac4e7 100644 --- a/Moose Development/Moose/Wrapper/Unit.lua +++ b/Moose Development/Moose/Wrapper/Unit.lua @@ -626,8 +626,8 @@ function UNIT:GetAmmunition() -- Type name of current weapon. local Tammo=ammotable[w]["desc"]["typeName"] - local _weaponString = UTILS.Split(Tammo,"%.") - local _weaponName = _weaponString[#_weaponString] + --local _weaponString = UTILS.Split(Tammo,"%.") + --local _weaponName = _weaponString[#_weaponString] -- Get the weapon category: shell=0, missile=1, rocket=2, bomb=3 local Category=ammotable[w].desc.category @@ -655,8 +655,9 @@ function UNIT:GetAmmunition() nbombs=nbombs+Nammo elseif Category==Weapon.Category.MISSILE then - - -- Add up all cruise missiles (category 5) + + + -- Add up all missiles (category 5) if MissileCategory==Weapon.MissileCategory.AAM then nmissiles=nmissiles+Nammo elseif MissileCategory==Weapon.MissileCategory.ANTI_SHIP then @@ -665,6 +666,10 @@ function UNIT:GetAmmunition() nmissiles=nmissiles+Nammo elseif MissileCategory==Weapon.MissileCategory.OTHER then nmissiles=nmissiles+Nammo + elseif MissileCategory==Weapon.MissileCategory.SAM then + nmissiles=nmissiles+Nammo + elseif MissileCategory==Weapon.MissileCategory.CRUISE then + nmissiles=nmissiles+Nammo end end @@ -678,8 +683,6 @@ function UNIT:GetAmmunition() return nammo, nshells, nrockets, nbombs, nmissiles end - - --- Returns the unit sensors. -- @param #UNIT self -- @return DCS#Unit.Sensors Table of sensors.