From 01dc8ab0ee2a7c630e5e4525d7c3b7b92768df1c Mon Sep 17 00:00:00 2001 From: Snirozu <72814880+Snirozu@users.noreply.github.com> Date: Mon, 18 Nov 2024 22:15:38 +0100 Subject: [PATCH 1/7] oopss --- source/online/replay/ReplayRecorder.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/online/replay/ReplayRecorder.hx b/source/online/replay/ReplayRecorder.hx index ec2920dc..6a84c9eb 100644 --- a/source/online/replay/ReplayRecorder.hx +++ b/source/online/replay/ReplayRecorder.hx @@ -147,7 +147,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; From 8469da3a231649c48e447fa965ef665fecf136e3 Mon Sep 17 00:00:00 2001 From: Snirozu <72814880+Snirozu@users.noreply.github.com> Date: Mon, 18 Nov 2024 22:26:10 +0100 Subject: [PATCH 2/7] penis commit --- source/online/FunkinPoints.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/online/FunkinPoints.hx b/source/online/FunkinPoints.hx index 4d7f2788..ae607fe2 100644 --- a/source/online/FunkinPoints.hx +++ b/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; From 79d0eacaafa6bf85cf586d9f2b8abd1ebfe0f3ce Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 18 Nov 2024 22:10:35 +0000 Subject: [PATCH 3/7] Bump to 0.9.2 --- gitVersion.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitVersion.txt b/gitVersion.txt index f514a2f0..f76f9131 100644 --- a/gitVersion.txt +++ b/gitVersion.txt @@ -1 +1 @@ -0.9.1 \ No newline at end of file +0.9.2 \ No newline at end of file From ca9c2932b49a7f619109b912c35edaa7469f5aa0 Mon Sep 17 00:00:00 2001 From: Snirozu <72814880+Snirozu@users.noreply.github.com> Date: Mon, 18 Nov 2024 23:14:11 +0100 Subject: [PATCH 4/7] jpiofgsdkojnfsdjoiksdfjnikoldfsioj --- gitVersion.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitVersion.txt b/gitVersion.txt index f76f9131..f374f666 100644 --- a/gitVersion.txt +++ b/gitVersion.txt @@ -1 +1 @@ -0.9.2 \ No newline at end of file +0.9.1 From 4d51b4e47a29e39683bb15bf0fae92d861bef616 Mon Sep 17 00:00:00 2001 From: Snirozu <72814880+Snirozu@users.noreply.github.com> Date: Mon, 18 Nov 2024 23:22:43 +0100 Subject: [PATCH 5/7] asassaddasda --- sync.hxs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sync.hxs b/sync.hxs index 4f13bcf2..a54a56df 100644 --- a/sync.hxs +++ b/sync.hxs @@ -2,9 +2,15 @@ // 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.1/2!)') + } } function switchState(state) { // game state gets switched From 84b1e6961d8888ed9c3df8135af8c3d9726a0b99 Mon Sep 17 00:00:00 2001 From: Snirozu <72814880+Snirozu@users.noreply.github.com> Date: Mon, 18 Nov 2024 23:29:17 +0100 Subject: [PATCH 6/7] o --- sync.hxs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sync.hxs b/sync.hxs index a54a56df..0d328f2b 100644 --- a/sync.hxs +++ b/sync.hxs @@ -9,7 +9,7 @@ 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.1/2!)') + Alert.alert('Outdated Version!', 'A hotfix is available!\n(You should update to v0.9.1/2!)'); } } From 49e19415192dd0a80a31f6b6117ce55545e2c48e Mon Sep 17 00:00:00 2001 From: Snirozu <72814880+Snirozu@users.noreply.github.com> Date: Mon, 18 Nov 2024 23:31:54 +0100 Subject: [PATCH 7/7] Update sync.hxs --- sync.hxs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sync.hxs b/sync.hxs index 0d328f2b..84355837 100644 --- a/sync.hxs +++ b/sync.hxs @@ -9,7 +9,7 @@ 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.1/2!)'); + Alert.alert('Outdated Version!', 'A hotfix is available!\n(You should update to v0.9.1h!)'); } } @@ -19,4 +19,4 @@ function switchState(state) { // game state gets switched function openSubState(substate) { // game substate gets opened //print(typeof(substate)); -} \ No newline at end of file +}