epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Water will not be smudged/scorched any more from nukes. All resources in range of nuke are destroyed now, not just the ones on the edge of the circle.

Browse Source
This commit is contained in:
James Dunne
2012-06-27 22:56:48 -05:00
parent 2ff4a76955
commit d0d3813173
1 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
OpenRA.Mods.RA/Combat.cs
View File

@@ -15,6 +15,7 @@ using OpenRA.GameRules;
using OpenRA.Mods.RA.Effects;
using OpenRA.Mods.RA.Render;
using OpenRA.Traits;
using System.Collections.Generic;
namespace OpenRA.Mods.RA
{
@@ -60,19 +61,38 @@ namespace OpenRA.Mods.RA
if (warhead.Size[0] > 0)
{
var smudgeCells = world.FindTilesInCircle(targetTile, warhead.Size[0]);
if (warhead.Size.Length == 2 )
smudgeCells = smudgeCells.Except(world.FindTilesInCircle(targetTile, warhead.Size[1])) ;
var resLayer = world.WorldActor.Trait<ResourceLayer>();
var allCells = world.FindTilesInCircle(targetTile, warhead.Size[0]).ToList();
// `smudgeCells` might want to just be an outer shell of the cells:
IEnumerable<CPos> smudgeCells = allCells;
if (warhead.Size.Length == 2)
smudgeCells = smudgeCells.Except(world.FindTilesInCircle(targetTile, warhead.Size[1]));
// Draw the smudges:
foreach (var sc in smudgeCells)
{
// Water doesn't get scorched/smudged, it just gets superheated =P.
if (world.GetTerrainInfo(sc).IsWater) continue;
smudgeLayer.AddSmudge(sc);
if (warhead.Ore)
world.WorldActor.Trait<ResourceLayer>().Destroy(sc);
resLayer.Destroy(sc);
}
// Destroy all resources in range, not just the outer shell:
foreach (var cell in allCells)
{
if (warhead.Ore)
resLayer.Destroy(cell);
}
}
else
smudgeLayer.AddSmudge(targetTile);
{
// Don't smudge water (if this ever happens):
if (!world.GetTerrainInfo(targetTile).IsWater)
smudgeLayer.AddSmudge(targetTile);
}
}
if (warhead.Ore)