Merge pull request #17 from silver984/changes

new stuff

Author: CrusherNotDrip

docs/BUILDING.md

@@ -1,7 +1,21 @@
 # Building TechNotDrip Engine
+
+## Windows:
+1. Install [Haxe](https://haxe.org/download/)
+2. Create a folder with ***no spaces*** somewhere in your computer, dedicated for haxe libraries
+3. Run `haxelib setup` and set the path to the folder you just made
+4. Run the following:
+```
+haxelib install hxpkg
+haxelib run hxpkg install --update
+```
+5. Compile the game with `haxelib run lime build windows`
+5. Test the game with `haxelib run lime test windows`
+6. Compiled game will be found in `TechNotDrip-Engine\export\release\windows\bin`
+
 ## Android:
-1. Install Android Studio from [developer.android.com](https://developer.android.com/studio)
-2. Install Java 17 from [oracle.com](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html)
+1. Install [Android Studio](https://developer.android.com/studio)
+2. Install [Java 17](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html)
 	- NOTE: Write down the install location, we will need it later.
 3. Open Android Studio.
 4. Click on Projects.

src/Main.hx

@@ -20,29 +20,31 @@ class Main extends Sprite
 	 */
 	public static var performanceStats:PerformanceStats;
 
-	final flxGameData:FlxGameInit = {
-		width: 1280,
-		height: 720,
-		initState: TitleState.new,
-		framerate: 60,
-		showSplash: false,
-		startFullscreen: false
-	};
-
 	public function new()
 	{
 		super();
 
-		initGame();
-	}
+		final gameData:GameData = {
+			screenWidth: 1280,
+			screenHeight: 720,
+			initState: TitleState.new,
+			framerate: 60,
+			isSkipSplash: true,
+			isStartFullscreen: false
+		};
 
-	function initGame():Void
-	{
-		var flxGame:FlxGame = new FlxGame(flxGameData.width, flxGameData.height, flxGameData.initState, flxGameData.framerate, flxGameData.framerate,
-			!flxGameData.showSplash, flxGameData.startFullscreen);
+		var flxGame:FlxGame = new FlxGame(
+			gameData.screenWidth,
+			gameData.screenHeight,
+			gameData.initState,
+			gameData.framerate,
+			gameData.framerate,
+			gameData.isSkipSplash,
+			gameData.isStartFullscreen
+		);
 		addChild(flxGame);
 
-		performanceStats = new PerformanceStats(5, 5);
+		performanceStats = new PerformanceStats();
 		addChild(performanceStats);
 
 		Assets.cache.enabled = false;
@@ -66,12 +68,12 @@ class Main extends Sprite
 	}
 }
 
-typedef FlxGameInit =
+typedef GameData =
 {
-	var width:Int;
-	var height:Int;
+	var screenWidth:Int;
+	var screenHeight:Int;
 	var initState:InitialState;
 	var framerate:Int;
-	var showSplash:Bool;
-	var startFullscreen:Bool;
+	var isSkipSplash:Bool;
+	var isStartFullscreen:Bool;
 }

src/funkin/data/StrumlineData.hx

@@ -3,6 +3,7 @@ package funkin.data;
 import flixel.util.FlxSort;
 import funkin.objects.gameplay.strumline.NoteSprite;
 import funkin.objects.gameplay.strumline.Strumline;
+import funkin.states.gameplay.PlayState;
 import funkin.util.FunkinControls;
 import funkin.util.InputUtil;
 import haxe.Json;
@@ -149,9 +150,20 @@ class StrumlineData
 				var rating:String = InputUtil.judgeNote(noteDiff);
 				var score:Int = InputUtil.scoreNote(noteDiff);
 
+				PlayState.totalScore += score;
+				PlayState.totalHittableNotes++;
+
 				strumline.noteHit(noteHit, rating == 'sick');
 				trace(rating);
 				trace(score);
+
+				if (PlayState.scoreTxt.scale.x < 1.2)
+				{
+					var quotient = score / InputUtil.MAX_SCORE;
+					var scaleIncrement = 0.025 * quotient;
+					PlayState.scoreTxt.scale.x += scaleIncrement;
+					PlayState.scoreTxt.scale.y += scaleIncrement;
+				}
 			}
 			else
 				strumline.getStrumNoteForDirection(input.direction).playAnimation('press', true);