Skip to content
This repository was archived by the owner on Mar 15, 2025. It is now read-only.

Commit a95a28c

Browse files
TheRealJake12TheRealJake12
committed
might've fixed ghost notes?
I only got one and that was because of a stupid little misplacement
1 parent 11238a3 commit a95a28c

File tree

11 files changed

+117
-563
lines changed

11 files changed

+117
-563
lines changed

‎assets/shared/images/fonts/pixel.fnt

+1-273
Large diffs are not rendered by default.

‎assets/shared/images/fonts/pixel.png

31.1 KB
Loading

‎assets/shared/images/fonts/vcr.fnt

+1-217
Large diffs are not rendered by default.

‎assets/shared/images/fonts/vcr.png

14.7 KB
Loading

‎source/kec/backend/KadeEngineData.hx

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ class KadeEngineData
6060
if (FlxG.save.data.ghost == null)
6161
FlxG.save.data.ghost = true;
6262

63-
if (FlxG.save.data.distractions == null)
64-
FlxG.save.data.distractions = true;
63+
if (FlxG.save.data.quality == null)
64+
FlxG.save.data.quality = true;
6565

6666
if (FlxG.save.data.colour == null)
6767
FlxG.save.data.colour = true;

‎source/kec/backend/Options.hx

+19-4
Original file line numberDiff line numberDiff line change
@@ -611,7 +611,7 @@ class SongPositionOption extends Option
611611
}
612612
}
613613

614-
class DistractionsAndEffectsOption extends Option
614+
class QualityOption extends Option
615615
{
616616
public function new(desc:String)
617617
{
@@ -629,7 +629,7 @@ class DistractionsAndEffectsOption extends Option
629629
{
630630
if (OptionsMenu.isInPause)
631631
return false;
632-
FlxG.save.data.distractions = !FlxG.save.data.distractions;
632+
FlxG.save.data.quality = !FlxG.save.data.quality;
633633
display = updateDisplay();
634634
return true;
635635
}
@@ -642,7 +642,7 @@ class DistractionsAndEffectsOption extends Option
642642

643643
private override function updateDisplay():String
644644
{
645-
return "Distractions: < " + (!FlxG.save.data.distractions ? "Disabled" : "Enabled") + " >";
645+
return "Stage Quality: < " + (FlxG.save.data.quality ? "High" : "Low") + " >";
646646
}
647647
}
648648

@@ -2566,6 +2566,7 @@ class HitSoundOption extends Option
25662566

25672567
class HitSoundVolume extends Option
25682568
{
2569+
var daHitSound:FlxSound = new FlxSound();
25692570
public function new(desc:String)
25702571
{
25712572
super();
@@ -2593,6 +2594,13 @@ class HitSoundVolume extends Option
25932594

25942595
if (FlxG.save.data.hitVolume > 1)
25952596
FlxG.save.data.hitVolume = 1;
2597+
2598+
if (FlxG.save.data.hitSound != 0)
2599+
{
2600+
daHitSound.loadEmbedded(Paths.sound('hitsounds/${HitSounds.getSoundByID(FlxG.save.data.hitSound).toLowerCase()}', 'shared'));
2601+
daHitSound.volume = FlxG.save.data.hitVolume;
2602+
daHitSound.play();
2603+
}
25962604
return true;
25972605
}
25982606

@@ -2611,6 +2619,13 @@ class HitSoundVolume extends Option
26112619
if (FlxG.save.data.hitVolume > 1)
26122620
FlxG.save.data.hitVolume = 1;
26132621

2622+
if (FlxG.save.data.hitSound != 0)
2623+
{
2624+
daHitSound.loadEmbedded(Paths.sound('hitsounds/${HitSounds.getSoundByID(FlxG.save.data.hitSound).toLowerCase()}', 'shared'));
2625+
daHitSound.volume = FlxG.save.data.hitVolume;
2626+
daHitSound.play();
2627+
}
2628+
26142629
return true;
26152630
}
26162631
}
@@ -2955,7 +2970,7 @@ class ResetSettings extends Option
29552970
FlxG.save.data.accuracyMod = null;
29562971
FlxG.save.data.watermark = null;
29572972
FlxG.save.data.ghost = null;
2958-
FlxG.save.data.distractions = null;
2973+
FlxG.save.data.quality = null;
29592974
FlxG.save.data.colour = null;
29602975
FlxG.save.data.stepMania = null;
29612976
FlxG.save.data.flashing = null;

