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.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(); int[] srcRemapIndex = srcPaletteInfo.RemapIndex; - var destMod = Enum.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 0000000000..89ff5b361b Binary files /dev/null and b/mods/d2k/bits/flagfly.shp differ diff --git a/mods/d2k/bits/fpls.shp b/mods/d2k/bits/fpls.shp new file mode 100644 index 0000000000..c287b8a51a Binary files /dev/null and b/mods/d2k/bits/fpls.shp differ diff --git a/mods/d2k/bits/poweroff.shp b/mods/d2k/bits/poweroff.shp new file mode 100644 index 0000000000..37c3e24d03 Binary files /dev/null and b/mods/d2k/bits/poweroff.shp differ 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