Taiko_Stuff/OpenTaiko
1
0
Fork 0
mirror of synced 2024-11-23 23:21:06 +01:00
Code Releases Activity

0.6.0.21 - Fix Confirm/Cancel keyboard inputs ending name change early (#750)

Browse Source 
- Fix confirm/cancel keyboard inputs ending name change early
This commit is contained in:
DragonRatTiger / リュウコ 2024-11-18 11:16:42 -06:00 committed by GitHub
parent 3f5f7ea970
commit defd8b370b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 33 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenTaiko/Lang/de/lang.json
View File

@ -445,7 +445,7 @@
"HEYA_DAN": "Dan-Titel",
"HEYA_NAMEPLATE": "Namensschild-Titel",
"HEYA_NAME": "Name",
"HEYA_NAME_INFO": "Type your name (Confirm to save, Cancel to discard changes):",
"HEYA_NAME_INFO": "Type your name (Enter to save, Escape to discard changes):",
// {0}: Asset name
"HEYA_DESCRIPTION_NAME": "Name: {0}",

2
OpenTaiko/Lang/en/lang.json
View File

@ -445,7 +445,7 @@
"HEYA_DAN": "Dan Title",
"HEYA_NAMEPLATE": "Nameplate Title",
"HEYA_NAME": "Name",
"HEYA_NAME_INFO": "Type your name (Confirm to save, Cancel to discard changes):",
"HEYA_NAME_INFO": "Type your name (Enter to save, Escape to discard changes):",
// {0}: Asset name
"HEYA_DESCRIPTION_NAME": "Name: {0}",

2
OpenTaiko/Lang/es/lang.json
View File

@ -446,7 +446,7 @@
"HEYA_DAN": "Título de Dan",
"HEYA_NAMEPLATE": "Título de la placa",
"HEYA_NAME": "Name",
"HEYA_NAME_INFO": "Type your name (Confirm to save, Cancel to discard changes):",
"HEYA_NAME_INFO": "Type your name (Enter to save, Escape to discard changes):",
// {0}: Asset name
"HEYA_DESCRIPTION_NAME": "Name: {0}",

2
OpenTaiko/Lang/fr/lang.json
View File

@ -445,7 +445,7 @@
"HEYA_DAN": "Titre Dan",
"HEYA_NAMEPLATE": "Titre",
"HEYA_NAME": "Name",
"HEYA_NAME_INFO": "Type your name (Confirm to save, Cancel to discard changes):",
"HEYA_NAME_INFO": "Type your name (Enter to save, Escape to discard changes):",
// {0}: Asset name
"HEYA_DESCRIPTION_NAME": "Name: {0}",

2
OpenTaiko/Lang/ja/lang.json
View File

@ -445,7 +445,7 @@
"HEYA_DAN": "段位称号",
"HEYA_NAMEPLATE": "名札称号",
"HEYA_NAME": "名前",
"HEYA_NAME_INFO": "Type your name (Confirm to save, Cancel to discard changes):",
"HEYA_NAME_INFO": "Type your name (Enter to save, Escape to discard changes):",
// {0}: Asset name
"HEYA_DESCRIPTION_NAME": "名前：{0}",

2
OpenTaiko/Lang/ko/lang.json
View File

@ -445,7 +445,7 @@
"HEYA_DAN": "단위 제목",
"HEYA_NAMEPLATE": "칭호 타이틀",
"HEYA_NAME": "Name",
"HEYA_NAME_INFO": "Type your name (Confirm to save, Cancel to discard changes):",
"HEYA_NAME_INFO": "Type your name (Enter to save, Escape to discard changes):",
// {0}: Asset name
"HEYA_DESCRIPTION_NAME": "이름: {0}",

2
OpenTaiko/Lang/nl/lang.json
View File

@ -441,7 +441,7 @@
"HEYA_DAN": "Dan Title",
"HEYA_NAMEPLATE": "Nameplate Title",
"HEYA_NAME": "Name",
"HEYA_NAME_INFO": "Type your name (Confirm to save, Cancel to discard changes):",
"HEYA_NAME_INFO": "Type your name (Enter to save, Escape to discard changes):",
// {0}: Asset name
"HEYA_DESCRIPTION_NAME": "Name: {0}",

2
OpenTaiko/Lang/ru/lang.json
View File

@ -445,7 +445,7 @@
"HEYA_DAN": "Ранг дан",
"HEYA_NAMEPLATE": "Ранг таблички",
"HEYA_NAME": "Имя",
"HEYA_NAME_INFO": "Введите своё имя («Выбрать», чтобы сохранить; «Отмена», чтобы отменить изменения):",
"HEYA_NAME_INFO": "Type your name (Enter to save, Escape to discard changes):",
// {0}: Asset name
"HEYA_DESCRIPTION_NAME": "Имя: {0}",

2
OpenTaiko/Lang/zh/lang.json
View File

@ -445,7 +445,7 @@
"HEYA_DAN": "段位称号",
"HEYA_NAMEPLATE": "名牌称号",
"HEYA_NAME": "姓名",
"HEYA_NAME_INFO": "输入您的姓名（确认保存，取消放弃更改）：",
"HEYA_NAME_INFO": "Type your name (Enter to save, Escape to discard changes):",
// {0}: Asset name
"HEYA_DESCRIPTION_NAME": "姓名：{0}",

36
OpenTaiko/src/Stages/11.Heya/CStageHeya.cs
View File

@ -557,8 +557,10 @@ class CStageHeya : CStage {
if (this.tMove(-1)) {
OpenTaiko.Skin.soundChangeSFX.tPlay();
}
} else if (OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return) ||
OpenTaiko.Pad.bPressed(EInstrumentPad.Drums, EPad.Decide)) {
}
else if (iCurrentMenu != CurrentMenu.Name && (OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return) ||
OpenTaiko.Pad.bPressed(EInstrumentPad.Drums, EPad.Decide)))
{
#region [Decide]
@ -677,14 +679,6 @@ class CStageHeya : CStage {
iCurrentMenu = CurrentMenu.ReturnToMenu;
this.tResetOpts();
}
else if (iCurrentMenu == CurrentMenu.Name) {
OpenTaiko.SaveFileInstances[iPlayer].data.Name = textInput.Text;
OpenTaiko.SaveFileInstances[iPlayer].tApplyHeyaChanges();
OpenTaiko.NamePlate.tNamePlateRefreshTitles(iPlayer);
iCurrentMenu = CurrentMenu.ReturnToMenu;
this.tResetOpts();
}
if (ess == ESelectStatus.SELECTED)
OpenTaiko.Skin.soundDecideSFX.tPlay();
@ -695,8 +689,9 @@ class CStageHeya : CStage {
#endregion
}
else if (OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape) ||
OpenTaiko.Pad.bPressed(EInstrumentPad.Drums, EPad.Cancel)) {
else if (iCurrentMenu != CurrentMenu.Name && (OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape) ||
OpenTaiko.Pad.bPressed(EInstrumentPad.Drums, EPad.Cancel)))
{
OpenTaiko.Skin.soundCancelSFX.tPlay();
@ -714,6 +709,23 @@ class CStageHeya : CStage {
return 0;
}
else if (iCurrentMenu == CurrentMenu.Name && OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return)) {
OpenTaiko.SaveFileInstances[iPlayer].data.Name = textInput.Text;
OpenTaiko.SaveFileInstances[iPlayer].tApplyHeyaChanges();
OpenTaiko.NamePlate.tNamePlateRefreshTitles(iPlayer);
iCurrentMenu = CurrentMenu.ReturnToMenu;
this.tResetOpts();
OpenTaiko.Skin.soundDecideSFX.tPlay();
return 0;
}
else if (iCurrentMenu == CurrentMenu.Name && OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape)) {
OpenTaiko.Skin.soundDecideSFX.tPlay();
iCurrentMenu = CurrentMenu.ReturnToMenu;
this.ttkInfoSection = null;
this.tResetOpts();
return 0;
}
#endregion