‎source/kec/backend/script/Script.hx

+1-1
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ class Script extends FlxBasic
247247
{
248248
trace(errorMsg);
249249
#if windows
250-
CPPInterface.messageBox(errorMsg, winTitle);
250+
CPPInterface.messageBox(errorMsg, winTitle != null ? winTitle : '${name}: Script Error!');
251251
#else
252252
Lib.application.window.alert(errorMsg, winTitle != null ? winTitle : '${name}: Script Error!');
253253
#end

‎source/kec/stages/Stage.hx

+28-28
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ class Stage extends MusicBeatState
9191
case 'halloween':
9292
{
9393
hasGF = true;
94-
if (FlxG.save.data.distractions)
94+
if (FlxG.save.data.quality)
9595
{
9696
var hallowTex = Paths.getSparrowAtlas('halloween_bg');
9797

@@ -134,7 +134,7 @@ class Stage extends MusicBeatState
134134
swagBacks['city'] = city;
135135
toAdd.push(city);
136136

137-
if (FlxG.save.data.distractions)
137+
if (FlxG.save.data.quality)
138138
{
139139
phillyWindow = new FlxSprite(city.x, city.y).loadGraphic(Paths.image('philly/window'));
140140
phillyWindow.scrollFactor.set(0.3, 0.3);
@@ -151,7 +151,7 @@ class Stage extends MusicBeatState
151151
toAdd.push(streetBehind);
152152

153153
var phillyTrain = new FlxSprite(2000, 360).loadGraphic(Paths.image('philly/train'));
154-
if (FlxG.save.data.distractions)
154+
if (FlxG.save.data.quality)
155155
{
156156
swagBacks['phillyTrain'] = phillyTrain;
157157
toAdd.push(phillyTrain);
@@ -189,7 +189,7 @@ class Stage extends MusicBeatState
189189
fastCar.moves = true;
190190
var grpLimoDancers = new FlxTypedGroup<BackgroundDancer>();
191191

192-
if (FlxG.save.data.distractions)
192+
if (FlxG.save.data.quality)
193193
{
194194
swagGroup['grpLimoDancers'] = grpLimoDancers;
195195
toAdd.push(grpLimoDancers);
@@ -217,7 +217,7 @@ class Stage extends MusicBeatState
217217
layInFront[0].push(limo);
218218
swagBacks['limo'] = limo;
219219

220-
if (!FlxG.save.data.distractions)
220+
if (!FlxG.save.data.quality)
221221
{
222222
grpLimoDancers.kill();
223223
grpLimoDancers.destroy();
@@ -243,7 +243,7 @@ class Stage extends MusicBeatState
243243
upperBoppers.scrollFactor.set(0.33, 0.33);
244244
upperBoppers.setGraphicSize(Std.int(upperBoppers.width * 0.85));
245245
upperBoppers.updateHitbox();
246-
if (FlxG.save.data.distractions)
246+
if (FlxG.save.data.quality)
247247
{
248248
swagBacks['upperBoppers'] = upperBoppers;
249249
toAdd.push(upperBoppers);
@@ -273,7 +273,7 @@ class Stage extends MusicBeatState
273273
bottomBoppers.scrollFactor.set(0.9, 0.9);
274274
bottomBoppers.setGraphicSize(Std.int(bottomBoppers.width * 1));
275275
bottomBoppers.updateHitbox();
276-
if (FlxG.save.data.distractions)
276+
if (FlxG.save.data.quality)
277277
{
278278
swagBacks['bottomBoppers'] = bottomBoppers;
279279
toAdd.push(bottomBoppers);
@@ -290,13 +290,13 @@ class Stage extends MusicBeatState
290290
santa.frames = Paths.getSparrowAtlas('christmas/santa');
291291
santa.animation.addByPrefix('idle', 'santa idle in fear', Std.int(24 * PlayState.songMultiplier), false);
292292
santa.antialiasing = FlxG.save.data.antialiasing;
293-
if (FlxG.save.data.distractions)
293+
if (FlxG.save.data.quality)
294294
{
295295
swagBacks['santa'] = santa;
296296
toAdd.push(santa);
297297
animatedBacks.push(santa);
298298
}
299-
if (!FlxG.save.data.distractions)
299+
if (!FlxG.save.data.quality)
300300
{
301301
upperBoppers.kill();
302302
bottomBoppers.kill();
@@ -390,7 +390,7 @@ class Stage extends MusicBeatState
390390
bgTrees.updateHitbox();
391391
treeLeaves.updateHitbox();
392392

393-
if (FlxG.save.data.distractions)
393+
if (FlxG.save.data.quality)
394394
{
395395
var bgGirls = new BackgroundGirls(-100, 190);
396396
bgGirls.scrollFactor.set(0.9, 0.9);
@@ -427,7 +427,7 @@ class Stage extends MusicBeatState
427427
tankSky.scrollFactor.set(0, 0);
428428
swagBacks['tankSky'] = tankSky;
429429
toAdd.push(tankSky);
430-
if (FlxG.save.data.distractions)
430+
if (FlxG.save.data.quality)
431431
{
432432
var tankClouds:FlxSprite = new FlxSprite(FlxG.random.int(-700, -100), FlxG.random.int(-20, 20)).loadGraphic(Paths.image('tankClouds'));
433433
tankClouds.velocity.x = FlxG.random.float(5, 15);
@@ -463,7 +463,7 @@ class Stage extends MusicBeatState
463463
swagBacks['tankRuins'] = tankRuins;
464464
toAdd.push(tankRuins);
465465

466-
if (FlxG.save.data.distractions)
466+
if (FlxG.save.data.quality)
467467
{
468468
var smokeLeft:FlxSprite = new FlxSprite(-200, -100);
469469
smokeLeft.antialiasing = FlxG.save.data.antialiasing;
@@ -522,7 +522,7 @@ class Stage extends MusicBeatState
522522
swagBacks['foreGround0'] = foreGround0;
523523
layInFront[2].push(foreGround0);
524524

525-
if (FlxG.save.data.distractions)
525+
if (FlxG.save.data.quality)
526526
{
527527
var foreGround1 = new FlxSprite(-300, 750);
528528
foreGround1.scrollFactor.set(2, 0.2);
@@ -543,7 +543,7 @@ class Stage extends MusicBeatState
543543
swagBacks['foreGround2'] = foreGround2;
544544
layInFront[2].push(foreGround2);
545545

546-
if (FlxG.save.data.distractions)
546+
if (FlxG.save.data.quality)
547547
{
548548
var foreGround3 = new FlxSprite(1300, 900);
549549
foreGround3.scrollFactor.set(1.5, 1.5);
@@ -564,7 +564,7 @@ class Stage extends MusicBeatState
564564
swagBacks['foreGround4'] = foreGround4;
565565
layInFront[2].push(foreGround4);
566566

567-
if (FlxG.save.data.distractions)
567+
if (FlxG.save.data.quality)
568568
{
569569
var foreGround5 = new FlxSprite(1400, 1290);
570570
foreGround5.scrollFactor.set(1.5, 1.5);
@@ -600,7 +600,7 @@ class Stage extends MusicBeatState
600600
swagBacks['stageFront'] = stageFront;
601601
toAdd.push(stageFront);
602602

603-
if (FlxG.save.data.distractions)
603+
if (FlxG.save.data.quality)
604604
{
605605
var stageCurtains:FlxSprite = new FlxSprite(-500, -300).loadGraphic(Paths.image('stagecurtains'));
606606
stageCurtains.setGraphicSize(Std.int(stageCurtains.width * 0.9));
@@ -806,31 +806,31 @@ class Stage extends MusicBeatState
806806
scripts.executeAllFunc("beatHit", [beatHit]);
807807
#end
808808

809-
if (FlxG.save.data.distractions && animatedBacks.length > 0 && FlxG.save.data.background)
809+
if (FlxG.save.data.quality && animatedBacks.length > 0 && FlxG.save.data.background)
810810
{
811811
for (bg in animatedBacks)
812812
bg.animation.play('idle', true);
813813
}
814814

815-
if (FlxG.save.data.distractions && FlxG.save.data.background)
815+
if (FlxG.save.data.quality && FlxG.save.data.background)
816816
{
817817
switch (curStage)
818818
{
819819
case 'halloween':
820820
if (FlxG.random.bool(Conductor.bpm > 320 ? 100 : 10) && curBeat > lightningStrikeBeat + lightningOffset && !inEditor)
821821
{
822-
if (FlxG.save.data.distractions)
822+
if (FlxG.save.data.quality)
823823
{
824824
lightningStrikeShit();
825825
}
826826
}
827827
case 'school':
828-
if (FlxG.save.data.distractions)
828+
if (FlxG.save.data.quality)
829829
{
830830
swagBacks['bgGirls'].dance();
831831
}
832832
case 'limo':
833-
if (FlxG.save.data.distractions)
833+
if (FlxG.save.data.quality)
834834
{
835835
swagGroup['grpLimoDancers'].forEach(function(dancer:BackgroundDancer)
836836
{
@@ -862,7 +862,7 @@ class Stage extends MusicBeatState
862862
}
863863
}
864864
case "philly":
865-
if (FlxG.save.data.distractions)
865+
if (FlxG.save.data.quality)
866866
{
867867
if (!trainMoving)
868868
trainCooldown += 1;
@@ -881,7 +881,7 @@ class Stage extends MusicBeatState
881881
&& trainCooldown > 8
882882
&& !inEditor)
883883
{
884-
if (FlxG.save.data.distractions)
884+
if (FlxG.save.data.quality)
885885
{
886886
trainCooldown = FlxG.random.int(-4, 0);
887887
trainStart();
@@ -1063,7 +1063,7 @@ class Stage extends MusicBeatState
10631063

10641064
function trainStart():Void
10651065
{
1066-
if (FlxG.save.data.distractions && FlxG.save.data.background && curStage == 'philly')
1066+
if (FlxG.save.data.quality && FlxG.save.data.background && curStage == 'philly')
10671067
{
10681068
trainMoving = true;
10691069
trainSound.play(true);
@@ -1074,7 +1074,7 @@ class Stage extends MusicBeatState
10741074

10751075
function updateTrainPos():Void
10761076
{
1077-
if (FlxG.save.data.distractions && curStage == 'philly')
1077+
if (FlxG.save.data.quality && curStage == 'philly')
10781078
{
10791079
if (trainSound.time >= 4700)
10801080
{
@@ -1106,7 +1106,7 @@ class Stage extends MusicBeatState
11061106

11071107
function trainReset():Void
11081108
{
1109-
if (FlxG.save.data.distractions && curStage == 'philly')
1109+
if (FlxG.save.data.quality && curStage == 'philly')
11101110
{
11111111
if (PlayState.instance.gf != null && PlayState.instance.gf.curCharacter == 'gftrain')
11121112
PlayState.instance.gf.playAnim('hairFall');
@@ -1125,7 +1125,7 @@ class Stage extends MusicBeatState
11251125

11261126
function resetFastCar():Void
11271127
{
1128-
if (FlxG.save.data.distractions && curStage == 'limo')
1128+
if (FlxG.save.data.quality && curStage == 'limo')
11291129
{
11301130
var fastCar = swagBacks['fastCar'];
11311131
fastCar.x = -12600;
@@ -1138,7 +1138,7 @@ class Stage extends MusicBeatState
11381138

11391139
function fastCarDrive()
11401140
{
1141-
if (FlxG.save.data.distractions && curStage == 'limo')
1141+
if (FlxG.save.data.quality && curStage == 'limo')
11421142
{
11431143
FlxG.sound.play(Paths.soundRandom('carPass', 0, 1, 'shared'), 0.7);
11441144

‎source/kec/states/PlayState.hx

+3-3
Original file line numberDiff line numberDiff line change
@@ -745,7 +745,7 @@ class PlayState extends MusicBeatState
745745

746746
if (dad.hasTrail)
747747
{
748-
if (FlxG.save.data.distractions)
748+
if (FlxG.save.data.quality)
749749
{
750750
var evilTrail = new FlxTrail(dad, null, 4, 24, 0.3, 0.069);
751751
add(evilTrail);
@@ -1128,11 +1128,11 @@ class PlayState extends MusicBeatState
11281128

11291129
super.create();
11301130

1131-
if (FlxG.save.data.distractions && FlxG.save.data.background)
1131+
if (FlxG.save.data.quality && FlxG.save.data.background)
11321132
{
11331133
if (Stage.curStage == 'tank' && gf != null && gf.curCharacter == 'pico-speaker')
11341134
{
1135-
if (FlxG.save.data.distractions)
1135+
if (FlxG.save.data.quality)
11361136
{
11371137
var firstTank:TankmenBG = new TankmenBG(20, 500, true);
11381138
firstTank.resetShit(20, 1500, true);

0 commit comments

Comments
 (0)