From d06eefd0838cdffcbe927bab61dc2cdd5ba84a45 Mon Sep 17 00:00:00 2001 From: torranx Date: Tue, 20 Aug 2024 22:41:39 +0800 Subject: [PATCH] translations and fixes --- src/locales/ca_ES/settings.ts | 6 +++++- src/locales/de/settings.ts | 4 ++++ src/locales/en/settings.ts | 6 +++++- src/locales/es/settings.ts | 6 +++++- src/locales/fr/settings.ts | 6 +++++- src/locales/it/settings.ts | 6 +++++- src/locales/ja/settings.ts | 4 ++++ src/locales/ko/settings.ts | 6 +++++- src/locales/pt_BR/settings.ts | 6 +++++- src/locales/zh_CN/settings.ts | 6 +++++- src/locales/zh_TW/settings.ts | 6 +++++- src/phases/select-modifier-phase.ts | 4 ++++ src/system/settings/settings.ts | 8 ++++---- 13 files changed, 61 insertions(+), 13 deletions(-) diff --git a/src/locales/ca_ES/settings.ts b/src/locales/ca_ES/settings.ts index 491bfa4a481..1b47c366bd3 100644 --- a/src/locales/ca_ES/settings.ts +++ b/src/locales/ca_ES/settings.ts @@ -96,5 +96,9 @@ export const settings: SimpleTranslationEntries = { "controller": "Controller", "gamepadSupport": "Gamepad Support", "showBgmBar": "Show Music Names", - "shopOverlayOpacity": "Shop Overlay Opacity" + "shopOverlayOpacity": "Shop Overlay Opacity", + "shopRerollTarget": "Shop Post-Reroll Target", + "items": "Items", + "reroll": "Reroll", + "shop": "Shop" } as const; diff --git a/src/locales/de/settings.ts b/src/locales/de/settings.ts index 7d4523c8cbd..21350e92be1 100644 --- a/src/locales/de/settings.ts +++ b/src/locales/de/settings.ts @@ -99,4 +99,8 @@ export const settings: SimpleTranslationEntries = { "showBgmBar": "Musiknamen anzeigen", "moveTouchControls": "Bewegung Touch Steuerung", "shopOverlayOpacity": "Shop Overlay Deckkraft", + "shopRerollTarget": "Shop Post-Reroll Target", + "items": "Items", + "reroll": "Reroll", + "shop": "Shop" } as const; diff --git a/src/locales/en/settings.ts b/src/locales/en/settings.ts index c63f9de6049..1e1b83fa3ea 100644 --- a/src/locales/en/settings.ts +++ b/src/locales/en/settings.ts @@ -98,5 +98,9 @@ export const settings: SimpleTranslationEntries = { "gamepadSupport": "Gamepad Support", "showBgmBar": "Show Music Names", "moveTouchControls": "Move Touch Controls", - "shopOverlayOpacity": "Shop Overlay Opacity" + "shopOverlayOpacity": "Shop Overlay Opacity", + "shopRerollTarget": "Shop Post-Reroll Target", + "items": "Items", + "reroll": "Reroll", + "shop": "Shop" } as const; diff --git a/src/locales/es/settings.ts b/src/locales/es/settings.ts index c7f723fe80c..b52752fd342 100644 --- a/src/locales/es/settings.ts +++ b/src/locales/es/settings.ts @@ -98,5 +98,9 @@ export const settings: SimpleTranslationEntries = { "gamepadSupport": "Gamepad Support", "showBgmBar": "Show Music Names", "moveTouchControls": "Move Touch Controls", - "shopOverlayOpacity": "Opacidad de la fase de compra" + "shopOverlayOpacity": "Opacidad de la fase de compra", + "shopRerollTarget": "Shop Post-Reroll Target", + "items": "Items", + "reroll": "Reroll", + "shop": "Shop" } as const; diff --git a/src/locales/fr/settings.ts b/src/locales/fr/settings.ts index 95246ccb7d0..8858d3c462d 100644 --- a/src/locales/fr/settings.ts +++ b/src/locales/fr/settings.ts @@ -98,5 +98,9 @@ export const settings: SimpleTranslationEntries = { "gamepadSupport": "Gamepad Support", "showBgmBar": "Titre de la musique", "moveTouchControls": "Déplacer les contrôles tactiles", - "shopOverlayOpacity": "Opacité boutique" + "shopOverlayOpacity": "Opacité boutique", + "shopRerollTarget": "Shop Post-Reroll Target", + "items": "Items", + "reroll": "Reroll", + "shop": "Shop" } as const; diff --git a/src/locales/it/settings.ts b/src/locales/it/settings.ts index 0d05d01ba1c..61a48011c53 100644 --- a/src/locales/it/settings.ts +++ b/src/locales/it/settings.ts @@ -98,5 +98,9 @@ export const settings: SimpleTranslationEntries = { "gamepadSupport": "Supporto Gamepad", "showBgmBar": "Mostra Nomi Musica", "moveTouchControls": "Move Touch Controls", - "shopOverlayOpacity": "Opacità Finestra Negozio" + "shopOverlayOpacity": "Opacità Finestra Negozio", + "shopRerollTarget": "Shop Post-Reroll Target", + "items": "Items", + "reroll": "Reroll", + "shop": "Shop" } as const; diff --git a/src/locales/ja/settings.ts b/src/locales/ja/settings.ts index ef20d071d2d..34514be03ae 100644 --- a/src/locales/ja/settings.ts +++ b/src/locales/ja/settings.ts @@ -98,4 +98,8 @@ export const settings: SimpleTranslationEntries = { "gamepadSupport": "コントローラーサポート", "showBgmBar": "Show Music Names", "shopOverlayOpacity": "Shop Overlay Opacity", + "shopRerollTarget": "Shop Post-Reroll Target", + "items": "Items", + "reroll": "Reroll", + "shop": "Shop" } as const; diff --git a/src/locales/ko/settings.ts b/src/locales/ko/settings.ts index aa4adfc4e41..76919067da3 100644 --- a/src/locales/ko/settings.ts +++ b/src/locales/ko/settings.ts @@ -98,5 +98,9 @@ export const settings: SimpleTranslationEntries = { "gamepadSupport": "게임패드 지원", "showBgmBar": "BGM 제목 보여주기", "moveTouchControls": "터치 컨트롤 이동", - "shopOverlayOpacity": "상점 오버레이 투명도" + "shopOverlayOpacity": "상점 오버레이 투명도", + "shopRerollTarget": "Shop Post-Reroll Target", + "items": "Items", + "reroll": "Reroll", + "shop": "Shop" } as const; diff --git a/src/locales/pt_BR/settings.ts b/src/locales/pt_BR/settings.ts index 14646b59742..9fc30d44a59 100644 --- a/src/locales/pt_BR/settings.ts +++ b/src/locales/pt_BR/settings.ts @@ -98,5 +98,9 @@ export const settings: SimpleTranslationEntries = { "gamepadSupport": "Suporte para Controle", "showBgmBar": "Exibir Nomes das Músicas", "moveTouchControls": "Move Touch Controls", - "shopOverlayOpacity": "Opacidade da Loja" + "shopOverlayOpacity": "Opacidade da Loja", + "shopRerollTarget": "Shop Post-Reroll Target", + "items": "Items", + "reroll": "Reroll", + "shop": "Shop" } as const; diff --git a/src/locales/zh_CN/settings.ts b/src/locales/zh_CN/settings.ts index 422b1bd591d..6c17cc84e94 100644 --- a/src/locales/zh_CN/settings.ts +++ b/src/locales/zh_CN/settings.ts @@ -98,5 +98,9 @@ export const settings: SimpleTranslationEntries = { "gamepadSupport": "手柄支持", "showBgmBar": "显示音乐名称", "moveTouchControls": "移动触摸控制", - "shopOverlayOpacity": "商店显示不透明度" + "shopOverlayOpacity": "商店显示不透明度", + "shopRerollTarget": "Shop Post-Reroll Target", + "items": "Items", + "reroll": "Reroll", + "shop": "Shop" } as const; diff --git a/src/locales/zh_TW/settings.ts b/src/locales/zh_TW/settings.ts index 35499f45d15..1ec98fabc44 100644 --- a/src/locales/zh_TW/settings.ts +++ b/src/locales/zh_TW/settings.ts @@ -98,5 +98,9 @@ export const settings: SimpleTranslationEntries = { "gamepadSupport": "手柄支持", "showBgmBar": "Show Music Names", "moveTouchControls": "移動觸控控制", - "shopOverlayOpacity": "Shop Overlay Opacity" + "shopOverlayOpacity": "Shop Overlay Opacity", + "shopRerollTarget": "Shop Post-Reroll Target", + "items": "Items", + "reroll": "Reroll", + "shop": "Shop" } as const; diff --git a/src/phases/select-modifier-phase.ts b/src/phases/select-modifier-phase.ts index 67ae904fb58..6065f360953 100644 --- a/src/phases/select-modifier-phase.ts +++ b/src/phases/select-modifier-phase.ts @@ -205,6 +205,10 @@ export class SelectModifierPhase extends BattlePhase { return true; } + getRerollCount(): integer { + return this.rerollCount; + } + getRerollCost(typeOptions: ModifierTypeOption[], lockRarities: boolean): integer { let baseValue = 0; if (Overrides.WAIVE_ROLL_FEE_OVERRIDE) { diff --git a/src/system/settings/settings.ts b/src/system/settings/settings.ts index a9851e6b36a..0d716a9b40b 100644 --- a/src/system/settings/settings.ts +++ b/src/system/settings/settings.ts @@ -392,19 +392,19 @@ export const Setting: Array = [ }, { key: SettingKeys.Reroll_Target, - label: i18next.t("settings:Reroll Target"), + label: i18next.t("settings:shopRerollTarget"), options: [ { value:"Reroll", - label: i18next.t("settings:Reroll") + label: i18next.t("settings:reroll") }, { value:"Items", - label: i18next.t("settings:Items") + label: i18next.t("settings:items") }, { value:"Shop", - label: i18next.t("settings:Shop") + label: i18next.t("settings:shop") } ], default: 1,