Format of Cybran weapon files (#5859)

lua/sim/weapons/cybran/CAAAutocannon.lua

@@ -23,4 +23,4 @@
 local DefaultProjectileWeapon = import('/lua/sim/defaultweapons.lua').DefaultProjectileWeapon
 
 ---@class CAAAutocannon : DefaultProjectileWeapon
-CAAAutocannon = ClassWeapon(DefaultProjectileWeapon) {}
+CAAAutocannon = ClassWeapon(DefaultProjectileWeapon) {}

lua/sim/weapons/cybran/CAABurstCloudFlakArtilleryWeapon.lua

@@ -24,9 +24,5 @@ local DefaultProjectileWeapon = import('/lua/sim/defaultweapons.lua').DefaultPro
 
 ---@class CAABurstCloudFlakArtilleryWeapon : DefaultProjectileWeapon
 CAABurstCloudFlakArtilleryWeapon = ClassWeapon(DefaultProjectileWeapon) {
-    FxMuzzleFlash = {
-        '/effects/emitters/default_muzzle_flash_01_emit.bp',
-        '/effects/emitters/default_muzzle_flash_02_emit.bp'
-    },
     FxMuzzleFlashScale = 1.5,
-}
+}

lua/sim/weapons/cybran/CAAMissileNaniteWeapon.lua

@@ -23,4 +23,4 @@
 local DefaultProjectileWeapon = import('/lua/sim/defaultweapons.lua').DefaultProjectileWeapon
 
 ---@class CAAMissileNaniteWeapon : DefaultProjectileWeapon
-CAAMissileNaniteWeapon = ClassWeapon(DefaultProjectileWeapon) {}
+CAAMissileNaniteWeapon = ClassWeapon(DefaultProjectileWeapon) {}

lua/sim/weapons/cybran/CAANanoDartWeapon.lua

@@ -28,4 +28,4 @@ CAANanoDartWeapon = ClassWeapon(DefaultProjectileWeapon) {
         '/effects/emitters/cannon_muzzle_flash_04_emit.bp',
         '/effects/emitters/cannon_muzzle_smoke_11_emit.bp',
     },
-}
+}

lua/sim/weapons/cybran/CAMEMPMissileWeapon.lua

@@ -25,4 +25,4 @@ local DefaultProjectileWeapon = import('/lua/sim/defaultweapons.lua').DefaultPro
 ---@class CAMEMPMissileWeapon : DefaultProjectileWeapon
 CAMEMPMissileWeapon = ClassWeapon(DefaultProjectileWeapon) {
     FxMuzzleFlash = { '/effects/emitters/missile_sam_muzzle_flash_01_emit.bp', },
-}
+}

lua/sim/weapons/cybran/CAMZapperWeapon02.lua

@@ -27,4 +27,4 @@ local ZapperCollisionBeam = import('/lua/defaultcollisionbeams.lua').ZapperColli
 CAMZapperWeapon02 = ClassWeapon(DefaultBeamWeapon) {
     BeamType = ZapperCollisionBeam,
     FxMuzzleFlash = { '/effects/emitters/cannon_muzzle_flash_01_emit.bp', },
-}
+}

lua/sim/weapons/cybran/CAMZapperWeapon03.lua

@@ -70,4 +70,4 @@ CAMZapperWeapon03 = ClassWeapon(DefaultBeamWeapon) {
         DefaultBeamWeapon.OnLostTarget(self)
         self.SphereEffectEntity:SetMesh(self.SphereEffectIdleMesh)
     end,
-}
+}

lua/sim/weapons/cybran/CANNaniteTorpedoWeapon.lua

@@ -29,4 +29,4 @@ CANNaniteTorpedoWeapon = ClassWeapon(DefaultProjectileWeapon) {
         '/effects/emitters/default_muzzle_flash_02_emit.bp',
         '/effects/emitters/torpedo_underwater_launch_01_emit.bp',
     },
-}
+}

lua/sim/weapons/cybran/CANTorpedoLauncherWeapon.lua

