From 2fb9a1b1d77c434fc92364c843c5c3b860a68350 Mon Sep 17 00:00:00 2001 From: Frank Date: Mon, 4 Apr 2022 12:15:29 +0200 Subject: [PATCH] static spawn --- Moose Development/Moose/Core/SpawnStatic.lua | 35 +++++++++++++------- Moose Development/Moose/Ops/Brigade.lua | 2 +- Moose Development/Moose/Ops/OpsGroup.lua | 1 - Moose Development/Moose/Ops/OpsTransport.lua | 5 ++- 4 files changed, 26 insertions(+), 17 deletions(-) diff --git a/Moose Development/Moose/Core/SpawnStatic.lua b/Moose Development/Moose/Core/SpawnStatic.lua index 5fde1c12c..b2ad3523d 100644 --- a/Moose Development/Moose/Core/SpawnStatic.lua +++ b/Moose Development/Moose/Core/SpawnStatic.lua @@ -46,14 +46,14 @@ -- @field #number InitOffsetAngle Link offset angle in degrees. -- @field #number InitStaticHeading Heading of the static. -- @field #string InitStaticLivery Livery for aircraft. --- @field #string InitStaticShape Shape of teh static. +-- @field #string InitStaticShape Shape of the static. -- @field #string InitStaticType Type of the static. -- @field #string InitStaticCategory Categrory of the static. -- @field #string InitStaticName Name of the static. -- @field Core.Point#COORDINATE InitStaticCoordinate Coordinate where to spawn the static. --- @field #boolean InitDead Set static to be dead if true. --- @field #boolean InitCargo If true, static can act as cargo. --- @field #number InitCargoMass Mass of cargo in kg. +-- @field #boolean InitStaticDead Set static to be dead if true. +-- @field #boolean InitStaticCargo If true, static can act as cargo. +-- @field #number InitStaticCargoMass Mass of cargo in kg. -- @extends Core.Base#BASE @@ -260,7 +260,7 @@ end -- @param #number Mass Mass of the cargo in kg. -- @return #SPAWNSTATIC self function SPAWNSTATIC:InitCargoMass(Mass) - self.InitCargoMass=Mass + self.InitStaticCargoMass=Mass return self end @@ -269,7 +269,16 @@ end -- @param #boolean IsCargo If true, this static can act as cargo. -- @return #SPAWNSTATIC self function SPAWNSTATIC:InitCargo(IsCargo) - self.InitCargo=IsCargo + self.InitStaticCargo=IsCargo + return self +end + +--- Initialize as dead. +-- @param #SPAWNSTATIC self +-- @param #boolean IsCargo If true, this static is dead. +-- @return #SPAWNSTATIC self +function SPAWNSTATIC:InitDead(IsDead) + self.InitStaticDead=IsDead return self end @@ -417,16 +426,16 @@ function SPAWNSTATIC:_SpawnStatic(Template, CountryID) Template.livery_id=self.InitStaticLivery end - if self.InitDead~=nil then - Template.dead=self.InitDead + if self.InitStaticDead~=nil then + Template.dead=self.InitStaticDead end - if self.InitCargo~=nil then - Template.canCargo=self.InitCargo + if self.InitStaticCargo~=nil then + Template.canCargo=self.InitStaticCargo end - if self.InitCargoMass~=nil then - Template.mass=self.InitCargoMass + if self.InitStaticCargoMass~=nil then + Template.mass=self.InitStaticCargoMass end if self.InitLinkUnit then @@ -479,6 +488,8 @@ function SPAWNSTATIC:_SpawnStatic(Template, CountryID) -- ED's dirty way to spawn FARPS. Static=coalition.addGroup(CountryID, -1, TemplateGroup) else + self:T("Spawning Static") + self:T2({Template=Template}) Static=coalition.addStaticObject(CountryID, Template) end diff --git a/Moose Development/Moose/Ops/Brigade.lua b/Moose Development/Moose/Ops/Brigade.lua index 9ce7e379f..54c884b3f 100644 --- a/Moose Development/Moose/Ops/Brigade.lua +++ b/Moose Development/Moose/Ops/Brigade.lua @@ -23,7 +23,7 @@ -- @field Core.Set#SET_ZONE retreatZones Retreat zone set. -- @extends Ops.Legion#LEGION ---- Be surprised! +--- *I am not afraid of an Army of lions lead by a sheep; I am afraid of sheep lead by a lion* -- Alexander the Great -- -- === -- diff --git a/Moose Development/Moose/Ops/OpsGroup.lua b/Moose Development/Moose/Ops/OpsGroup.lua index edf9a8c85..92c5aba92 100644 --- a/Moose Development/Moose/Ops/OpsGroup.lua +++ b/Moose Development/Moose/Ops/OpsGroup.lua @@ -6162,7 +6162,6 @@ function OPSGROUP:Teleport(Coordinate, Delay) for i=1,#units do local unit=units[i] d[i]={x=Coordinate.x+(units[i].x-units[1].x), y=Coordinate.z+units[i].y-units[1].y} - --COORDINATE:NewFromVec2(d[i]):MarkToAll(unit.name.." teleported") end for i=#units,1,-1 do diff --git a/Moose Development/Moose/Ops/OpsTransport.lua b/Moose Development/Moose/Ops/OpsTransport.lua index 7940c17d7..7817b3e2a 100644 --- a/Moose Development/Moose/Ops/OpsTransport.lua +++ b/Moose Development/Moose/Ops/OpsTransport.lua @@ -17,8 +17,7 @@ -- -- ### Author: **funkyfranky** -- --- == --- +-- === -- @module Ops.OpsTransport -- @image OPS_OpsTransport.png @@ -63,7 +62,7 @@ -- -- @extends Core.Fsm#FSM ---- *Victory is the beautiful, bright-colored flower. Transport is the stem without which it could never have blossomed.* -- Winston Churchill +--- *Victory is the beautiful, bright-colored flower; Transport is the stem without which it could never have blossomed* -- Winston Churchill -- -- === --