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

Initial cleanup of BaseBuilder.

Browse Source
This commit is contained in:
Paul Chote
2013-08-24 10:10:16 +12:00
parent d5f65eff88
commit aadfd6979b
1 changed files with 51 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
OpenRA.Mods.RA/AI/BaseBuilder.cs
View File

@@ -1,6 +1,6 @@
#region Copyright & License Information #region Copyright & License Information
/* /*
* Copyright 2007-2011 The OpenRA Developers (see AUTHORS) * Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made * 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 * available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information, * as published by the Free Software Foundation. For more information,
@@ -9,13 +9,7 @@
#endregion #endregion
using System; using System;
using System.Collections.Generic;
using System.Linq; using System.Linq;
using OpenRA.FileFormats;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Traits;
using OpenRA.Mods.RA.Activities;
using XRandom = OpenRA.Thirdparty.Random;
namespace OpenRA.Mods.RA.AI namespace OpenRA.Mods.RA.AI
{ {
@@ -39,7 +33,7 @@ namespace OpenRA.Mods.RA.AI
public void Tick() public void Tick()
{ {
// Pick a free queue // Pick a free queue
var queue = ai.FindQueues( category ).FirstOrDefault(); var queue = ai.FindQueues(category).FirstOrDefault();
if (queue == null) if (queue == null)
return; return;
@@ -47,7 +41,6 @@ namespace OpenRA.Mods.RA.AI
switch (state) switch (state)
{ {
case BuildState.ChooseItem: case BuildState.ChooseItem:
{
var item = chooseItem(queue); var item = chooseItem(queue);
if (item == null) if (item == null)
{ {
@@ -60,24 +53,24 @@ namespace OpenRA.Mods.RA.AI
state = BuildState.WaitForProduction; state = BuildState.WaitForProduction;
ai.world.IssueOrder(Order.StartProduction(queue.self, item.Name, 1)); ai.world.IssueOrder(Order.StartProduction(queue.self, item.Name, 1));
} }
}
break; break;
case BuildState.WaitForProduction: case BuildState.WaitForProduction:
if (currentBuilding == null) return; /* let it happen.. */ if (currentBuilding == null)
return;
else if (currentBuilding.Paused) if (currentBuilding.Paused)
ai.world.IssueOrder(Order.PauseProduction(queue.self, currentBuilding.Item, false)); ai.world.IssueOrder(Order.PauseProduction(queue.self, currentBuilding.Item, false));
else if (currentBuilding.Done) else if (currentBuilding.Done)
{ {
state = BuildState.WaitForFeedback; state = BuildState.WaitForFeedback;
lastThinkTick = ai.ticks; lastThinkTick = ai.ticks;
/* place the building */ // Place the building
BuildingType type = BuildingType.Building; var type = BuildingType.Building;
if(Rules.Info[currentBuilding.Item].Traits.Contains<AttackBaseInfo>()) if (Rules.Info[currentBuilding.Item].Traits.Contains<AttackBaseInfo>())
type = BuildingType.Defense; type = BuildingType.Defense;
else if(Rules.Info[currentBuilding.Item].Traits.Contains<OreRefineryInfo>()) else if (Rules.Info[currentBuilding.Item].Traits.Contains<OreRefineryInfo>())
type = BuildingType.Refinery; type = BuildingType.Refinery;
var location = ai.ChooseBuildLocation(currentBuilding.Item, type); var location = ai.ChooseBuildLocation(currentBuilding.Item, type);
@@ -95,6 +88,7 @@ namespace OpenRA.Mods.RA.AI
}); });
} }
} }
break; break;
case BuildState.WaitForFeedback: case BuildState.WaitForFeedback:
@@ -105,4 +99,3 @@ namespace OpenRA.Mods.RA.AI
} }
} }
} }