Revert "Scu changes (FAForever#3241)"

This reverts commit 39032bf.

loc/US/strings_db.lua

@@ -7,7 +7,10 @@
 --Aeon
 ual0301_Engineer_desc="SACU (Engineer Preset)"
 ual0301_Engineer_help="Enhanced during construction with Rapid Fabricator."
-ual0301_Engineer_name="SACU (Engineer Preset)"
+ual0301_Engineer_name=""
+ual0301_NanoCombat_desc="SACU (Nano Combatant Preset)"
+ual0301_NanoCombat_help="Enhanced during construction with the Reacton Refractor and Nano-Repair System."
+ual0301_NanoCombat_name=""
 ual0301_Rambo_desc="SACU (Rambo Preset)"
 ual0301_Rambo_help="Enhanced during construction with the Heavy Personal Shield and Reacton Refractor."
 ual0301_Rambo_name=""
@@ -65,7 +68,10 @@ url0301_RAS_help="Enhanced during construction with a Resource Allocation System
 url0301_RAS_name=""
 
 --Seraphim
-xsl0301_Combat_desc="Support Armoured Command Unit (Combatant Preset)"
+xsl0301_AdvancedCombat_desc="SACU (Advanced Combatant Preset)"
+xsl0301_AdvancedCombat_help="Enhanced during construction with the Enhanced Sensor System, Nano-Repair System and Overcharge."
+xsl0301_AdvancedCombat_name=""
+xsl0301_Combat_desc="SACU (Combatant Preset)"
 xsl0301_Combat_help="Enhanced during construction with the Enhanced Sensor System."
 xsl0301_Combat_name=""
 xsl0301_Engineer_desc="SACU (Engineer Preset)"
@@ -76,10 +82,10 @@ xsl0301_Missile_help="Enhanced during construction with the Tactical Missile Lau
 xsl0301_Missile_name=""
 xsl0301_NanoCombat_desc="SACU (Nano Combatant Preset)"
 xsl0301_NanoCombat_help="Enhanced during construction with the Enhanced Sensor System and Nano-Repair System."
-xsl0301_NanoCombat_name="SACU (Nano Combatant Preset)"
-xsl0301_Rambo_desc="Support Armoured Command Unit (Rambo Preset)"
-xsl0301_Rambo_help="Enhanced during construction with the Enhanced Sensor System, Nano-Repair System and Overcharge."
-xsl0301_Rambo_name="SACU (Rambo Preset)"
+xsl0301_NanoCombat_name=""
+xsl0301_Rambo_desc="SACU (Rambo Preset)"
+xsl0301_Rambo_help="Enhanced during construction with the Personal Shield Generator, Nano-Repair System and Overcharge."
+xsl0301_Rambo_name=""
 
 A02_M01_OBJ_010_113="(%s%%/%s%%)"
 Abasi="Abasi"

lua/sim/Buff.lua

@@ -264,11 +264,7 @@ function BuffAffectUnit(unit, buffName, instigator, afterRemove)
             unit:SetSpeedMult(val)
             unit:SetAccMult(val)
             unit:SetTurnMult(val)
-        elseif atype == 'MoveMult2' then
-            local val = BuffCalculate(unit, buffName, 'MoveMult2', 1)
-            unit:SetSpeedMult(val)
-            unit:SetAccMult(val)
-		elseif atype == 'Stun' and not afterRemove then
+        elseif atype == 'Stun' and not afterRemove then
             unit:SetStunned(buffDef.Duration or 1, instigator)
             if unit.Anims then
                 for k, manip in unit.Anims do

lua/terranprojectiles.lua

@@ -37,19 +37,6 @@ TFragmentationGrenade= Class(EmitterProjectile) {
     #PolyTrail= EffectTemplate.THeavyFragmentationGrenadePolyTrail,
 }
 
