Add keybinds for some System controls (#566)

FDK/src/02.Input/IInputDevice.cs

@@ -30,8 +30,12 @@ namespace FDK
 
 		void Polling( bool bバッファ入力を使用する );
 		bool KeyPressed( int nKey );
+		bool KeyPressed( List<int> nKey ) { return nKey.Any(key => KeyPressed(key)); }
 		bool KeyPressing( int nKey );
+		bool KeyPressing( List<int> nKey ) { return nKey.Any(key => KeyPressing(key)); }
 		bool KeyReleased( int nKey );
+		bool KeyReleased( List<int> nKey ) { return nKey.Any(key => KeyReleased(key)); }
 		bool KeyReleasing( int nKey );
+		bool KeyReleasing( List<int> nKey ) { return nKey.Any(key => KeyReleasing(key)); }
 	}
 }

OpenTaiko/src/Common/CConfigIni.cs

@@ -234,17 +234,6 @@ namespace TJAPlayer3
 						this.padLBD = value;
 					}
 				}
-				public CConfigIni.CKeyAssign.STKEYASSIGN[] Capture
-				{
-					get
-					{
-						return this.padCapture;
-					}
-					set
-					{
-						this.padCapture = value;
-					}
-				}
 				public CConfigIni.CKeyAssign.STKEYASSIGN[] LeftRed
 				{
 					get
@@ -552,6 +541,127 @@ namespace TJAPlayer3
 						this.padRightChange = value;
 					}
 				}
+				public CConfigIni.CKeyAssign.STKEYASSIGN[] Capture
+				{
+					get
+					{
+						return this.padCapture;
+					}
+					set
+					{
+						this.padCapture = value;
+					}
+				}
+				public CConfigIni.CKeyAssign.STKEYASSIGN[] SongVolIncrease
+				{
+					get
+					{
+						return this.padSongVolIncrease;
+					}
+					set
+					{
+						this.padSongVolIncrease = value;
+					}
+				}
+				public CConfigIni.CKeyAssign.STKEYASSIGN[] SongVolDecrease
+				{
+					get
+					{
+						return this.padSongVolDecrease;
+					}
+					set
+					{
+						this.padSongVolDecrease = value;
+					}
+				}
+				public CConfigIni.CKeyAssign.STKEYASSIGN[] DisplayHits
+				{
+					get
+					{
+						return this.padDisplayHits;
+					}
+					set
+					{
+						this.padDisplayHits = value;
+					}
+				}
+				public CConfigIni.CKeyAssign.STKEYASSIGN[] DisplayDebug
+				{
+					get
+					{
+						return this.padDisplayDebug;
+					}
+					set
+					{
+						this.padDisplayDebug = value;
+					}
+				}
+				public CConfigIni.CKeyAssign.STKEYASSIGN[] QuickConfig
+				{
+					get
+					{
+						return this.padQuickConfig;
+					}
+					set
+					{
+						this.padQuickConfig = value;
+					}
+				}
+				public CConfigIni.CKeyAssign.STKEYASSIGN[] NewHeya
+				{
+					get
+					{
+						return this.padNewHeya;
+					}
+					set
+					{
+						this.padNewHeya = value;
+					}
+				}
+				public CConfigIni.CKeyAssign.STKEYASSIGN[] SortSongs
+				{
+					get
+					{
+						return this.padSortSongs;
+					}
+					set
+					{
+						this.padSortSongs = value;
+					}
+				}
+				public CConfigIni.CKeyAssign.STKEYASSIGN[] ToggleAutoP1
+				{
+					get
+					{
+						return this.padToggleAutoP1;
+					}
+					set
+					{
+						this.padToggleAutoP1 = value;
+					}
+				}
+				public CConfigIni.CKeyAssign.STKEYASSIGN[] ToggleAutoP2
+				{
+					get
+					{
+						return this.padToggleAutoP2;
+					}
+					set
+					{
+						this.padToggleAutoP2 = value;
+					}
+				}
+				public CConfigIni.CKeyAssign.STKEYASSIGN[] ToggleTrainingMode
+				{
+					get
+					{
+						return this.padToggleTrainingMode;
+					}
+					set
+					{
+						this.padToggleTrainingMode = value;
+					}
+				}
 
 				public CConfigIni.CKeyAssign.STKEYASSIGN[] this[int index]
 				{
@@ -678,6 +788,36 @@ namespace TJAPlayer3
 
 							case (int)EKeyConfigPad.Capture:
 								return this.padCapture;
+
+							case (int)EKeyConfigPad.SongVolumeIncrease:
+								return this.padSongVolIncrease;
+
+							case (int)EKeyConfigPad.SongVolumeDecrease:
+								return this.padSongVolDecrease;
+
+							case (int)EKeyConfigPad.DisplayHits:
+								return this.padDisplayHits;
+
+							case (int)EKeyConfigPad.DisplayDebug:
+								return this.padDisplayDebug;
+
+							case (int)EKeyConfigPad.QuickConfig:
+								return this.padQuickConfig;
+
+							case (int)EKeyConfigPad.NewHeya:
+								return this.padNewHeya;
+
+							case (int)EKeyConfigPad.SortSongs:
+								return this.padSortSongs;
+
+							case (int)EKeyConfigPad.ToggleAutoP1:
+								return this.padToggleAutoP1;
+
+							case (int)EKeyConfigPad.ToggleAutoP2:
+								return this.padToggleAutoP2;
+
+							case (int)EKeyConfigPad.ToggleTrainingMode:
+								return this.padToggleTrainingMode;
 						}
 						throw new IndexOutOfRangeException();
 					}
