AirDog46/Kade-Engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

shit fix :)

Browse Source
This commit is contained in:
KadeDev 2021-03-30 09:39:08 -07:00
parent 7b62e78c94
commit 69ee9f0a01
2 changed files with 66 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
source/Note.hx
View File

@ -33,6 +33,8 @@ class Note extends FlxSprite
public static var BLUE_NOTE:Int = 1; public static var BLUE_NOTE:Int = 1;
public static var RED_NOTE:Int = 3; public static var RED_NOTE:Int = 3;
public var rating:String = "shit";
public function new(strumTime:Float, noteData:Int, ?prevNote:Note, ?sustainNote:Bool = false) public function new(strumTime:Float, noteData:Int, ?prevNote:Note, ?sustainNote:Bool = false)
{ {
super(); super();
@ -178,15 +180,38 @@ class Note extends FlxSprite
if (mustPress) if (mustPress)
{ {
// The * 0.5 is so that it's easier to hit them too late, instead of too early
if (strumTime > Conductor.songPosition - Conductor.safeZoneOffset if (strumTime > Conductor.songPosition - Conductor.safeZoneOffset
&& strumTime < Conductor.songPosition + (Conductor.safeZoneOffset * 0.5)) && strumTime < Conductor.songPosition + Conductor.safeZoneOffset)
canBeHit = true; canBeHit = true;
else else
canBeHit = false; canBeHit = false;
if (strumTime < Conductor.songPosition - Conductor.safeZoneOffset && !wasGoodHit) var noteDiff:Float = Math.abs(strumTime - Conductor.songPosition);
if (canBeHit)
{
if (noteDiff > Conductor.safeZoneOffset * 0.95)
rating = "shit";
else if (noteDiff < Conductor.safeZoneOffset * -0.95)
rating = "shit";
else if (noteDiff > Conductor.safeZoneOffset * 0.70)
rating = "bad";
else if (noteDiff < Conductor.safeZoneOffset * -0.75)
rating = "bad";
else if (noteDiff > Conductor.safeZoneOffset * 0.45)
rating = "good";
else if (noteDiff < Conductor.safeZoneOffset * -0.45)
rating = "good";
else
rating = "sick";
FlxG.watch.addQuick("Note " + this.ID,rating);
}
if (strumTime < Conductor.songPosition - (Conductor.safeZoneOffset * 0.80) && !wasGoodHit)
{
tooLate = true; tooLate = true;
rating = "shit";
}
} }
else else
{ {

66
source/PlayState.hx
View File

@ -2009,14 +2009,15 @@ class PlayState extends MusicBeatState
} }
} }
var endingSong:Bool = false; var endingSong:Bool = false;
var timeShown = 0; var timeShown = 0;
var currentTimingShown:FlxText = null; var currentTimingShown:FlxText = null;
private function popUpScore(strumtime:Float):Void private function popUpScore(daNote:Note):Void
{ {
var noteDiff:Float = Math.abs(strumtime - Conductor.songPosition); var noteDiff:Float = Math.abs(daNote.strumTime - Conductor.songPosition);
var wife:Float = EtternaFunctions.wife3(noteDiff, FlxG.save.data.etternaMode ? 1 : 1.7); var wife:Float = EtternaFunctions.wife3(noteDiff, FlxG.save.data.etternaMode ? 1 : 1.7);
// boyfriend.playAnim('hey'); // boyfriend.playAnim('hey');
vocals.volume = 1; vocals.volume = 1;
@ -2033,68 +2034,38 @@ class PlayState extends MusicBeatState
var rating:FlxSprite = new FlxSprite(); var rating:FlxSprite = new FlxSprite();
var score:Float = 350; var score:Float = 350;
var daRating:String = "sick";
totalNotesHit += wife; totalNotesHit += wife;
if (noteDiff > Conductor.safeZoneOffset * 1.25) var daRating = daNote.rating;
switch(daRating)
{ {
daRating = 'shit'; case 'shit':
score = -3000; score = -300;
combo = 0; combo = 0;
misses++; misses++;
health -= 0.2; health -= 0.2;
ss = false; ss = false;
shits++; shits++;
} case 'bad':
else if (noteDiff < Conductor.safeZoneOffset * -1.25)
{
daRating = 'shit';
score = -3000;
combo = 0;
misses++;
health -= 0.2;
ss = false;
shits++;
}
else if (noteDiff < Conductor.safeZoneOffset * -0.45)
{
daRating = 'bad'; daRating = 'bad';
score = 0; score = 0;
health -= 0.03; health -= 0.06;
ss = false; ss = false;
bads++; bads++;
} case 'good':
else if (noteDiff > Conductor.safeZoneOffset * 0.45)
{
daRating = 'bad';
score = 0;
health -= 0.03;
ss = false;
bads++;
}
else if (noteDiff < Conductor.safeZoneOffset * -0.25)
{
daRating = 'good'; daRating = 'good';
score = 200; score = 200;
ss = false; ss = false;
goods++; goods++;
} if (health < 2)
else if (noteDiff > Conductor.safeZoneOffset * 0.35) health += 0.04;
{ case 'sick':
daRating = 'good';
score = 200;
ss = false;
goods++;
}
if (daRating == 'sick')
{
if (health < 2) if (health < 2)
health += 0.1; health += 0.1;
sicks++; sicks++;
} }
if (FlxG.save.data.etternaMode) if (FlxG.save.data.etternaMode)
etternaModeScore += Math.round(score / wife); etternaModeScore += Math.round(score / wife);
@ -2771,7 +2742,12 @@ class PlayState extends MusicBeatState
} }
else else
{ {
playerStrums.members[note.noteData].animation.play('static'); // this is bad but fuck you
playerStrums.members[0].animation.play('static');
playerStrums.members[1].animation.play('static');
playerStrums.members[2].animation.play('static');
playerStrums.members[3].animation.play('static');
health -= 0.2;
trace('mash ' + mashing); trace('mash ' + mashing);
} }
@ -2790,7 +2766,7 @@ class PlayState extends MusicBeatState
{ {
if (!note.isSustainNote) if (!note.isSustainNote)
{ {
popUpScore(note.strumTime); popUpScore(note);
combo += 1; combo += 1;
} }
else else