fix utilty remap, remapped flag/poweroff to d2k.pal

This commit is contained in:
Matthias Mailänder
2012-06-25 00:02:26 +02:00
committed by Chris Forbes
parent 8607575e2b
commit 1aafc9f726
6 changed files with 5 additions and 5 deletions

4
.gitignore vendored
View File

@@ -55,4 +55,6 @@ OpenRA.Launcher.Mac/OpenRA.xcodeproj/*.mode1v3
*.config *.config
*.resources *.resources
*.kate-swp # KDE crap
*.kate-swp
*.directory

View File

@@ -372,14 +372,14 @@ namespace OpenRA.Utility
for (var i = 0; i < 4; i++) for (var i = 0; i < 4; i++)
remap[i] = i; remap[i] = i;
var srcMod = Enum<string>.Parse(args[1].Split(':')[0]); var srcMod = args[1].Split(':')[0];
Game.modData = new ModData(srcMod); Game.modData = new ModData(srcMod);
FileSystem.LoadFromManifest(Game.modData.Manifest); FileSystem.LoadFromManifest(Game.modData.Manifest);
Rules.LoadRules(Game.modData.Manifest, new Map()); Rules.LoadRules(Game.modData.Manifest, new Map());
var srcPaletteInfo = Rules.Info["player"].Traits.Get<PlayerColorPaletteInfo>(); var srcPaletteInfo = Rules.Info["player"].Traits.Get<PlayerColorPaletteInfo>();
int[] srcRemapIndex = srcPaletteInfo.RemapIndex; int[] srcRemapIndex = srcPaletteInfo.RemapIndex;
var destMod = Enum<string>.Parse(args[2].Split(':')[0]); var destMod = args[2].Split(':')[0];
Game.modData = new ModData(destMod); Game.modData = new ModData(destMod);
FileSystem.LoadFromManifest(Game.modData.Manifest); FileSystem.LoadFromManifest(Game.modData.Manifest);
Rules.LoadRules(Game.modData.Manifest, new Map()); Rules.LoadRules(Game.modData.Manifest, new Map());

BIN
mods/d2k/bits/flagfly.shp Normal file

Binary file not shown.

BIN
mods/d2k/bits/fpls.shp Normal file

Binary file not shown.

BIN
mods/d2k/bits/poweroff.shp Normal file

Binary file not shown.

View File

@@ -937,7 +937,6 @@ powerdown:
disabled: speed disabled: speed
Start: 3 Start: 3
#TODO: falls back to RA, different palette
poweroff: poweroff:
offline: offline:
Start: 0 Start: 0
@@ -962,7 +961,6 @@ overlay:
target-invalid: target-invalid:
Start: 1 Start: 1
#TODO: falls back to RA, different palette
rallypoint: rallypoint:
flag:flagfly flag:flagfly
Start: 0 Start: 0