@@ -844,6 +984,46 @@ namespace TJAPlayer3
 							case (int)EKeyConfigPad.Capture:
 								this.padCapture = value;
 								return;
+
+							case (int)EKeyConfigPad.SongVolumeIncrease:
+								this.padSongVolIncrease = value;
+								return;
+
+							case (int)EKeyConfigPad.SongVolumeDecrease:
+								this.padSongVolDecrease = value;
+								return;
+
+							case (int)EKeyConfigPad.DisplayHits:
+								this.padDisplayHits = value;
+								return;
+
+							case (int)EKeyConfigPad.DisplayDebug:
+								this.padDisplayDebug = value;
+								return;
+
+							case (int)EKeyConfigPad.QuickConfig:
+								this.padQuickConfig = value;
+								return;
+
+							case (int)EKeyConfigPad.NewHeya:
+								this.padNewHeya = value;
+								return;
+
+							case (int)EKeyConfigPad.SortSongs:
+								this.padSortSongs = value;
+								return;
+
+							case (int)EKeyConfigPad.ToggleAutoP1:
+								this.padToggleAutoP1 = value;
+								return;
+
+							case (int)EKeyConfigPad.ToggleAutoP2:
+								this.padToggleAutoP2 = value;
+								return;
+
+							case (int)EKeyConfigPad.ToggleTrainingMode:
+								this.padToggleTrainingMode = value;
+								return;
 						}
 						throw new IndexOutOfRangeException();
 					}
@@ -898,10 +1078,25 @@ namespace TJAPlayer3
 				private CConfigIni.CKeyAssign.STKEYASSIGN[] padRightChange;
 
 				private CConfigIni.CKeyAssign.STKEYASSIGN[] padCapture;
+				private CConfigIni.CKeyAssign.STKEYASSIGN[] padSongVolIncrease;
+				private CConfigIni.CKeyAssign.STKEYASSIGN[] padSongVolDecrease;
+				private CConfigIni.CKeyAssign.STKEYASSIGN[] padDisplayHits;
+				private CConfigIni.CKeyAssign.STKEYASSIGN[] padDisplayDebug;
+				private CConfigIni.CKeyAssign.STKEYASSIGN[] padQuickConfig;
+				private CConfigIni.CKeyAssign.STKEYASSIGN[] padNewHeya;
+				private CConfigIni.CKeyAssign.STKEYASSIGN[] padSortSongs;
+				private CConfigIni.CKeyAssign.STKEYASSIGN[] padToggleAutoP1;
+				private CConfigIni.CKeyAssign.STKEYASSIGN[] padToggleAutoP2;
+				private CConfigIni.CKeyAssign.STKEYASSIGN[] padToggleTrainingMode;
 				//-----------------
 				#endregion
 			}
 
