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

move McvDeploy from rules into yaml. fix buttons on chronoSelect. removed extraneous PlayAnimation order.

Browse Source
This commit is contained in:
Bob
2010-01-24 13:46:05 +13:00
parent a43787d0cb
commit 67319eac11
6 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenRa.Game/GameRules/GeneralInfo.cs
View File

@@ -105,7 +105,6 @@ namespace OpenRa.GameRules
/* Misc */ /* Misc */
[Obsolete] [Obsolete]
public readonly bool FineDiffControl = false; public readonly bool FineDiffControl = false;
public readonly bool MCVUndeploy = false;
/* OpenRA-specific */ /* OpenRA-specific */
public readonly float OreChance = 0; /* chance of spreading to a particular eligible cell */ public readonly float OreChance = 0; /* chance of spreading to a particular eligible cell */

2
OpenRa.Game/Orders/ChronosphereSelectOrderGenerator.cs
View File

@@ -20,7 +20,7 @@ namespace OpenRa.Orders
IEnumerable<Order> OrderInner(World world, int2 xy, MouseInput mi) IEnumerable<Order> OrderInner(World world, int2 xy, MouseInput mi)
{ {
if (mi.Button == MouseButton.Right) if (mi.Button == MouseButton.Left)
{ {
var loc = mi.Location + Game.viewport.Location; var loc = mi.Location + Game.viewport.Location;
var underCursor = world.FindUnits(loc, loc) var underCursor = world.FindUnits(loc, loc)

2
OpenRa.Game/Traits/ChronoshiftPower.cs
View File

@@ -42,7 +42,7 @@ namespace OpenRa.Traits
var chronosphere = self.World.Actors.Where(a => a.Owner == self.Owner var chronosphere = self.World.Actors.Where(a => a.Owner == self.Owner
&& a.traits.Contains<Chronosphere>()).FirstOrDefault(); && a.traits.Contains<Chronosphere>()).FirstOrDefault();
if( chronosphere != null ) if( chronosphere != null )
Game.orderManager.IssueOrder(new Order("PlayAnimation", chronosphere, "active")); chronosphere.traits.Get<RenderBuilding>().PlayCustomAnim( chronosphere, "active" );
// Trigger screen desaturate effect // Trigger screen desaturate effect
foreach (var a in self.World.Actors.Where(a => a.traits.Contains<ChronoshiftPaletteEffect>())) foreach (var a in self.World.Actors.Where(a => a.traits.Contains<ChronoshiftPaletteEffect>()))

4
OpenRa.Game/Traits/ConstructionYard.cs
View File

@@ -5,6 +5,8 @@ namespace OpenRa.Traits
{ {
class ConstructionYardInfo : ITraitInfo class ConstructionYardInfo : ITraitInfo
{ {
public readonly bool AllowUndeploy;
public object Create(Actor self) { return new ConstructionYard(self); } public object Create(Actor self) { return new ConstructionYard(self); }
} }
@@ -19,7 +21,7 @@ namespace OpenRa.Traits
public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor) public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor)
{ {
if (!Rules.General.MCVUndeploy) return null; if (!self.Info.Traits.Get<ConstructionYardInfo>().AllowUndeploy) return null;
if (mi.Button == MouseButton.Left) return null; if (mi.Button == MouseButton.Left) return null;

8
OpenRa.Game/Traits/RenderBuilding.cs
View File

@@ -8,7 +8,7 @@ namespace OpenRa.Traits
public override object Create(Actor self) { return new RenderBuilding(self); } public override object Create(Actor self) { return new RenderBuilding(self); }
} }
class RenderBuilding : RenderSimple, INotifyDamage, INotifySold, IResolveOrder class RenderBuilding : RenderSimple, INotifyDamage, INotifySold
{ {
const int SmallBibStart = 1; const int SmallBibStart = 1;
const int LargeBibStart = 5; const int LargeBibStart = 5;
@@ -99,11 +99,5 @@ namespace OpenRa.Traits
} }
public void Sold(Actor self) { DoBib(self, true); } public void Sold(Actor self) { DoBib(self, true); }
public void ResolveOrder(Actor self, Order order)
{
if (order.OrderString == "PlayAnimation")
PlayCustomAnim(self, order.TargetString);
}
} }
} }

1
mods/ra/rules.ini
View File

@@ -110,7 +110,6 @@ TeamDelay=.6 ; interval between checking for and creating teams
; misc ; misc
FineDiffControl=no ; Allow 5 difficulty settings instead of only 3 settings? FineDiffControl=no ; Allow 5 difficulty settings instead of only 3 settings?
MCVUndeploy=yes ; Allow construction yard to undeploy back into MCV?
; ******* Unit Statistics ******* ; ******* Unit Statistics *******