Merge remote-tracking branch 'upstream/main'

gitVersion.txt

@@ -1 +1 @@
-0.9.1
+0.9.1

source/online/FunkinPoints.hx

@@ -12,7 +12,7 @@ class FunkinPoints {
 
 		// depends on the amount of hitted notes and the density of the song
 		// density values for songs: 2.9p (unbeatable), 3.6 (ballistic), 4.2 (spookeez erect), 4.6 (sporting) 
-		// so for a song with 3.0 density (ex. spookeez erect), for every ~65 hitted notes a player will gain 1 fp (without combo bonus)
+		// so for a song with 4.0 density (ex. spookeez erect), for every 50 hitted notes a player will gain 1 fp (without combo bonus)
 		var fp:Float = (1 + songDensity) * (notesHit / 200);
 		// depends on player's note streak (x2fp per 2000 combo)
 		fp *= 1 + maxCombo / 2000;

source/online/replay/ReplayRecorder.hx

@@ -199,7 +199,7 @@ class ReplayRecorder extends FlxBasic {
 		data.goods = state.songGoods;
 		data.bads = state.songBads;
 		data.shits = state.songShits;
-		data.points = FunkinPoints.calcFP(state.ratingPercent, state.songMisses, state.songDensity, state.totalNotesHit, state.combo);
+		data.points = FunkinPoints.calcFP(state.ratingPercent, state.songMisses, state.songDensity, state.totalNotesHit, state.maxCombo);
 		data.beat_time = Date.now().getTime();
 		data.note_offset = ClientPrefs.data.noteOffset;
 

sync.hxs

@@ -1,8 +1,16 @@
 // for quick patches, hooking into classes
 // this can be locally tested with sync.hxs in the game directory
 
+import backend.Mods;
+import Main;
+import online.gui.Alert;
+
 function init() { // initializes the game
     print("received sync script from git!");
+
+    if (Main.GIT_COMMIT == "807d1b1d7314e08f13a61f1c88a974617ca9f37e") {
+        Alert.alert('Outdated Version!', 'A hotfix is available!\n(You should update to v0.9.1h!)');
+    }
 }
 
 function switchState(state) { // game state gets switched
@@ -11,4 +19,4 @@ function switchState(state) { // game state gets switched
 
 function openSubState(substate) { // game substate gets opened
     //print(typeof(substate));
-}
+}