invuln moved to mod
This commit is contained in:
@@ -81,7 +81,6 @@
|
||||
<Compile Include="Effects\DelayedAction.cs" />
|
||||
<Compile Include="Effects\FlashTarget.cs" />
|
||||
<Compile Include="Effects\GpsSatellite.cs" />
|
||||
<Compile Include="Effects\InvulnEffect.cs" />
|
||||
<Compile Include="Effects\MoveFlash.cs" />
|
||||
<Compile Include="Effects\RepairIndicator.cs" />
|
||||
<Compile Include="Effects\SatelliteLaunch.cs" />
|
||||
@@ -218,8 +217,6 @@
|
||||
<Compile Include="Traits\Helicopter.cs" />
|
||||
<Compile Include="Traits\InvisibleToOthers.cs" />
|
||||
<Compile Include="Traits\ConstructionYard.cs" />
|
||||
<Compile Include="Traits\IronCurtainable.cs" />
|
||||
<Compile Include="Traits\IronCurtainPower.cs" />
|
||||
<Compile Include="Traits\JamsRadar.cs" />
|
||||
<Compile Include="Traits\LightPaletteRotator.cs" />
|
||||
<Compile Include="Traits\LimitedAmmo.cs" />
|
||||
|
||||
@@ -3,12 +3,12 @@ using OpenRa.Effects;
|
||||
|
||||
namespace OpenRa.Traits
|
||||
{
|
||||
class RenderBuildingInfo : RenderSimpleInfo
|
||||
public class RenderBuildingInfo : RenderSimpleInfo
|
||||
{
|
||||
public override object Create(Actor self) { return new RenderBuilding(self); }
|
||||
}
|
||||
|
||||
class RenderBuilding : RenderSimple, INotifyDamage, INotifySold
|
||||
public class RenderBuilding : RenderSimple, INotifyDamage, INotifySold
|
||||
{
|
||||
const int SmallBibStart = 1;
|
||||
const int LargeBibStart = 5;
|
||||
|
||||
@@ -5,12 +5,12 @@ using System.Text;
|
||||
|
||||
namespace OpenRa.Traits
|
||||
{
|
||||
class SelectableInfo : StatelessTraitInfo<Selectable>
|
||||
public class SelectableInfo : StatelessTraitInfo<Selectable>
|
||||
{
|
||||
public readonly int Priority = 10;
|
||||
public readonly int[] Bounds = null;
|
||||
public readonly string Voice = "GenericVoice";
|
||||
}
|
||||
|
||||
class Selectable {}
|
||||
public class Selectable {}
|
||||
}
|
||||
|
||||
@@ -52,6 +52,12 @@ namespace OpenRa
|
||||
world.TileSet.GetWalkability(world.Map.MapTiles[a.X, a.Y])) < double.PositiveInfinity;
|
||||
}
|
||||
|
||||
public static IEnumerable<Actor> FindUnitsAtMouse(this World world, int2 mouseLocation)
|
||||
{
|
||||
var loc = mouseLocation + Game.viewport.Location;
|
||||
return FindUnits(world, loc, loc);
|
||||
}
|
||||
|
||||
public static IEnumerable<Actor> FindUnits(this World world, float2 a, float2 b)
|
||||
{
|
||||
var min = float2.Min(a, b);
|
||||
|
||||
3
OpenRa.Game/Effects/InvulnEffect.cs → OpenRa.Mods.RA/Effects/InvulnEffect.cs
Executable file → Normal file
3
OpenRa.Game/Effects/InvulnEffect.cs → OpenRa.Mods.RA/Effects/InvulnEffect.cs
Executable file → Normal file
@@ -1,8 +1,9 @@
|
||||
using System.Collections.Generic;
|
||||
using OpenRa.Graphics;
|
||||
using OpenRa.Traits;
|
||||
using OpenRa.Effects;
|
||||
|
||||
namespace OpenRa.Effects
|
||||
namespace OpenRa.Mods.RA.Effects
|
||||
{
|
||||
class InvulnEffect : IEffect
|
||||
{
|
||||
@@ -1,10 +1,8 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using OpenRa.Orders;
|
||||
using OpenRa.Traits;
|
||||
|
||||
namespace OpenRa.Traits
|
||||
namespace OpenRa.Mods.RA
|
||||
{
|
||||
class IronCurtainPowerInfo : SupportPowerInfo
|
||||
{
|
||||
@@ -61,9 +59,8 @@ namespace OpenRa.Traits
|
||||
{
|
||||
if (mi.Button == MouseButton.Left)
|
||||
{
|
||||
var loc = mi.Location + Game.viewport.Location;
|
||||
var underCursor = world.FindUnits(loc, loc)
|
||||
.Where(a => a.Owner == world.LocalPlayer
|
||||
var underCursor = world.FindUnitsAtMouse(mi.Location)
|
||||
.Where(a => a.Owner != null
|
||||
&& a.traits.Contains<IronCurtainable>()
|
||||
&& a.traits.Contains<Selectable>()).FirstOrDefault();
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
using System.Linq;
|
||||
using OpenRa.Effects;
|
||||
using OpenRa.Traits;
|
||||
using OpenRa.Mods.RA.Effects;
|
||||
|
||||
namespace OpenRa.Traits
|
||||
namespace OpenRa.Mods.RA
|
||||
{
|
||||
class IronCurtainableInfo : ITraitInfo
|
||||
{
|
||||
@@ -53,9 +53,12 @@
|
||||
<Compile Include="Activities\Steal.cs" />
|
||||
<Compile Include="C4Demolition.cs" />
|
||||
<Compile Include="Effects\CrateEffect.cs" />
|
||||
<Compile Include="Effects\InvulnEffect.cs" />
|
||||
<Compile Include="Effects\Parachute.cs" />
|
||||
<Compile Include="EngineerCapture.cs" />
|
||||
<Compile Include="InfiltrateForSonarPulse.cs" />
|
||||
<Compile Include="IronCurtainable.cs" />
|
||||
<Compile Include="IronCurtainPower.cs" />
|
||||
<Compile Include="ParaDrop.cs" />
|
||||
<Compile Include="ParatroopersPower.cs" />
|
||||
<Compile Include="RequiresPower.cs" />
|
||||
|
||||
Reference in New Issue
Block a user