Skip to content

Commit

Permalink
Fixes for release 3732 (FAForever#3784)
Browse files Browse the repository at this point in the history
  • Loading branch information
Garanas authored Apr 13, 2022
1 parent 3d7ab6d commit 56cd89d
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 5 deletions.
15 changes: 11 additions & 4 deletions effects/Entities/UnitTeleport01/UnitTeleport01_script.lua
Original file line number Diff line number Diff line change
Expand Up @@ -73,20 +73,27 @@ UnitTeleportEffect01 = Class(NullShell) {
DamageRing(self, pos, .1, 11, 100, 'Disintegrate', false, false)
WaitSeconds(0.2)

-- light some trees on fire
DamageRing(self, pos, 1, 16, 1, 'TreeFire', false, false)
DamageRing(self, pos, 1, 16, 1, 'TreeFire', false, false)

-- knockdown trees
for k = 1, 2 do
DamageRing(self, pos, 11, 11 + k, 1, 'Force', false, false)
DamageRing(self, pos, 11, 11 + k, 1, 'TreeForce', false, false)
WaitSeconds(0.1)
end

-- light some trees on fire
DamageRing(self, pos, 13, 21, 1, 'TreeFire', false, false)

-- knockdown trees
for k = 1, 4 do
DamageRing(self, pos, 11, 13 + k * 2, 1, 'Force', false, false)
DamageRing(self, pos, 11, 13 + k * 2, 1, 'TreeForce', false, false)
WaitSeconds(0.1)
end

-- Scorch decal and light some trees on fire
DamageRing(self, pos, 20, 27, 1, 'Fire', false, false)
-- light some trees on fire
DamageRing(self, pos, 12, 22, 1, 'TreeFire', false, false)
end,

CreateEnergySpinner = function(self)
Expand Down
2 changes: 1 addition & 1 deletion units/XSL0401/XSL0401_Script.lua
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ XSL0401 = Class(SWalkingLandUnit) {
end

-- only apply death damage when the unit is sufficiently build
local bp = self.GetBlueprint
local bp = self.Blueprint
local FractionThreshold = bp.General.FractionThreshold or 0.5
if self:GetFractionComplete() >= FractionThreshold then
for i, numWeapons in bp.Weapon do
Expand Down

0 comments on commit 56cd89d

Please sign in to comment.