Nearly There

This commit is contained in:
alzeih
2010-07-25 18:14:05 +12:00
parent fe527c1297
commit c749fcfce3
6 changed files with 48 additions and 17 deletions

View File

@@ -13,34 +13,44 @@ namespace OpenRA.Traits
{
public class DeveloperModeInfo : ITraitInfo
{
public int InitialCash = 20000;
public int BuildSpeed = 1;
public int ChargeTime = 1;
public object Create(ActorInitializer init) { return new DeveloperMode(this); }
public int Cash = 20000;
public bool FastBuild = false;
public bool FastCharge = false;
public object Create (ActorInitializer init) { return new DeveloperMode(this); }
}
public class DeveloperMode : IResolveOrder
{
DeveloperModeInfo Info;
public DeveloperMode (DeveloperModeInfo info)
[Sync]
public bool FastCharge;
public bool FastBuild;
public DeveloperMode(DeveloperModeInfo info)
{
Info = info;
FastBuild = Info.FastBuild;
FastCharge = Info.FastCharge;
}
public void ResolveOrder (Actor self, Order order)
{
switch (order.OrderString)
switch(order.OrderString)
{
case "DevModeGiveCash":
self.World.AddFrameEndTask( w =>
{
self.Owner.PlayerActor.traits.Get<PlayerResources>().GiveCash(Info.InitialCash);
});
break;
case "DevModeFastCharge":
{
FastCharge ^= true;
break;
}
case "DevModeFastBuild":
{
FastBuild ^= true;
break;
}
}
}
}
}

View File

@@ -22,7 +22,7 @@ namespace OpenRA.Traits
public object Create(ActorInitializer init) { return new PlayerResources(init.self); }
}
public class PlayerResources : ITick
public class PlayerResources : ITick, IResolveOrder
{
Player Owner;
int AdviceInterval;
@@ -187,5 +187,22 @@ namespace OpenRA.Traits
TickPower();
TickOre(self);
}
public void ResolveOrder (Actor self, Order order)
{
switch (order.OrderString)
{
case "DevModeGiveCash":
{
if (!Game.LobbyInfo.GlobalSettings.AllowCheats) break;
self.World.AddFrameEndTask( w =>
{
var amt = order.Subject.Info.Traits.Get<DeveloperModeInfo>().Cash;
GiveCash(amt);
});
}
break;
}
}
}
}

View File

@@ -101,6 +101,7 @@ namespace OpenRA.Traits
if (unit == null || ! unit.Traits.Contains<BuildableInfo>())
return 0;
if (self.traits.Get<DeveloperMode>().FastBuild) return 0;
var ui = unit.Traits.Get<BuildableInfo>();
var time = ui.Cost
* self.Owner.PlayerActor.Info.Traits.Get<ProductionQueueInfo>().BuildSpeed /* todo: country-specific build speed bonus */

View File

@@ -69,6 +69,7 @@ namespace OpenRA.Traits
if (IsAvailable && (!Info.RequiresPower || IsPowered()))
{
if (self.traits.Get<DeveloperMode>().FastCharge) RemainingTime = 0;
if (RemainingTime > 0) --RemainingTime;
if (!notifiedCharging)
{

View File

@@ -84,19 +84,21 @@ namespace OpenRA.Widgets.Delegates
() => true;
devmodeBG.GetWidget<CheckboxWidget>("SETTINGS_GIVE_CASH").OnMouseDown = mi =>
{
Game.IssueOrder(new Order("DevModeGiveCash", Game.world.LocalPlayer.PlayerActor));
return true;
};
devmodeBG.GetWidget<CheckboxWidget>("SETTINGS_BUILD_SPEED").OnMouseDown = mi =>
{
Game.IssueOrder(new Order("DevModeFastBuild", Game.world.LocalPlayer.PlayerActor));
return true;
};
devmodeBG.GetWidget<CheckboxWidget>("SETTINGS_BUILD_SPEED").Checked =
() => true;
devmodeBG.GetWidget<CheckboxWidget>("SETTINGS_CHARGE_TIME").OnMouseDown = mi =>
{
Game.IssueOrder(new Order("DevModeFastCharge", Game.world.LocalPlayer.PlayerActor));
return true;
};
devmodeBG.GetWidget<CheckboxWidget>("SETTINGS_CHARGE_TIME").Checked =

View File

@@ -16,7 +16,7 @@ using OpenRA.Traits.Activities;
namespace OpenRA.Mods.RA
{
class AirstrikePowerInfo : SupportPowerInfo
{
{
[ActorReference]
public readonly string UnitType = "badr.bomber";
[ActorReference]