@@ -23,4 +23,4 @@
 local DefaultProjectileWeapon = import('/lua/sim/defaultweapons.lua').DefaultProjectileWeapon
 
 ---@class CANTorpedoLauncherWeapon : DefaultProjectileWeapon
-CANTorpedoLauncherWeapon = ClassWeapon(DefaultProjectileWeapon) {}
+CANTorpedoLauncherWeapon = ClassWeapon(DefaultProjectileWeapon) {}

lua/sim/weapons/cybran/CCannonMolecularWeapon.lua

@@ -26,4 +26,4 @@ local CMolecularRipperFlash01 = import('/lua/effecttemplates.lua').CMolecularRip
 ---@class CCannonMolecularWeapon : DefaultProjectileWeapon
 CCannonMolecularWeapon = ClassWeapon(DefaultProjectileWeapon) {
     FxMuzzleFlash = CMolecularRipperFlash01,
-}
+}

lua/sim/weapons/cybran/CDFBrackmanCrabHackPegLauncherWeapon.lua

@@ -24,6 +24,8 @@ local DefaultProjectileWeapon = import('/lua/sim/defaultweapons.lua').DefaultPro
 
 ---@class CDFBrackmanCrabHackPegLauncherWeapon : DefaultProjectileWeapon
 CDFBrackmanCrabHackPegLauncherWeapon = ClassWeapon(DefaultProjectileWeapon) {
-    FxMuzzleFlash = { '/effects/emitters/proton_cannon_muzzle_01_emit.bp',
-        '/effects/emitters/proton_cannon_muzzle_02_emit.bp', },
-}
+    FxMuzzleFlash = {
+        '/effects/emitters/proton_cannon_muzzle_01_emit.bp',
+        '/effects/emitters/proton_cannon_muzzle_02_emit.bp',
+    },
+}

lua/sim/weapons/cybran/CDFEMP.lua

@@ -25,4 +25,4 @@ local DefaultProjectileWeapon = import('/lua/sim/defaultweapons.lua').DefaultPro
 ---@class CDFEMP : DefaultProjectileWeapon
 CDFEMP = ClassWeapon(DefaultProjectileWeapon) {
     FxMuzzleFlash = { '/effects/emitters/laserturret_muzzle_flash_01_emit.bp', },
-}
+}

lua/sim/weapons/cybran/CDFHeavyDisintegratorWeapon.lua

@@ -31,4 +31,4 @@ CDFHeavyDisintegratorWeapon = ClassWeapon(DefaultProjectileWeapon) {
         '/effects/emitters/disintegratorhvy_muzzle_flash_04_emit.bp',
         '/effects/emitters/disintegratorhvy_muzzle_flash_05_emit.bp',
     },
-}
+}

lua/sim/weapons/cybran/CDFHeavyElectronBolterWeapon.lua

@@ -26,4 +26,4 @@ local CElectronBolterMuzzleFlash02 = import('/lua/effecttemplates.lua').CElectro
 ---@class CDFHeavyElectronBolterWeapon : DefaultProjectileWeapon
 CDFHeavyElectronBolterWeapon = ClassWeapon(DefaultProjectileWeapon) {
     FxMuzzleFlash = CElectronBolterMuzzleFlash02,
-}
+}

lua/sim/weapons/cybran/CDFHeavyMicrowaveLaserGenerator.lua

@@ -24,6 +24,9 @@ local DefaultBeamWeapon = import('/lua/sim/defaultweapons.lua').DefaultBeamWeapo
 local MicrowaveLaserCollisionBeam01 = import("/lua/defaultcollisionbeams.lua").MicrowaveLaserCollisionBeam01
 local CMicrowaveLaserCharge01 = import('/lua/effecttemplates.lua').CMicrowaveLaserCharge01
 
+-- upvalue scope for performance
+local CreateRotator = CreateRotator
+
 --- SPIDER BOT WEAPON!
 ---@class CDFHeavyMicrowaveLaserGenerator : DefaultBeamWeapon
 ---@field RotatorManip moho.RotateManipulator
