add PlayerPaletteFromCurrentTileset and desert tileset for RA

some things left to do:
ore, walls and silo/hbox need some work
This commit is contained in:
Matthias Mailänder
2012-11-17 13:15:06 +01:00
parent a2f5ffd59e
commit f3dc31be40
8 changed files with 2427 additions and 4 deletions

3
.gitignore vendored
View File

@@ -13,9 +13,6 @@ mods/*/*.dll
# ReSharper crap
_ReSharper.*/
# Red Alert binary files
mods/*/packages/*.[mM][iI][xX]
#binary stuff
/*.dll
*.pdb

View File

@@ -78,6 +78,7 @@ namespace OpenRA.FileFormats
public string Name;
public string Id;
public string Palette;
public string PlayerPalette;
public int TileSize = 24;
public string[] Extensions;
public int WaterPaletteRotationBase = 0x60;

View File

@@ -0,0 +1,41 @@
#region Copyright & License Information
/*
* Copyright 2007-2012 The OpenRA Developers (see AUTHORS)
* 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
* as published by the Free Software Foundation. For more information,
* see COPYING.
*/
#endregion
using OpenRA.FileFormats;
using OpenRA.Traits;
namespace OpenRA.Mods.RA
{
class PlayerPaletteFromCurrentTilesetInfo : ITraitInfo
{
public readonly string Name = null;
public readonly int[] ShadowIndex = { };
public object Create(ActorInitializer init) { return new PlayerPaletteFromCurrentTileset(init.world, this); }
}
class PlayerPaletteFromCurrentTileset : IPalette
{
readonly World world;
readonly PlayerPaletteFromCurrentTilesetInfo info;
public PlayerPaletteFromCurrentTileset(World world, PlayerPaletteFromCurrentTilesetInfo info)
{
this.world = world;
this.info = info;
}
public void InitPalette (OpenRA.Graphics.WorldRenderer wr)
{
string Filename = world.TileSet.PlayerPalette == null ? world.TileSet.Palette : world.TileSet.PlayerPalette;
wr.AddPalette(info.Name, new Palette(FileSystem.Open(Filename), info.ShadowIndex));
}
}
}

View File

@@ -8,6 +8,7 @@ Folders:
.
./mods/ra
./mods/ra/bits
./mods/ra/packages
./mods/ra/uibits
~^/Content/ra
@@ -24,6 +25,7 @@ Packages:
temperat.mix
snow.mix
interior.mix
desert.mix
~scores.mix
~movies1.mix
~movies2.mix
@@ -79,6 +81,7 @@ TileSets:
mods/ra/tilesets/snow.yaml
mods/ra/tilesets/interior.yaml
mods/ra/tilesets/temperat.yaml
mods/ra/tilesets/desert.yaml
Music:
mods/ra/music.yaml

BIN
mods/ra/packages/desert.mix Normal file

Binary file not shown.

Binary file not shown.

View File

@@ -182,7 +182,7 @@ Player:
harv: 10%
SquadSize: 7
PlayerColorPalette:
BasePalette: terrain
BasePalette: player
RemapIndex: 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95
DebugResourceCash:
DebugResourceOre:
@@ -208,6 +208,9 @@ World:
Maximum: 3
SpawnInterval: 120
WaterChance: .2
PlayerPaletteFromCurrentTileset:
Name: player
ShadowIndex: 4
PaletteFromCurrentTileset:
Name: terrain
ShadowIndex: 3,4

2378
mods/ra/tilesets/desert.yaml Normal file

File diff suppressed because it is too large Load Diff