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

brought back the MoveFlash

Browse Source 
closes #2592
This commit is contained in:
Matthias Mailänder
2013-10-24 21:37:43 +02:00
parent 55b848f071
commit b1c3ac20bf
16 changed files with 104 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
OpenRA.Game/Effects/MoveFlash.cs Normal file
View File

@@ -0,0 +1,41 @@
#region Copyright & License Information
/*
* Copyright 2007-2013 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. For more information,
* see COPYING.
*/
#endregion
using System.Collections.Generic;
using OpenRA.Effects;
using OpenRA.FileFormats;
using OpenRA.Graphics;
using OpenRA.Traits;
namespace OpenRA.Effects
{
public class MoveFlash : IEffect
{
Animation anim;
WPos pos;
public MoveFlash(WPos pos, World world)
{
this.pos = pos;
anim = new Animation("moveflsh");
anim.PlayThen("idle", () => world.AddFrameEndTask(w => w.Remove(this)));
}
public void Tick(World world)
{
anim.Tick();
}
public IEnumerable<IRenderable> Render(WorldRenderer wr)
{
return anim.Render(pos, WVec.Zero, 0, wr.Palette("moveflash"), 1f / wr.Viewport.Zoom);
}
}
}

7
OpenRA.Game/Graphics/Viewport.cs
View File

@@ -94,7 +94,12 @@ namespace OpenRA.Graphics
Zoom = Game.Settings.Graphics.PixelDouble ? 2 : 1;
}
public CPos ViewToWorld(int2 view)
public WPos ViewToWorldPosition(int2 view)
{
return worldRenderer.Position(ViewToWorldPx(view));
}
public CPos ViewToWorldCellPosition(int2 view)
{
return worldRenderer.Position(ViewToWorldPx(view)).ToCPos();
}

1
OpenRA.Game/OpenRA.Game.csproj
View File

@@ -236,6 +236,7 @@
<Compile Include="Traits\World\ScreenMap.cs" />
<Compile Include="Traits\World\ActorMap.cs" />
<Compile Include="Widgets\HotkeyEntryWidget.cs" />
<Compile Include="Effects\MoveFlash.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">

2
OpenRA.Game/Widgets/ViewportControllerWidget.cs
View File

@@ -95,7 +95,7 @@ namespace OpenRA.Widgets
public void UpdateMouseover()
{
TooltipType = WorldTooltipType.None;
var cell = worldRenderer.Viewport.ViewToWorld(Viewport.LastMousePos);
var cell = worldRenderer.Viewport.ViewToWorldCellPosition(Viewport.LastMousePos);
if (!world.Map.IsInMap(cell))
return;

3
OpenRA.Game/Widgets/WorldInteractionControllerWidget.cs
View File

@@ -12,6 +12,7 @@ using System;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using OpenRA.Effects;
using OpenRA.FileFormats;
using OpenRA.Graphics;
using OpenRA.Orders;
@@ -140,6 +141,8 @@ namespace OpenRA.Widgets
orders.Do(o => world.IssueOrder(o));
world.PlayVoiceForOrders(orders);
if (orders.Where(o => o.OrderString != null && o.OrderString.EndsWith("Move")).Any())
world.Add(new MoveFlash(worldRenderer.Viewport.ViewToWorldPosition(mi.Location), world));
}
public override string GetCursor(int2 screenPos)

2
OpenRA.Mods.RA/Orders/PlaceBuildingOrderGenerator.cs Executable file → Normal file
View File

@@ -71,7 +71,7 @@ namespace OpenRA.Mods.RA.Orders
public IEnumerable<IRenderable> Render(WorldRenderer wr, World world) { yield break; }
public void RenderAfterWorld(WorldRenderer wr, World world)
{
var position = wr.Viewport.ViewToWorld(Viewport.LastMousePos);
var position = wr.Viewport.ViewToWorldCellPosition(Viewport.LastMousePos);
var topLeft = position - FootprintUtils.AdjustForBuildingSize(BuildingInfo);
var actorInfo = Rules.Info[Building];

6
OpenRA.Mods.RA/SupportPowers/ChronoshiftPower.cs Executable file → Normal file
View File

@@ -138,7 +138,7 @@ namespace OpenRA.Mods.RA
public void RenderAfterWorld(WorldRenderer wr, World world)
{
var xy = wr.Viewport.ViewToWorld(Viewport.LastMousePos);
var xy = wr.Viewport.ViewToWorldCellPosition(Viewport.LastMousePos);
var targetUnits = power.UnitsInRange(xy);
foreach (var unit in targetUnits)
if (manager.self.Owner.Shroud.IsTargetable(unit) || manager.self.Owner.HasFogVisibility())
@@ -147,7 +147,7 @@ namespace OpenRA.Mods.RA
public IEnumerable<IRenderable> Render(WorldRenderer wr, World world)
{
var xy = wr.Viewport.ViewToWorld(Viewport.LastMousePos);
var xy = wr.Viewport.ViewToWorldCellPosition(Viewport.LastMousePos);
var tiles = world.FindTilesInCircle(xy, range);
var pal = wr.Palette("terrain");
foreach (var t in tiles)
@@ -226,7 +226,7 @@ namespace OpenRA.Mods.RA
public IEnumerable<IRenderable> Render(WorldRenderer wr, World world)
{
var xy = wr.Viewport.ViewToWorld(Viewport.LastMousePos);
var xy = wr.Viewport.ViewToWorldCellPosition(Viewport.LastMousePos);
var pal = wr.Palette("terrain");
// Source tiles

4
OpenRA.Mods.RA/SupportPowers/IronCurtainPower.cs Executable file → Normal file
View File

@@ -90,14 +90,14 @@ namespace OpenRA.Mods.RA
public void RenderAfterWorld(WorldRenderer wr, World world)
{
var xy = wr.Viewport.ViewToWorld(Viewport.LastMousePos);
var xy = wr.Viewport.ViewToWorldCellPosition(Viewport.LastMousePos);
foreach (var unit in power.UnitsInRange(xy))
wr.DrawSelectionBox(unit, Color.Red);
}
public IEnumerable<IRenderable> Render(WorldRenderer wr, World world)
{
var xy = wr.Viewport.ViewToWorld(Viewport.LastMousePos);
var xy = wr.Viewport.ViewToWorldCellPosition(Viewport.LastMousePos);
var pal = wr.Palette("terrain");
foreach (var t in world.FindTilesInCircle(xy, range))
yield return new SpriteRenderable(tile, t.CenterPosition, WVec.Zero, -511, pal, 1f, true);

6
mods/cnc/rules/system.yaml
View File

@@ -257,6 +257,12 @@ World:
G: 255
B: 255
A: 128
PaletteFromRGBA@moveflash:
Name: moveflash
R: 255
G: 255
B: 255
A: 64
PaletteFromRGBA@disabled:
Name: disabled
R: 0

8
mods/cnc/sequences/misc.yaml
View File

@@ -304,4 +304,10 @@ icon:
ioncannon: ionicnh
Start: 0
abomb: atomicnh
Start: 0
Start: 0
moveflsh:
idle:
Start: 0
Length: *
Tick: 80

5
mods/d2k/rules/system.yaml
View File

@@ -417,6 +417,11 @@ World:
G: 0
B: 0
A: 128
PaletteFromR8@moveflash:
Name: moveflash
Filename: DATA.R8
Offset: 2572352
A: 64
PaletteFromRGBA@disabled:
Name: disabled
R: 0

9
mods/d2k/sequences/misc.yaml
View File

@@ -297,4 +297,11 @@ spicebloom:
idle: DATA.R8
Start: 109
ZOffset: -511
Offset: -16,-16
Offset: -16,-16
moveflsh:
idle: DATA.R8
Start: 3621
Length: 5
Tick: 80
BlendMode: Subtractive

6
mods/ra/rules/system.yaml
View File

@@ -587,6 +587,12 @@ World:
G: 255
B: 255
A: 128
PaletteFromRGBA@moveflash:
Name: moveflash
R: 255
G: 255
B: 255
A: 64
PaletteFromRGBA@invuln:
Name: invuln
R: 128

1
mods/ra/sequences/misc.yaml
View File

@@ -162,6 +162,7 @@ moveflsh:
idle:
Start: 0
Length: *
Tick: 80
select:
repair:

6
mods/ts/rules/system.yaml
View File

@@ -91,6 +91,12 @@ World:
G: 0
B: 0
A: 128
PaletteFromRGBA@moveflash:
Name: moveflash
R: 255
G: 255
B: 255
A: 64
PaletteFromRGBA@disabled:
Name: disabled
R: 0

8
mods/ts/sequences/misc.yaml
View File

@@ -242,4 +242,10 @@ crystal4:
torpedo:
idle:
Start: 0
Length: *
Length: *
moveflsh:
idle:
Start: 0
Length: *
Tick: 80