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

Take BuiltAt overrides into account when calculating speedup - prevent kennels contributing to rifle infantry speedup for example

Browse Source
This commit is contained in:
ScottNZ
2014-07-27 14:09:14 +12:00
parent b21f0eaf20
commit 88ea7f1c7e
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
OpenRA.Mods.RA/Player/ClassicProductionQueue.cs
View File

@@ -8,7 +8,6 @@
*/ */
#endregion #endregion
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using OpenRA.Mods.RA.Buildings; using OpenRA.Mods.RA.Buildings;
@@ -76,8 +75,8 @@ namespace OpenRA.Mods.RA
protected override bool BuildUnit(string name) protected override bool BuildUnit(string name)
{ {
// Find a production structure to build this actor // Find a production structure to build this actor
var info = self.World.Map.Rules.Actors[name]; var ai = self.World.Map.Rules.Actors[name];
var bi = info.Traits.GetOrDefault<BuildableInfo>(); var bi = ai.Traits.GetOrDefault<BuildableInfo>();
// Some units may request a specific production type, which is ignored if the AllTech cheat is enabled // Some units may request a specific production type, which is ignored if the AllTech cheat is enabled
var type = bi == null || developerMode.AllTech ? Info.Type : bi.BuildAtProductionType ?? Info.Type; var type = bi == null || developerMode.AllTech ? Info.Type : bi.BuildAtProductionType ?? Info.Type;
@@ -96,7 +95,7 @@ namespace OpenRA.Mods.RA
foreach (var p in producers.Where(p => !p.Actor.IsDisabled())) foreach (var p in producers.Where(p => !p.Actor.IsDisabled()))
{ {
if (p.Trait.Produce(p.Actor, info, Race)) if (p.Trait.Produce(p.Actor, ai, Race))
{ {
FinishProduction(); FinishProduction();
return true; return true;
@@ -108,23 +107,24 @@ namespace OpenRA.Mods.RA
public override int GetBuildTime(string unitString) public override int GetBuildTime(string unitString)
{ {
var unit = self.World.Map.Rules.Actors[unitString]; var ai = self.World.Map.Rules.Actors[unitString];
if (unit == null || !unit.Traits.Contains<BuildableInfo>()) var bi = ai.Traits.GetOrDefault<BuildableInfo>();
if (bi == null)
return 0; return 0;
if (self.World.AllowDevCommands && self.Owner.PlayerActor.Trait<DeveloperMode>().FastBuild) if (self.World.AllowDevCommands && self.Owner.PlayerActor.Trait<DeveloperMode>().FastBuild)
return 0; return 0;
var time = (int)(unit.GetBuildTime() * Info.BuildSpeed); var time = (int)(ai.GetBuildTime() * Info.BuildSpeed);
if (info.SpeedUp) if (info.SpeedUp)
{ {
var queues = unit.Traits.Get<BuildableInfo>().Queue; var type = bi.BuildAtProductionType ?? info.Type;
var selfsameBuildings = self.World.ActorsWithTrait<Production>()
.Where(p => p.Actor.Owner == self.Owner && p.Trait.Info.Produces.Intersect(queues).Any())
.ToArray();
var speedModifier = selfsameBuildings.Count().Clamp(1, info.BuildTimeSpeedReduction.Length) - 1; var selfsameBuildingsCount = self.World.ActorsWithTrait<Production>()
.Count(p => p.Actor.Owner == self.Owner && p.Trait.Info.Produces.Contains(type));
var speedModifier = selfsameBuildingsCount.Clamp(1, info.BuildTimeSpeedReduction.Length) - 1;
time = (time * info.BuildTimeSpeedReduction[speedModifier]) / 100; time = (time * info.BuildTimeSpeedReduction[speedModifier]) / 100;
} }