From f6f90a6730c8cbacca83f6981c8672294d698ec1 Mon Sep 17 00:00:00 2001 From: Knux Date: Sun, 3 Apr 2022 22:55:28 +0100 Subject: [PATCH 1/2] Export textures that don't have names. Trying to export textures from Revolution seems to only export the last one with no file name as they don't have one. This numbers nameless textures to allow them to be exported too. --- Assets/Scripts/OpenSpace/Exporter/MapExporter.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Assets/Scripts/OpenSpace/Exporter/MapExporter.cs b/Assets/Scripts/OpenSpace/Exporter/MapExporter.cs index b4133a48..40625936 100644 --- a/Assets/Scripts/OpenSpace/Exporter/MapExporter.cs +++ b/Assets/Scripts/OpenSpace/Exporter/MapExporter.cs @@ -253,12 +253,20 @@ private void ExportScene(string path) private void ExportTextures(string texturePath) { + int textureIndex = 0; foreach (TextureInfo texture in loader.textures) { if (texture == null) { continue; } string path = Path.Combine(texturePath, texture.name + ".png"); + + if (texture.name == null) + { + path = Path.Combine(texturePath, textureIndex + ".png"); + textureIndex++; + } + if (!Directory.Exists(Path.GetDirectoryName(path))) { Directory.CreateDirectory(Path.GetDirectoryName(path)); } From 2fc69fa026b264d65bc52f3d8e8317a4aecdb9df Mon Sep 17 00:00:00 2001 From: Knux Date: Tue, 5 Apr 2022 22:23:24 +0100 Subject: [PATCH 2/2] Some Revolution Map Names Was bugging me that it didn't have any. The `ds1_son` maps are left unlabelled as I'm not too sure on their purpose. My ordering may also be a little iffy. --- .../Scripts/OpenSpace/General/LevelTranslation.cs | 15 +++++++++++++++ Assets/Scripts/OpenSpace/General/Settings.cs | 1 + 2 files changed, 16 insertions(+) diff --git a/Assets/Scripts/OpenSpace/General/LevelTranslation.cs b/Assets/Scripts/OpenSpace/General/LevelTranslation.cs index 91a8c939..cc694fa2 100644 --- a/Assets/Scripts/OpenSpace/General/LevelTranslation.cs +++ b/Assets/Scripts/OpenSpace/General/LevelTranslation.cs @@ -81,9 +81,12 @@ public string Translate(string level) { ("LEARN_10", "The Woods of Light"), ("MAPMONDE", "The Hall of Doors"), ("MAPMONDE2", "The Isle of Doors"), + ("MC_10", "The Minisaurus Plains 1"), + ("MC_15", "The Minisaurus Plains 2"), ("LEARN_30", "The Fairy Glade 1"), ("LEARN_31", "The Fairy Glade 2"), ("BAST_20", "The Fairy Glade 3"), + ("BAST_20_REVISITE1", "The Fairy Glade 3 (Revisited)"), ("BAST_22", "The Fairy Glade 4"), ("LEARN_60", "The Fairy Glade 5"), ("SKI_10", "The Marshes of Awakening 1"), @@ -96,6 +99,8 @@ public string Translate(string level) { ("WATER_10", "The Sanctuary of Water and Ice 1"), ("WATER_20", "The Sanctuary of Water and Ice 2"), ("POLOC_10", "Polokus - First Mask"), + ("MC_20", "Globox's House"), + ("MC_25", "Down the Well"), ("RODEO_10", "The Menhir Hills 1"), ("RODEO_40", "The Menhir Hills 2"), ("RODEO_60", "The Menhir Hills 3"), @@ -110,7 +115,11 @@ public string Translate(string level) { ("PLUM_00", "The Sanctuary of Stone and Fire 1"), ("PLUM_20", "The Sanctuary of Stone and Fire 2"), ("PLUM_10", "The Sanctuary of Stone and Fire 3"), + ("PLUM_05", "The Sanctuary of Stone and Fire 3 (Alternative)"), + ("PLUM_15", "The Sanctuary of Stone and Fire 3 (Alternative)"), ("POLOC_20", "Polokus - Second Mask"), + ("MC_30", "Rainbow Creek"), + ("MC_31", "The Pirate Factory"), ("BAST_09", "The Echoing Caves (Intro)"), ("BAST_10", "The Echoing Caves 1"), ("CASK_10", "The Echoing Caves 2"), @@ -135,6 +144,7 @@ public string Translate(string level) { ("BALL", "The Iron Mountains (Balloon Flight)"), ("ILE_10", "The Iron Mountains 2 (The Gloomy Island)"), ("MINE_10", "The Iron Mountains 3 (The Pirate Mines)"), + ("AIR_00", "Grolem 13"), ("POLOC_40", "Polokus - Fourth Mask"), ("BATAM_20", "Meanwhile, on the Prison Ship (The Grolgoth)"), ("BOAT01", "The Prison Ship 1"), @@ -145,6 +155,7 @@ public string Translate(string level) { ("RHOP_10", "The Crow's Nest"), ("END_10", "Ending"), ("STAFF_10", "Staff Roll"), + ("FIESTA", "Staff Roll"), ("BONUX", "Bonus Level"), ("GLOBVILL", "Globox Village"), ("B_PYRAM", "Minigame - Pyralums"), @@ -153,6 +164,10 @@ public string Translate(string level) { ("B_DISC", "Minigame - Globox Disc"), ("B_LIFT", "Minigame - Lift"), ("B_INVADE", "Minigame - Invade"), + ("B_SKI", "Minigame - Waterski Challenge"), + ("RTYPE", "Minigame - Ray-Type Challenge"), + ("STADE_00", "Minigame - Baby Football"), + ("DOGFIGHT", "Minigame - Dogfight"), ("RAYCAP", "Score Recap"), }); diff --git a/Assets/Scripts/OpenSpace/General/Settings.cs b/Assets/Scripts/OpenSpace/General/Settings.cs index a28790e0..e97a551c 100644 --- a/Assets/Scripts/OpenSpace/General/Settings.cs +++ b/Assets/Scripts/OpenSpace/General/Settings.cs @@ -853,6 +853,7 @@ public string DisplayName { aiTypes = AITypes.Revolution, //textureAnimationSpeedModifier = 2f, hasExtraInputData = false, + levelTranslation = LevelTranslation.levelTranslation_r2, hasObjectTypes = false, caps = new Dictionary() { { CapsType.All, Caps.None }