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

fixed Building.unitInfo

Browse Source
This commit is contained in:
Bob
2010-01-12 20:18:36 +13:00
parent d5d6812e07
commit 4a004eda0f
9 changed files with 40 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenRa.Game/Orders/PlaceBuildingOrderGenerator.cs
View File

@@ -1,17 +1,19 @@
using System.Collections.Generic;
using OpenRa.Game.GameRules;
using OpenRa.Game.Traits;
namespace OpenRa.Game.Orders
{
class PlaceBuildingOrderGenerator : IOrderGenerator
{
readonly Actor Producer;
readonly LegacyBuildingInfo Building;
readonly string Building;
BuildingInfo BuildingInfo { get { return Rules.NewUnitInfo[ Building ].Traits.Get<BuildingInfo>(); } }
public PlaceBuildingOrderGenerator(Actor producer, string name)
{
Producer = producer;
Building = (LegacyBuildingInfo)Rules.UnitInfo[ name ];
Building = name;
}
public IEnumerable<Order> Order(int2 xy, MouseInput mi)
@@ -26,27 +28,27 @@ namespace OpenRa.Game.Orders
{
if (mi.Button == MouseButton.Left)
{
if (!Game.CanPlaceBuilding(Building, xy, null, true)
|| !Game.IsCloseEnoughToBase(Producer.Owner, Building, xy))
if (!Game.CanPlaceBuilding( Building, BuildingInfo, xy, null, true)
|| !Game.IsCloseEnoughToBase(Producer.Owner, Building, BuildingInfo, xy))
{
Sound.Play("nodeply1.aud");
yield break;
}
yield return new Order("PlaceBuilding", Producer.Owner.PlayerActor, null, xy, Building.Name);
yield return new Order("PlaceBuilding", Producer.Owner.PlayerActor, null, xy, Building);
}
}
public void Tick()
{
var producing = Producer.traits.Get<Traits.ProductionQueue>().CurrentItem( Rules.UnitCategory[ Building.Name ] );
if (producing == null || producing.Item != Building.Name || producing.RemainingTime != 0)
var producing = Producer.traits.Get<Traits.ProductionQueue>().CurrentItem( Rules.UnitCategory[ Building ] );
if (producing == null || producing.Item != Building || producing.RemainingTime != 0)
Game.controller.CancelInputMode();
}
public void Render()
{
Game.worldRenderer.uiOverlay.DrawBuildingGrid( Building );
Game.worldRenderer.uiOverlay.DrawBuildingGrid( Building, BuildingInfo );
}
public Cursor GetCursor(int2 xy, MouseInput mi)

4
OpenRa.Game/Orders/UnitOrderGenerator.cs
View File

@@ -69,8 +69,8 @@ namespace OpenRa.Game.Orders
else
return Cursor.MoveBlocked;
case "DeployMcv":
var factBuildingInfo = (LegacyBuildingInfo)Rules.UnitInfo["fact"];
if (Game.CanPlaceBuilding(factBuildingInfo, a.Location - new int2(1, 1), a, false))
var factBuildingInfo = Rules.NewUnitInfo["fact"].Traits.Get<BuildingInfo>();
if (Game.CanPlaceBuilding("fact", factBuildingInfo, a.Location - new int2(1, 1), a, false))
return Cursor.Deploy;
else
return Cursor.DeployBlocked;

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

@@ -20,7 +20,7 @@ namespace OpenRa.Game.Orders
if( producing == null || producing.Item != order.TargetString || producing.RemainingTime != 0 )
return;
Game.world.Add( new Actor( order.TargetString, order.TargetLocation - Footprint.AdjustForBuildingSize( (LegacyBuildingInfo)Rules.UnitInfo[ order.TargetString ] ), order.Player ) );
Game.world.Add( new Actor( order.TargetString, order.TargetLocation - Footprint.AdjustForBuildingSize( Rules.NewUnitInfo[ order.TargetString ].Traits.Get<BuildingInfo>() ), order.Player ) );
if (order.Player == Game.LocalPlayer)
{
Sound.Play("placbldg.aud");