ChartData no longer needs needsVoices (pun)
This commit is contained in:
@@ -110,7 +110,6 @@ class Chart {
|
|||||||
data.setFieldDefault("bpm", Flags.DEFAULT_BPM);
|
data.setFieldDefault("bpm", Flags.DEFAULT_BPM);
|
||||||
data.setFieldDefault("beatsPerMeasure", Flags.DEFAULT_BEATS_PER_MEASURE);
|
data.setFieldDefault("beatsPerMeasure", Flags.DEFAULT_BEATS_PER_MEASURE);
|
||||||
data.setFieldDefault("stepsPerBeat", Flags.DEFAULT_STEPS_PER_BEAT);
|
data.setFieldDefault("stepsPerBeat", Flags.DEFAULT_STEPS_PER_BEAT);
|
||||||
data.setFieldDefault("needsVoices", true);
|
|
||||||
data.setFieldDefault("icon", Flags.DEFAULT_HEALTH_ICON);
|
data.setFieldDefault("icon", Flags.DEFAULT_HEALTH_ICON);
|
||||||
data.setFieldDefault("difficulties", []);
|
data.setFieldDefault("difficulties", []);
|
||||||
data.setFieldDefault("coopAllowed", Flags.DEFAULT_COOP_ALLOWED);
|
data.setFieldDefault("coopAllowed", Flags.DEFAULT_COOP_ALLOWED);
|
||||||
|
|||||||
@@ -28,7 +28,6 @@ typedef ChartMetaData = {
|
|||||||
public var ?coopAllowed:Bool;
|
public var ?coopAllowed:Bool;
|
||||||
public var ?opponentModeAllowed:Bool;
|
public var ?opponentModeAllowed:Bool;
|
||||||
public var ?customValues:Dynamic;
|
public var ?customValues:Dynamic;
|
||||||
public var ?needsVoices:Bool;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
typedef ChartStrumLine = {
|
typedef ChartStrumLine = {
|
||||||
|
|||||||
@@ -40,7 +40,6 @@ class FNFLegacyParser {
|
|||||||
}
|
}
|
||||||
|
|
||||||
result.meta.bpm = data.bpm;
|
result.meta.bpm = data.bpm;
|
||||||
result.meta.needsVoices = data.needsVoices.getDefault(true);
|
|
||||||
|
|
||||||
var camFocusedBF:Bool = false;
|
var camFocusedBF:Bool = false;
|
||||||
var altAnims:Bool = false;
|
var altAnims:Bool = false;
|
||||||
@@ -157,7 +156,7 @@ class FNFLegacyParser {
|
|||||||
notes: null,
|
notes: null,
|
||||||
bpm: chart.meta.bpm,
|
bpm: chart.meta.bpm,
|
||||||
speed: chart.scrollSpeed,
|
speed: chart.scrollSpeed,
|
||||||
needsVoices: chart.meta.needsVoices,
|
needsVoices: true,
|
||||||
|
|
||||||
player1: null,
|
player1: null,
|
||||||
player2: null,
|
player2: null,
|
||||||
|
|||||||
@@ -67,7 +67,6 @@ class VSliceParser {
|
|||||||
|
|
||||||
var timeChanges = metadata.timeChanges;
|
var timeChanges = metadata.timeChanges;
|
||||||
result.meta.bpm = timeChanges[0].bpm;
|
result.meta.bpm = timeChanges[0].bpm;
|
||||||
result.meta.needsVoices = true;
|
|
||||||
|
|
||||||
for (note in data)
|
for (note in data)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -602,10 +602,7 @@ class Charter extends UIState {
|
|||||||
noteTypes = PlayState.SONG.noteTypes;
|
noteTypes = PlayState.SONG.noteTypes;
|
||||||
|
|
||||||
FlxG.sound.setMusic(FlxG.sound.load(Paths.inst(__song, __diff)));
|
FlxG.sound.setMusic(FlxG.sound.load(Paths.inst(__song, __diff)));
|
||||||
if (PlayState.SONG.meta.needsVoices != false && Assets.exists(Paths.voices(__song, __diff))) // null or true
|
vocals = Assets.exists(Paths.voices(__song, __diff)) ? FlxG.sound.load(Paths.voices(__song, __diff)) : new FlxSound();
|
||||||
vocals = FlxG.sound.load(Paths.voices(__song, __diff));
|
|
||||||
else
|
|
||||||
vocals = new FlxSound();
|
|
||||||
vocals.group = FlxG.sound.defaultMusicGroup;
|
vocals.group = FlxG.sound.defaultMusicGroup;
|
||||||
|
|
||||||
gridBackdrops.createGrids(PlayState.SONG.strumLines.length);
|
gridBackdrops.createGrids(PlayState.SONG.strumLines.length);
|
||||||
|
|||||||
@@ -1114,11 +1114,9 @@ class PlayState extends MusicBeatState
|
|||||||
curSongID = curSong.replace(" ", "-");
|
curSongID = curSong.replace(" ", "-");
|
||||||
|
|
||||||
FlxG.sound.setMusic(inst = FlxG.sound.load(Assets.getMusic(Paths.inst(SONG.meta.name, difficulty))));
|
FlxG.sound.setMusic(inst = FlxG.sound.load(Assets.getMusic(Paths.inst(SONG.meta.name, difficulty))));
|
||||||
if (SONG.meta.needsVoices != false && Assets.exists(Paths.voices(SONG.meta.name, difficulty))) // null or true
|
|
||||||
vocals = FlxG.sound.load(Options.streamedVocals ? Assets.getMusic(Paths.voices(SONG.meta.name, difficulty)) : Paths.voices(SONG.meta.name, difficulty));
|
|
||||||
else
|
|
||||||
vocals = new FlxSound();
|
|
||||||
|
|
||||||
|
var vocalsPath = Paths.voices(SONG.meta.name, difficulty);
|
||||||
|
vocals = Assets.exists(vocalsPath) ? FlxG.sound.load(Options.streamedVocals ? Assets.getMusic(vocalsPath) : vocalsPath) : new FlxSound();
|
||||||
vocals.group = FlxG.sound.defaultMusicGroup;
|
vocals.group = FlxG.sound.defaultMusicGroup;
|
||||||
vocals.persist = false;
|
vocals.persist = false;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user