Skip to content

Commit

Permalink
alright WHO EDITED THE HMM JSON
Browse files Browse the repository at this point in the history
the versions that i specified are for allowing compilation on both Windows and Android.

anyways:
added npsspeedmult, which multiplies the time threshold
  • Loading branch information
JordanSantiagoYT committed Nov 23, 2023
1 parent e103053 commit 36babb4
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 12 deletions.
34 changes: 27 additions & 7 deletions hmm.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{
"name": "lime",
"type": "haxelib",
"version": null
"version": "8.0.1"
},
{
"name": "openfl",
Expand All @@ -23,24 +23,37 @@
{
"name": "flixel-tools",
"type": "haxelib",
"version": null
"version": "1.5.1"
},
{
"name": "flixel-ui",
"type": "haxelib",
"version": null
"version": "2.5.0"
},
{
"name": "hxcpp",
"type": "haxelib",
"version": "4.2.1"
},
{
"name": "extension-androidtools",
"type": "haxelib",
"version": null
},
{
"name": "tjson",
"type": "haxelib",
"version": "1.4.0"
},
{
"name": "hxjsonast",
"type": "haxelib",
"version": null
},
{
"name": "hxCodec",
"type": "git",
"dir": null,
"ref": "c8c47e706ad82a423783006ed901b6d93c89a421",
"url": "https://github.com/polybiusproxy/hxCodec"
"type": "haxelib",
"version": "2.5.1"
},
{
"name": "hscript",
Expand All @@ -59,6 +72,13 @@
"ref": "master",
"url": "https://github.com/Aidan63/linc_discord-rpc"
},
{
"name": "hscript-ex",
"type": "git",
"dir": null,
"ref": "master",
"url": "https://github.com/ianharrigan/hscript-ex"
},
{
"name": "linc_luajit",
"type": "git",
Expand Down
2 changes: 2 additions & 0 deletions source/FunkinLua.hx
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,8 @@ class FunkinLua {

set('shouldKillNotes', PlayState.instance.shouldKillNotes);

set('npsSpeedMult', PlayState.instance.npsSpeedMult);

// Gameplay settings
set('healthGainMult', PlayState.instance.healthGain);
set('healthLossMult', PlayState.instance.healthLoss);
Expand Down
14 changes: 9 additions & 5 deletions source/PlayState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,6 @@ import vlc.MP4Handler;
#end
#end

import ColorSwap.ColorSwapShader; //for motion blur


using StringTools;

class PlayState extends MusicBeatState
Expand Down Expand Up @@ -157,6 +154,8 @@ class PlayState extends MusicBeatState

public var playbackRate(default, set):Float = 1;

public var npsSpeedMult:Float = 1;

public var boyfriendGroup:FlxSpriteGroup;
public var dadGroup:FlxSpriteGroup;
public var gfGroup:FlxSpriteGroup;
Expand Down Expand Up @@ -247,6 +246,8 @@ class PlayState extends MusicBeatState
public var maxCombo:Float = 0;
public var missCombo:Int = 0;

public var timeThreshold:Float = 0;

public var notesAddedCount:Int = 0;

var endingTimeLimit:Int = 20;
Expand Down Expand Up @@ -4297,7 +4298,8 @@ class PlayState extends MusicBeatState
}
}
sectionsLoaded += 1;
trace('loaded section ' + sectionsLoaded);
notesLoadedRN += section.sectionNotes.length;
trace('loaded section ' + sectionsLoaded + ', notes loaded now: ' + notesLoadedRN);
}
for (event in SONG.events) //Event Notes
{
Expand Down Expand Up @@ -4325,6 +4327,8 @@ class PlayState extends MusicBeatState
unspawnNotesCopy = unspawnNotes.copy();
generatedMusic = true;
maxScore = totalNotes * (ClientPrefs.noMarvJudge ? 350 : 500);
sectionsLoaded = 0;
notesLoadedRN = 0;
var elapsedTime = endTime - startTime;
trace("Loaded chart in " + elapsedTime + " seconds");
}
Expand Down Expand Up @@ -4871,7 +4875,7 @@ class PlayState extends MusicBeatState
}
if (ClientPrefs.showNPS) {
var currentTime = Date.now().getTime();
var timeThreshold = ClientPrefs.npsWithSpeed ? 1000 / playbackRate : 1000;
timeThreshold = (ClientPrefs.npsWithSpeed ? 1000 / playbackRate : 1000) * npsSpeedMult;

// Track the count of items to remove for notesHitDateArray
var notesToRemoveCount:Int = 0;
Expand Down

0 comments on commit 36babb4

Please sign in to comment.