Merge pull request #9483 from reaperrr/cleanup-assets

Clean up assets

OpenRA.Game/Game.cs

@@ -281,6 +281,7 @@ namespace OpenRA
 			Sound.Initialize();
 
 			ModData = new ModData(mod, !Settings.Server.Dedicated);
+			ModData.MountFiles();
 			ModData.InitializeLoaders();
 			if (!Settings.Server.Dedicated)
 				Renderer.InitializeFonts(ModData.Manifest);

OpenRA.Game/ModData.cs

@@ -74,11 +74,6 @@ namespace OpenRA
 			SpriteSequenceLoader = (ISpriteSequenceLoader)ctor.Invoke(new[] { this });
 			SpriteSequenceLoader.OnMissingSpriteError = s => Log.Write("debug", s);
 
-			// HACK: Mount only local folders so we have a half-working environment for the asset installer
-			GlobalFileSystem.UnmountAll();
-			foreach (var dir in Manifest.Folders)
-				GlobalFileSystem.Mount(dir);
-
 			defaultRules = Exts.Lazy(() => RulesetCache.Load());
 
 			initialThreadId = System.Threading.Thread.CurrentThread.ManagedThreadId;
@@ -92,6 +87,11 @@ namespace OpenRA
 				LoadScreen.Display();
 		}
 
+		public void MountFiles()
+		{
+			GlobalFileSystem.LoadFromManifest(Manifest);
+		}
+
 		public void InitializeLoaders()
 		{
 			// all this manipulation of static crap here is nasty and breaks

mods/cnc/cursors.yaml

@@ -1,5 +1,5 @@
 Palettes:
-	cursor: cursor.pal
+	cursor: temperat.pal
 
 Cursors:
 	mouse2.shp: cursor

mods/d2k/cursors.yaml

@@ -1,7 +1,7 @@
 ShadowIndex: 1
 
 Palettes:
-	mouse: d2k.pal
+	mouse: PALETTE.BIN
 
 Cursors:
 	MOUSE.R8: mouse

mods/d2k/rules/palettes.yaml

@@ -3,21 +3,21 @@
 		Name: terrain
 	PaletteFromFile@d2k:
 		Name: d2k
-		Filename: d2k.pal
+		Filename: PALETTE.BIN
 		ShadowIndex: 1
 	PaletteFromFile@chrome:
 		Name: chrome
-		Filename: d2k.pal
+		Filename: PALETTE.BIN
 		ShadowIndex: 3
 		AllowModifiers: false
 	PaletteFromFile@effect:
 		Name: effect
-		Filename: d2k.pal
+		Filename: PALETTE.BIN
 		ShadowIndex: 4
 		AllowModifiers: false
 	PaletteFromFile@colorpicker:
 		Name: colorpicker
-		Filename: d2k.pal
+		Filename: PALETTE.BIN
 		ShadowIndex: 4
 		AllowModifiers: false
 	PaletteFromRGBA@shadow:

mods/d2k/tilesets/arrakis.yaml

@@ -2,7 +2,7 @@ General:
 	Name: Arrakis
 	Id: ARRAKIS
 	SheetSize: 1024
-	Palette: d2k.pal
+	Palette: PALETTE.BIN
 	EditorTemplateOrder: Basic, Dune, Sand-Detail, Brick, Sand-Cliff, Sand-Smooth, Cliff-Type-Changer, Rock-Sand-Smooth, Rock-Detail, Rock-Cliff, Rock-Cliff-Rock, Rotten-Base, Dead-Worm, Ice, Ice-Detail, Rock-Cliff-Sand, Sand-Platform, Unidentified
 	IgnoreTileSpriteOffsets: True
 

mods/ra/cursors.yaml

@@ -1,5 +1,5 @@
 Palettes:
-	cursor: cursor.pal
+	cursor: temperat.pal
 
 Cursors:
 	mouse.shp: cursor

mods/ra/mod.yaml

@@ -207,7 +207,7 @@ MapGrid:
 
 SupportsMapsFrom: ra
 
-SpriteFormats: ShpTD, TmpRA, TmpTD, ShpTS
+SpriteFormats: ShpD2, ShpTD, TmpRA, TmpTD, ShpTS
 
 SpriteSequenceFormat: TilesetSpecificSpriteSequence
 	TilesetExtensions: