Make shield assist start repairing the shield instantly

changelog/snippets/balance.6464.md

@@ -0,0 +1 @@
+- (#6464) Make engineers assisting a shield start repairing the shield in 0.1 seconds instead of 0.7 to 1.1 seconds.

lua/shield.lua

@@ -356,7 +356,7 @@ Shield = ClassShield(moho.shield_methods, Entity) {
 
     --- Retrieves allied shields that overlap with this shield, caches the results per tick
     -- @param self A shield that we're computing the overlapping shields for
-    -- @param tick Optional parameter, represents the game tick. Used to determine if we need to refresh the cash
+    -- @param tick Optional parameter, represents the game tick. Used to determine if we need to refresh the cache
     GetOverlappingShields = function(self, tick)
 
         -- allow the game tick to be send to us, saves cycles
@@ -458,7 +458,7 @@ Shield = ClassShield(moho.shield_methods, Entity) {
     ---@param instigator Unit
     ---@param amount number
     ---@param type DamageType
-    ---@return number damageAbsorbed If not all damage is absorbed, the remainder passes to targets under the shield.
+    ---@return number? damageAbsorbed If not all damage is absorbed, the remainder passes to targets under the shield.
     OnGetDamageAbsorption = function(self, instigator, amount, type)
         if type == "TreeForce" or type == "TreeFire" then
             return
@@ -559,11 +559,33 @@ Shield = ClassShield(moho.shield_methods, Entity) {
 
         -- do damage logic for shield
 
-        if self.Owner ~= instigator then
+        local owner = self.Owner
+        if owner ~= instigator then
             local absorbed = self:OnGetDamageAbsorption(instigator, amount, dmgType)
 
             -- take some damage
-            EntityAdjustHealth(self, instigator, -absorbed)
+            if absorbed then
+                EntityAdjustHealth(self, instigator, -absorbed)
+
+                -- force guards to start repairing in 1 tick instead of waiting for them to react 7-11 ticks
+                if tick > owner.tickIssuedShieldRepair then
+                    owner.tickIssuedShieldRepair = tick
+                    local guards = owner:GetGuards()
+                    if not table.empty(guards) then
+                        for k, guard in guards do
+                            -- do not clear queues for units order to do something after assisting the shield
+                            if table.getn(guard:GetCommandQueue()) == 1 then
+                                IssueToUnitClearCommands(guard)
+                            else
+                                guards[k] = nil
+                            end
+                        end
+                        IssueRepair(guards, owner)
+                        -- Queue a guard order so that units start guarding again after the repair is done
+                        IssueGuard(guards, owner)
+                    end
+                end
+            end
 
             -- check to spawn impact effect
             local r = Random(1, self.Size)
@@ -678,8 +700,8 @@ Shield = ClassShield(moho.shield_methods, Entity) {
     end,
 
     --- Called when a shield collides with a projectile to check if the collision is valid
-    -- @param self The shield we're checking the collision for
-    -- @param other The projectile we're checking the collision with
+    ---@param self Shield The shield we're checking the collision for
+    ---@param other Projectile The projectile we're checking the collision with
     OnCollisionCheck = function(self, other)
 
         -- special logic when it is a projectile to simulate air crashes

lua/sim/Unit.lua

@@ -146,6 +146,7 @@ local cUnitGetBuildRate = cUnit.GetBuildRate
 ---@field ReclaimTimeMultiplier? number
 ---@field CaptureTimeMultiplier? number
 ---@field PlatoonHandle? Platoon
+---@field tickIssuedShieldRepair number? # Used by shields to keep track of when this unit's guards were ordered to start shield repair instantly
 Unit = ClassUnit(moho.unit_methods, IntelComponent, VeterancyComponent, DebugUnitComponent) {
 
     IsUnit = true,