actually WORKS now

This commit is contained in:
Chris Forbes
2010-03-17 23:06:29 +13:00
parent e005e9e314
commit c1827e5d25
5 changed files with 31 additions and 23 deletions

View File

@@ -34,6 +34,8 @@ namespace OpenRA.Traits
public readonly bool SplitRamp = false;
public readonly int[] DisplayColor = null;
public readonly bool Playable = true;
public object Create(Actor self) { return new PlayerColorPalette(self, this); }
}
@@ -50,8 +52,9 @@ namespace OpenRA.Traits
wr.AddPalette(info.Name, newpal);
Player.RegisterPlayerColor(info.Name, info.DisplayName,
ArrayToColor(info.DisplayColor));
if (info.Playable)
Player.RegisterPlayerColor(info.Name, info.DisplayName,
ArrayToColor(info.DisplayColor));
}
static Color ArrayToColor(int[] x) { return Color.FromArgb(x[0], x[1], x[2]); }

View File

@@ -53,7 +53,7 @@ namespace OpenRA
public Player NeutralPlayer
{
get { return players[0]; } // todo, perhaps.
get { return players.Single(p => p.Value.InternalName == "Neutral").Value; }
}
public void SetLocalPlayer(int index)

View File

@@ -99,28 +99,29 @@ World:
SplitRamp: yes
PlayerColorPalette@player7:
Name: player7
DisplayName: Gray
BasePalette: terrain
DisplayColor: 133,113,101
Color1: 238,238,238
Color2: 44,28,24
SplitRamp: yes
PlayerColorPalette@player8:
Name: player8
DisplayName: White
BasePalette: terrain
DisplayColor: 255,255,255
Color1: 255,255,255
Color2: 75,75,75
SplitRamp: yes
PlayerColorPalette@player9:
Name: player9
PlayerColorPalette@player8:
Name: player8
DisplayName: Black
BasePalette: terrain
DisplayColor: 30,30,30
Color1: 80,80,80
Color2: 5,5,5
SplitRamp: yes
PlayerColorPalette@neutral:
Name: neutral
DisplayName: Neutral
BasePalette: terrain
DisplayColor: 133,113,101
Color1: 238,238,238
Color2: 44,28,24
SplitRamp: yes
Playable: no
PaletteFromFile@chrome:
Name: chrome
Filename: temperat.pal

View File

@@ -130,25 +130,26 @@ World:
Color2: 20,20,20
PlayerColorPalette@player7:
Name: player7
DisplayName: Gray
BasePalette: terrain
DisplayColor: 133,113,101
Color1: 238,238,238
Color2: 44,28,24
PlayerColorPalette@player8:
Name: player8
DisplayName: White
BasePalette: terrain
DisplayColor: 255,255,255
Color1: 255,255,255
Color2: 75,75,75
PlayerColorPalette@player9:
Name: player9
PlayerColorPalette@player8:
Name: player8
DisplayName: Black
BasePalette: terrain
DisplayColor: 30,30,30
Color1: 80,80,80
Color2: 5,5,5
PlayerColorPalette@neutral:
Name: neutral
DisplayName: Neutral
BasePalette: terrain
DisplayColor: 133,113,101
Color1: 238,238,238
Color2: 44,28,24
Playable: no
PaletteFromFile@chrome:
Name: chrome
Filename: temperat.pal

View File

@@ -1,4 +1,7 @@
[Settings]
NetworkHost=localhost
NetworkPort=1234
InitialMods=ra
InitialMods=ra
Width=800
Height=600
Fullscreen=false