From 49463d5da9b90a289550f4531a1380a3b3552488 Mon Sep 17 00:00:00 2001
From: wcko87 <wcko87@gmail.com>
Date: Sun, 3 Jan 2021 11:17:28 +0900
Subject: [PATCH 1/2] Add option to configure START+SELECT hold duration to
 exit

---
 src/bms/player/beatoraja/PlayerConfig.java         | 14 ++++++++++++++
 .../beatoraja/launcher/PlayConfigurationView.fxml  |  6 ++++++
 .../beatoraja/launcher/PlayConfigurationView.java  |  4 ++++
 .../beatoraja/play/ControlInputProcessor.java      |  6 +++++-
 src/resources/UIResources.properties               |  1 +
 src/resources/UIResources_ja_JP.properties         |  1 +
 6 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/src/bms/player/beatoraja/PlayerConfig.java b/src/bms/player/beatoraja/PlayerConfig.java
index 47d28fd1e..1a2ad3e36 100644
--- a/src/bms/player/beatoraja/PlayerConfig.java
+++ b/src/bms/player/beatoraja/PlayerConfig.java
@@ -143,6 +143,11 @@ public class PlayerConfig {
 	 */
 	private int sevenToNineType = 0;
 
+	/**
+	 * START+SELECTを押すと終了するまでの期間
+	 */
+	private int exitPressDuration = 1000;
+
 	/**
 	 * Guide SE
 	 */
@@ -584,6 +589,14 @@ public void setSevenToNineType(int sevenToNineType) {
 		this.sevenToNineType = sevenToNineType;
 	}
 
+	public int getExitPressDuration() {
+		return exitPressDuration;
+	}
+
+	public void setExitPressDuration(int exitPressDuration) {
+		this.exitPressDuration = exitPressDuration;
+	}
+
 	public boolean isGuideSE() {
 		return isGuideSE;
 	}
@@ -714,6 +727,7 @@ public void validate() {
 		hranThresholdBPM = MathUtils.clamp(hranThresholdBPM, 1, 1000);
 		sevenToNinePattern = MathUtils.clamp(sevenToNinePattern, 0, 6);
 		sevenToNineType = MathUtils.clamp(sevenToNineType, 0, 2);
+		exitPressDuration = MathUtils.clamp(exitPressDuration, 0, 100000);
 
 		scrollMode = MathUtils.clamp(scrollMode, 0, ScrollSpeedModifier.Mode.values().length);
 		longnoteMode = MathUtils.clamp(longnoteMode, 0, LongNoteModifier.Mode.values().length);
diff --git a/src/bms/player/beatoraja/launcher/PlayConfigurationView.fxml b/src/bms/player/beatoraja/launcher/PlayConfigurationView.fxml
index 833566c92..c8662118b 100644
--- a/src/bms/player/beatoraja/launcher/PlayConfigurationView.fxml
+++ b/src/bms/player/beatoraja/launcher/PlayConfigurationView.fxml
@@ -296,6 +296,12 @@
                                          <ComboBox fx:id="seventoninepattern" GridPane.columnIndex="1" GridPane.rowIndex="4" />
                                          <Label text="%SEVEN_TO_NINE_TYPE" GridPane.columnIndex="2" GridPane.rowIndex="4" />
                                          <ComboBox fx:id="seventoninetype" GridPane.columnIndex="3" GridPane.rowIndex="4" />
+                                         <Label text="%EXIT_PRESS_DURATION" GridPane.columnIndex="0" GridPane.rowIndex="5" />
+                                         <NumericSpinner fx:id="exitpressduration" editable="true" GridPane.columnIndex="1" GridPane.rowIndex="5">
+                                             <valueFactory>
+                                                 <SpinnerValueFactory.IntegerSpinnerValueFactory amountToStepBy="1" initialValue="1000" max="2000" min="0" />
+                                             </valueFactory>
+                                         </NumericSpinner>
                                      </GridPane>
                                  </VBox>
                            </content>
diff --git a/src/bms/player/beatoraja/launcher/PlayConfigurationView.java b/src/bms/player/beatoraja/launcher/PlayConfigurationView.java
index ef4c892d2..09bb1569a 100644
--- a/src/bms/player/beatoraja/launcher/PlayConfigurationView.java
+++ b/src/bms/player/beatoraja/launcher/PlayConfigurationView.java
@@ -170,6 +170,8 @@ public class PlayConfigurationView implements Initializable {
 	@FXML
 	private ComboBox<Integer> seventoninetype;
 	@FXML
+	private Spinner<Integer> exitpressduration;
+	@FXML
 	private CheckBox guidese;
 	@FXML
 	private CheckBox windowhold;
@@ -418,6 +420,7 @@ public void updatePlayer() {
 		doubleop.getSelectionModel().select(player.getDoubleoption());
 		seventoninepattern.getSelectionModel().select(player.getSevenToNinePattern());
 		seventoninetype.getSelectionModel().select(player.getSevenToNineType());
+		exitpressduration.getValueFactory().setValue(player.getExitPressDuration());
 		guidese.setSelected(player.isGuideSE());
 		windowhold.setSelected(player.isWindowHold());
 		gaugeop.getSelectionModel().select(player.getGauge());
@@ -514,6 +517,7 @@ public void commitPlayer() {
 		player.setDoubleoption(doubleop.getValue());
 		player.setSevenToNinePattern(seventoninepattern.getValue());
 		player.setSevenToNineType(seventoninetype.getValue());
+		player.setExitPressDuration(getValue(exitpressduration));
 		player.setGuideSE(guidese.isSelected());
 		player.setWindowHold(windowhold.isSelected());
 		player.setGauge(gaugeop.getValue());
diff --git a/src/bms/player/beatoraja/play/ControlInputProcessor.java b/src/bms/player/beatoraja/play/ControlInputProcessor.java
index 4f3c2b850..eb369d17f 100644
--- a/src/bms/player/beatoraja/play/ControlInputProcessor.java
+++ b/src/bms/player/beatoraja/play/ControlInputProcessor.java
@@ -23,6 +23,8 @@ public class ControlInputProcessor {
 	private long laneCoverStartTiming = Long.MIN_VALUE;
 	private long exitpressedtime;
 
+	private final long exitPressDuration;
+
 	private boolean enableControl = true;
 	private boolean enableCursor = true;
 
@@ -48,6 +50,8 @@ public ControlInputProcessor(BMSPlayer player, PlayMode autoplay) {
 		coverChangeMarginHigh = playConfig.getLanecovermarginhigh();
 		coverSpeedSwitchDuration = playConfig.getLanecoverswitchduration();
 
+		exitPressDuration = player.main.getPlayerConfig().getExitPressDuration();
+
 		switch (this.player.getMode()) {
 		case POPN_9K:
 			processStart = () -> processStart9key();
@@ -143,7 +147,7 @@ public void input() {
 			}
 		}
 		long now = System.currentTimeMillis();
-		if((input.startPressed() && input.isSelectPressed() && now - exitpressedtime > 1000 )||
+		if((input.startPressed() && input.isSelectPressed() && now - exitpressedtime > exitPressDuration )||
 				(player.isNoteEnd() && (input.startPressed() || input.isSelectPressed()))){
 			input.startChanged(false);
 			input.setSelectPressed(false);
diff --git a/src/resources/UIResources.properties b/src/resources/UIResources.properties
index ff9904c91..bc56abfe0 100644
--- a/src/resources/UIResources.properties
+++ b/src/resources/UIResources.properties
@@ -51,6 +51,7 @@ SEVEN_TO_NINE_TYPE=SC Type
 SEVEN_TO_NINE_OFF=1 Lane
 SEVEN_TO_NINE_NO_MASHING=No Mashing (Assist Option)
 SEVEN_TO_NINE_ALTERNATION=Alternation (Assist Option)
+EXIT_PRESS_DURATION=START+SELECT Exit Delay
 GUIDE_SE=GUIDE SE
 WINDOW_HOLD=WINDOW HOLD
 RANDOM_SELECT=RANDOM SELECT
diff --git a/src/resources/UIResources_ja_JP.properties b/src/resources/UIResources_ja_JP.properties
index ab17d723e..7eb37b071 100644
--- a/src/resources/UIResources_ja_JP.properties
+++ b/src/resources/UIResources_ja_JP.properties
@@ -49,6 +49,7 @@ SEVEN_TO_NINE_TYPE=SC\u30bf\u30a4\u30d7
 SEVEN_TO_NINE_OFF=1\u30ec\u30fc\u30f3
 SEVEN_TO_NINE_NO_MASHING=\u9023\u6253\u6642\u4ea4\u4e92(\u30a2\u30b7\u30b9\u30c8\u30aa\u30d7\u30b7\u30e7\u30f3)
 SEVEN_TO_NINE_ALTERNATION=\u5e38\u6642\u4ea4\u4e92(\u30a2\u30b7\u30b9\u30c8\u30aa\u30d7\u30b7\u30e7\u30f3)
+EXIT_PRESS_DURATION=START+SELECT\u7d42\u4e86\u307e\u3067\u671f\u9593
 GUIDE_SE=GUIDE SE
 WINDOW_HOLD=WINDOW HOLD
 RANDOM_SELECT=RANDOM SELECT

From b4bbfa2b874ac768e79674f789b4e91b2d19de67 Mon Sep 17 00:00:00 2001
From: wcko87 <wcko87@gmail.com>
Date: Fri, 8 Jan 2021 04:35:25 +0900
Subject: [PATCH 2/2] Fix typo in exit press duration option

---
 src/bms/player/beatoraja/PlayerConfig.java | 2 +-
 src/resources/UIResources_ja_JP.properties | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bms/player/beatoraja/PlayerConfig.java b/src/bms/player/beatoraja/PlayerConfig.java
index 1a2ad3e36..cfc7a8db5 100644
--- a/src/bms/player/beatoraja/PlayerConfig.java
+++ b/src/bms/player/beatoraja/PlayerConfig.java
@@ -144,7 +144,7 @@ public class PlayerConfig {
 	private int sevenToNineType = 0;
 
 	/**
-	 * START+SELECTを押すと終了するまでの期間
+	 * START+SELECTを押すと終了するまでの時間
 	 */
 	private int exitPressDuration = 1000;
 
diff --git a/src/resources/UIResources_ja_JP.properties b/src/resources/UIResources_ja_JP.properties
index 7eb37b071..3e4ab6676 100644
--- a/src/resources/UIResources_ja_JP.properties
+++ b/src/resources/UIResources_ja_JP.properties
@@ -49,7 +49,7 @@ SEVEN_TO_NINE_TYPE=SC\u30bf\u30a4\u30d7
 SEVEN_TO_NINE_OFF=1\u30ec\u30fc\u30f3
 SEVEN_TO_NINE_NO_MASHING=\u9023\u6253\u6642\u4ea4\u4e92(\u30a2\u30b7\u30b9\u30c8\u30aa\u30d7\u30b7\u30e7\u30f3)
 SEVEN_TO_NINE_ALTERNATION=\u5e38\u6642\u4ea4\u4e92(\u30a2\u30b7\u30b9\u30c8\u30aa\u30d7\u30b7\u30e7\u30f3)
-EXIT_PRESS_DURATION=START+SELECT\u7d42\u4e86\u307e\u3067\u671f\u9593
+EXIT_PRESS_DURATION=START+SELECT\u7d42\u4e86\u307e\u3067\u6642\u9593
 GUIDE_SE=GUIDE SE
 WINDOW_HOLD=WINDOW HOLD
 RANDOM_SELECT=RANDOM SELECT