BUNCH OF FIXES

nebulazorua · Jul 8, 2021 · 3e33343 · 3e33343
1 parent cdaf247
commit 3e33343
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 10 deletions.
diff --git a/assets/week6/sounds/intro1.ogg → assets/shared/sounds/intro1-pixel.ogg b/assets/week6/sounds/intro1.ogg → assets/shared/sounds/intro1-pixel.ogg
diff --git a/assets/week6/sounds/intro2.ogg → assets/shared/sounds/intro2-pixel.ogg b/assets/week6/sounds/intro2.ogg → assets/shared/sounds/intro2-pixel.ogg
diff --git a/assets/week6/sounds/intro3.ogg → assets/shared/sounds/intro3-pixel.ogg b/assets/week6/sounds/intro3.ogg → assets/shared/sounds/intro3-pixel.ogg
diff --git a/assets/week6/sounds/introGo.ogg → assets/shared/sounds/introGo-pixel.ogg b/assets/week6/sounds/introGo.ogg → assets/shared/sounds/introGo-pixel.ogg
diff --git a/source/DialogueBox.hx b/source/DialogueBox.hx
@@ -129,7 +129,7 @@ class DialogueBox extends FlxSpriteGroup
 		portraitLeft.visible = false;
 
 		portraitRight = new FlxSprite(Std.int(FlxG.width/2), 40);
-		if(PlayState.SONG.song.toLowerCase()=='thorns' || PlayState.SONG.song.toLowerCase()=='roses' || PlayState.SONG.song.toLowerCase()=='senpai' || PlayState.SONG.song.toLowerCase()=='2v200')
+		if(PlayState.SONG.song.toLowerCase()=='thorns' || PlayState.SONG.song.toLowerCase()=='roses' || PlayState.SONG.song.toLowerCase()=='senpai')
 		{
 			portraitRight.x = 0;
 			portraitRight.frames = Paths.getSparrowAtlas('weeb/bfPortrait');

diff --git a/source/FreeplayState.hx b/source/FreeplayState.hx
@@ -287,10 +287,11 @@ class FreeplayState extends MusicBeatState
 	function changeDiff(change:Int = 0)
 	{
 		curDifficulty += change;
-
+		var max = 2;
+		if(FlxG.save.data.canGlitch) max=3;
 		if (curDifficulty < 0)
-			curDifficulty = 3;
-		if (curDifficulty > 3)
+			curDifficulty = max;
+		if (curDifficulty > max)
 			curDifficulty = 0;
 
 		#if !switch

diff --git a/source/ItemState.hx b/source/ItemState.hx
@@ -265,7 +265,7 @@ class ItemState extends MusicBeatState
 		var conditions = [
       FlxG.save.data.omegaGoodEnding,
       FlxG.save.data.getResistance,
-      FlxG.save.data.becomeATwat,
+      FlxG.save.data.beATwat,
       FlxG.save.data.omegaBadEnding,
       FlxG.save.data.drunk,
 			true

diff --git a/source/MainMenuState.hx b/source/MainMenuState.hx
@@ -92,8 +92,6 @@ class MainMenuState extends MusicBeatState
 		add(iconSpr);
 
 		if(FlxG.save.data.daddyTimeTime){
-			FlxG.save.data.daddyTimeTime=false;
-			FlxG.save.data.foundFatherTime=true;
 			FlxG.mouse.visible=true;
 			var paper:FlxSprite = new FlxSprite(0,0).loadGraphic(Paths.image("paperBG"));
 			paper.scrollFactor.set(.01,.01);
@@ -284,6 +282,7 @@ class MainMenuState extends MusicBeatState
 
 		if(fatherTimeButton!=null){
 			if(FlxG.mouse.overlaps(fatherTimeButton) && FlxG.mouse.justPressed){
+				FlxG.save.data.daddyTimeTime=false;
 				PlayState.blueballs=0;
 				LoadingState.loadAndSwitchState(new CutsceneState(CoolUtil.coolTextFile(Paths.txt('father-time/found')),new PlayState()));
 			}

diff --git a/source/Options.hx b/source/Options.hx
@@ -136,7 +136,7 @@ class Options
 	public var dishonorShaders:Bool = true;
 	public var controls:Array<FlxKey> = [FlxKey.A,FlxKey.S,FlxKey.K,FlxKey.L,FlxKey.R];
 	public var controlsSixK:Array<FlxKey> = [FlxKey.A,FlxKey.S,FlxKey.D,FlxKey.J,FlxKey.K,FlxKey.L,FlxKey.R];
-	public var ghosttapping:Bool = false;
+	public var ghosttapping:Bool = true;
 	public var failForMissing:Bool = false;
 	public var loadModcharts:Bool = true;
 	public var pauseHoldAnims:Bool = true;

diff --git a/source/PlayState.hx b/source/PlayState.hx
@@ -1439,7 +1439,7 @@ class PlayState extends MusicBeatState
 				boyfriend = new Boyfriend(770, 450, SONG.player1);
 			}
 		}else{
-			boyfriend = new Boyfriend(770, 450, SONG.player1);
+			boyfriend = new Boyfriend(770, 450, 'bf-pixel');
 		}
 
 
@@ -3841,7 +3841,7 @@ class PlayState extends MusicBeatState
 			#end
 		}
 		blueballs=0;
-		if(accuracy>=.9){
+		if(accuracy>=.9 && !FlxG.save.data.beATwat){
 			FlxG.save.data.beATwat=true;
 			UnlockingItemState.unlocking.push('twatmode');
 		}