From 717b483ce7ab0ed8cdf8657d42fda34214133f6a Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Tue, 8 Jan 2019 17:50:37 +0100 Subject: [PATCH] Use map folder names instead of paths in the mission browser --- .../Widgets/Logic/MissionBrowserLogic.cs | 3 +- mods/cnc/missions.yaml | 62 +++++++++--------- mods/d2k/missions.yaml | 60 ++++++++--------- mods/ra/missions.yaml | 64 +++++++++---------- 4 files changed, 95 insertions(+), 94 deletions(-) diff --git a/OpenRA.Mods.Common/Widgets/Logic/MissionBrowserLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/MissionBrowserLogic.cs index a89e8cd3a3..861bc58448 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/MissionBrowserLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/MissionBrowserLogic.cs @@ -11,6 +11,7 @@ using System; using System.Collections.Generic; +using System.IO; using System.Linq; using System.Threading; using OpenRA.Graphics; @@ -110,7 +111,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic .Select(p => new { Preview = p, - Index = missionMapPaths.IndexOf(Platform.UnresolvePath(p.Package.Name)) + Index = missionMapPaths.IndexOf(Path.GetFileName(p.Package.Name)) }) .Where(x => x.Index != -1) .OrderBy(x => x.Index) diff --git a/mods/cnc/missions.yaml b/mods/cnc/missions.yaml index e4c9415ef1..7234d483fa 100644 --- a/mods/cnc/missions.yaml +++ b/mods/cnc/missions.yaml @@ -1,38 +1,38 @@ GDI Campaign: - ./mods/cnc/maps/gdi01 - ./mods/cnc/maps/gdi02 - ./mods/cnc/maps/gdi03 - ./mods/cnc/maps/gdi04a - ./mods/cnc/maps/gdi04b - ./mods/cnc/maps/gdi04c - ./mods/cnc/maps/gdi05a - ./mods/cnc/maps/gdi05b - ./mods/cnc/maps/gdi06 - ./mods/cnc/maps/gdi07 + gdi01 + gdi02 + gdi03 + gdi04a + gdi04b + gdi04c + gdi05a + gdi05b + gdi06 + gdi07 Nod Campaign: - ./mods/cnc/maps/nod01 - ./mods/cnc/maps/nod02a - ./mods/cnc/maps/nod02b - ./mods/cnc/maps/nod03a - ./mods/cnc/maps/nod03b - ./mods/cnc/maps/nod04a - ./mods/cnc/maps/nod04b - ./mods/cnc/maps/nod05 - ./mods/cnc/maps/nod06a - ./mods/cnc/maps/nod06b - ./mods/cnc/maps/nod06c - ./mods/cnc/maps/nod07a - ./mods/cnc/maps/nod07b - ./mods/cnc/maps/nod07c - ./mods/cnc/maps/nod08a - ./mods/cnc/maps/nod08b - ./mods/cnc/maps/nod09 - ./mods/cnc/maps/nod10a - ./mods/cnc/maps/nod10b + nod01 + nod02a + nod02b + nod03a + nod03b + nod04a + nod04b + nod05 + nod06a + nod06b + nod06c + nod07a + nod07b + nod07c + nod08a + nod08b + nod09 + nod10a + nod10b Funpark Campaign: - ./mods/cnc/maps/funpark01 + funpark01 Bonus Missions: - ./mods/cnc/maps/cnc64gdi01 + cnc64gdi01 diff --git a/mods/d2k/missions.yaml b/mods/d2k/missions.yaml index 2b7622daa6..13590d7e36 100644 --- a/mods/d2k/missions.yaml +++ b/mods/d2k/missions.yaml @@ -1,35 +1,35 @@ Atreides Campaign: - ./mods/d2k/maps/atreides-01a - ./mods/d2k/maps/atreides-01b - ./mods/d2k/maps/atreides-02a - ./mods/d2k/maps/atreides-02b - ./mods/d2k/maps/atreides-03a - ./mods/d2k/maps/atreides-03b - ./mods/d2k/maps/atreides-04 - ./mods/d2k/maps/atreides-05 + atreides-01a + atreides-01b + atreides-02a + atreides-02b + atreides-03a + atreides-03b + atreides-04 + atreides-05 Ordos Campaign: - ./mods/d2k/maps/ordos-01a - ./mods/d2k/maps/ordos-01b - ./mods/d2k/maps/ordos-02a - ./mods/d2k/maps/ordos-02b - ./mods/d2k/maps/ordos-03a - ./mods/d2k/maps/ordos-03b - ./mods/d2k/maps/ordos-04 - ./mods/d2k/maps/ordos-05 + ordos-01a + ordos-01b + ordos-02a + ordos-02b + ordos-03a + ordos-03b + ordos-04 + ordos-05 Harkonnen Campaign: - ./mods/d2k/maps/harkonnen-01a - ./mods/d2k/maps/harkonnen-01b - ./mods/d2k/maps/harkonnen-02a - ./mods/d2k/maps/harkonnen-02b - ./mods/d2k/maps/harkonnen-03a - ./mods/d2k/maps/harkonnen-03b - ./mods/d2k/maps/harkonnen-04 - ./mods/d2k/maps/harkonnen-05 - ./mods/d2k/maps/harkonnen-06a - ./mods/d2k/maps/harkonnen-06b - ./mods/d2k/maps/harkonnen-07 - ./mods/d2k/maps/harkonnen-08 - ./mods/d2k/maps/harkonnen-09a - ./mods/d2k/maps/harkonnen-09b + harkonnen-01a + harkonnen-01b + harkonnen-02a + harkonnen-02b + harkonnen-03a + harkonnen-03b + harkonnen-04 + harkonnen-05 + harkonnen-06a + harkonnen-06b + harkonnen-07 + harkonnen-08 + harkonnen-09a + harkonnen-09b diff --git a/mods/ra/missions.yaml b/mods/ra/missions.yaml index 7e1051de8c..f5e19be633 100644 --- a/mods/ra/missions.yaml +++ b/mods/ra/missions.yaml @@ -1,38 +1,38 @@ Allied Campaign: - ./mods/ra/maps/allies-01 - ./mods/ra/maps/allies-02 - ./mods/ra/maps/allies-03a - ./mods/ra/maps/allies-03b - ./mods/ra/maps/allies-04 - ./mods/ra/maps/allies-05a - ./mods/ra/maps/allies-06a - ./mods/ra/maps/allies-06b - ./mods/ra/maps/allies-07 - ./mods/ra/maps/allies-08a - ./mods/ra/maps/allies-08b + allies-01 + allies-02 + allies-03a + allies-03b + allies-04 + allies-05a + allies-06a + allies-06b + allies-07 + allies-08a + allies-08b Soviet Campaign: - ./mods/ra/maps/soviet-01 - ./mods/ra/maps/soviet-02a - ./mods/ra/maps/soviet-02b - ./mods/ra/maps/soviet-03 - ./mods/ra/maps/soviet-04a - ./mods/ra/maps/soviet-04b - ./mods/ra/maps/soviet-05 - ./mods/ra/maps/soviet-06a - ./mods/ra/maps/soviet-06b - ./mods/ra/maps/soviet-07 - ./mods/ra/maps/soviet-08a + soviet-01 + soviet-02a + soviet-02b + soviet-03 + soviet-04a + soviet-04b + soviet-05 + soviet-06a + soviet-06b + soviet-07 + soviet-08a Counterstrike: - ./mods/ra/maps/sarin-gas-1-crackdown - ./mods/ra/maps/soviet-soldier-volkov-n-chitzkoi + sarin-gas-1-crackdown + soviet-soldier-volkov-n-chitzkoi Aftermath: - ./mods/ra/maps/monster-tank-madness + monster-tank-madness OpenRA Originals: - ./mods/ra/maps/evacuation - ./mods/ra/maps/exodus - ./mods/ra/maps/infiltration - ./mods/ra/maps/intervention - ./mods/ra/maps/survival01 - ./mods/ra/maps/survival02 + evacuation + exodus + infiltration + intervention + survival01 + survival02 Ant Missions: - ./mods/ra/maps/ant-01 + ant-01