fix the remaining issues with the ra desert terrain

- extract mix file as it is easier to work with SHPs
- light palette rotator now excludes terrain palette
- water palette rotator now excludes player palette
- use wire fence, sand bags and brick wall from cnc
- draw ressources with player palette (workaround)
- delete all test maps
This commit is contained in:
Matthias Mailänder
2012-10-21 20:26:05 +02:00
parent 6dceb30632
commit c859fb1186
346 changed files with 5 additions and 6 deletions

View File

@@ -24,7 +24,7 @@ namespace OpenRA.Mods.RA
t += .5f; t += .5f;
} }
static readonly string[] ExcludePalettes = { "cursor", "chrome", "colorpicker" }; static readonly string[] ExcludePalettes = { "cursor", "chrome", "colorpicker", "terrain" };
public void AdjustPalette(Dictionary<string,Palette> palettes) public void AdjustPalette(Dictionary<string,Palette> palettes)
{ {

View File

@@ -17,7 +17,7 @@ namespace OpenRA.Mods.RA
{ {
class WaterPaletteRotationInfo : ITraitInfo class WaterPaletteRotationInfo : ITraitInfo
{ {
public readonly string[] ExcludePalettes = { "cursor", "chrome", "colorpicker" }; public readonly string[] ExcludePalettes = { "cursor", "chrome", "colorpicker", "player" };
public object Create(ActorInitializer init) { return new WaterPaletteRotation(init.world, this); } public object Create(ActorInitializer init) { return new WaterPaletteRotation(init.world, this); }
} }

BIN
mods/ra/bits/desert/b01.des Normal file

Binary file not shown.

BIN
mods/ra/bits/desert/b02.des Normal file

Binary file not shown.

BIN
mods/ra/bits/desert/b03.des Normal file

Binary file not shown.

BIN
mods/ra/bits/desert/b04.des Normal file

Binary file not shown.

BIN
mods/ra/bits/desert/b05.des Normal file

Binary file not shown.

BIN
mods/ra/bits/desert/b06.des Normal file

Binary file not shown.

Binary file not shown.

BIN
mods/ra/bits/desert/bc.des Normal file

Binary file not shown.

BIN
mods/ra/bits/desert/bd.des Normal file

Binary file not shown.

BIN
mods/ra/bits/desert/be.des Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
mods/ra/bits/desert/bra.des Normal file

Binary file not shown.

BIN
mods/ra/bits/desert/brb.des Normal file

Binary file not shown.

BIN
mods/ra/bits/desert/brc.des Normal file

Binary file not shown.

BIN
mods/ra/bits/desert/brd.des Normal file

Binary file not shown.

BIN
mods/ra/bits/desert/bre.des Normal file

Binary file not shown.

BIN
mods/ra/bits/desert/brf.des Normal file

Binary file not shown.

BIN
mods/ra/bits/desert/brg.des Normal file

Binary file not shown.

BIN
mods/ra/bits/desert/brh.des Normal file

Binary file not shown.

BIN
mods/ra/bits/desert/bri.des Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
mods/ra/bits/desert/brj.des Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
mods/ra/bits/desert/cr1.des Normal file

Binary file not shown.

BIN
mods/ra/bits/desert/cr2.des Normal file

Binary file not shown.

BIN
mods/ra/bits/desert/cr3.des Normal file

Binary file not shown.

BIN
mods/ra/bits/desert/cr4.des Normal file

Binary file not shown.

BIN
mods/ra/bits/desert/cr5.des Normal file

Binary file not shown.

BIN
mods/ra/bits/desert/cr6.des Normal file

Binary file not shown.

Binary file not shown.

BIN
mods/ra/bits/desert/d01.des Normal file

Binary file not shown.

BIN
mods/ra/bits/desert/d02.des Normal file

Binary file not shown.

BIN
mods/ra/bits/desert/d03.des Normal file

Binary file not shown.

BIN
mods/ra/bits/desert/d04.des Normal file

Binary file not shown.

BIN
mods/ra/bits/desert/d05.des Normal file

Binary file not shown.

BIN
mods/ra/bits/desert/d06.des Normal file

Binary file not shown.

BIN
mods/ra/bits/desert/d07.des Normal file

Binary file not shown.

BIN
mods/ra/bits/desert/d08.des Normal file

Binary file not shown.

BIN
mods/ra/bits/desert/d09.des Normal file

Binary file not shown.

BIN
mods/ra/bits/desert/d10.des Normal file

Binary file not shown.

BIN
mods/ra/bits/desert/d11.des Normal file

Binary file not shown.

BIN
mods/ra/bits/desert/d12.des Normal file

Binary file not shown.

BIN
mods/ra/bits/desert/d13.des Normal file

Binary file not shown.

BIN
mods/ra/bits/desert/d14.des Normal file

Binary file not shown.

BIN
mods/ra/bits/desert/d15.des Normal file

Binary file not shown.

BIN
mods/ra/bits/desert/d16.des Normal file

Binary file not shown.

BIN
mods/ra/bits/desert/d17.des Normal file

Binary file not shown.

BIN
mods/ra/bits/desert/d18.des Normal file

Binary file not shown.

BIN
mods/ra/bits/desert/d19.des Normal file

Binary file not shown.

BIN
mods/ra/bits/desert/d20.des Normal file

Binary file not shown.

BIN
mods/ra/bits/desert/d21.des Normal file

Binary file not shown.

BIN
mods/ra/bits/desert/d22.des Normal file

Binary file not shown.

BIN
mods/ra/bits/desert/d23.des Normal file

Binary file not shown.

BIN
mods/ra/bits/desert/d24.des Normal file

Binary file not shown.

BIN
mods/ra/bits/desert/d25.des Normal file

Binary file not shown.

BIN
mods/ra/bits/desert/d26.des Normal file

Binary file not shown.

BIN
mods/ra/bits/desert/d27.des Normal file

Binary file not shown.

BIN
mods/ra/bits/desert/d28.des Normal file

Binary file not shown.

BIN
mods/ra/bits/desert/d29.des Normal file

Binary file not shown.

BIN
mods/ra/bits/desert/d30.des Normal file

Binary file not shown.

BIN
mods/ra/bits/desert/d31.des Normal file

Binary file not shown.

BIN
mods/ra/bits/desert/d32.des Normal file

Binary file not shown.

BIN
mods/ra/bits/desert/d33.des Normal file

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More