diff --git a/Assets/Scripts/GameInitializer.cs b/Assets/Scripts/GameInitializer.cs index 998687462..ff110493e 100644 --- a/Assets/Scripts/GameInitializer.cs +++ b/Assets/Scripts/GameInitializer.cs @@ -55,7 +55,7 @@ namespace HeavenStudio { if (editorGO == null && OpeningManager.OnOpenFile.IndexOfAny(Path.GetInvalidPathChars()) == -1) { - if (File.Exists(OpeningManager.OnOpenFile)) + if (File.Exists(OpeningManager.OnOpenFile) && Path.GetExtension(OpeningManager.OnOpenFile) == ".riq") { input = OpeningManager.OnOpenFile; fromCmd = true; diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index 03ea53f4f..4111f2cae 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -6,8 +6,7 @@ using UnityEngine; using Starpelly; using Jukebox; -using Jukebox.Legacy; -using Newtonsoft.Json; +using HeavenStudio.Util; using HeavenStudio.Games; using HeavenStudio.Common; @@ -237,6 +236,15 @@ namespace HeavenStudio { SetGame("noGame"); } + + if (editor) + { + Debug.Log(Beatmap.data.riqOrigin); + if (Beatmap.data.riqOrigin != "HeavenStudio") + { + GlobalGameManager.ShowErrorMessage("Warning", "This chart was made for another game,\nand thus may not be playable in Heaven Studio.\nYou may be able to edit this chart in Heaven Studio to be used in its original game.\n\nChart Origin: " + Beatmap.data.riqOrigin.DisplayName()); + } + } } public void ScoreInputAccuracy(double accuracy, bool late, double time, double weight = 1, bool doDisplay = true) diff --git a/Assets/Scripts/LevelEditor/Editor.cs b/Assets/Scripts/LevelEditor/Editor.cs index 072f9a782..c67e98714 100644 --- a/Assets/Scripts/LevelEditor/Editor.cs +++ b/Assets/Scripts/LevelEditor/Editor.cs @@ -386,9 +386,7 @@ namespace HeavenStudio.Editor { var extensions = new[] { - new ExtensionFilter("All Supported Files ", new string[] { "riq", "tengoku", "rhmania" }), new ExtensionFilter("Heaven Studio Remix File ", new string[] { "riq" }), - new ExtensionFilter("Legacy Heaven Studio Remix ", new string[] { "tengoku", "rhmania" }) }; StandaloneFileBrowser.OpenFilePanelAsync("Open Remix", "", extensions, false, (string[] paths) => diff --git a/Assets/Scripts/Minigames.cs b/Assets/Scripts/Minigames.cs index 3006fe06f..3637ff8ff 100644 --- a/Assets/Scripts/Minigames.cs +++ b/Assets/Scripts/Minigames.cs @@ -170,15 +170,13 @@ namespace HeavenStudio if (item.Key == "track") continue; if (item.Value == null) - { - e[item.Key] = 0; - } + continue; var value = item.Value; if (value.GetType() == typeof(long)) value = new EntityTypes.Integer(int.MinValue, int.MaxValue, (int)value); else if (value.GetType() == typeof(double)) value = new EntityTypes.Float(float.NegativeInfinity, float.PositiveInfinity, (float)value); - parameters.Add(new Minigames.Param(item.Key, value, item.Key, "[inferred from remix.json]")); + parameters.Add(new Minigames.Param(item.Key, value, item.Key.DisplayName(), "[inferred from remix.json]")); } action = new Minigames.GameAction(actionName, actionName.DisplayName(), e.length, true, parameters); game.actions.Add(action); diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index de7ccdd01..cfc095163 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -7,7 +7,7 @@ "dependencies": { "com.unity.nuget.newtonsoft-json": "3.2.1" }, - "hash": "619442ba26163fb6a00dd50ba52e2fdeaea33e37" + "hash": "769b4fe2c85792b34defb00e051e823442b78564" }, "com.unity.2d.sprite": { "version": "1.0.0",