mirrors/HeavenStudio
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

make base datamodels for special entity reading (#463)

Browse source 
* make base datamodels for special entity reading

* fix crop stomp breaking when no game switch or remix end is set

* fix save shortcut

fix loading charts with no music
This commit is contained in:
minenice55 2023-06-11 12:12:25 -04:00 committed by GitHub
parent af8395fb6a
commit 9e3e594209
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 91 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Assets/Scripts/GameManager.cs
View file

@ -188,6 +188,11 @@ namespace HeavenStudio
}
current = load.Current;
}
catch (System.IO.FileNotFoundException f)
{
Debug.LogWarning("chart has no music: " + f.Message);
Conductor.instance.musicSource.clip = null;
}
catch (Exception e)
{
Debug.LogError($"Failed to load music: {e.Message}");

23
Assets/Scripts/Games/CropStomp/CropStomp.cs
View file

@ -160,16 +160,23 @@ namespace HeavenStudio.Games
// find out when the next game switch (or remix end) happens
var allEnds = EventCaller.GetAllInGameManagerList("gameManager", new string[] { "switchGame", "end" });
allEnds.Sort((x, y) => x.beat.CompareTo(y.beat));
//get the beat of the closest end event
foreach (var end in allEnds)
if (allEnds.Count == 0)
{
if (end.datamodel.Split(2) == "cropStomp") continue;
if (end.beat > startBeat)
endBeat = double.MaxValue;
}
else
{
allEnds.Sort((x, y) => x.beat.CompareTo(y.beat));
//get the beat of the closest end event
foreach (var end in allEnds)
{
endBeat = end.beat;
break;
if (end.datamodel.Split(2) == "cropStomp") continue;
if (end.beat > startBeat)
{
endBeat = end.beat;
break;
}
}
}

7
Assets/Scripts/LevelEditor/Editor.cs
View file

@ -315,7 +315,7 @@ namespace HeavenStudio.Editor
}
else
{
if (currentRemixPath == string.Empty)
if (currentRemixPath == string.Empty || currentRemixPath == null)
{
SaveRemixFilePanel();
}
@ -370,15 +370,16 @@ namespace HeavenStudio.Editor
public void LoadRemix(bool create = false)
{
if (create)
{
GameManager.instance.NewRemix();
currentRemixPath = string.Empty;
}
else
{
GameManager.instance.LoadRemix(true);
}
Timeline.instance.LoadRemix();
Timeline.FitToSong();
currentRemixPath = string.Empty;
}
public void OpenRemix()

84
Assets/Scripts/Minigames.cs
View file

@ -73,6 +73,70 @@ namespace HeavenStudio
{"resultrepeat_ng", "Next time, follow the example better."}, // "Try Again" message for call-and-response games (two-liner)
};
static Dictionary<string, object> tempoChangeModel = new()
{
{"tempo", 120f},
{"swing", 0f},
{"timeSignature", new Vector2(4, 4)},
};
static Dictionary<string, object> volumeChangeModel = new()
{
{"volume", 1f},
{"fade", Util.EasingFunction.Ease.Instant},
};
static Dictionary<string, object> sectionMarkModel = new()
{
{"sectionName", ""},
{"isCheckpoint", false},
{"startPerfect", false},
{"breakSection", false},
{"extendsPrevious", false},
{"sectionWeight", 1f},
};
static void PreProcessSpecialEntity(RiqEntity e, Dictionary<string, object> model)
{
foreach (var t in model)
{
string propertyName = t.Key;
Type type = t.Value.GetType();
if (!e.dynamicData.ContainsKey(propertyName))
{
e.CreateProperty(propertyName, t.Value);
}
Type pType = e[propertyName].GetType();
if (pType != type)
{
try
{
if (type == typeof(Util.EasingFunction.Ease) && (pType == typeof(string) || pType == typeof(int) || pType == typeof(long)))
{
if (pType == typeof(int) || pType == typeof(long) || pType == typeof(Jukebox.EasingFunction.Ease))
{
e[propertyName] = (Util.EasingFunction.Ease)e[propertyName];
}
else
e[propertyName] = Enum.Parse(typeof(Util.EasingFunction.Ease), (string)e[propertyName]);
}
else if (type.IsEnum)
e[propertyName] = (int)e[propertyName];
else if (pType == typeof(Newtonsoft.Json.Linq.JObject))
e[propertyName] = e[propertyName].ToObject(type);
else
e[propertyName] = Convert.ChangeType(e[propertyName], type);
}
catch
{
Debug.LogWarning($"Could not convert {propertyName} to {type}! Using default value...");
// use default value
e.CreateProperty(propertyName, t.Value);
}
}
}
}
/// <summary>
/// processes an riq beatmap after it is loaded
/// </summary>
@ -179,31 +243,17 @@ namespace HeavenStudio
foreach (var tempo in data.tempoChanges)
{
tempo["tempo"] = (float)tempo["tempo"];
tempo["swing"] = (float)tempo["swing"];
if (tempo.dynamicData.ContainsKey("timeSignature"))
tempo["timeSignature"] = (Vector2)tempo["timeSignature"];
else
tempo.dynamicData.Add("timeSignature", new Vector2(4, 4));
PreProcessSpecialEntity(tempo, tempoChangeModel);
}
foreach (var vol in data.volumeChanges)
{
vol["volume"] = (float)vol["volume"];
if (vol["fade"].GetType() == typeof(string))
vol["fade"] = Enum.Parse(typeof(Util.EasingFunction.Ease), (string)vol["fade"]);
else
vol["fade"] = (Util.EasingFunction.Ease)vol["fade"];
PreProcessSpecialEntity(vol, volumeChangeModel);
}
foreach (var section in data.beatmapSections)
{
section["sectionName"] = (string)section["sectionName"];
section["isCheckpoint"] = (bool)section["isCheckpoint"];
section["startPerfect"] = (bool)section["startPerfect"];
section["breakSection"] = (bool)section["breakSection"];
section["extendsPrevious"] = (bool)section["extendsPrevious"];
section["sectionWeight"] = (float)section["sectionWeight"];
PreProcessSpecialEntity(section, sectionMarkModel);
}
//go thru each property of the model beatmap and add any missing keyvalue pair