-TFragmentationGrenade2= Class(EmitterProjectile) {
-	FxTrails= EffectTemplate.THeavyFragmentationGrenadeFxTrails,
-    #PolyTrail= EffectTemplate.THeavyFragmentationGrenadePolyTrail,
-
-    # Hit Effects
-    FxImpactUnit = EffectTemplate.TNapalmHvyCarpetBombHitLand01,
-    FxImpactProp = EffectTemplate.TNapalmHvyCarpetBombHitLand01,
-    FxImpactLand = EffectTemplate.TNapalmHvyCarpetBombHitLand01,
-    FxImpactWater = EffectTemplate.TNapalmHvyCarpetBombHitWater01,
-    FxImpactUnderWater = {},
-    PolyTrail = '/effects/emitters/default_polytrail_01_emit.bp',
-}
-
 TIFMissileNuke = Class(NukeProjectile, SingleBeamProjectile) {
     BeamName = '/effects/emitters/missile_exhaust_fire_beam_01_emit.bp',
     FxImpactUnit = {},

lua/ui/help/unitdescription.lua

@@ -345,10 +345,12 @@ Description = {
     ['ual0301-tsg'] = "<LOC Unit_Description_0171> Creates a protective shield around the SACU.",
     ['ual0301-htsg'] = "<LOC Unit_Description_0172> Upgrades the SACU's protective shield. Requires Energy to run.",
     ['ual0301-ss'] = "<LOC Unit_Description_0173> Equips the standard SACU's Reacton cannon with area-of-effect damage.",
+    ['ual0301-sic'] = "<LOC Unit_Description_0174> Greatly increases the speed at which the SACU repairs itself.",
     ['ual0301-pqt'] = "<LOC Unit_Description_0175> Adds teleporter. Requires considerable Energy to activate.",
 
     -- AEON -- Support Commander Presets
     ['ual0301_Engineer']     = "<LOC ual0301_Engineer_help> Support Armored Command Unit. Enhanced during construction with rapid fabrication enhancement.",
+    ['ual0301_NanoCombat'] = "<LOC ual0301_NanoCombat_help>Support Armored Command Unit. Enhanced during construction with the reacton refractor and nano-repair system enhancements.",
     ['ual0301_Rambo'] = "<LOC ual0301_Rambo_help>Support Armored Command Unit. Enhanced during construction with a heavy personal shield and the reacton refractor enhancements.",
     ['ual0301_RAS'] = "<LOC ual0301_RAS_help>Support Armored Command Unit. Enhanced during construction with a Resource Allocation System.",
     ['ual0301_ShieldCombat'] = "<LOC ual0301_ShieldCombat_help>Support Armored Command Unit. Enhanced during construction with a personal shield and the reacton refractor enhancements.",
@@ -489,15 +491,17 @@ Description = {
     ['xsl0301-dss'] = "<LOC Unit_Description_0435> Increases the speed at which the SACU repairs itself. Also increases hit points.",
     ['xsl0301-sre'] = "<LOC Unit_Description_0436> Greatly expands the range of the standard on-board SACU sensor systems, including Omni.",
     ['xsl0301-efm'] = "<LOC Unit_Description_0437> Speeds up all engineering-related functions.",
+    ['xsl0301-sp'] = "<LOC Unit_Description_0438> Adds a personal shield generator to the SACU.",
     ['xsl0301-pqt'] = "<LOC Unit_Description_0439> Adds teleporter. Requires considerable Energy to activate.",
     ['xsl0301-oc'] = "<LOC Unit_Description_0440> Single shot destroys most units. Consumes large amount of Energy.",
 
     -- SERAPHIM -- Support Commander Presets
+    ['xsl0301_AdvancedCombat'] = "<LOC xsl0301_AdvancedCombat_help>Support Armored Command Unit. Enhanced during construction with the enhanced sensor system, nano-repair system and overcharge enhancements.",
     ['xsl0301_Combat'] = "<LOC xsl0301_Combat_help>Support Armored Command Unit. Enhanced during construction with the enhanced sensor system enhancement.",
     ['xsl0301_Engineer'] = "<LOC xsl0301_Engineer_help>Support Armored Command Unit. Enhanced during construction with the rapid fabricator enhancement.",
     ['xsl0301_Missile'] = "<LOC xsl0301_Missile_help>Support Armored Command Unit. Enhanced during construction with the tactical missile launcher and rapid fabricator enhancements.",
     ['xsl0301_NanoCombat'] = "<LOC xsl0301_NanoCombat_help>Support Armored Command Unit. Enhanced during construction with the enhanced sensor system and nano-repair system enhancements.",
-    ['xsl0301_Rambo'] = "<LOC xsl0301_Rambo_help>Support Armored Command Unit. Enhanced during construction with the enhanced sensor system, nano-repair system and overcharge enhancements.",
+    ['xsl0301_Rambo'] = "<LOC xsl0301_Rambo_help>Support Armored Command Unit. Enhanced during construction with the personal shield generator, nano-repair system and overcharge enhancements.",
 
     -- SERAPHIM -- Land Units
     ['xsl0101'] = "<LOC Unit_Description_0337> Light, fast mobile reconnaissance unit. When stationary, deploys cloaking and stealth fields.",

units/UAB0304/UAB0304_unit.bp

@@ -191,7 +191,7 @@ UnitBlueprint {
     Economy = {
         BuildCostEnergy = 30000,
         BuildCostMass = 3000,
-        BuildRate = 180,
+        BuildRate = 120,
         BuildTime = 4097,
         BuildableCategory = {
             'BUILTBYQUANTUMGATE AEON',

units/UAL0301/UAL0301_script.lua

@@ -8,16 +8,14 @@
 local CommandUnit = import('/lua/defaultunits.lua').CommandUnit
 local AWeapons = import('/lua/aeonweapons.lua')
 local ADFReactonCannon = AWeapons.ADFReactonCannon
-local ADFChronoDampener = AWeapons.ADFChronoDampener
 local SCUDeathWeapon = import('/lua/sim/defaultweapons.lua').SCUDeathWeapon
 local EffectUtil = import('/lua/EffectUtilities.lua')
 local Buff = import('/lua/sim/Buff.lua')
 
 UAL0301 = Class(CommandUnit) {
     Weapons = {
         RightReactonCannon = Class(ADFReactonCannon) {},
-        ChronoDampener = Class(ADFChronoDampener) {},
-		DeathWeapon = Class(SCUDeathWeapon) {},
+        DeathWeapon = Class(SCUDeathWeapon) {},
     },
 
     __init = function(self)
@@ -28,8 +26,7 @@ UAL0301 = Class(CommandUnit) {
         CommandUnit.OnStopBuild(self, unitBeingBuilt)
         self:BuildManipulatorSetEnabled(false)
         self.BuildArmManipulator:SetPrecedence(0)
-        self:SetWeaponEnabledByLabel('ChronoDampener', false)
-		self:SetWeaponEnabledByLabel('RightReactonCannon', true)
+        self:SetWeaponEnabledByLabel('RightReactonCannon', true)
         self:GetWeaponManipulatorByLabel('RightReactonCannon'):SetHeadingPitch(self.BuildArmManipulator:GetHeadingPitch())
         self.UnitBeingBuilt = nil
         self.UnitBuildOrder = nil
@@ -41,7 +38,6 @@ UAL0301 = Class(CommandUnit) {
         self:SetCapturable(false)
         self:HideBone('Turbine', true)
         self:SetupBuildBones()
-		self:SetWeaponEnabledByLabel('ChronoDampener', false)
     end,
 
     CreateBuildEffects = function(self, unitBeingBuilt, order)
@@ -57,31 +53,7 @@ UAL0301 = Class(CommandUnit) {
             self:AddCommandCap('RULEUCC_Teleport')
         elseif enh == 'TeleporterRemove' then
             self:RemoveCommandCap('RULEUCC_Teleport')
-        -- ChronoDampener
-        elseif enh == 'ChronoDampener' then
-            self:SetWeaponEnabledByLabel('ChronoDampener', true)
-            if not Buffs['AeonSACUChronoDampener'] then
-				BuffBlueprint {
-					Name = 'AeonSACUChronoDampener',
-					DisplayName = 'AeonSACUChronoDampener',
-					BuffType = 'DamageStabilization',
-					Stacks = 'REPLACE',
-					Duration = -1,
-					Affects = {
-						MaxHealth = {
-							Add = bp.NewHealth,
-							Mult = 1.0,
-						},
-					},
-				}
-			end
-			Buff.ApplyBuff(self, 'AeonSACUChronoDampener')
-		elseif enh == 'ChronoDampenerRemove' then
-		    if Buff.HasBuff(self, 'AeonSACUChronoDampener') then
-				Buff.RemoveBuff(self, 'AeonSACUChronoDampener')
-			end
-			self:SetWeaponEnabledByLabel('ChronoDampener', false)
-		-- Shields
+        -- Shields
         elseif enh == 'Shield' then
             self:AddToggleCap('RULEUTC_ShieldToggle')
             self:SetEnergyMaintenanceConsumptionOverride(bp.MaintenanceConsumptionPerSecondEnergy or 0)
@@ -110,8 +82,7 @@ UAL0301 = Class(CommandUnit) {
             self:SetProductionPerSecondMass(bpEcon.ProductionPerSecondMass or 0)
         -- Engineering Focus Module
         elseif enh =='EngineeringFocusingModule' then
-            self:AddCommandCap('RULEUCC_Sacrifice')
-			if not Buffs['AeonSCUBuildRate'] then
+            if not Buffs['AeonSCUBuildRate'] then
                 BuffBlueprint {
                     Name = 'AeonSCUBuildRate',
                     DisplayName = 'AeonSCUBuildRate',
@@ -128,35 +99,48 @@ UAL0301 = Class(CommandUnit) {
             end
             Buff.ApplyBuff(self, 'AeonSCUBuildRate')
         elseif enh == 'EngineeringFocusingModuleRemove' then
-			self:RemoveCommandCap('RULEUCC_Sacrifice')
             if Buff.HasBuff(self, 'AeonSCUBuildRate') then
                 Buff.RemoveBuff(self, 'AeonSCUBuildRate')
             end
-        -- GunRange
-        elseif enh =='GunRange' then
+        -- SystemIntegrityCompensator
+        elseif enh == 'SystemIntegrityCompensator' then
+            local name = 'AeonSCURegenRate'
+            if not Buffs[name] then
+                BuffBlueprint {
+                    Name = name,
+                    DisplayName = name,
+                    BuffType = 'SCUREGENRATE',
+                    Stacks = 'REPLACE',
+                    Duration = -1,
+                    Affects = {
+                        Regen = {
+                            Add =  bp.NewRegenRate - self:GetBlueprint().Defense.RegenRate,
+                            Mult = 1,
+                        },
+                    },
+                }
+            end
+            Buff.ApplyBuff(self, name)
+        elseif enh == 'SystemIntegrityCompensatorRemove' then
+            if Buff.HasBuff(self, 'AeonSCURegenRate') then
+                Buff.RemoveBuff(self, 'AeonSCURegenRate')
+            end
+        -- Sacrifice
+        elseif enh == 'Sacrifice' then
+            self:AddCommandCap('RULEUCC_Sacrifice')
+        elseif enh == 'SacrificeRemove' then
+            self:RemoveCommandCap('RULEUCC_Sacrifice')
+        -- StabilitySupressant
+        elseif enh =='StabilitySuppressant' then
             local wep = self:GetWeaponByLabel('RightReactonCannon')
+            wep:AddDamageMod(bp.NewDamageMod or 0)
+            wep:AddDamageRadiusMod(bp.NewDamageRadiusMod or 0)
             wep:ChangeMaxRadius(bp.NewMaxRadius or 40)
-        elseif enh =='GunRangeRemove' then
-            local wep = self:GetWeaponByLabel('RightReactonCannon')
-            wep:ChangeMaxRadius(bp.NewMaxRadius or 30)
-		-- GunAoe
-        elseif enh =='GunAoe' then
+        elseif enh =='StabilitySuppressantRemove' then
             local wep = self:GetWeaponByLabel('RightReactonCannon')
+            wep:AddDamageMod(-self:GetBlueprint().Enhancements['RightReactonCannon'].NewDamageMod)
             wep:AddDamageRadiusMod(bp.NewDamageRadiusMod or 0)
-        elseif enh =='GunAoeRemove' then
-            local bp = self:GetBlueprint().Enhancements['GunAoe']
-            if not bp then return end
-            local wep = self:GetWeaponByLabel('RightReactonCannon')
-            wep:AddDamageRadiusMod(-bp.NewDamageRadiusMod)
-        -- GunRange
-        elseif enh =='GunDps' then
-            local wep = self:GetWeaponByLabel('RightReactonCannon')
-            wep:AddDamageMod(bp.GunDamageMod)
-        elseif enh =='GunDpsRemove' then
-            local bp = self:GetBlueprint().Enhancements['GunDps']
-            if not bp then return end
-            local wep = self:GetWeaponByLabel('RightReactonCannon')
-            wep:AddDamageMod(-bp.GunDamageMod)
+            wep:ChangeMaxRadius(bp.NewMaxRadius or 30)
         end
     end,