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

Merge pull request #3114 from ScottNZ/mrj

Browse Source 
Implementation of MRJ
This commit is contained in:
Chris Forbes
2013-04-20 16:53:52 -07:00
parent ecae967386 51b485dd2e
commit 5cead96550
6 changed files with 141 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,8 +41,9 @@ namespace OpenRA.Mods.RA.Effects
public readonly Color ContrailColor = Color.White;
public readonly bool ContrailUsePlayerColor = false;
public readonly int ContrailDelay = 1;
public readonly bool Jammable = true;
public IEffect Create(ProjectileArgs args) { return new Missile( this, args ); }
public IEffect Create(ProjectileArgs args) { return new Missile(this, args); }
}
class Missile : IEffect
@@ -90,27 +91,44 @@ namespace OpenRA.Mods.RA.Effects
const int MissileCloseEnough = 7;
int ticksToNextSmoke;
public void Tick( World world )
public void Tick(World world)
{
t += 40;
// In pixels
var dist = Args.target.CenterLocation + offset - PxPosition;
var targetAltitude = 0;
var targetAltitude = 0;
if (Args.target.IsValid && Args.target.IsActor && Args.target.Actor.HasTrait<IMove>())
targetAltitude = Args.target.Actor.Trait<IMove>().Altitude;
targetAltitude = Args.target.Actor.Trait<IMove>().Altitude;
Altitude += Math.Sign(targetAltitude - Altitude);
var jammed = Info.Jammable && world.ActorsWithTrait<JamsMissiles>().Any(tp =>
(tp.Actor.CenterLocation - PxPosition).ToCVec().Length <= tp.Trait.Range
if (Args.target.IsValid)
&& (tp.Actor.Owner.Stances[Args.firedBy.Owner] != Stance.Ally
|| (tp.Actor.Owner.Stances[Args.firedBy.Owner] == Stance.Ally && tp.Trait.AlliedMissiles))
&& world.SharedRandom.Next(100 / tp.Trait.Chance) == 0);
if (!jammed)
{
Altitude += Math.Sign(targetAltitude - Altitude);
if (Args.target.IsValid)
Facing = Traits.Util.TickFacing(Facing,
Traits.Util.GetFacing(dist, Facing),
Info.ROT);
}
else
{
Altitude += world.SharedRandom.Next(-1, 2);
Facing = Traits.Util.TickFacing(Facing,
Traits.Util.GetFacing(dist, Facing),
Facing + world.SharedRandom.Next(-20, 21),
Info.ROT);
}
anim.Tick();
if (dist.LengthSquared < MissileCloseEnough * MissileCloseEnough && Args.target.IsValid )
if (dist.LengthSquared < MissileCloseEnough * MissileCloseEnough && Args.target.IsValid)
Explode(world);
// TODO: Replace this with a lookup table

35
OpenRA.Mods.RA/JamsMissiles.cs Normal file
View File

@@ -0,0 +1,35 @@
#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 OpenRA;
using OpenRA.Traits;
namespace OpenRA.Mods.RA
{
class JamsMissilesInfo : ITraitInfo
{
public readonly int Range = 0;
public readonly bool AlliedMissiles = true;
public readonly int Chance = 100;
public object Create(ActorInitializer init) { return new JamsMissiles(this); }
}
class JamsMissiles
{
readonly JamsMissilesInfo info;
public int Range { get { return info.Range; } }
public bool AlliedMissiles { get { return info.AlliedMissiles; } }
public int Chance { get { return info.Chance; } }
public JamsMissiles(JamsMissilesInfo info) { this.info = info; }
}
}

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

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -233,6 +233,7 @@
<Compile Include="InfiltrateForSupportPower.cs" />
<Compile Include="Invulnerable.cs" />
<Compile Include="IronCurtainable.cs" />
<Compile Include="JamsMissiles.cs" />
<Compile Include="LeavesHusk.cs" />
<Compile Include="LightPaletteRotator.cs" />
<Compile Include="LimitedAmmo.cs" />
@@ -301,6 +302,7 @@
<Compile Include="RallyPoint.cs" />
<Compile Include="Reloads.cs" />
<Compile Include="RenderDetectionCircle.cs" />
<Compile Include="RenderJammerCircle.cs" />
<Compile Include="RenderRangeCircle.cs" />
<Compile Include="Render\RenderBuilding.cs" />
<Compile Include="Render\RenderBuildingCharge.cs" />

6
OpenRA.Mods.RA/ProvidesRadar.cs
View File

@@ -26,14 +26,14 @@ namespace OpenRA.Mods.RA
// Check if powered
if (self.IsDisabled()) return false;
var isJammed = self.World.ActorsWithTrait<JamsRadar>().Any(a => self.Owner != a.Actor.Owner
&& (self.Location - a.Actor.Location).Length < a.Actor.Info.Traits.Get<JamsRadarInfo>().Range);
var isJammed = self.World.ActorsWithTrait<JamsRadar>().Any(a => a.Actor.Owner.Stances[self.Owner] != Stance.Ally
&& (self.Location - a.Actor.Location).Length <= a.Actor.Info.Traits.Get<JamsRadarInfo>().Range);
return !isJammed;
}
}
class JamsRadarInfo : TraitInfo<JamsRadar> { public readonly int Range = 0; }
class JamsRadarInfo : TraitInfo<JamsRadar> { public readonly int Range = 0; }
class JamsRadar { }
}

