Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Decimal Hit Windows #15155

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions source/backend/ClientPrefs.hx
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@ import states.TitleState;

public var comboOffset:Array<Int> = [0, 0, 0, 0];
public var ratingOffset:Int = 0;
public var sickWindow:Int = 45;
public var goodWindow:Int = 90;
public var badWindow:Int = 135;
public var safeFrames:Float = 10;
public var sickWindow:Float = 45.0;
public var goodWindow:Float = 90.0;
public var badWindow:Float = 135.0;
public var safeFrames:Float = 10.0;
public var guitarHeroSustains:Bool = true;
public var discordRPC:Bool = true;
public var loadingScreen:Bool = true;
Expand Down
2 changes: 1 addition & 1 deletion source/backend/Rating.hx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class Rating
{
public var name:String = '';
public var image:String = '';
public var hitWindow:Null<Int> = 0; //ms
public var hitWindow:Null<Float> = 0.0; //ms
public var ratingMod:Float = 1;
public var score:Int = 350;
public var noteSplash:Bool = true;
Expand Down
35 changes: 19 additions & 16 deletions source/options/GameplaySettingsSubState.hx
crowplexus marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,12 @@ class GameplaySettingsSubState extends BaseOptionsMenu
BOOL);
addOption(option);

var option:Option = new Option('Sustains as One Note',
"If checked, Hold Notes can't be pressed if you miss,\nand count as a single Hit/Miss.\nUncheck this if you prefer the old Input System.",
'guitarHeroSustains',
BOOL);
addOption(option);

var option:Option = new Option('Hitsound Volume',
'Funny notes does \"Tick!\" when you hit them.',
'hitsoundVolume',
Expand All @@ -70,31 +76,34 @@ class GameplaySettingsSubState extends BaseOptionsMenu
var option:Option = new Option('Sick! Hit Window',
'Changes the amount of time you have\nfor hitting a "Sick!" in milliseconds.',
'sickWindow',
INT);
FLOAT);
option.displayFormat = '%vms';
option.scrollSpeed = 15;
option.minValue = 15;
option.maxValue = 45;
option.minValue = 15.0;
option.maxValue = 45.0;
option.changeValue = 0.1;
addOption(option);

var option:Option = new Option('Good Hit Window',
'Changes the amount of time you have\nfor hitting a "Good" in milliseconds.',
'goodWindow',
INT);
FLOAT);
option.displayFormat = '%vms';
option.scrollSpeed = 30;
option.minValue = 15;
option.maxValue = 90;
option.minValue = 15.0;
option.maxValue = 90.0;
option.changeValue = 0.1;
addOption(option);

var option:Option = new Option('Bad Hit Window',
'Changes the amount of time you have\nfor hitting a "Bad" in milliseconds.',
'badWindow',
INT);
FLOAT);
option.displayFormat = '%vms';
option.scrollSpeed = 60;
option.minValue = 15;
option.maxValue = 135;
option.minValue = 15.0;
option.maxValue = 135.0;
option.changeValue = 0.1;
addOption(option);

var option:Option = new Option('Safe Frames',
Expand All @@ -107,12 +116,6 @@ class GameplaySettingsSubState extends BaseOptionsMenu
option.changeValue = 0.1;
addOption(option);

var option:Option = new Option('Sustains as One Note',
"If checked, Hold Notes can't be pressed if you miss,\nand count as a single Hit/Miss.\nUncheck this if you prefer the old Input System.",
'guitarHeroSustains',
BOOL);
addOption(option);

super();
}

Expand All @@ -121,4 +124,4 @@ class GameplaySettingsSubState extends BaseOptionsMenu

function onChangeAutoPause()
FlxG.autoPause = ClientPrefs.data.autoPause;
}
}
Loading