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

Merge pull request #6455 from reaperrr/blocksbullets

Browse Source 
Renamed Wall to BlocksBullets
This commit is contained in:
Matthias Mailänder
2014-09-14 12:51:44 +02:00
parent 53f926b792 e8b9397e1a
commit c7c816f22e
14 changed files with 54 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
OpenRA.Mods.RA/BlocksBullets.cs Normal file
View File

@@ -0,0 +1,20 @@
#region Copyright & License Information
/*
* Copyright 2007-2014 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.Linq;
using OpenRA.Traits;
namespace OpenRA.Mods.RA
{
//TODO: Add functionality like a customizable Height that is compared to projectile altitude
[Desc("This actor blocks bullets and missiles without 'High' property.")]
public class BlocksBulletsInfo : TraitInfo<BlocksBullets> { }
public class BlocksBullets : IBlocksBullets { }
}

50
OpenRA.Mods.RA/Buildings/Wall.cs
View File

@@ -1,50 +0,0 @@
#region Copyright & License Information
/*
* Copyright 2007-2014 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.Linq;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Buildings
{
public class WallInfo : ITraitInfo, Requires<BuildingInfo>
{
public readonly string[] CrushClasses = { };
public readonly string CrushSound;
public object Create(ActorInitializer init) { return new Wall(init.self, this); }
}
public class Wall : ICrushable, IBlocksBullets
{
readonly Actor self;
readonly WallInfo info;
public Wall(Actor self, WallInfo info)
{
this.self = self;
this.info = info;
}
public void WarnCrush(Actor crusher) {}
public bool CrushableBy(string[] crushClasses, Player crushOwner)
{
if (crushOwner.Stances[self.Owner] == Stance.Ally)
return false;
return info.CrushClasses.Intersect(crushClasses).Any();
}
public void OnCrush(Actor crusher)
{
self.Kill(crusher);
Sound.Play(info.CrushSound, self.CenterPosition);
}
}
}

2
OpenRA.Mods.RA/Effects/Bullet.cs
View File

@@ -28,7 +28,7 @@ namespace OpenRA.Mods.RA.Effects
[Desc("Maximum offset at the maximum range")]
public readonly WRange Inaccuracy = WRange.Zero;
public readonly string Image = null;
[Desc("Check for whether an actor with Wall: trait blocks fire")]
[Desc("Check for whether an actor with BlocksBullets: trait blocks fire")]
public readonly bool High = false;
public readonly bool Shadow = false;
[Desc("Arc in WAngles, two values indicate variable arc.")]

2
OpenRA.Mods.RA/Effects/Missile.cs
View File

@@ -25,7 +25,7 @@ namespace OpenRA.Mods.RA.Effects
public readonly WRange Speed = new WRange(8);
public readonly WAngle MaximumPitch = WAngle.FromDegrees(30);
public readonly int Arm = 0;
[Desc("Check for whether an actor with Wall: trait blocks fire")]
[Desc("Check for whether an actor with BlocksBullets: trait blocks fire")]
public readonly bool High = false;
public readonly bool Shadow = false;
public readonly string Trail = null;

2
OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
View File

@@ -183,7 +183,7 @@
<Compile Include="Buildings\ShakeOnDeath.cs" />
<Compile Include="Buildings\SoundOnDamageTransition.cs" />
<Compile Include="Buildings\Util.cs" />
<Compile Include="Buildings\Wall.cs" />
<Compile Include="BlocksBullets.cs" />
<Compile Include="Burns.cs" />
<Compile Include="C4Demolition.cs" />
<Compile Include="ExternalCapturable.cs" />