add hopo_threshold support to please jnack (YARC-Official#200)

spasarto · Apr 28, 2023 · d1217fa · d1217fa
1 parent e2a3522
commit d1217fa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/Assets/Script/Serialization/Xbox/XboxSong.cs b/Assets/Script/Serialization/Xbox/XboxSong.cs
@@ -87,7 +87,7 @@ public void CompleteSongInfo(SongInfo song, bool rb) {
 			song.songLength = songDta.songLength / 1000f;
 			// song.delay
 			song.drumType = rb ? SongInfo.DrumType.FOUR_LANE : SongInfo.DrumType.FIVE_LANE;
-			// song.hopoFreq
+			if(songDta.hopoThreshold != 0) song.hopoFreq = songDta.hopoThreshold;
 			song.artistName = songDta.artist;
 			song.album = songDta.albumName;
 			song.genre = songDta.genre;

diff --git a/Assets/Script/Serialization/Xbox/XboxSongData.cs b/Assets/Script/Serialization/Xbox/XboxSongData.cs
@@ -31,6 +31,7 @@ public class XboxSongData {
 		public short[] realGuitarTuning, realBassTuning;
 		public string[] solos;
 		public Dictionary<string, ushort> ranks;
+		public int hopoThreshold = 0;
 
 		//TODO: implement macro support, such as #ifndef kControllerRealGuitar, or #ifdef YARG
 		public void ParseFromDta(DataArray dta) {
@@ -90,6 +91,7 @@ public void ParseFromDta(DataArray dta) {
 							if (dtaArray[j] is DataArray inner)
 								ranks.Add(((DataSymbol) inner[0]).Name, (ushort) ((DataAtom) inner[1]).Int);
 						break;
+					case "hopo_threshold": hopoThreshold = ((DataAtom) dtaArray[1]).Int; break;
 					case "game_origin": gameOrigin = ((DataSymbol) dtaArray[1]).Name; break;
 					case "genre": genre = ((DataSymbol) dtaArray[1]).Name; break;
 					case "rating": rating = (byte) ((DataAtom) dtaArray[1]).Int; break;