+			public bool KeyIsPressed(STKEYASSIGN[] pad)
+			{
+				return TJAPlayer3.Input管理.Keyboard.KeyPressed(pad.ToList().ConvertAll<int>(key => key.コード));
+			}
+
 			[StructLayout(LayoutKind.Sequential)]
 			public struct STKEYASSIGN
 			{
@@ -1285,7 +1480,7 @@ namespace TJAPlayer3
 			{
 				for( int i = 0; i <= (int)EKeyConfigPart.SYSTEM; i++ )
 				{
-					for( int j = 0; j <= (int)EKeyConfigPad.Capture; j++ )
+					for( int j = 0; j < (int)EKeyConfigPad.MAX; j++ )
 					{
 						for( int k = 0; k < 0x10; k++ )
 						{
@@ -1990,7 +2185,7 @@ namespace TJAPlayer3
 			var isMenu = pad == EKeyConfigPad.Decide || pad == EKeyConfigPad.RightChange || pad == EKeyConfigPad.LeftChange;
 			for( int i = 0; i <= (int)EKeyConfigPart.SYSTEM; i++ )
 			{
-				for( int j = 0; j <= (int)EKeyConfigPad.Capture; j++ )
+				for( int j = 0; j < (int)EKeyConfigPad.Capture; j++ ) // Do not restrict duplicate keybinds for System controls
 				{
 					if (isMenu ? 
 						(j != (int)EKeyConfigPad.LeftChange && j != (int)EKeyConfigPad.RightChange &&
@@ -2747,6 +2942,36 @@ namespace TJAPlayer3
 			sw.Write( "Capture=" );
 			this.tキーの書き出し( sw, this.KeyAssign.System.Capture );
 			sw.WriteLine();
+			sw.Write( "SongVolumeIncrease=" );
+			this.tキーの書き出し( sw, this.KeyAssign.System.SongVolIncrease );
+			sw.WriteLine();
+			sw.Write( "SongVolumeDecrease=" );
+			this.tキーの書き出し( sw, this.KeyAssign.System.SongVolDecrease );
+			sw.WriteLine();
+			sw.Write( "DisplayHits=" );
+			this.tキーの書き出し( sw, this.KeyAssign.System.DisplayHits );
+			sw.WriteLine();
+			sw.Write( "DisplayDebug=" );
+			this.tキーの書き出し( sw, this.KeyAssign.System.DisplayDebug );
+			sw.WriteLine();
+			sw.Write( "QuickConfig=" );
+			this.tキーの書き出し( sw, this.KeyAssign.System.QuickConfig );
+			sw.WriteLine();
+			sw.Write( "NewHeya=" );
+			this.tキーの書き出し( sw, this.KeyAssign.System.NewHeya );
+			sw.WriteLine();
+			sw.Write( "SortSongs=" );
+			this.tキーの書き出し( sw, this.KeyAssign.System.SortSongs );
+			sw.WriteLine();
+			sw.Write( "ToggleAutoP1=" );
+			this.tキーの書き出し( sw, this.KeyAssign.System.ToggleAutoP1 );
+			sw.WriteLine();
+			sw.Write( "ToggleAutoP2=" );
+			this.tキーの書き出し( sw, this.KeyAssign.System.ToggleAutoP2 );
+			sw.WriteLine();
+			sw.Write( "ToggleTrainingMode=" );
+			this.tキーの書き出し( sw, this.KeyAssign.System.ToggleTrainingMode );
+			sw.WriteLine();
 			sw.WriteLine();
 			#endregion
 
@@ -3974,11 +4199,53 @@ namespace TJAPlayer3
 									#region [ [SystemKeyAssign] ]
 									//-----------------------------
 									case Eセクション種別.SystemKeyAssign:
+									{
 										if( str3.Equals( "Capture" ) )
 										{
 											this.tキーの読み出しと設定( str4, this.KeyAssign.System.Capture );
 										}
+										else if( str3.Equals( "SongVolumeIncrease" ) )
+										{
+											this.tキーの読み出しと設定( str4, this.KeyAssign.System.SongVolIncrease );
+										}
+										else if( str3.Equals( "SongVolumeDecrease" ) )
+										{
+											this.tキーの読み出しと設定( str4, this.KeyAssign.System.SongVolDecrease );
+										}
+										else if( str3.Equals( "DisplayHits" ) )
+										{
+											this.tキーの読み出しと設定( str4, this.KeyAssign.System.DisplayHits );
+										}
+										else if( str3.Equals( "DisplayDebug" ) )
+										{
+											this.tキーの読み出しと設定( str4, this.KeyAssign.System.DisplayDebug );
+										}
+										else if( str3.Equals( "QuickConfig" ) )
+										{
+											this.tキーの読み出しと設定( str4, this.KeyAssign.System.QuickConfig );
+										}
+										else if( str3.Equals( "NewHeya" ) )
+										{
+											this.tキーの読み出しと設定( str4, this.KeyAssign.System.NewHeya );
+										}
+										else if( str3.Equals( "SortSongs" ) )
+										{
+											this.tキーの読み出しと設定( str4, this.KeyAssign.System.SortSongs );
+										}
+										else if( str3.Equals( "ToggleAutoP1" ) )
+										{
+											this.tキーの読み出しと設定( str4, this.KeyAssign.System.ToggleAutoP1 );
+										}
+										else if( str3.Equals( "ToggleAutoP2" ) )
+										{
+											this.tキーの読み出しと設定( str4, this.KeyAssign.System.ToggleAutoP2 );
+										}
+										else if( str3.Equals( "ToggleTrainingMode" ) )
+										{
+											this.tキーの読み出しと設定( str4, this.KeyAssign.System.ToggleTrainingMode );
+										}
 										continue;
+									}
 									//-----------------------------
 									#endregion
 								}
@@ -4076,7 +4343,7 @@ namespace TJAPlayer3
 			this.KeyAssign = new CKeyAssign();
 			for( int i = 0; i <= (int)EKeyConfigPart.SYSTEM; i++ )
 			{
-				for( int j = 0; j <= (int)EKeyConfigPad.Capture; j++ )
+				for( int j = 0; j < (int)EKeyConfigPad.MAX; j++ )
 				{
 					this.KeyAssign[ i ][ j ] = new CKeyAssign.STKEYASSIGN[ 16 ];
 					for( int k = 0; k < 16; k++ )
@@ -4215,6 +4482,16 @@ RightChange=K020
 
 [SystemKeyAssign]
 Capture=K065
+SongVolumeIncrease=K074
+SongVolumeDecrease=K0115
+DisplayHits=K057
+DisplayDebug=K043
+QuickConfig=K055
+NewHeya=K062
+SortSongs=K0126
+ToggleAutoP1=K056
+ToggleAutoP2=K057
+ToggleTrainingMode=K060
 ";
 			t文字列から読み込み( strDefaultKeyAssign );
 		}

OpenTaiko/src/Common/C定数.cs

@@ -148,7 +148,7 @@ namespace TJAPlayer3
 		LC		= Eパッド.LC,
 		LP		= Eパッド.LP,		// #27029 2012.1.4 from
         LBD     = Eパッド.LBD,
-
+		#region [Gameplay Keys]
         LRed    = Eパッド.LRed,
         RRed    = Eパッド.RRed,
         LBlue   = Eパッド.LBlue,
@@ -181,8 +181,23 @@ namespace TJAPlayer3
 		Clap5P = Eパッド.CLAP5P,
 		LeftChange = Eパッド.LeftChange,
 		RightChange = Eパッド.RightChange,
-
+		#endregion
+		#region [System Keys]
 		Capture,
+		SongVolumeIncrease,
+		SongVolumeDecrease,
+		DisplayHits,
+		DisplayDebug,
+		#region [Song Select only]
+		QuickConfig,
+		NewHeya,
+		SortSongs,
+		ToggleAutoP1,
+		ToggleAutoP2,
+		ToggleTrainingMode,
+		#endregion
+		MAX,
+		#endregion
 		UNKNOWN = Eパッド.UNKNOWN
 	}
 	[Flags]

OpenTaiko/src/Common/KeyboardSoundGroupLevelControlHandler.cs

@@ -26,11 +26,10 @@ namespace TJAPlayer3
             CSkin skin,
             bool isSongPreview)
         {
-            var isAdjustmentPositive = keyboard.KeyPressed((int)SlimDXKeys.Key.RightBracket);
+            bool isAdjustmentPositive = TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.System.SongVolIncrease);
-            if (!(isAdjustmentPositive || keyboard.KeyPressed((int)SlimDXKeys.Key.LeftBracket)))
+            bool isAdjustmentNegative = TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.System.SongVolDecrease);
-            {
+
-                return;
+            if (!(isAdjustmentPositive || isAdjustmentNegative)) return;
-            }
 
             ESoundGroup soundGroup;
             CSkin.Cシステムサウンド システムサウンド = null;
@@ -47,10 +46,6 @@ namespace TJAPlayer3
                 soundGroup = ESoundGroup.Voice;
                 システムサウンド = skin.soundゲーム開始音;
             }
-            else if (isSongPreview)
-            {
-                soundGroup = ESoundGroup.SongPlayback;
-            }
             else
             {
                 soundGroup = ESoundGroup.SongPlayback;

OpenTaiko/src/Common/TJAPlayer3.cs

@@ -2334,9 +2334,10 @@ for (int i = 0; i < 3; i++) {
 				}
 			}
 
-			foreach(var capture in ConfigIni.KeyAssign.System.Capture)
+			//foreach(var capture in ConfigIni.KeyAssign.System.Capture)
-			{
+			//{
-				if (TJAPlayer3.Input管理.Keyboard.KeyPressed(capture.コード) && capture.コード != 0)
+				//if (TJAPlayer3.Input管理.Keyboard.KeyPressed(capture.コード) && capture.コード != 0)
+				if (TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.System.Capture))
 				{
 #if DEBUG
 						if (TJAPlayer3.Input管理.Keyboard.KeyPressing((int)SlimDXKeys.Key.LeftControl))
@@ -2367,14 +2368,14 @@ for (int i = 0; i < 3; i++) {
 							SaveResultScreen(strFullPath);
 						}
 #else
-						string strFullPath =
+					string strFullPath =
-							Path.Combine(TJAPlayer3.strEXEのあるフォルダ, "Capture_img");
+						Path.Combine(TJAPlayer3.strEXEのあるフォルダ, "Capture_img");
-						strFullPath = Path.Combine(strFullPath, DateTime.Now.ToString("yyyyMMddHHmmss") + ".png");
+					strFullPath = Path.Combine(strFullPath, DateTime.Now.ToString("yyyyMMddHHmmss") + ".png");
-						SaveResultScreen(strFullPath);
+					SaveResultScreen(strFullPath);
 #endif
-					}
+				}
 
-			}
+			//}
 
 			/*
 			if ( Sound管理?.GetCurrentSoundDeviceType() != "DirectSound" )

OpenTaiko/src/I18N/CLang_en.cs

@@ -154,8 +154,6 @@ namespace TJAPlayer3
                 "(Single Player Only)",
             [95] = "Gameplay Key Config",
             [96] = "A secondary menu to adjust keys used during gameplay.",
-            [97] = "Capture",
-            [98] = "Capture key assign:\nTo assign key for screen capture.\n (You can use keyboard only. You can't\nuse pads to capture screenshot.",
             [99] = "LeftRed",
 
             [9992] = "Simplifies Drawing\n",
@@ -312,6 +310,29 @@ namespace TJAPlayer3
 			[10126] = "Always use normal gauge",
 			[10127] = "Always use normal gauge",
 
+            [97] = "Capture",
+            [98] = "System key assign:\nAssign any key for screen capture.\n(You can only use keyboard. You can't\nuse gamepads.)",
+            [10128] = "Increase Volume",
+            [10129] = "System key assign:\nAssign any key for increasing volume.\n(You can only use keyboard. You can't\nuse gamepads.)",
+            [10130] = "Decrease Volume",
+            [10131] = "System key assign:\nAssign any key for decreasing volume.\n(You can only use keyboard. You can't\nuse gamepads.)",
+            [10132] = "Display Hit Values",
+            [10133] = "System key assign:\nAssign any key for displaying hit values.\n(You can only use keyboard. You can't\nuse gamepads.)",
+            [10134] = "Display Debug Menu",
+            [10135] = "System key assign:\nAssign any key for displaying debug menu.\n(You can only use keyboard. You can't\nuse gamepads.)",
+            [10136] = "Quick Config",
+            [10137] = "System key assign:\nAssign any key for accessing the quick config.\n(You can only use keyboard. You can't\nuse gamepads.)",
+            [10138] = "Player Customization",
+            [10139] = "System key assign:\nAssign any key for player customization.\n(You can only use keyboard. You can't\nuse gamepads.)",
+            [10140] = "Change Song Sort",
+            [10141] = "System key assign:\nAssign any key for resorting songs.\n(You can only use keyboard. You can't\nuse gamepads.)",
+            [10142] = "Toggle Auto (P1)",
+            [10143] = "System key assign:\nAssign any key for toggling auto (P1).\n(You can only use keyboard. You can't\nuse gamepads.)",
+            [10144] = "Toggle Auto (P2)",
+            [10145] = "System key assign:\nAssign any key for toggling auto (P2).\n(You can only use keyboard. You can't\nuse gamepads.)",
+            [10146] = "Toggle Training Mode",
+            [10147] = "System key assign:\nAssign any key for toggling training mode.\n(You can only use keyboard. You can't\nuse gamepads.)",
+
             [100] = "Taiko Mode",
             [101] = "Dan-i Dojo",
             [102] = "Taiko Towers",

OpenTaiko/src/Stages/04.Config/CActConfigList.cs

@@ -618,6 +618,46 @@ namespace TJAPlayer3
 			{
 				TJAPlayer3.stageコンフィグ.tパッド選択通知( EKeyConfigPart.SYSTEM, EKeyConfigPad.Capture);
 			}
+			else if ( this.list項目リスト[ this.n現在の選択項目 ] == this.iKeyAssignSystemSongVolIncrease )
+			{
+				TJAPlayer3.stageコンフィグ.tパッド選択通知( EKeyConfigPart.SYSTEM, EKeyConfigPad.SongVolumeIncrease);
+			}
+			else if ( this.list項目リスト[ this.n現在の選択項目 ] == this.iKeyAssignSystemSongVolDecrease )
+			{
+				TJAPlayer3.stageコンフィグ.tパッド選択通知( EKeyConfigPart.SYSTEM, EKeyConfigPad.SongVolumeDecrease);
+			}
+			else if ( this.list項目リスト[ this.n現在の選択項目 ] == this.iKeyAssignSystemDisplayHit )
+			{
+				TJAPlayer3.stageコンフィグ.tパッド選択通知( EKeyConfigPart.SYSTEM, EKeyConfigPad.DisplayHits);
+			}
+			else if ( this.list項目リスト[ this.n現在の選択項目 ] == this.iKeyAssignSystemDisplayDebug )
+			{
+				TJAPlayer3.stageコンフィグ.tパッド選択通知( EKeyConfigPart.SYSTEM, EKeyConfigPad.DisplayDebug);
+			}
+			else if ( this.list項目リスト[ this.n現在の選択項目 ] == this.iKeyAssignSystemQuickConfig )
+			{
+				TJAPlayer3.stageコンフィグ.tパッド選択通知( EKeyConfigPart.SYSTEM, EKeyConfigPad.QuickConfig);
+			}
+			else if ( this.list項目リスト[ this.n現在の選択項目 ] == this.iKeyAssignSystemNewHeya )
+			{
+				TJAPlayer3.stageコンフィグ.tパッド選択通知( EKeyConfigPart.SYSTEM, EKeyConfigPad.NewHeya);
+			}
+			else if ( this.list項目リスト[ this.n現在の選択項目 ] == this.iKeyAssignSystemSortSongs )
+			{
+				TJAPlayer3.stageコンフィグ.tパッド選択通知( EKeyConfigPart.SYSTEM, EKeyConfigPad.SortSongs);
+			}
+			else if ( this.list項目リスト[ this.n現在の選択項目 ] == this.iKeyAssignSystemToggleAutoP1 )
+			{
+				TJAPlayer3.stageコンフィグ.tパッド選択通知( EKeyConfigPart.SYSTEM, EKeyConfigPad.ToggleAutoP1);
+			}
+			else if ( this.list項目リスト[ this.n現在の選択項目 ] == this.iKeyAssignSystemToggleAutoP2 )
+			{
+				TJAPlayer3.stageコンフィグ.tパッド選択通知( EKeyConfigPart.SYSTEM, EKeyConfigPad.ToggleAutoP2);
+			}
+			else if ( this.list項目リスト[ this.n現在の選択項目 ] == this.iKeyAssignSystemToggleTrainingMode )
+			{
+				TJAPlayer3.stageコンフィグ.tパッド選択通知( EKeyConfigPart.SYSTEM, EKeyConfigPad.ToggleTrainingMode);
+			}
 			#endregion
 			else
 			{
@@ -741,9 +781,40 @@ namespace TJAPlayer3
 			this.iKeyAssignSystemReturnToMenu = new CItemBase(CLangManager.LangInstance.GetString(2), CItemBase.Eパネル種別.その他,
 				CLangManager.LangInstance.GetString(3));
 			this.list項目リスト.Add( this.iKeyAssignSystemReturnToMenu );
+
 			this.iKeyAssignSystemCapture = new CItemBase(CLangManager.LangInstance.GetString(97),
 				CLangManager.LangInstance.GetString(98));
 			this.list項目リスト.Add( this.iKeyAssignSystemCapture );
+			this.iKeyAssignSystemSongVolIncrease = new CItemBase(CLangManager.LangInstance.GetString(10128),
+				CLangManager.LangInstance.GetString(10129));
+			this.list項目リスト.Add( this.iKeyAssignSystemSongVolIncrease );
+			this.iKeyAssignSystemSongVolDecrease = new CItemBase(CLangManager.LangInstance.GetString(10130),
+				CLangManager.LangInstance.GetString(10131));
+			this.list項目リスト.Add( this.iKeyAssignSystemSongVolDecrease );
+			this.iKeyAssignSystemDisplayHit = new CItemBase(CLangManager.LangInstance.GetString(10132),
+				CLangManager.LangInstance.GetString(10133));
+			this.list項目リスト.Add( this.iKeyAssignSystemDisplayHit );
+			this.iKeyAssignSystemDisplayDebug = new CItemBase(CLangManager.LangInstance.GetString(10134),
+				CLangManager.LangInstance.GetString(10135));
+			this.list項目リスト.Add( this.iKeyAssignSystemDisplayDebug );
+			this.iKeyAssignSystemQuickConfig = new CItemBase(CLangManager.LangInstance.GetString(10136),
+				CLangManager.LangInstance.GetString(10137));
+			this.list項目リスト.Add( this.iKeyAssignSystemQuickConfig );
+			this.iKeyAssignSystemNewHeya = new CItemBase(CLangManager.LangInstance.GetString(10138),
+				CLangManager.LangInstance.GetString(10139));
+			this.list項目リスト.Add( this.iKeyAssignSystemNewHeya );
+			this.iKeyAssignSystemSortSongs = new CItemBase(CLangManager.LangInstance.GetString(10140),
+				CLangManager.LangInstance.GetString(10141));
+			this.list項目リスト.Add( this.iKeyAssignSystemSortSongs );
+			this.iKeyAssignSystemToggleAutoP1 = new CItemBase(CLangManager.LangInstance.GetString(10142),
+				CLangManager.LangInstance.GetString(10143));
+			this.list項目リスト.Add( this.iKeyAssignSystemToggleAutoP1);
+			this.iKeyAssignSystemToggleAutoP2 = new CItemBase(CLangManager.LangInstance.GetString(10144),
+				CLangManager.LangInstance.GetString(10145));
+			this.list項目リスト.Add( this.iKeyAssignSystemToggleAutoP2);
+			this.iKeyAssignSystemToggleTrainingMode = new CItemBase(CLangManager.LangInstance.GetString(10146),
+				CLangManager.LangInstance.GetString(10147));
+			this.list項目リスト.Add( this.iKeyAssignSystemToggleTrainingMode);
 
             OnListMenuの初期化();
 			this.n現在の選択項目 = 0;
@@ -1422,6 +1493,16 @@ namespace TJAPlayer3
 		private Eメニュー種別 eメニュー種別;
 		#region [ キーコンフィグ ]
 		private CItemBase iKeyAssignSystemCapture;			// #24609
+		private CItemBase iKeyAssignSystemSongVolIncrease;
+		private CItemBase iKeyAssignSystemSongVolDecrease;
+		private CItemBase iKeyAssignSystemDisplayHit;
+		private CItemBase iKeyAssignSystemDisplayDebug;
+		private CItemBase iKeyAssignSystemQuickConfig;
+		private CItemBase iKeyAssignSystemNewHeya;
+		private CItemBase iKeyAssignSystemSortSongs;
+		private CItemBase iKeyAssignSystemToggleAutoP1;
+		private CItemBase iKeyAssignSystemToggleAutoP2;
+		private CItemBase iKeyAssignSystemToggleTrainingMode;
 		private CItemBase iKeyAssignSystemReturnToMenu;		// #24609
 		private CItemBase iKeyAssignDrumsReturnToMenu;
 

OpenTaiko/src/Stages/05.SongSelect/CStage選曲.cs

@@ -902,21 +902,21 @@ namespace TJAPlayer3
                         }
                         #endregion
                         #region [ F2 簡易オプション ]
-                        if (TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.F2))
+                        if (TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.System.QuickConfig))
                         {
                             TJAPlayer3.Skin.sound変更音.t再生する();
                             this.actQuickConfig.tActivatePopupMenu(E楽器パート.DRUMS);
                         }
                         #endregion
                         #region [ F3 1PオートON/OFF ]
-                        if (TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.F3))
+                        if (TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.System.ToggleAutoP1))
                         {
                             TJAPlayer3.Skin.sound変更音.t再生する();
                             CUtility.ToggleBoolian(ref TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[0]);
                         }
                         #endregion
                         #region [ F4 2PオートON/OFF ]
-                        if (TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.F4))
+                        if (TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.System.ToggleAutoP2))
                         {
                             if (TJAPlayer3.ConfigIni.nPlayerCount > 1)
                             {
@@ -955,7 +955,7 @@ namespace TJAPlayer3
                         }
                         #endregion
                         #region [ F7 TokkunMode ]
-                        if (TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.F7))
+                        if (TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.System.ToggleTrainingMode))
                         {
                             if (TJAPlayer3.ConfigIni.nPlayerCount < 2)
                             {
@@ -977,7 +977,7 @@ namespace TJAPlayer3
                         }
                         #endregion
                         #region [ F9  ]
-                        if (TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.F9))
+                        if (TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.System.NewHeya))
                         {
                             actNewHeya.Open();
                         }
@@ -1197,7 +1197,7 @@ namespace TJAPlayer3
                             }
                             #endregion
                             #region [ BDx2: 簡易CONFIG ]
-                            if (TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.Space))
+                            if (TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.System.SortSongs))
                             {
                                 TJAPlayer3.Skin.sound変更音.t再生する();
                                 this.actSortSongs.tActivatePopupMenu(E楽器パート.DRUMS, ref this.act曲リスト);

OpenTaiko/src/Stages/07.Game/CStage演奏画面共通.cs

@@ -3231,7 +3231,7 @@ namespace TJAPlayer3
 					ドラムスクロール速度ダウン();
 				}
                 // Debug mode
-				else if (keyboard.KeyPressed( (int)SlimDXKeys.Key.Delete ) )
+				else if (TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.System.DisplayDebug) )
 				{	// del (debug info)
 					TJAPlayer3.ConfigIni.b演奏情報を表示する = !TJAPlayer3.ConfigIni.b演奏情報を表示する;
 				}
@@ -3342,14 +3342,15 @@ namespace TJAPlayer3
                     this.b強制的に分岐させた[0] = true;
                 }
 
-                if ( keyboard.KeyPressed( (int)SlimDXKeys.Key.F4 ) )
+                if ( TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.System.DisplayHits) )
-				{
+                {
                     if( TJAPlayer3.ConfigIni.bJudgeCountDisplay == false )
                         TJAPlayer3.ConfigIni.bJudgeCountDisplay = true;
                     else
                         TJAPlayer3.ConfigIni.bJudgeCountDisplay = false;
-				}
+                }
-				else if ( keyboard.KeyPressed( (int)SlimDXKeys.Key.F5 ) )
+
+				if ( keyboard.KeyPressed( (int)SlimDXKeys.Key.F5 ) )
 				{
                     switch( TJAPlayer3.ConfigIni.eClipDispType  )
                     {
@@ -3367,6 +3368,7 @@ namespace TJAPlayer3
                             break;
                     }
 				}
+
                 if (TJAPlayer3.ConfigIni.bTokkunMode) 
                 {
                     if (keyboard.KeyPressed((int)SlimDXKeys.Key.F6))