FlightControl-Master/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-10-29 16:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

RANGE 1.0.3

Browse Source 
Improved ammo counting.
This commit is contained in:
funkyfranky 2018-03-30 19:54:53 +02:00
parent b3facc6e88
commit 9de6993a4c
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Moose Development/Moose/Functional/Range.lua
View File

@ -227,7 +227,7 @@ RANGE.id="RANGE | "
--- Range script version. --- Range script version.
-- @field #number version -- @field #number version
RANGE.version="1.0.2" RANGE.version="1.0.3"
--TODO list --TODO list
--TODO: Add statics for strafe pits. --TODO: Add statics for strafe pits.
@ -1573,6 +1573,9 @@ end
function RANGE:_GetAmmo(unitname) function RANGE:_GetAmmo(unitname)
self:F(unitname) self:F(unitname)
-- Init counter.
local ammo=0
local unit, playername = self:_GetPlayerUnitAndName(unitname) local unit, playername = self:_GetPlayerUnitAndName(unitname)
if unit and playername then if unit and playername then
@ -1580,7 +1583,7 @@ function RANGE:_GetAmmo(unitname)
local has_ammo=false local has_ammo=false
local ammotable=unit:GetAmmo() local ammotable=unit:GetAmmo()
self:E({ammotable=ammotable}) self:T2({ammotable=ammotable})
if ammotable ~= nil then if ammotable ~= nil then
@ -1594,16 +1597,19 @@ function RANGE:_GetAmmo(unitname)
-- We are specifically looking for shells here. -- We are specifically looking for shells here.
if string.match(Tammo, "shell") then if string.match(Tammo, "shell") then
-- Add up all shells
ammo=ammo+Nammo
local text=string.format("Player %s has %d rounds ammo of type %s", playername, Nammo, Tammo) local text=string.format("Player %s has %d rounds ammo of type %s", playername, Nammo, Tammo)
self:T(RANGE.id..text) self:T(RANGE.id..text)
MESSAGE:New(text, 10):ToAllIf(self.Debug) MESSAGE:New(text, 10):ToAllIf(self.Debug)
return Nammo
end end
end end
end end
end end
return 0 return ammo
end end
--- Mark targets on F10 map. --- Mark targets on F10 map.