Display yellow footprint for cells that trigger damage in D2k.

This commit is contained in:
Paul Chote
2019-05-18 18:45:52 +00:00
committed by reaperrr
parent 3b2b093e0e
commit 697935f931
6 changed files with 96 additions and 6 deletions

View File

@@ -51,7 +51,7 @@ namespace OpenRA.Mods.Common.Traits
public class ActorPreviewPlaceBuildingPreview { } public class ActorPreviewPlaceBuildingPreview { }
class ActorPreviewPlaceBuildingPreviewPreview : FootprintPlaceBuildingPreviewPreview public class ActorPreviewPlaceBuildingPreviewPreview : FootprintPlaceBuildingPreviewPreview
{ {
readonly ActorPreviewPlaceBuildingPreviewInfo info; readonly ActorPreviewPlaceBuildingPreviewInfo info;
readonly PaletteReference palette; readonly PaletteReference palette;

View File

@@ -42,7 +42,7 @@ namespace OpenRA.Mods.Common.Traits
public class FootprintPlaceBuildingPreview { } public class FootprintPlaceBuildingPreview { }
class FootprintPlaceBuildingPreviewPreview : IPlaceBuildingPreview public class FootprintPlaceBuildingPreviewPreview : IPlaceBuildingPreview
{ {
protected readonly ActorInfo actorInfo; protected readonly ActorInfo actorInfo;
protected readonly WVec centerOffset; protected readonly WVec centerOffset;
@@ -72,7 +72,7 @@ namespace OpenRA.Mods.Common.Traits
protected virtual void TickInner() { } protected virtual void TickInner() { }
protected IEnumerable<IRenderable> RenderFootprint(WorldRenderer wr, CPos topLeft, Dictionary<CPos, PlaceBuildingCellType> footprint, protected virtual IEnumerable<IRenderable> RenderFootprint(WorldRenderer wr, CPos topLeft, Dictionary<CPos, PlaceBuildingCellType> footprint,
PlaceBuildingCellType filter = PlaceBuildingCellType.Invalid | PlaceBuildingCellType.Valid | PlaceBuildingCellType.LineBuild) PlaceBuildingCellType filter = PlaceBuildingCellType.Invalid | PlaceBuildingCellType.Valid | PlaceBuildingCellType.LineBuild)
{ {
var cellPalette = wr.Palette(info.Palette); var cellPalette = wr.Palette(info.Palette);

View File

@@ -0,0 +1,88 @@
#region Copyright & License Information
/*
* Copyright 2007-2019 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation, either version 3 of
* the License, or (at your option) any later version. For more
* information, see COPYING.
*/
#endregion
using System.Collections.Generic;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Orders;
using OpenRA.Primitives;
using OpenRA.Widgets;
namespace OpenRA.Mods.Common.Traits
{
[Desc("Creates a building placement preview based on the map editor actor preview.")]
public class D2kActorPreviewPlaceBuildingPreviewInfo : ActorPreviewPlaceBuildingPreviewInfo
{
[Desc("Terrain types that should show the 'unsafe' footprint tile.")]
public readonly HashSet<string> UnsafeTerrainTypes = new HashSet<string> { "Rock" };
protected override IPlaceBuildingPreview CreatePreview(WorldRenderer wr, ActorInfo ai, TypeDictionary init)
{
return new D2kActorPreviewPlaceBuildingPreviewPreview(wr, ai, this, init);
}
public override object Create(ActorInitializer init)
{
return new D2kActorPreviewPlaceBuildingPreview();
}
}
public class D2kActorPreviewPlaceBuildingPreview { }
class D2kActorPreviewPlaceBuildingPreviewPreview : ActorPreviewPlaceBuildingPreviewPreview
{
readonly D2kActorPreviewPlaceBuildingPreviewInfo info;
readonly Sprite buildOk;
readonly Sprite buildUnsafe;
readonly Sprite buildBlocked;
readonly CachedTransform<CPos, List<CPos>> unpathableCells;
public D2kActorPreviewPlaceBuildingPreviewPreview(WorldRenderer wr, ActorInfo ai, D2kActorPreviewPlaceBuildingPreviewInfo info, TypeDictionary init)
: base(wr, ai, info, init)
{
this.info = info;
var world = wr.World;
var sequences = world.Map.Rules.Sequences;
buildOk = sequences.GetSequence("overlay", "build-valid").GetSprite(0);
buildUnsafe = sequences.GetSequence("overlay", "build-unsafe").GetSprite(0);
buildBlocked = sequences.GetSequence("overlay", "build-invalid").GetSprite(0);
var buildingInfo = ai.TraitInfo<BuildingInfo>();
unpathableCells = new CachedTransform<CPos, List<CPos>>(topLeft => buildingInfo.UnpathableTiles(topLeft).ToList());
}
protected override IEnumerable<IRenderable> RenderFootprint(WorldRenderer wr, CPos topLeft, Dictionary<CPos, PlaceBuildingCellType> footprint,
PlaceBuildingCellType filter = PlaceBuildingCellType.Invalid | PlaceBuildingCellType.Valid | PlaceBuildingCellType.LineBuild)
{
var cellPalette = wr.Palette(info.Palette);
var linePalette = wr.Palette(info.LineBuildSegmentPalette);
var topLeftPos = wr.World.Map.CenterOfCell(topLeft);
var candidateSafeTiles = unpathableCells.Update(topLeft);
foreach (var c in footprint)
{
if ((c.Value & filter) == 0)
continue;
var tile = c.Value.HasFlag(PlaceBuildingCellType.Invalid) ? buildBlocked :
candidateSafeTiles.Contains(c.Key) && info.UnsafeTerrainTypes.Contains(wr.World.Map.GetTerrainInfo(c.Key).Type)
? buildUnsafe : buildOk;
var pal = c.Value.HasFlag(PlaceBuildingCellType.LineBuild) ? linePalette : cellPalette;
var pos = wr.World.Map.CenterOfCell(c.Key);
var offset = new WVec(0, 0, topLeftPos.Z - pos.Z);
yield return new SpriteRenderable(tile, pos, offset, -511, pal, 1f, true);
}
}
}
}

BIN
mods/d2k/bits/concfoot.shp Normal file

Binary file not shown.

View File

@@ -385,7 +385,7 @@
Footprint: x Footprint: x
TerrainTypes: Rock, Concrete TerrainTypes: Rock, Concrete
BuildSounds: BUILD1.WAV BuildSounds: BUILD1.WAV
ActorPreviewPlaceBuildingPreview: D2kActorPreviewPlaceBuildingPreview:
OverridePalette: placebuilding OverridePalette: placebuilding
RequiresBuildableArea: RequiresBuildableArea:
AreaTypes: building AreaTypes: building

View File

@@ -169,12 +169,14 @@ rank:
overlay: overlay:
Defaults: DATA.R8 Defaults: DATA.R8
Offset: -16,-16 Offset: -16,-16
build-valid-arrakis: build-valid:
build-unsafe: concfoot.shp
Offset: 0, 0
build-invalid: build-invalid:
Start: 1 Start: 1
target-select: target-select:
Start: 2 Start: 2
target-valid-arrakis: target-valid:
target-invalid: target-invalid:
Start: 1 Start: 1