Revert "Merge branch 'master' into master" CUZ IM AN IDIOT

This reverts commit 005ed34, reversing
changes made to 3f72476.

Author: Octol1ttle

README.md

@@ -79,4 +79,4 @@ ProjectFNF is a engine for Friday Night Funkin' designed to be flexible. It cont
 
 
 # Usage
-We do not ask for much, all we ask is you link the github and if the mod is on gamebanana make sure to credit aflacc and Zeptos for making the engine. Also please do not remove the ProjectFNF version on the bottom of the screen in the main menu, this gives the engine its credit and also makes it easier to receive help with the mod. I will *not* be able to help you if you do not have the version of ProjectFNF in the game. also make sure to add the tag "projectfnf" to the github page.
+We do not ask for much, all we ask is you link the github and if the mod is on gamebanana make sure to credit aflack and Zeptos for making the engine. Also please do not remove the ProjectFNF version on the bottom of the screen in the main menu, this gives the engine its credit and also makes it easier to receive help with the mod. I will *not* be able to help you if you do not have the version of ProjectFNF in the game. also make sure to add the tag "projectfnf" to the github page.

source/PlayState.hx

@@ -74,9 +74,9 @@ class PlayState extends MusicBeatState
 	private var curSong:String = "";
 
 	private var gfSpeed:Int = 1;
-  
+
 	var health:Float; // modders: go to line 208 to set starting health (dont set to static)
-	var maxHealth:Float = 3; // 100%
+	var maxHealth:Float = 2; // 100%
 	var healthPercentage:Float;
 
 	private var combo:Int = 0;
@@ -205,7 +205,7 @@ class PlayState extends MusicBeatState
 		if (FlxG.save.data.customscrollspeed > 0) {
 			usingCustomScrollSpeed = true;
 		}
-		health = FlxG.save.data.nohealthgain == 0 ? 2 : FlxG.save.data.nohealthgain * 0.02;
+		health = FlxG.save.data.nohealthgain == 0 ? 1 : FlxG.save.data.nohealthgain * 0.02;
 		var stageCurtains:FlxSprite;
 		var stageFront:FlxSprite;
 		var bg:FlxSprite;
@@ -2187,16 +2187,16 @@ class PlayState extends MusicBeatState
 							sustain2(spr.ID, spr, daNote);
 						}
 					});
-					if (health > 2) {
-						health -= 0.0275;
-					} else if (health > 1.6) {
-						health -= 0.025;
-					} else if (health < 0.4) {
-						health -= 0.02;
-					} else {
-						health -= 0.0225;
+					if (ModCharts.dadNotesDoDamage) {
+						if (!(health - ModCharts.damageFromDadNotes < 0.001)) {
+							health -= ModCharts.damageFromDadNotes;
+							updateInfo();
+						} else {
+							if (ModCharts.dadNotesCanKill) {
+								health -= ModCharts.damageFromDadNotes;
+							}
+						}
 					}
-					updateInfo();
 
 					dad.holdTimer = 0;
 
@@ -2892,15 +2892,13 @@ class PlayState extends MusicBeatState
 			trace("BALLS");
 		//	trace(boyfriend.stunned);
 			try {
-				if (note.nType == 1) { 
-					health += 0.023;
-					return;
-				}
+				if (note.nType == 1) { return; }
 			} catch (e) {
 				trace("idk smtn");
 			}
+			trace(FlxG.save.data.ghosttapping);
 			trace(boyfriend.stunned);
-			if (true) {
+			if (!FlxG.save.data.ghosttapping) {
 			if (!boyfriend.stunned)
 			{
 				trace('balls');
@@ -3050,7 +3048,7 @@ class PlayState extends MusicBeatState
 
 		// SEXY FAILSAFE (THANKS VM U A REAL ONE)
 		if (note == 'none') {
-			if (false) {
+			if (FlxG.save.data.ghosttapping) {
 			if (FlxG.save.data.enablemissanimations) { // indenting worked out in the end *holds hands with family*
 				if (leftP) {
 					boyfriend.playAnim('singLEFTmiss', true);
@@ -3166,14 +3164,14 @@ class PlayState extends MusicBeatState
 				if (note.noteData >= 0)
 				{
 					if (FlxG.save.data.nohealthgain == 0)
-						health += FlxG.save.data.hardmode ? 0.007 : 0.029;
+						health += FlxG.save.data.hardmode ? 0.007 : 0.023;
 					if (combo == 10 || combo == 50 || combo == 100 || combo == 200 || combo == 300)
 						gf.playAnim('cheer', true);
 				}
 				else
 				{
 					if (FlxG.save.data.nohealthgain == 0)
-						health += 0.009;
+						health += 0.004;
 					if (combo == 10 || combo == 50 || combo == 100 || combo == 200 || combo == 300)
 						gf.playAnim('cheer', true);
 				}