63
OpenRA.Mods.RA/RenderJammerCircle.cs Normal file
View File

@@ -0,0 +1,63 @@
#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.Drawing;
using OpenRA.Graphics;
using OpenRA.Traits;
namespace OpenRA.Mods.RA
{
//todo: remove all the Render*Circle duplication
class RenderJammerCircleInfo : TraitInfo<RenderJammerCircle>, IPlaceBuildingDecoration
{
public void Render(WorldRenderer wr, World w, ActorInfo ai, PPos centerLocation)
{
var jamsMissiles = ai.Traits.GetOrDefault<JamsMissilesInfo>();
if (jamsMissiles != null)
RenderJammerCircle.DrawRangeCircle(wr, centerLocation.ToFloat2(), jamsMissiles.Range, Color.Red);
var jamsRadar = ai.Traits.GetOrDefault<JamsRadarInfo>();
if (jamsRadar != null)
RenderJammerCircle.DrawRangeCircle(wr, centerLocation.ToFloat2(), jamsRadar.Range, Color.Blue);
foreach (var a in w.ActorsWithTrait<RenderJammerCircle>())
if (a.Actor.Owner == a.Actor.World.LocalPlayer)
a.Trait.RenderBeforeWorld(wr, a.Actor);
}
}
public class RenderJammerCircle : IPreRenderSelection
{
public void RenderBeforeWorld(WorldRenderer wr, Actor self)
{
if (self.Owner != self.World.LocalPlayer)
return;
var jamsMissiles = self.Info.Traits.GetOrDefault<JamsMissilesInfo>();
if (jamsMissiles != null)
DrawRangeCircle(wr, self.CenterLocation.ToFloat2(), jamsMissiles.Range, Color.Red);
var jamsRadar = self.Info.Traits.GetOrDefault<JamsRadarInfo>();
if (jamsRadar != null)
DrawRangeCircle(wr, self.CenterLocation.ToFloat2(), jamsRadar.Range, Color.Blue);
}
public static void DrawRangeCircle(WorldRenderer wr, float2 location, int range, Color color)
{
wr.DrawRangeCircleWithContrast(
Color.FromArgb(128, color),
location,
range,
Color.FromArgb(96, Color.Black),
1);
}
}
}

15
mods/ra/rules/vehicles.yaml
View File

@@ -490,7 +490,7 @@ MGG:
Inherits: ^Vehicle
Buildable:
Queue: Vehicle
BuildPaletteOrder: 150
BuildPaletteOrder: 160
Prerequisites: atek
Owner: allies
Hotkey: y
@@ -537,11 +537,13 @@ MRJ:
Cost: 1000
Tooltip:
Name: Mobile Radar Jammer
Description: Unarmed
Description: Jams nearby enemy radar domes\nand deflects incoming missiles.\n Unarmed
Buildable:
Queue: Vehicle
BuildPaletteOrder: 1000
Owner: None
BuildPaletteOrder: 150
Prerequisites: atek
Owner: allies
Hotkey: m
Health:
HP: 200
Armor:
@@ -558,6 +560,11 @@ MRJ:
Explodes:
Weapon: UnitExplodeSmall
EmptyWeapon: UnitExplodeSmall
JamsRadar:
Range: 15
JamsMissiles:
Range: 3
RenderJammerCircle:
1TNK.Husk:
Inherits: ^Husk