From 1aafc9f726c627529046d4083391c6e3be4d6777 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Mon, 25 Jun 2012 00:02:26 +0200
Subject: [PATCH] fix utilty remap, remapped flag/poweroff to d2k.pal

---
 .gitignore                 |   4 +++-
 OpenRA.Utility/Command.cs  |   4 ++--
 mods/d2k/bits/flagfly.shp  | Bin 0 -> 7688 bytes
 mods/d2k/bits/fpls.shp     | Bin 0 -> 7170 bytes
 mods/d2k/bits/poweroff.shp | Bin 0 -> 3005 bytes
 mods/d2k/sequences.yaml    |   2 --
 6 files changed, 5 insertions(+), 5 deletions(-)
 create mode 100644 mods/d2k/bits/flagfly.shp
 create mode 100644 mods/d2k/bits/fpls.shp
 create mode 100644 mods/d2k/bits/poweroff.shp

diff --git a/.gitignore b/.gitignore
index aa58b211cd..609611eaa4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,4 +55,6 @@ OpenRA.Launcher.Mac/OpenRA.xcodeproj/*.mode1v3
 *.config
 *.resources
 
-*.kate-swp
+# KDE crap
+*.kate-swp
+*.directory
\ No newline at end of file
diff --git a/OpenRA.Utility/Command.cs b/OpenRA.Utility/Command.cs
index 2adb1a3159..5feb93dabb 100644
--- a/OpenRA.Utility/Command.cs
+++ b/OpenRA.Utility/Command.cs
@@ -372,14 +372,14 @@ namespace OpenRA.Utility
 			for (var i = 0; i < 4; i++)
 				remap[i] = i;
 
-			var srcMod = Enum<string>.Parse(args[1].Split(':')[0]);
+			var srcMod = args[1].Split(':')[0];
 			Game.modData = new ModData(srcMod);
 			FileSystem.LoadFromManifest(Game.modData.Manifest);
 			Rules.LoadRules(Game.modData.Manifest, new Map());
 			var srcPaletteInfo = Rules.Info["player"].Traits.Get<PlayerColorPaletteInfo>();
 			int[] srcRemapIndex = srcPaletteInfo.RemapIndex;
 
-			var destMod = Enum<string>.Parse(args[2].Split(':')[0]);
+			var destMod = args[2].Split(':')[0];
 			Game.modData = new ModData(destMod);
 			FileSystem.LoadFromManifest(Game.modData.Manifest);
 			Rules.LoadRules(Game.modData.Manifest, new Map());
diff --git a/mods/d2k/bits/flagfly.shp b/mods/d2k/bits/flagfly.shp
new file mode 100644
index 0000000000000000000000000000000000000000..89ff5b361b9795df6ddb3a886fcd4dec23e042d8
GIT binary patch
literal 7688
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
AApigX

literal 0
HcmV?d00001

diff --git a/mods/d2k/bits/fpls.shp b/mods/d2k/bits/fpls.shp
new file mode 100644
index 0000000000000000000000000000000000000000..c287b8a51a492f7a7db1a77c5313a6118a4730ee
GIT binary patch
literal 7170
zcmeHLU1}6T5MBZzqKJs1f-m00n|J}wAbAyU;st!1XD{G6LPB66Abx*U-C1@Qaad#_
zmC1DVSHIm;Q!_iyHl(-sBYoLyE;;_Z@c8PH$4`$vet+We_Nm8@&pm#7;qli?j~`xp
z{QSn_k9Qs~-qZV_Ww8ImozVVw(VQ5u%*7_Y&~4FX6D{g)w{1_BP~cn8!qcskfZ~7-
z<|Ye{;)pK`xfzZsM1`)%$*dCHZWd_XTaYcZwlc=ZxoE<~o^bznL+zb^ZS?Ygr*b6z
zT~TKXhFIp}VlO_Ila&x94qX^#X&v|mwD5EzB}gEEI_4$|j^c<f3%MDNDnuNWf5lc#
zReDRMY7w&|jaBv>P*!Eg=Og<!s~zOm+Mh=$jazrx2!ff4%~lA_<zyv9i@IGHW(ftp
z1}!{YO9?0rsAF!j;3$sxvXGnMs6tfc&WW>~Ocw*v(}HX<u`ME2Yqu88YfE9R{dttq
z)MR?+aC>)`5u2?Ln#;*bh!%CbFw7DPd<9x~x{?x598kyHWWiA!@ns=5!%>B(#GMmo
zJDDy9q^AYhVq#lFtRB7A!g*~ethGOnQkt4f?;Kh{cNwwS3Zc22tb}M$w+q88p};J?
zbS2wRkaAE&mleRnIO5Bqx>6ifh)TTRWHvHgpgEqW`&hZ)T1Dls#<iue*8V(7X=*aH
zaclv+!9`-T6+#J!q(&X;w*Hs~=C#SYQV<L{rVGkxANz2`mxV91AC3SB>ffnOQzS@9
z2wg?MSda}Uj%kZzGK1vTmcm;5^C+cp>rVSeFjKMF3Zc22yyDRs%|JGmba&zdBfsDx
zfj+o?jDW!u;9(r`WkFvcl_8_@pH4$$2_>_U=>quPf^49*#Wq%iTD3)MOJS}3d6bgw
z!hN@A_EDm21$e!N<bu|%ZnXEEHR7hA_a(l@E<E}7KO{Jy(=WFc9K{h|7IHHjDGbAf
zDzX~VoasYXsx3NYgB`bSN7JiD-RqQBe6sv4WXc<f`$88+|8i5i0L)+43r}~d9=O0E
zJOM2@ilda`>7JtsQJFIdrkKnsQGQoa>eADKY%#GdB35g+7S3zC%3AyL=t}M|d}>TY
zFjKMF3Zc4~s*L(sMBV9Q3|T^f`OR<fhrdW505^Rz<P_jx9Pwo#H!zH&3Q?ICtcIk|
zMot!`u(KdrXl-STk#o_6iCtR?YwgdYl*X+)?H|ER#bzsn=5n$UqD9><jQ+~49;D0O
zUCA~S2u}nR3BkiS;>VM_QXEx?%DmuYHZpzqu2fre$_6_%nGT1$o;SEiY)VNe0a1S~
zrf%z-EeIoPG4D!2F$hltRFILwIO5BKzCelwpvTU&5<!AwL)bq7V?j2cIHoO<$qbUu
O`gh^Kp0Bl^y3!wj@0Sq(

literal 0
HcmV?d00001

diff --git a/mods/d2k/bits/poweroff.shp b/mods/d2k/bits/poweroff.shp
new file mode 100644
index 0000000000000000000000000000000000000000..37c3e24d0334ff3886e3d865df983d5f15429043
GIT binary patch
literal 3005
zcmeHJF;2uV5Ii9;LVSQ9(B3O}5PhVylsv};%13xaYFEtcI(EjkMAFA6#n$X*XFR)#
z?&-$$h9B3*?KX4&e(?SG(f9Xf-#=e`|9NFrT}wTlKZOvMFnBGjSbZR@cdR4<@{jPN
zaMf>BQi3KS@Zuy^=8P{bPB~aTjDS-}dE?Kx1j+?asSg+fov8ZFN25@O9EYGG4E;kK
zXv=Df+T@LYlx@uaJibbN-bxi@bZFa?b3%-9iM`?w*^Dj#7`EP%1i(MU55PuT^m~<*
zplMH#i<4NGH{3>P{{rP$qa~d;#&y@GijP937GBF|I+xV9n;8S0DEiG)r%;ESdR6(B
zO{pBEro3ARBf8EYAISn|eh>@n_3_l~0+++tQDS?_%k>baX<DW}5+^pJ3jn6CNdmaa
z5I+DLacPBDNeP<v1i3hgg?Ynml=d%Bjx}1+d1+jCZL0VvWoqHIe5P|reY=@4(21ho
zY;_8C$f;MAZ`qW}QEJM&bugmq4DyjIaOMZGz+N9u%`R{`oE@d>t3>OruTmMHdN?~u
T^-Vot#IFBJu;lu$1QX^ziXy#i

literal 0
HcmV?d00001

diff --git a/mods/d2k/sequences.yaml b/mods/d2k/sequences.yaml
index 5941b3d32c..f83e628018 100644
--- a/mods/d2k/sequences.yaml
+++ b/mods/d2k/sequences.yaml
@@ -937,7 +937,6 @@ powerdown:
 	disabled: speed
 		Start: 3
 
-#TODO: falls back to RA, different palette
 poweroff:
 	offline:
 		Start: 0
@@ -962,7 +961,6 @@ overlay:
 	target-invalid:
 		Start: 1
 
-#TODO: falls back to RA, different palette
 rallypoint:
 	flag:flagfly
 		Start: 0