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

removed old input and made shits hitable

Browse Source
This commit is contained in:
KadeDev 2021-03-30 08:54:53 -07:00
parent 2a7bc51ed5
commit b0ffa2aa43
2 changed files with 19 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source/Options.hx
View File

@ -52,21 +52,6 @@ class DFJKOption extends Option
} }
} }
class NewInputOption extends Option
{
public override function press():Bool
{
FlxG.save.data.newInput = !FlxG.save.data.newInput;
display = updateDisplay();
return true;
}
private override function updateDisplay():String
{
return FlxG.save.data.newInput ? "New input" : "Old Input";
}
}
class DownscrollOption extends Option class DownscrollOption extends Option
{ {
public override function press():Bool public override function press():Bool

71
source/PlayState.hx
View File

@ -173,7 +173,6 @@ class PlayState extends MusicBeatState
Conductor.safeFrames = 10; // 166ms hit window (j1) Conductor.safeFrames = 10; // 166ms hit window (j1)
theFunne = FlxG.save.data.newInput;
if (FlxG.sound.music != null) if (FlxG.sound.music != null)
FlxG.sound.music.stop(); FlxG.sound.music.stop();
@ -1480,12 +1479,12 @@ class PlayState extends MusicBeatState
ranking = "(GFC)"; ranking = "(GFC)";
else if ((shits < 10 && shits != 0 || bads < 10 && bads != 0) && misses == 0) // Single Digit Combo Breaks else if ((shits < 10 && shits != 0 || bads < 10 && bads != 0) && misses == 0) // Single Digit Combo Breaks
ranking = "(SDCB)"; ranking = "(SDCB)";
else if (misses == 0 && (shits >= 10 || bads >= 10)) // Regular FC else if (misses == 0 && (shits >= 10)) // Regular FC
ranking = "(FC)"; ranking = "(FC)";
else if (misses >= 10 || (shits >= 10 || bads >= 10)) // Combo Breaks else if (misses >= 10 || (shits >= 10)) // Combo Breaks
ranking = "(CB)"; ranking = "(CB)";
else else
ranking = ""; ranking = "(Clear)";
// WIFE TIME :)))) (based on Wife3) // WIFE TIME :)))) (based on Wife3)
@ -2038,85 +2037,53 @@ class PlayState extends MusicBeatState
totalNotesHit += wife; totalNotesHit += wife;
if (noteDiff > Conductor.safeZoneOffset * 2) if (noteDiff > Conductor.safeZoneOffset * 1.25)
{ {
daRating = 'shit'; daRating = 'shit';
score = -3000;
combo = 0;
misses++;
health -= 0.2;
ss = false; ss = false;
if (theFunne)
{
score = -3000;
combo = 0;
misses++;
health -= 0.2;
}
shits++; shits++;
} }
else if (noteDiff < Conductor.safeZoneOffset * -2) else if (noteDiff < Conductor.safeZoneOffset * -1.25)
{ {
daRating = 'shit'; daRating = 'shit';
if (theFunne) score = -3000;
{ combo = 0;
score = -3000; misses++;
combo = 0; health -= 0.2;
misses++;
health -= 0.2;
}
ss = false; ss = false;
shits++; shits++;
} }
else if (noteDiff < Conductor.safeZoneOffset * -0.45) else if (noteDiff < Conductor.safeZoneOffset * -0.45)
{ {
daRating = 'bad'; daRating = 'bad';
if (theFunne) score = 0;
{ health -= 0.03;
score = -1000;
health -= 0.03;
misses++;
combo = 0;
}
else
score = 100;
ss = false; ss = false;
bads++; bads++;
} }
else if (noteDiff > Conductor.safeZoneOffset * 0.45) else if (noteDiff > Conductor.safeZoneOffset * 0.45)
{ {
daRating = 'bad'; daRating = 'bad';
if (theFunne) score = 0;
{ health -= 0.03;
score = -1000;
health -= 0.03;
combo = 0;
misses++;
}
else
score = 100;
ss = false; ss = false;
bads++; bads++;
} }
else if (noteDiff < Conductor.safeZoneOffset * -0.25) else if (noteDiff < Conductor.safeZoneOffset * -0.25)
{ {
daRating = 'good'; daRating = 'good';
if (theFunne) score = 200;
{
score = 200;
//health -= 0.01;
}
else
score = 200;
ss = false; ss = false;
goods++; goods++;
} }
else if (noteDiff > Conductor.safeZoneOffset * 0.35) else if (noteDiff > Conductor.safeZoneOffset * 0.35)
{ {
daRating = 'good'; daRating = 'good';
if (theFunne) score = 200;
{
score = 200;
//health -= 0.01;
}
else
score = 200;
ss = false; ss = false;
goods++; goods++;
} }