@@ -42,8 +45,7 @@ CDFHeavyMicrowaveLaserGenerator = ClassWeapon(DefaultBeamWeapon) {
         if not rotator then
             local unit = self.unit
             rotator = CreateRotator(unit, 'Center_Turret_Barrel', 'z')
-            unit.Trash:Add(rotator)
-            self.RotatorManip = rotator
+            self.RotatorManip = unit.Trash:Add(rotator)
         end
 
         -- set their respective properties when firing
@@ -63,4 +65,4 @@ CDFHeavyMicrowaveLaserGenerator = ClassWeapon(DefaultBeamWeapon) {
             rotator:SetAccel(90)
         end
     end,
-}
+}

lua/sim/weapons/cybran/CDFHeavyMicrowaveLaserGeneratorCom.lua

@@ -27,4 +27,4 @@ local MicrowaveLaserCollisionBeam02 = import('/lua/defaultcollisionbeams.lua').M
 ---@class CDFHeavyMicrowaveLaserGeneratorCom : DefaultBeamWeapon
 CDFHeavyMicrowaveLaserGeneratorCom = ClassWeapon(DefaultBeamWeapon) {
     BeamType = MicrowaveLaserCollisionBeam02,
-}
+}

lua/sim/weapons/cybran/CDFLaserDisintegratorWeapon01.lua

@@ -34,4 +34,4 @@ CDFLaserDisintegratorWeapon01 = ClassWeapon(DefaultProjectileWeapon) {
         '/effects/emitters/disintegrator_muzzle_flash_02_emit.bp',
         '/effects/emitters/disintegrator_muzzle_flash_03_emit.bp',
     },
-}
+}

lua/sim/weapons/cybran/CDFLaserDisintegratorWeapon02.lua

@@ -32,4 +32,4 @@ CDFLaserDisintegratorWeapon02 = ClassWeapon(DefaultProjectileWeapon) {
         '/effects/emitters/disintegrator_muzzle_flash_04_emit.bp',
         '/effects/emitters/disintegrator_muzzle_flash_05_emit.bp',
     },
-}
+}

lua/sim/weapons/cybran/CDFLaserHeavyWeapon.lua

@@ -26,4 +26,4 @@ local CLaserMuzzleFlash02 = import('/lua/effecttemplates.lua').CLaserMuzzleFlash
 ---@class CDFLaserHeavyWeapon : DefaultProjectileWeapon
 CDFLaserHeavyWeapon = ClassWeapon(DefaultProjectileWeapon) {
     FxMuzzleFlash = CLaserMuzzleFlash02,
-}
+}

lua/sim/weapons/cybran/CDFLaserHeavyWeapon02.lua

@@ -26,4 +26,4 @@ local CLaserMuzzleFlash03 = import('/lua/effecttemplates.lua').CLaserMuzzleFlash
 ---@class CDFLaserHeavyWeapon02 : DefaultProjectileWeapon
 CDFLaserHeavyWeapon02 = ClassWeapon(DefaultProjectileWeapon) {
     FxMuzzleFlash = CLaserMuzzleFlash03,
-}
+}

lua/sim/weapons/cybran/CDFLaserPulseLightWeapon.lua

@@ -26,4 +26,4 @@ local CLaserMuzzleFlash01 = import('/lua/effecttemplates.lua').CLaserMuzzleFlash
 ---@class CDFLaserPulseLightWeapon : DefaultProjectileWeapon
 CDFLaserPulseLightWeapon = ClassWeapon(DefaultProjectileWeapon) {
     FxMuzzleFlash = CLaserMuzzleFlash01,
-}
+}

lua/sim/weapons/cybran/CDFMissileMesonWeapon.lua

@@ -23,4 +23,4 @@
 local DefaultProjectileWeapon = import('/lua/sim/defaultweapons.lua').DefaultProjectileWeapon
 
 ---@class CDFMissileMesonWeapon : DefaultProjectileWeapon
-CDFMissileMesonWeapon = ClassWeapon(DefaultProjectileWeapon) {}
+CDFMissileMesonWeapon = ClassWeapon(DefaultProjectileWeapon) {}

