save
This commit is contained in:
parent
a148c75ca9
commit
6376fe6d68
@ -448,6 +448,8 @@ class PlayState extends MusicBeatState
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
trace('INFORMATION ABOUT WHAT U PLAYIN WIT:\nFRAMES: ' + PlayStateChangeables.safeFrames + '\nZONE: ' + Conductor.safeZoneOffset + '\nTS: '
|
||||
+ Conductor.timeScale + '\nBotPlay : ' + PlayStateChangeables.botPlay);
|
||||
|
||||
@ -2237,40 +2239,7 @@ class PlayState extends MusicBeatState
|
||||
}
|
||||
}
|
||||
|
||||
if (updateFrame == 4)
|
||||
{
|
||||
TimingStruct.clearTimings();
|
||||
|
||||
var currentIndex = 0;
|
||||
for (i in SONG.eventObjects)
|
||||
{
|
||||
if (i.type == "BPM Change")
|
||||
{
|
||||
var beat:Float = i.position;
|
||||
|
||||
var endBeat:Float = Math.POSITIVE_INFINITY;
|
||||
|
||||
TimingStruct.addTiming(beat,i.value,endBeat, 0); // offset in this case = start time since we don't have a offset
|
||||
|
||||
if (currentIndex != 0)
|
||||
{
|
||||
var data = TimingStruct.AllTimings[currentIndex - 1];
|
||||
data.endBeat = beat;
|
||||
data.length = (data.endBeat - data.startBeat) / (data.bpm / 60);
|
||||
var step = ((60 / data.bpm) * 1000) / 4;
|
||||
TimingStruct.AllTimings[currentIndex].startStep = Math.floor(((data.endBeat / (data.bpm / 60)) * 1000) / step);
|
||||
TimingStruct.AllTimings[currentIndex].startTime = data.startTime + data.length;
|
||||
}
|
||||
|
||||
currentIndex++;
|
||||
}
|
||||
}
|
||||
|
||||
updateFrame++;
|
||||
}
|
||||
else if (updateFrame != 5)
|
||||
updateFrame++;
|
||||
|
||||
|
||||
var timingSeg = TimingStruct.getTimingAtTimestamp(Conductor.songPosition);
|
||||
|
||||
@ -3205,8 +3174,6 @@ class PlayState extends MusicBeatState
|
||||
totalNotesHit += 1;
|
||||
else
|
||||
{
|
||||
if (!daNote.isSustainNote)
|
||||
health -= 0.2;
|
||||
vocals.volume = 0;
|
||||
if (theFunne && !daNote.isSustainNote)
|
||||
{
|
||||
@ -3214,7 +3181,7 @@ class PlayState extends MusicBeatState
|
||||
}
|
||||
if (daNote.isParent)
|
||||
{
|
||||
health -= 0.30; // give a health punishment for failing a LN
|
||||
health -= 0.15; // give a health punishment for failing a LN
|
||||
trace("hold fell over at the start");
|
||||
for (i in daNote.children)
|
||||
{
|
||||
@ -3229,7 +3196,7 @@ class PlayState extends MusicBeatState
|
||||
&& daNote.sustainActive
|
||||
&& daNote.spotInLine != daNote.parent.children.length)
|
||||
{
|
||||
health -= 0.35; // give a health punishment for failing a LN
|
||||
health -= 0.2; // give a health punishment for failing a LN
|
||||
trace("hold fell over at " + daNote.spotInLine);
|
||||
for (i in daNote.parent.children)
|
||||
{
|
||||
@ -3240,13 +3207,15 @@ class PlayState extends MusicBeatState
|
||||
misses++;
|
||||
updateAccuracy();
|
||||
}
|
||||
else
|
||||
{
|
||||
health -= 0.15;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (!daNote.isSustainNote)
|
||||
health -= 0.20;
|
||||
vocals.volume = 0;
|
||||
if (theFunne && !daNote.isSustainNote)
|
||||
{
|
||||
@ -3261,7 +3230,7 @@ class PlayState extends MusicBeatState
|
||||
|
||||
if (daNote.isParent)
|
||||
{
|
||||
health -= 0.2; // give a health punishment for failing a LN
|
||||
health -= 0.15; // give a health punishment for failing a LN
|
||||
trace("hold fell over at the start");
|
||||
for (i in daNote.children)
|
||||
{
|
||||
@ -3289,6 +3258,10 @@ class PlayState extends MusicBeatState
|
||||
misses++;
|
||||
updateAccuracy();
|
||||
}
|
||||
else
|
||||
{
|
||||
health -= 0.15;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -3576,7 +3549,7 @@ class PlayState extends MusicBeatState
|
||||
totalNotesHit += 0.75;
|
||||
case 'sick':
|
||||
if (health < 2)
|
||||
health += 0.02;
|
||||
health += 0.04;
|
||||
if (FlxG.save.data.accuracyMod == 0)
|
||||
totalNotesHit += 1;
|
||||
sicks++;
|
||||
|
Loading…
x
Reference in New Issue
Block a user