removed TechLevel from Buildable; fixed lineendings in structures.yaml

This commit is contained in:
Bob
2010-05-13 19:01:01 +12:00
parent aa1c149dbb
commit bed3c28233
5 changed files with 919 additions and 935 deletions

View File

@@ -31,14 +31,13 @@ namespace OpenRA.Traits
class BuildableInfo : ValuedInfo
{
public readonly int TechLevel = -1;
public readonly string[] Prerequisites = { };
public readonly string[] BuiltAt = { };
public readonly string[] Owner = { };
public readonly string Icon = null;
public readonly string[] AlternateName = { };
public readonly int BuildPaletteOrder = 50;
public readonly int BuildPaletteOrder = 9999;
public readonly string Hotkey = null;
public override object Create(Actor self) { return new Buildable(); }

View File

@@ -201,7 +201,7 @@ namespace OpenRA.Widgets
var allBuildables = Rules.TechTree.AllBuildables(queueName)
.Where(a => a.Traits.Get<BuildableInfo>().Owner.Contains(world.LocalPlayer.Country.Race))
.OrderBy(a => a.Traits.Get<BuildableInfo>().BuildPaletteOrder)
.ThenBy(a => a.Traits.Get<BuildableInfo>().TechLevel).ToArray();
.ToArray();
var queue = world.LocalPlayer.PlayerActor.traits.Get<ProductionQueue>();

View File

@@ -1,7 +1,7 @@
DOG:
Inherits: ^Infantry
Buildable:
TechLevel: 3
BuildPaletteOrder: 30
Prerequisites: kenn
BuiltAt: KENN
Owner: soviet
@@ -22,7 +22,7 @@ DOG:
E1:
Inherits: ^Infantry
Buildable:
TechLevel: 1
BuildPaletteOrder: 10
Prerequisites: @Barracks
Owner: allies,soviet
Cost: 100
@@ -41,7 +41,7 @@ E1:
E2:
Inherits: ^Infantry
Buildable:
TechLevel: 1
BuildPaletteOrder: 10
Owner: soviet
Cost: 160
Description: Grenadier
@@ -62,7 +62,7 @@ E2:
E3:
Inherits: ^Infantry
Buildable:
TechLevel: 2
BuildPaletteOrder: 20
Owner: allies,soviet
Cost: 300
Description: Rocket Soldier
@@ -83,7 +83,7 @@ E3:
E4:
Inherits: ^Infantry
Buildable:
TechLevel: 6
BuildPaletteOrder: 60
Prerequisites: stek, @Barracks
Owner: soviet
Cost: 300
@@ -104,7 +104,7 @@ E4:
E6:
Inherits: ^Infantry
Buildable:
TechLevel: 5
BuildPaletteOrder: 50
Owner: soviet,allies
Cost: 500
Description: Engineer
@@ -126,7 +126,7 @@ E6:
SPY:
Inherits: ^Infantry
Buildable:
TechLevel: 6
BuildPaletteOrder: 60
Prerequisites: dome, tent
Owner: allies
Cost: 500
@@ -151,7 +151,7 @@ SPY:
E7:
Inherits: ^Infantry
Buildable:
TechLevel: 11
BuildPaletteOrder: 110
Prerequisites: @Tech Center, @Barracks
Owner: allies,soviet
Cost: 1200
@@ -175,7 +175,7 @@ E7:
MEDI:
Inherits: ^Infantry
Buildable:
TechLevel: 2
BuildPaletteOrder: 20
Owner: allies
Cost: 800
Description: Medic

File diff suppressed because it is too large Load Diff

View File

@@ -39,7 +39,7 @@ BADR.bomber:
V2RL:
Inherits: ^Vehicle
Buildable:
TechLevel: 4
BuildPaletteOrder: 40
Prerequisites: weap,dome
Owner: soviet
Cost: 700
@@ -61,7 +61,7 @@ V2RL:
1TNK:
Inherits: ^Vehicle
Buildable:
TechLevel: 4
BuildPaletteOrder: 40
Prerequisites: weap
Owner: allies
Cost: 700
@@ -86,7 +86,7 @@ V2RL:
2TNK:
Inherits: ^Vehicle
Buildable:
TechLevel: 6
BuildPaletteOrder: 60
Prerequisites: weap
Owner: allies
Cost: 800
@@ -111,7 +111,7 @@ V2RL:
3TNK:
Inherits: ^Vehicle
Buildable:
TechLevel: 4
BuildPaletteOrder: 40
Prerequisites: weap
Owner: soviet
Cost: 950
@@ -136,7 +136,7 @@ V2RL:
4TNK:
Inherits: ^Vehicle
Buildable:
TechLevel: 10
BuildPaletteOrder: 100
Prerequisites: weap,stek
Owner: soviet
Cost: 1700
@@ -164,7 +164,7 @@ V2RL:
ARTY:
Inherits: ^Vehicle
Buildable:
TechLevel: 8
BuildPaletteOrder: 80
Prerequisites: weap
Owner: allies
Cost: 600
@@ -188,7 +188,7 @@ ARTY:
HARV:
Inherits: ^Vehicle
Buildable:
TechLevel: 1
BuildPaletteOrder: 10
Prerequisites: weap,proc
Owner: allies,soviet
Cost: 1100
@@ -212,7 +212,7 @@ HARV:
MCV:
Inherits: ^Vehicle
Buildable:
TechLevel: 11
BuildPaletteOrder: 110
Prerequisites: weap,fix
Owner: allies,soviet
Cost: 2000
@@ -239,7 +239,7 @@ MCV:
JEEP:
Inherits: ^Vehicle
Buildable:
TechLevel: 3
BuildPaletteOrder: 30
Prerequisites: weap
Owner: allies
Cost: 600
@@ -264,7 +264,7 @@ JEEP:
APC:
Inherits: ^Vehicle
Buildable:
TechLevel: 5
BuildPaletteOrder: 50
Prerequisites: weap,tent
Owner: allies
Cost: 800
@@ -292,7 +292,7 @@ APC:
MNLY.AP:
Inherits: ^Vehicle
Buildable:
TechLevel: 3
BuildPaletteOrder: 30
Prerequisites: weap,fix
Owner: soviet
Cost: 800
@@ -318,7 +318,7 @@ MNLY.AP:
MNLY.AT:
Inherits: ^Vehicle
Buildable:
TechLevel: 3
BuildPaletteOrder: 30
Prerequisites: weap,fix
Owner: allies
Cost: 800
@@ -353,7 +353,7 @@ TRUK:
SS:
Inherits: ^Ship
Buildable:
TechLevel: 5
BuildPaletteOrder: 50
Prerequisites: spen
BuiltAt: spen
Owner: soviet
@@ -380,7 +380,7 @@ SS:
DD:
Inherits: ^Ship
Buildable:
TechLevel: 7
BuildPaletteOrder: 70
Prerequisites: syrd
BuiltAt: syrd
Owner: allies
@@ -409,7 +409,7 @@ DD:
CA:
Inherits: ^Ship
Buildable:
TechLevel: 10
BuildPaletteOrder: 100
Prerequisites: syrd,atek
BuiltAt: syrd
Owner: allies
@@ -440,7 +440,7 @@ CA:
LST:
Inherits: ^Ship
Buildable:
TechLevel: 3
BuildPaletteOrder: 30
Owner: allies,soviet
Cost: 700
Description: Transport
@@ -462,7 +462,7 @@ LST:
PT:
Inherits: ^Ship
Buildable:
TechLevel: 5
BuildPaletteOrder: 50
Prerequisites: syrd
BuiltAt: syrd
Owner: allies
@@ -491,7 +491,7 @@ PT:
MIG:
Inherits: ^Plane
Buildable:
TechLevel: 10
BuildPaletteOrder: 100
Prerequisites: afld
BuiltAt: afld
Owner: soviet
@@ -519,7 +519,7 @@ MIG:
YAK:
Inherits: ^Plane
Buildable:
TechLevel: 5
BuildPaletteOrder: 50
Prerequisites: afld
BuiltAt: afld
Owner: soviet
@@ -548,7 +548,7 @@ YAK:
TRAN:
Inherits: ^Plane
Buildable:
TechLevel: 11
BuildPaletteOrder: 110
Prerequisites: hpad
BuiltAt: hpad
Owner: allies
@@ -575,7 +575,7 @@ TRAN:
HELI:
Inherits: ^Plane
Buildable:
TechLevel: 9
BuildPaletteOrder: 90
Prerequisites: hpad
BuiltAt: hpad
Owner: allies
@@ -606,7 +606,7 @@ HELI:
HIND:
Inherits: ^Plane
Buildable:
TechLevel: 9
BuildPaletteOrder: 90
Prerequisites: hpad
BuiltAt: hpad
Owner: allies