lua/sim/weapons/cybran/CDFOverchargeWeapon.lua

@@ -27,4 +27,4 @@ local CMolecularRipperOverChargeFlash01 = import('/lua/effecttemplates.lua').CMo
 CDFOverchargeWeapon = ClassWeapon(DefaultOverchargeWeapon) {
     FxMuzzleFlash = CMolecularRipperOverChargeFlash01,
     DesiredWeaponLabel = 'RightRipper'
-}
+}

lua/sim/weapons/cybran/CDFParticleCannonWeapon.lua

@@ -27,4 +27,4 @@ local ParticleCannonCollisionBeam = import('/lua/defaultcollisionbeams.lua').Par
 CDFParticleCannonWeapon = ClassWeapon(DefaultBeamWeapon) {
     BeamType = ParticleCannonCollisionBeam,
     FxMuzzleFlash = { '/effects/emitters/particle_cannon_muzzle_01_emit.bp' },
-}
+}

lua/sim/weapons/cybran/CDFProtonCannonWeapon.lua

@@ -26,4 +26,4 @@ local DefaultProjectileWeapon = import('/lua/sim/defaultweapons.lua').DefaultPro
 CDFProtonCannonWeapon = ClassWeapon(DefaultProjectileWeapon) {
     FxMuzzleFlash = { '/effects/emitters/proton_cannon_muzzle_01_emit.bp',
         '/effects/emitters/proton_cannon_muzzle_02_emit.bp', },
-}
+}

lua/sim/weapons/cybran/CDFRocketIridiumWeapon.lua

@@ -25,4 +25,4 @@ local DefaultProjectileWeapon = import('/lua/sim/defaultweapons.lua').DefaultPro
 ---@class CDFRocketIridiumWeapon : DefaultProjectileWeapon
 CDFRocketIridiumWeapon = ClassWeapon(DefaultProjectileWeapon) {
     FxMuzzleFlash = { '/effects/emitters/muzzle_flash_01_emit.bp', },
-}
+}

lua/sim/weapons/cybran/CDFRocketIridiumWeapon02.lua

@@ -28,4 +28,4 @@ CDFRocketIridiumWeapon02 = ClassWeapon(DefaultProjectileWeapon) {
         '/effects/emitters/cybran_hoplight_muzzle_smoke_01_emit.bp',
         '/effects/emitters/muzzle_flash_01_emit.bp',
     },
-}
+}

lua/sim/weapons/cybran/CEMPAutoCannon.lua

@@ -23,4 +23,4 @@
 local DefaultProjectileWeapon = import('/lua/sim/defaultweapons.lua').DefaultProjectileWeapon
 
 ---@class CEMPAutoCannon : DefaultProjectileWeapon
-CEMPAutoCannon = ClassWeapon(DefaultProjectileWeapon) {}
+CEMPAutoCannon = ClassWeapon(DefaultProjectileWeapon) {}

lua/sim/weapons/cybran/CIFArtilleryWeapon.lua

@@ -26,4 +26,4 @@ local CArtilleryFlash01 = import('/lua/effecttemplates.lua').CArtilleryFlash01
 ---@class CIFArtilleryWeapon : DefaultProjectileWeapon
 CIFArtilleryWeapon = ClassWeapon(DefaultProjectileWeapon) {
     FxMuzzleFlash = CArtilleryFlash01
-}
+}

lua/sim/weapons/cybran/CIFBombNeutronWeapon.lua

@@ -25,4 +25,4 @@ local DefaultProjectileWeapon = import('/lua/sim/defaultweapons.lua').DefaultPro
 ---@class CIFBombNeutronWeapon : DefaultProjectileWeapon
 CIFBombNeutronWeapon = ClassWeapon(DefaultProjectileWeapon) {
     FxMuzzleFlash = { '/effects/emitters/antiair_muzzle_fire_02_emit.bp', },
-}
+}

lua/sim/weapons/cybran/CIFGrenadeWeapon.lua

