Update for FAF unitview.lua to allow for custom shield types

[Resin_Smoker]

Old unitview lines 451-469

Spoiler: show

Code: Select all

            if info.shieldRatio > 0 and info.userUnit:GetBlueprint().Defense.Shield.ShieldMaxHealth then
                local ShieldMaxHealth = info.userUnit:GetBlueprint().Defense.Shield.ShieldMaxHealth
                controls.shieldText:Show()
                if info.userUnit:GetBlueprint().Defense.Shield.ShieldRegenRate then
                    controls.shieldText:SetText(string.format("%d / %d +%d/s", math.floor(ShieldMaxHealth*info.shieldRatio), info.userUnit:GetBlueprint().Defense.Shield.ShieldMaxHealth , info.userUnit:GetBlueprint().Defense.Shield.ShieldRegenRate))
                else
                    controls.shieldText:SetText(string.format("%d / %d", math.floor(ShieldMaxHealth*info.shieldRatio), info.userUnit:GetBlueprint().Defense.Shield.ShieldMaxHealth ))
                end
            end

            if info.shieldRatio > 0 and info.userUnit:GetBlueprint().Defense.Shield.ShieldMaxHealth == nil then
                local ShieldMaxHealth = info.userUnit:GetBlueprint().Enhancements[getEnh.GetEnhancements(info.entityId).Back].ShieldMaxHealth
                controls.shieldText:Show()
                if info.userUnit:GetBlueprint().Enhancements[getEnh.GetEnhancements(info.entityId).Back].ShieldRegenRate then
                    controls.shieldText:SetText(string.format("%d / %d +%d/s", math.floor(ShieldMaxHealth*info.shieldRatio), ShieldMaxHealth , info.userUnit:GetBlueprint().Enhancements[getEnh.GetEnhancements(info.entityId).Back].ShieldRegenRate))
                else
                    controls.shieldText:SetText(string.format("%d / %d", math.floor(ShieldMaxHealth*info.shieldRatio), ShieldMaxHealth ))
                end
            end

Replacement script

Spoiler: show

Code: Select all

if info.shieldRatio > 0 then
   local unitBp = info.userUnit:GetBlueprint()
   local ShieldMaxHealth, ShieldRegenRate
   if unitBp.Defense.Shield.ShieldMaxHealth > 0 then
      ShieldMaxHealth = unitBp.Defense.Shield.ShieldMaxHealth
      ShieldRegenRate = unitBp.Defense.Shield.ShieldRegenRate or 0
   elseif unitBp.Enhancements[getEnh.GetEnhancements(info.entityId).Back].ShieldMaxHealth > 0 then
      ShieldMaxHealth = unitBp.Enhancements[getEnh.GetEnhancements(info.entityId).Back].ShieldMaxHealth
      ShieldRegenRate = unitBp.Enhancements[getEnh.GetEnhancements(info.entityId).Back].ShieldRegenRate or 0
   elseif GetShieldParams(info.userUnit, 'MyShield') then
      local CustomShield = GetShieldParams(info.userUnit, 'MyShield')
      ShieldMaxHealth = CustomShield.ShieldMaxHealth or 0
      ShieldRegenRate = CustomShield.ShieldRegenRate or 0
   end
   if ShieldMaxHealth > 0 then
      controls.shieldText:Show()
      if ShieldRegenRate > 0 then
         controls.shieldText:SetText(string.format("%d / %d +%d/s", math.floor(ShieldMaxHealth*info.shieldRatio), ShieldMaxHealth, ShieldRegenRate))
      else
         controls.shieldText:SetText(string.format("%d / %d", math.floor(ShieldMaxHealth*info.shieldRatio), ShieldMaxHealth))
      end
   end
end

This is proposed to allow 4DC custom shield types to display without triggering a lua / ui error.

Resin

[ckitching]

Please file a pull request:
https://github.com/FAForever/fa

[Resin_Smoker]

Please file a pull request:
https://github.com/FAForever/fa

My prior attempts all met with either disapproval or someone got pissy with the formatting. Not going to bother with that gain so either take it or leave it... after all i not only fixed my problem but a divide by zero error in faf as well.

Resin

[Sheeo]

Please file a pull request:
https://github.com/FAForever/fa

My prior attempts all met with either disapproval or someone got pissy with the formatting. Not going to bother with that gain so either take it or leave it... after all i not only fixed my problem but a divide by zero error in faf as well.

Resin

Which PR's have you submitted that you feel were badly reviewed?

[Resin_Smoker]

Please file a pull request:
https://github.com/FAForever/fa

My prior attempts all met with either disapproval or someone got pissy with the formatting. Not going to bother with that gain so either take it or leave it... after all i not only fixed my problem but a divide by zero error in faf as well.

Resin

Which PR's have you submitted that you feel were badly reviewed?

Wasnt talking about PR's but modding in general.

[Sheeo]

Wasnt talking about PR's but modding in general.

Okay well, let me know if there's any particular place where you feel we did something wrong.

[Resin_Smoker]

I think I have come up with a way of doing what is necessary I should be able to send you the associated files Monday or Tuesday of next week.