From f7bff84ce29252602a1254f4c9f2143fc52811a5 Mon Sep 17 00:00:00 2001 From: beedee Date: Fri, 13 Jul 2007 17:20:57 +0000 Subject: [PATCH] git-svn-id: svn://svn.ijw.co.nz/svn/OpenRa@1212 993157c7-ee19-0410-b2c4-bb4e9862e678 --- OpenRa.Game/Sidebar.cs | 12 ++++++------ OpenRa.TechTree/TechTree.cs | 11 +++++++---- rules.ini | 3 +++ 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/OpenRa.Game/Sidebar.cs b/OpenRa.Game/Sidebar.cs index fea0404f1d..9624010536 100644 --- a/OpenRa.Game/Sidebar.cs +++ b/OpenRa.Game/Sidebar.cs @@ -24,12 +24,12 @@ namespace OpenRa.Game public Sidebar(Race race, Renderer renderer) { techTree.CurrentRace = race; - techTree.Build("FACT"); - techTree.Build("POWR"); - techTree.Build("BARR"); - techTree.Build("PROC"); - techTree.Build("WEAP"); - techTree.Build("DOME"); + techTree.Build("FACT", true); + //techTree.Build("POWR"); + //techTree.Build("BARR"); + //techTree.Build("PROC"); + //techTree.Build("WEAP"); + //techTree.Build("DOME"); this.renderer = renderer; this.spriteRenderer = new SpriteRenderer(renderer); diff --git a/OpenRa.TechTree/TechTree.cs b/OpenRa.TechTree/TechTree.cs index e6144640cb..b695030a98 100644 --- a/OpenRa.TechTree/TechTree.cs +++ b/OpenRa.TechTree/TechTree.cs @@ -27,8 +27,6 @@ namespace OpenRa.TechTree public TechTree() { LoadRules(); - - built.Add("FACT"); CheckAll(); } @@ -65,15 +63,20 @@ namespace OpenRa.TechTree objects.Add(p.a, new Item(p.a, p.b, rulesFile.GetSection(p.a), p.c)); } - public bool Build(string key) + public bool Build(string key, bool force) { Item b = objects[key]; - if (!b.CanBuild) return false; + if (!force && !b.CanBuild) return false; built.Add(key); CheckAll(); return true; } + public bool Build(string key) + { + return Build(key, false); + } + public bool Unbuild(string key) { Item b = objects[key]; diff --git a/rules.ini b/rules.ini index 5750e949f0..790c53a82c 100644 --- a/rules.ini +++ b/rules.ini @@ -1670,6 +1670,7 @@ Crewed=yes ; sandbag wall [SBAG] +Prerequisite=fact Strength=1 Armor=none TechLevel=2 @@ -1682,6 +1683,7 @@ Adjacent=1 ; concrete wall [BRIK] +Prerequisite=fact Strength=1 Armor=none TechLevel=8 @@ -1694,6 +1696,7 @@ Adjacent=1 ; wire fence [FENC] +Prerequisite=fact Strength=1 Armor=none TechLevel=2