pause screen polish shit

This commit is contained in:
Cameron Taylor
2021-03-01 23:00:02 -05:00
parent 05da693f68
commit 3d46cdcb77
5 changed files with 84 additions and 66 deletions

View File

@ -1,8 +1,8 @@
package;
import Conductor.BPMChangeEvent;
import Section.SwagSection;
import Song.SwagSong;
import Conductor.BPMChangeEvent;
import flixel.FlxG;
import flixel.FlxSprite;
import flixel.addons.display.FlxGridOverlay;
@ -447,21 +447,21 @@ class ChartingState extends MusicBeatState
var updatedSection:Bool = false;
/* this function got owned LOL
function lengthBpmBullshit():Float
{
if (_song.notes[curSection].changeBPM)
return _song.notes[curSection].lengthInSteps * (_song.notes[curSection].bpm / _song.bpm);
else
return _song.notes[curSection].lengthInSteps;
function lengthBpmBullshit():Float
{
if (_song.notes[curSection].changeBPM)
return _song.notes[curSection].lengthInSteps * (_song.notes[curSection].bpm / _song.bpm);
else
return _song.notes[curSection].lengthInSteps;
}*/
function sectionStartTime():Float
{
var daBPM:Int = _song.bpm;
var daPos:Float = 0;
for (i in 0...curSection)
{
if (_song.notes[i].changeBPM) {
if (_song.notes[i].changeBPM)
{
daBPM = _song.notes[i].bpm;
}
daPos += 4 * (1000 * 60 / daBPM);
@ -744,11 +744,11 @@ class ChartingState extends MusicBeatState
vocals.pause();
/*var daNum:Int = 0;
var daLength:Float = 0;
while (daNum <= sec)
{
daLength += lengthBpmBullshit();
daNum++;
var daLength:Float = 0;
while (daNum <= sec)
{
daLength += lengthBpmBullshit();
daNum++;
}*/
FlxG.sound.music.time = sectionStartTime();
@ -830,7 +830,7 @@ class ChartingState extends MusicBeatState
}
else
{
//get last bpm
// get last bpm
var daBPM:Int = _song.bpm;
for (i in 0...curSection)
if (_song.notes[i].changeBPM)
@ -975,29 +975,28 @@ class ChartingState extends MusicBeatState
}
/*
function calculateSectionLengths(?sec:SwagSection):Int
{
var daLength:Int = 0;
for (i in _song.notes)
function calculateSectionLengths(?sec:SwagSection):Int
{
var swagLength = i.lengthInSteps;
var daLength:Int = 0;
if (i.typeOfSection == Section.COPYCAT)
swagLength * 2;
daLength += swagLength;
if (sec != null && sec == i)
for (i in _song.notes)
{
trace('swag loop??');
break;
var swagLength = i.lengthInSteps;
if (i.typeOfSection == Section.COPYCAT)
swagLength * 2;
daLength += swagLength;
if (sec != null && sec == i)
{
trace('swag loop??');
break;
}
}
}
return daLength;
return daLength;
}*/
private var daSpacing:Float = 0.3;
function loadLevel():Void