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

CSAR give scripted spawned pilots a name.

Browse Source 
CTLD corrected that generic troops could be spawned only once.
This commit is contained in:
Applevangelist 2021-07-06 20:24:35 +02:00
parent b7bc3cfbcf
commit 5d3ea57d4d
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Moose Development/Moose/Ops/CSAR.lua
View File

@ -663,7 +663,7 @@ function CSAR:_SpawnCsarAtZone( _zone, _coalition, _description, _randomPoint, _
return return
end end
local _description = _description or "none" local _description = _description or "Unknown"
local pos = {} local pos = {}
if _randomPoint then if _randomPoint then
@ -682,7 +682,7 @@ function CSAR:_SpawnCsarAtZone( _zone, _coalition, _description, _randomPoint, _
_country = country.id.UN_PEACEKEEPERS _country = country.id.UN_PEACEKEEPERS
end end
self:_AddCsar(_coalition, _country, pos, "PoW", "Unknown", nil, freq, _nomessage, _description) self:_AddCsar(_coalition, _country, pos, "PoW", _description, nil, freq, _nomessage, _description)
return self return self
end end

17
Moose Development/Moose/Ops/CTLD.lua
View File

@ -55,10 +55,10 @@ CTLD_CARGO = {
-- @type CTLD_CARGO.Enum -- @type CTLD_CARGO.Enum
-- @field #string Type Type of Cargo. -- @field #string Type Type of Cargo.
CTLD_CARGO.Enum = { CTLD_CARGO.Enum = {
VEHICLE = "Vehicle", -- #string vehicles ["VEHICLE"] = "Vehicle", -- #string vehicles
TROOPS = "Troops", -- #string troops ["TROOPS"] = "Troops", -- #string troops
FOB = "FOB", -- #string FOB ["FOB"] = "FOB", -- #string FOB
CRATE = "CRATE", -- #string crate ["CRATE"] = "Crate", -- #string crate
} }
--- Function to create new CTLD_CARGO object. --- Function to create new CTLD_CARGO object.
@ -513,7 +513,7 @@ CTLD.SkipFrequencies = {
--- CTLD class version. --- CTLD class version.
-- @field #string version -- @field #string version
CTLD.version="0.1.4r2" CTLD.version="0.1.3r2"
--- Instantiate a new CTLD. --- Instantiate a new CTLD.
-- @param #CTLD self -- @param #CTLD self
@ -1010,8 +1010,11 @@ function CTLD:_LoadTroops(Group, Unit, Cargotype)
--local m = MESSAGE:New("Sorry, we\'re crammed already!",10,"CTLD",true):ToGroup(group) --local m = MESSAGE:New("Sorry, we\'re crammed already!",10,"CTLD",true):ToGroup(group)
return return
else else
self.CargoCounter = self.CargoCounter + 1
local loadcargotype = CTLD_CARGO:New(self.CargoCounter, Cargotype.Name, Cargotype.Templates, CTLD_CARGO.Enum.TROOPS, true, true, Cargotype.CratesNeeded)
self:T({cargotype=loadcargotype})
loaded.Troopsloaded = loaded.Troopsloaded + troopsize loaded.Troopsloaded = loaded.Troopsloaded + troopsize
table.insert(loaded.Cargo,Cargotype) table.insert(loaded.Cargo,loadcargotype)
self.Loaded_Cargo[unitname] = loaded self.Loaded_Cargo[unitname] = loaded
self:_SendMessage("Troops boarded!", 10, false, Group) self:_SendMessage("Troops boarded!", 10, false, Group)
--local m = MESSAGE:New("Troops boarded!",10,"CTLD",true):ToGroup(group) --local m = MESSAGE:New("Troops boarded!",10,"CTLD",true):ToGroup(group)
@ -1583,7 +1586,7 @@ function CTLD:_BuildCrates(Group, Unit)
buildables[name].CanBuild = true buildables[name].CanBuild = true
canbuild = true canbuild = true
end end
--self:T{buildables = buildables}) self:T({buildables = buildables})
end -- end dropped end -- end dropped
end -- end crate loop end -- end crate loop
-- ok let\'s list what we have -- ok let\'s list what we have