@@ -25,4 +25,4 @@ local DefaultProjectileWeapon = import('/lua/sim/defaultweapons.lua').DefaultPro
 ---@class CIFGrenadeWeapon : DefaultProjectileWeapon
 CIFGrenadeWeapon = ClassWeapon(DefaultProjectileWeapon) {
     FxMuzzleFlash = { '/effects/emitters/antiair_muzzle_fire_01_emit.bp', },
-}
+}

lua/sim/weapons/cybran/CIFMissileCorsairWeapon.lua

@@ -25,4 +25,4 @@ local DefaultProjectileWeapon = import('/lua/sim/defaultweapons.lua').DefaultPro
 ---@class CIFMissileCorsairWeapon : DefaultProjectileWeapon
 CIFMissileCorsairWeapon = ClassWeapon(DefaultProjectileWeapon) {
     FxMuzzleFlash = { '/effects/emitters/muzzle_flash_01_emit.bp', },
-}
+}

lua/sim/weapons/cybran/CIFMissileLoaTacticalWeapon.lua

@@ -28,4 +28,4 @@ CIFMissileLoaTacticalWeapon = ClassWeapon(DefaultProjectileWeapon) {
         '/effects/emitters/cybran_tactical_missile_launch_01_emit.bp',
         '/effects/emitters/cybran_tactical_missile_launch_02_emit.bp',
     },
-}
+}

lua/sim/weapons/cybran/CIFMissileLoaWeapon.lua

@@ -26,4 +26,4 @@ local CIFCruiseMissileLaunchSmoke = import('/lua/effecttemplates.lua').CIFCruise
 ---@class CIFMissileLoaWeapon : DefaultProjectileWeapon
 CIFMissileLoaWeapon = ClassWeapon(DefaultProjectileWeapon) {
     FxMuzzleFlash = CIFCruiseMissileLaunchSmoke,
-}
+}

lua/sim/weapons/cybran/CIFMissileStrategicWeapon.lua

@@ -23,4 +23,4 @@
 local DefaultProjectileWeapon = import('/lua/sim/defaultweapons.lua').DefaultProjectileWeapon
 
 ---@class CIFMissileStrategicWeapon : DefaultProjectileWeapon
-CIFMissileStrategicWeapon = ClassWeapon(DefaultProjectileWeapon) {}
+CIFMissileStrategicWeapon = ClassWeapon(DefaultProjectileWeapon) {}

lua/sim/weapons/cybran/CIFNaniteTorpedoWeapon.lua

@@ -25,4 +25,4 @@ local DefaultProjectileWeapon = import('/lua/sim/defaultweapons.lua').DefaultPro
 ---@class CIFNaniteTorpedoWeapon : DefaultProjectileWeapon
 CIFNaniteTorpedoWeapon = ClassWeapon(DefaultProjectileWeapon) {
     FxMuzzleFlash = { '/effects/emitters/antiair_muzzle_fire_02_emit.bp', },
-}
+}

lua/sim/weapons/cybran/CIFSmartCharge.lua

@@ -41,4 +41,4 @@ CIFSmartCharge = ClassWeapon(DefaultProjectileWeapon) {
 
         return proj
     end,
-}
+}

lua/sim/weapons/cybran/CKrilTorpedoLauncherWeapon.lua

@@ -26,4 +26,4 @@ local CKrilTorpedoLauncherMuzzleFlash01 = import('/lua/effecttemplates.lua').CKr
 ---@class CKrilTorpedoLauncherWeapon : DefaultProjectileWeapon
 CKrilTorpedoLauncherWeapon = ClassWeapon(DefaultProjectileWeapon) {
     FxMuzzleFlash = CKrilTorpedoLauncherMuzzleFlash01,
-}
+}

lua/sim/weapons/cybran/CMobileKamikazeBombWeapon.lua

@@ -48,4 +48,4 @@ CMobileKamikazeBombWeapon = ClassWeapon(KamikazeWeapon) {
 
         KamikazeWeapon.OnFire(self)
     end,
-}
+}