From e093afcff1c92073251b86c953d60b32a5c0be5d Mon Sep 17 00:00:00 2001 From: Josh Date: Wed, 18 Dec 2024 13:39:50 +0000 Subject: [PATCH] All lingering changes --- .../SBOOhwalliBombEffectController01_script.lua | 4 ++-- effects/Entities/SCUDeath01/SCUDeath01_script.lua | 2 +- .../TeleportSpinner01/TeleportSpinner01_script.lua | 2 +- .../TeleportSpinner02/TeleportSpinner02_script.lua | 2 +- .../TeleportSpinner03/TeleportSpinner03_script.lua | 2 +- env/DevTest/Props/thermal_vent_01_script.lua | 2 +- lua/SimCallbacks.lua | 8 ++++---- lua/defaultantiprojectile.lua | 6 +++--- lua/shield.lua | 2 +- lua/sim/CollisionBeam.lua | 2 +- lua/sim/Unit.lua | 4 ++-- .../ExperimentalPhasonLaserCollisionBeam.lua | 6 +++--- .../LightningSmallSurfaceCollisionBeam.lua | 2 +- .../collisionBeams/MicrowaveLaserCollisionBeam01.lua | 2 +- .../OrbitalDeathLaserCollisionBeam.lua | 2 +- lua/sim/collisionBeams/PhasonLaserCollisionBeam.lua | 2 +- .../QuantumBeamGeneratorCollisionBeam.lua | 2 +- lua/sim/collisionBeams/TDFHiroCollisionBeam.lua | 2 +- .../UltraChromaticBeamGeneratorCollisionBeam.lua | 2 +- .../UnstablePhasonLaserCollisionBeam.lua | 2 +- lua/sim/projectiles/OverchargeProjectile.lua | 2 +- lua/sim/units/uef/TConstructionPodUnit.lua | 2 +- .../CIFPulsarEMPMissile01_Script.lua | 2 +- .../MissileCruiseSubTerran01_script.lua | 12 ++++++------ units/UAC1101/UAC1101_Script.lua | 2 +- units/UEB1303/UEB1303_script.lua | 4 ++-- units/UEC1501/UEC1501_Script.lua | 2 +- units/XSC1101/XSC1101_Script.lua | 2 +- units/XSC1901/XSC1901_Script.lua | 2 +- 29 files changed, 44 insertions(+), 44 deletions(-) diff --git a/effects/Entities/SBOOhwalliBombEffectController01/SBOOhwalliBombEffectController01_script.lua b/effects/Entities/SBOOhwalliBombEffectController01/SBOOhwalliBombEffectController01_script.lua index 3fb909f926..ff2e05209b 100644 --- a/effects/Entities/SBOOhwalliBombEffectController01/SBOOhwalliBombEffectController01_script.lua +++ b/effects/Entities/SBOOhwalliBombEffectController01/SBOOhwalliBombEffectController01_script.lua @@ -98,10 +98,10 @@ SBOOhwalliBombEffectController01 = Class(NullShell) { WaitTicks(26) -- Create a light for this thing's flash. - CreateLightParticle(self, -1, self:GetArmy(), 80, 14, 'flare_lens_add_03', 'ramp_white_07' ) + CreateLightParticle(self, -1, self.Army, 80, 14, 'flare_lens_add_03', 'ramp_white_07' ) -- Create our decals - CreateDecal( self:GetPosition(), RandomFloat(0.0,6.28), 'Scorch_012_albedo', '', 'Albedo', 80, 80, 1000, 0, self:GetArmy()) + CreateDecal( self:GetPosition(), RandomFloat(0.0,6.28), 'Scorch_012_albedo', '', 'Albedo', 80, 80, 1000, 0, self.Army) -- Create explosion effects for k, v in EffectTemplate.SOhwalliDetonate01 do diff --git a/effects/Entities/SCUDeath01/SCUDeath01_script.lua b/effects/Entities/SCUDeath01/SCUDeath01_script.lua index cd01020d58..0ecdfa513c 100644 --- a/effects/Entities/SCUDeath01/SCUDeath01_script.lua +++ b/effects/Entities/SCUDeath01/SCUDeath01_script.lua @@ -47,7 +47,7 @@ SCUDeath01 = Class(NullShell) { ---@param self SCUDeath01 EffectThread = function(self) - local army = self:GetArmy() + local army = self.Army local position = self:GetPosition() if position[2] + 2 > GetSurfaceHeight(position[1], position[3]) then self:ForkThread(self.CreateOuterRingWaveSmokeRing) diff --git a/effects/Entities/TeleportSpinner01/TeleportSpinner01_script.lua b/effects/Entities/TeleportSpinner01/TeleportSpinner01_script.lua index 462a73046d..899aad2fd5 100644 --- a/effects/Entities/TeleportSpinner01/TeleportSpinner01_script.lua +++ b/effects/Entities/TeleportSpinner01/TeleportSpinner01_script.lua @@ -15,7 +15,7 @@ TeleportSpinner01 = Class(NullShell) { ---@param self TeleportSpinner01 OnCreate = function(self) NullShell.OnCreate(self) - local army = self:GetArmy() + local army = self.Army for k, v in EffectTemplate.CSGTestSpinner1 do CreateEmitterOnEntity( self, army, v ) diff --git a/effects/Entities/TeleportSpinner02/TeleportSpinner02_script.lua b/effects/Entities/TeleportSpinner02/TeleportSpinner02_script.lua index ef3123cb41..7828a6a495 100644 --- a/effects/Entities/TeleportSpinner02/TeleportSpinner02_script.lua +++ b/effects/Entities/TeleportSpinner02/TeleportSpinner02_script.lua @@ -14,7 +14,7 @@ TeleportSpinner02 = Class(NullShell) { ---@param self TeleportSpinner02 OnCreate = function(self) NullShell.OnCreate(self) - local army = self:GetArmy() + local army = self.Army for k, v in EffectTemplate.CSGTestSpinner2 do CreateEmitterOnEntity( self, army, v ) diff --git a/effects/Entities/TeleportSpinner03/TeleportSpinner03_script.lua b/effects/Entities/TeleportSpinner03/TeleportSpinner03_script.lua index c92aa30a53..bcde70d206 100644 --- a/effects/Entities/TeleportSpinner03/TeleportSpinner03_script.lua +++ b/effects/Entities/TeleportSpinner03/TeleportSpinner03_script.lua @@ -14,7 +14,7 @@ TeleportSpinner03 = Class(NullShell) { ---@param self TeleportSpinner03 OnCreate = function(self) NullShell.OnCreate(self) - local army = self:GetArmy() + local army = self.Army for k, v in EffectTemplate.CSGTestSpinner3 do CreateEmitterOnEntity( self, army, v ) diff --git a/env/DevTest/Props/thermal_vent_01_script.lua b/env/DevTest/Props/thermal_vent_01_script.lua index 71511d86b0..7fed450d31 100644 --- a/env/DevTest/Props/thermal_vent_01_script.lua +++ b/env/DevTest/Props/thermal_vent_01_script.lua @@ -6,7 +6,7 @@ local Prop = import("/lua/sim/prop.lua").Prop ThermalVent01 = Class(Prop) { OnCreate = function(self) Prop.OnCreate(self) - --CreateAttachedEmitter(self, -1, self:GetArmy(), '/effects/emitters/_test_20_gaseous_emit.bp') + --CreateAttachedEmitter(self, -1, self.Army, '/effects/emitters/_test_20_gaseous_emit.bp') end, } TypeClass = ThermalVent01 \ No newline at end of file diff --git a/lua/SimCallbacks.lua b/lua/SimCallbacks.lua index 824e7a6522..d439238d25 100644 --- a/lua/SimCallbacks.lua +++ b/lua/SimCallbacks.lua @@ -896,13 +896,13 @@ local function ShowRaisedPlatforms(self) pos[3] + plats[((i - 1) * 12) + (b * 3) - 1] ), true) end - self.Trash:Add(AttachBeamEntityToEntity(entities[i][1], -2, entities[i][2], -2, self:GetArmy(), + self.Trash:Add(AttachBeamEntityToEntity(entities[i][1], -2, entities[i][2], -2, self.Army, '/effects/emitters/build_beam_01_emit.bp')) - self.Trash:Add(AttachBeamEntityToEntity(entities[i][1], -2, entities[i][3], -2, self:GetArmy(), + self.Trash:Add(AttachBeamEntityToEntity(entities[i][1], -2, entities[i][3], -2, self.Army, '/effects/emitters/build_beam_01_emit.bp')) - self.Trash:Add(AttachBeamEntityToEntity(entities[i][4], -2, entities[i][2], -2, self:GetArmy(), + self.Trash:Add(AttachBeamEntityToEntity(entities[i][4], -2, entities[i][2], -2, self.Army, '/effects/emitters/build_beam_01_emit.bp')) - self.Trash:Add(AttachBeamEntityToEntity(entities[i][4], -2, entities[i][3], -2, self:GetArmy(), + self.Trash:Add(AttachBeamEntityToEntity(entities[i][4], -2, entities[i][3], -2, self.Army, '/effects/emitters/build_beam_01_emit.bp')) end end diff --git a/lua/defaultantiprojectile.lua b/lua/defaultantiprojectile.lua index c72fd0b2fa..81c825021b 100644 --- a/lua/defaultantiprojectile.lua +++ b/lua/defaultantiprojectile.lua @@ -50,7 +50,7 @@ Flare = Class(Entity) { ---@param self Flare ---@param spec FlareSpec OnCreate = function(self, spec) - self.Army = self:GetArmy() + self.Army = self.Army self.Owner = spec.Owner self.Radius = spec.Radius or 5 self.OffsetMult = spec.OffsetMult or 0 @@ -133,7 +133,7 @@ DepthCharge = Class(Entity) { ---@param self DepthCharge ---@param spec DepthChargeSpec OnCreate = function(self, spec) - self.Army = self:GetArmy() + self.Army = self.Army self.Owner = spec.Owner self.Radius = spec.Radius self.ProjectilesToDeflect = spec.ProjectilesToDeflect or 3 @@ -172,7 +172,7 @@ MissileRedirect = Class(Entity) { ---@param self MissileRedirect ---@param spec MissileRedirectSpec OnCreate = function(self, spec) - self.Army = self:GetArmy() + self.Army = self.Army self.Owner = spec.Owner self.Radius = spec.Radius self.RedirectRateOfFire = spec.RedirectRateOfFire or 1 diff --git a/lua/shield.lua b/lua/shield.lua index fb0dcd0d53..76e6655c8e 100644 --- a/lua/shield.lua +++ b/lua/shield.lua @@ -1379,7 +1379,7 @@ CzarShield = ClassShield(PersonalShield) { self.LiveImpactEntities = self.LiveImpactEntities + 1 - local army = self:GetArmy() + local army = self.Army local OffsetLength = Util.GetVectorLength(vector) local ImpactMesh = Entity(self.ImpactEntitySpecs) local pos = self:GetPosition() diff --git a/lua/sim/CollisionBeam.lua b/lua/sim/CollisionBeam.lua index 0bf3e84b39..d370ca6ee0 100644 --- a/lua/sim/CollisionBeam.lua +++ b/lua/sim/CollisionBeam.lua @@ -50,7 +50,7 @@ CollisionBeam = Class(moho.CollisionBeamEntity) { self.LastTerrainType = nil self.BeamEffectsBag = {} self.TerrainEffectsBag = {} - self.Army = self:GetArmy() + self.Army = self.Army self.Trash = TrashBag() end, diff --git a/lua/sim/Unit.lua b/lua/sim/Unit.lua index 2537e59a22..112b30b952 100644 --- a/lua/sim/Unit.lua +++ b/lua/sim/Unit.lua @@ -203,7 +203,7 @@ Unit = ClassUnit(moho.unit_methods, IntelComponent, VeterancyComponent, DebugUni -- Each unit has a sync table to replicate values to the global sync table to be copied to the user layer at sync time. self.Sync = {} self.Sync.id = self:GetEntityId() - self.Sync.army = self:GetArmy() + self.Sync.army = self.Army setmetatable(self.Sync, SyncMeta) self.Trash = self.Trash or TrashBag() @@ -253,7 +253,7 @@ Unit = ClassUnit(moho.unit_methods, IntelComponent, VeterancyComponent, DebugUni -- cache engine calls self.EntityId = self:GetEntityId() - self.Army = self:GetArmy() + self.Army = self.Army self.UnitId = self:GetUnitId() self.Brain = self:GetAIBrain() diff --git a/lua/sim/collisionBeams/ExperimentalPhasonLaserCollisionBeam.lua b/lua/sim/collisionBeams/ExperimentalPhasonLaserCollisionBeam.lua index 2822092b94..01e8f2928f 100644 --- a/lua/sim/collisionBeams/ExperimentalPhasonLaserCollisionBeam.lua +++ b/lua/sim/collisionBeams/ExperimentalPhasonLaserCollisionBeam.lua @@ -41,7 +41,7 @@ ExperimentalPhasonLaserCollisionBeam = Class(SCCollisionBeam) { ---@param self ExperimentalPhasonLaserCollisionBeam ScorchThread = function(self) - local army = self:GetArmy() + local army = self.Army local size = 4.0 + (Random() * 1.0) local CurrentPosition = self:GetPosition(1) local LastPosition = Vector(0,0,0) @@ -71,11 +71,11 @@ ExperimentalPhasonLaserCollisionBeam = Class(SCCollisionBeam) { CreateBeamEffects = function(self) SCCollisionBeam.CreateBeamEffects(self) for k, v in EffectTemplate.SExperimentalPhasonLaserBeam do - local fxBeam = CreateBeamEntityToEntity(self, 0, self, 1, self:GetArmy(), v) + local fxBeam = CreateBeamEntityToEntity(self, 0, self, 1, self.Army, v) table.insert(self.BeamEffectsBag, fxBeam) self.Trash:Add(fxBeam) end - -- local fxBeam = CreateBeamEntityToEntity(self, 0, self, 1, self:GetArmy(), '/effects/emitters/seraphim_expirimental_laser_beam_02_emit.bp' ) + -- local fxBeam = CreateBeamEntityToEntity(self, 0, self, 1, self.Army, '/effects/emitters/seraphim_expirimental_laser_beam_02_emit.bp' ) end, } diff --git a/lua/sim/collisionBeams/LightningSmallSurfaceCollisionBeam.lua b/lua/sim/collisionBeams/LightningSmallSurfaceCollisionBeam.lua index 470e1ca1b8..96b3d4d7a6 100644 --- a/lua/sim/collisionBeams/LightningSmallSurfaceCollisionBeam.lua +++ b/lua/sim/collisionBeams/LightningSmallSurfaceCollisionBeam.lua @@ -35,7 +35,7 @@ LightningSmallSurfaceCollisionBeam = Class(LightningSmallCollisionBeam) { ---@param self LightningSmallSurfaceCollisionBeam ScorchThread = function(self) - local army = self:GetArmy() + local army = self.Army local size = 1.1 + (Random() * 1.1) local CurrentPosition = self:GetPosition(1) local LastPosition = Vector(0,0,0) diff --git a/lua/sim/collisionBeams/MicrowaveLaserCollisionBeam01.lua b/lua/sim/collisionBeams/MicrowaveLaserCollisionBeam01.lua index 96be04005b..7b067a02aa 100644 --- a/lua/sim/collisionBeams/MicrowaveLaserCollisionBeam01.lua +++ b/lua/sim/collisionBeams/MicrowaveLaserCollisionBeam01.lua @@ -40,7 +40,7 @@ MicrowaveLaserCollisionBeam01 = Class(SCCollisionBeam) { ---@param self MicrowaveLaserCollisionBeam01 ScorchThread = function(self) - local army = self:GetArmy() + local army = self.Army local size = 1.5 + (Random() * 1.5) local CurrentPosition = self:GetPosition(1) local LastPosition = Vector(0,0,0) diff --git a/lua/sim/collisionBeams/OrbitalDeathLaserCollisionBeam.lua b/lua/sim/collisionBeams/OrbitalDeathLaserCollisionBeam.lua index 9a5d8cd548..8c47481638 100644 --- a/lua/sim/collisionBeams/OrbitalDeathLaserCollisionBeam.lua +++ b/lua/sim/collisionBeams/OrbitalDeathLaserCollisionBeam.lua @@ -41,7 +41,7 @@ OrbitalDeathLaserCollisionBeam = Class(SCCollisionBeam) { ---@param self OrbitalDeathLaserCollisionBeam ScorchThread = function(self) - local army = self:GetArmy() + local army = self.Army local size = 3.5 + (Random() * 3.5) local CurrentPosition = self:GetPosition(1) local LastPosition = Vector(0,0,0) diff --git a/lua/sim/collisionBeams/PhasonLaserCollisionBeam.lua b/lua/sim/collisionBeams/PhasonLaserCollisionBeam.lua index d347325398..b7ef96cfa9 100644 --- a/lua/sim/collisionBeams/PhasonLaserCollisionBeam.lua +++ b/lua/sim/collisionBeams/PhasonLaserCollisionBeam.lua @@ -39,7 +39,7 @@ PhasonLaserCollisionBeam = Class(SCCollisionBeam) { ---@param self PhasonLaserCollisionBeam ScorchThread = function(self) - local army = self:GetArmy() + local army = self.Army local size = 1.5 + (Random() * 1.5) local CurrentPosition = self:GetPosition(1) local LastPosition = Vector(0,0,0) diff --git a/lua/sim/collisionBeams/QuantumBeamGeneratorCollisionBeam.lua b/lua/sim/collisionBeams/QuantumBeamGeneratorCollisionBeam.lua index 474f108f10..e2914e6a71 100644 --- a/lua/sim/collisionBeams/QuantumBeamGeneratorCollisionBeam.lua +++ b/lua/sim/collisionBeams/QuantumBeamGeneratorCollisionBeam.lua @@ -41,7 +41,7 @@ QuantumBeamGeneratorCollisionBeam = Class(SCCollisionBeam) { ---@param self QuantumBeamGeneratorCollisionBeam ScorchThread = function(self) - local army = self:GetArmy() + local army = self.Army local size = 3.5 + (Random() * 3.5) local CurrentPosition = self:GetPosition(1) local LastPosition = Vector(0,0,0) diff --git a/lua/sim/collisionBeams/TDFHiroCollisionBeam.lua b/lua/sim/collisionBeams/TDFHiroCollisionBeam.lua index fa1abc3a04..0e85b0c59e 100644 --- a/lua/sim/collisionBeams/TDFHiroCollisionBeam.lua +++ b/lua/sim/collisionBeams/TDFHiroCollisionBeam.lua @@ -38,7 +38,7 @@ TDFHiroCollisionBeam = Class(CollisionBeam) { ---@param self TDFHiroCollisionBeam ScorchThread = function(self) - local army = self:GetArmy() + local army = self.Army local size = 1.5 + (Random() * 1.5) local CurrentPosition = self:GetPosition(1) local LastPosition = Vector(0,0,0) diff --git a/lua/sim/collisionBeams/UltraChromaticBeamGeneratorCollisionBeam.lua b/lua/sim/collisionBeams/UltraChromaticBeamGeneratorCollisionBeam.lua index 1e78f6bb07..be2005bbd2 100644 --- a/lua/sim/collisionBeams/UltraChromaticBeamGeneratorCollisionBeam.lua +++ b/lua/sim/collisionBeams/UltraChromaticBeamGeneratorCollisionBeam.lua @@ -40,7 +40,7 @@ UltraChromaticBeamGeneratorCollisionBeam = Class(SCCollisionBeam) { ---@param self UltraChromaticBeamGeneratorCollisionBeam ScorchThread = function(self) - local army = self:GetArmy() + local army = self.Army local size = 1 + (Random() * 1) local CurrentPosition = self:GetPosition(1) local LastPosition = Vector(0,0,0) diff --git a/lua/sim/collisionBeams/UnstablePhasonLaserCollisionBeam.lua b/lua/sim/collisionBeams/UnstablePhasonLaserCollisionBeam.lua index ebdbcf05f2..eaf5f5a899 100644 --- a/lua/sim/collisionBeams/UnstablePhasonLaserCollisionBeam.lua +++ b/lua/sim/collisionBeams/UnstablePhasonLaserCollisionBeam.lua @@ -50,7 +50,7 @@ UnstablePhasonLaserCollisionBeam = Class(SCCollisionBeam) { ---@param self ExperimentalPhasonLaserCollisionBeam ScorchThread = function(self) - local army = self:GetArmy() + local army = self.Army local size = 1.5 + (Random() * 1.5) local CurrentPosition = self:GetPosition(1) local LastPosition = Vector(0,0,0) diff --git a/lua/sim/projectiles/OverchargeProjectile.lua b/lua/sim/projectiles/OverchargeProjectile.lua index d6317ba3fa..76a9bc7b35 100644 --- a/lua/sim/projectiles/OverchargeProjectile.lua +++ b/lua/sim/projectiles/OverchargeProjectile.lua @@ -34,7 +34,7 @@ OverchargeProjectile = ClassSimple { ---@param self OverchargeProjectile | moho.projectile_methods OnCreate = function(self) - self.Army = self:GetArmy() + self.Army = self.Army if not OCProjectiles[self.Army] then OCProjectiles[self.Army] = 0 diff --git a/lua/sim/units/uef/TConstructionPodUnit.lua b/lua/sim/units/uef/TConstructionPodUnit.lua index f58a18b08f..f0edb602a3 100644 --- a/lua/sim/units/uef/TConstructionPodUnit.lua +++ b/lua/sim/units/uef/TConstructionPodUnit.lua @@ -12,7 +12,7 @@ TConstructionPodUnit = ClassUnit(TConstructionUnit) { ---@param self TConstructionPodUnit OnCreate = function(self) TConstructionUnit.OnCreate(self) - self.guardDummy = CreateUnitHPR('ZXA0003', self:GetArmy(), 0,0,0,0,0,0) + self.guardDummy = CreateUnitHPR('ZXA0003', self.Army, 0,0,0,0,0,0) self.guardDummy:AttachTo(self, -1) self.Trash:Add(self.guardDummy) end, diff --git a/projectiles/CIFPulsarEMPMissile01/CIFPulsarEMPMissile01_Script.lua b/projectiles/CIFPulsarEMPMissile01/CIFPulsarEMPMissile01_Script.lua index 0f871cedf6..f61c0af1fa 100644 --- a/projectiles/CIFPulsarEMPMissile01/CIFPulsarEMPMissile01_Script.lua +++ b/projectiles/CIFPulsarEMPMissile01/CIFPulsarEMPMissile01_Script.lua @@ -8,7 +8,7 @@ CDFRocketIridium03 = Class(CIridiumRocketProjectile) { OnImpact = function(self, targetType, targetEntity) CIridiumRocketProjectile.OnImpact(self, targetType, targetEntity) - local army = self:GetArmy() + local army = self.Army CreateLightParticle( self, -1, army, 2, 1, 'glow_03', 'ramp_red_06' ) CreateLightParticle( self, -1, army, 1, 3, 'glow_03', 'ramp_antimatter_02' ) end, diff --git a/projectiles/MissileCruiseSubTerran01/MissileCruiseSubTerran01_script.lua b/projectiles/MissileCruiseSubTerran01/MissileCruiseSubTerran01_script.lua index 0a8ef5f45c..946301139d 100644 --- a/projectiles/MissileCruiseSubTerran01/MissileCruiseSubTerran01_script.lua +++ b/projectiles/MissileCruiseSubTerran01/MissileCruiseSubTerran01_script.lua @@ -21,7 +21,7 @@ MissileCruiseSubTerran01 = ClassProjectile(TMissileCruiseSubProjectile) { WaitTicks(1) local emitter = {} for i in self.FxUnderWaterTrail do --underwater trail - table.insert(emitter, CreateEmitterOnEntity(self,self:GetArmy(),self.FxUnderWaterTrail[i]):ScaleEmitter(self.FxTrailScale):OffsetEmitter(0,0,self.FxTrailOffset)) + table.insert(emitter, CreateEmitterOnEntity(self,self.Army,self.FxUnderWaterTrail[i]):ScaleEmitter(self.FxTrailScale):OffsetEmitter(0,0,self.FxTrailOffset)) end WaitTicks(45) @@ -31,10 +31,10 @@ MissileCruiseSubTerran01 = ClassProjectile(TMissileCruiseSubProjectile) { for i in emitter do emitter[i]:Destroy() end - self.MissileExhaust = CreateBeamEmitter('/effects/emitters/missile_cruise_munition_exhaust_beam_01_emit.bp',self:GetArmy()) - AttachBeamToEntity(self.MissileExhaust, self, -1, self:GetArmy()) + self.MissileExhaust = CreateBeamEmitter('/effects/emitters/missile_cruise_munition_exhaust_beam_01_emit.bp',self.Army) + AttachBeamToEntity(self.MissileExhaust, self, -1, self.Army) for i in self.FxLaunchTrails do --launch trails - CreateEmitterOnEntity(self,self:GetArmy(),self.FxLaunchTrails[i]):ScaleEmitter(self.FxTrailScale):OffsetEmitter(0,0,self.FxTrailOffset) + CreateEmitterOnEntity(self,self.Army,self.FxLaunchTrails[i]):ScaleEmitter(self.FxTrailScale):OffsetEmitter(0,0,self.FxTrailOffset) end WaitTicks(30) --Straight Up self:TrackTarget(true) @@ -44,8 +44,8 @@ MissileCruiseSubTerran01 = ClassProjectile(TMissileCruiseSubProjectile) { self:SetBallisticAcceleration() self.MissileExhaust:Destroy() WaitTicks(10) --Falling - self.MissileExhaust = CreateBeamEmitter('/effects/emitters/missile_cruise_munition_exhaust_beam_02_emit.bp',self:GetArmy()) - AttachBeamToEntity(self.MissileExhaust, self, -1, self:GetArmy()) + self.MissileExhaust = CreateBeamEmitter('/effects/emitters/missile_cruise_munition_exhaust_beam_02_emit.bp',self.Army) + AttachBeamToEntity(self.MissileExhaust, self, -1, self.Army) for i in self.FxTrails do --flight trails CreateEmitterOnEntity(self,self.Army,self.FxTrails[i]):ScaleEmitter(self.FxTrailScale):OffsetEmitter(0,0,self.FxTrailOffset) end diff --git a/units/UAC1101/UAC1101_Script.lua b/units/UAC1101/UAC1101_Script.lua index 8937a9b525..3efb5ea94f 100644 --- a/units/UAC1101/UAC1101_Script.lua +++ b/units/UAC1101/UAC1101_Script.lua @@ -34,7 +34,7 @@ UAC1101 = ClassUnit(ACivilianStructureUnit) { OnCreate = function(self) ACivilianStructureUnit.OnCreate(self) - local army = self:GetArmy() + local army = self.Army for k, v in self.BoneSetE01 do AttachBeamEntityToEntity(self, self.BoneB01, self, v, army, self.FxBeamAmbient ) end diff --git a/units/UEB1303/UEB1303_script.lua b/units/UEB1303/UEB1303_script.lua index f7c834e687..f42f117735 100644 --- a/units/UEB1303/UEB1303_script.lua +++ b/units/UEB1303/UEB1303_script.lua @@ -19,7 +19,7 @@ UEB1303 = ClassUnit(TMassFabricationUnit) { self.Rotator:SetAccel(10) self.Rotator:SetTargetSpeed(40) self.Trash:Add(self.Rotator) - self.AmbientEffects = CreateEmitterAtEntity(self, self:GetArmy(), '/effects/emitters/uef_t3_massfab_ambient_01_emit.bp') + self.AmbientEffects = CreateEmitterAtEntity(self, self.Army, '/effects/emitters/uef_t3_massfab_ambient_01_emit.bp') self.Trash:Add(self.AmbientEffects) end, @@ -37,7 +37,7 @@ UEB1303 = ClassUnit(TMassFabricationUnit) { TMassFabricationUnit.OnProductionUnpaused(self) self.Rotator:SetTargetSpeed(40) self.Rotator:SetSpinDown(false) - self.AmbientEffects = CreateEmitterAtEntity(self, self:GetArmy(), '/effects/emitters/uef_t3_massfab_ambient_01_emit.bp') + self.AmbientEffects = CreateEmitterAtEntity(self, self.Army, '/effects/emitters/uef_t3_massfab_ambient_01_emit.bp') self.Trash:Add(self.AmbientEffects) end, } diff --git a/units/UEC1501/UEC1501_Script.lua b/units/UEC1501/UEC1501_Script.lua index 91b1aae592..9120e6168d 100644 --- a/units/UEC1501/UEC1501_Script.lua +++ b/units/UEC1501/UEC1501_Script.lua @@ -23,7 +23,7 @@ UEC1501 = ClassUnit(TCivilianStructureUnit) { OnCreate = function(self) TCivilianStructureUnit.OnCreate(self) - local army = self:GetArmy() + local army = self.Army for k, v in self.EffectBones01 do CreateAttachedEmitter(self,v,army,'/effects/emitters/uec1501_smoke_01_emit.bp') end diff --git a/units/XSC1101/XSC1101_Script.lua b/units/XSC1101/XSC1101_Script.lua index 8937a9b525..3efb5ea94f 100644 --- a/units/XSC1101/XSC1101_Script.lua +++ b/units/XSC1101/XSC1101_Script.lua @@ -34,7 +34,7 @@ UAC1101 = ClassUnit(ACivilianStructureUnit) { OnCreate = function(self) ACivilianStructureUnit.OnCreate(self) - local army = self:GetArmy() + local army = self.Army for k, v in self.BoneSetE01 do AttachBeamEntityToEntity(self, self.BoneB01, self, v, army, self.FxBeamAmbient ) end diff --git a/units/XSC1901/XSC1901_Script.lua b/units/XSC1901/XSC1901_Script.lua index 5396a8fe84..c6b1ea1ffa 100644 --- a/units/XSC1901/XSC1901_Script.lua +++ b/units/XSC1901/XSC1901_Script.lua @@ -11,7 +11,7 @@ local SCivilianStructureUnit = import("/lua/seraphimunits.lua").SCivilianStructu XSC1901 = ClassUnit(SCivilianStructureUnit) { OnCreate = function(self) SCivilianStructureUnit.OnCreate(self) - local army = self:GetArmy() + local army = self.Army --------------CreateAttachedEmitter(self,'XSC1901',army, '/effects/emitters/seraphim_rift_arch_base_01_emit.bp'):OffsetEmitter(0.00, 0.00, 0.00) CreateAttachedEmitter(self,'XSC1901',army, '/effects/emitters/seraphim_rift_arch_base_01_emit.bp') -- glow CreateAttachedEmitter(self,'XSC1901',army, '/effects/emitters/seraphim_rift_arch_base_02_emit.bp') -- plasma pillar