translations and fixes

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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) {

src/system/settings/settings.ts

@@ -392,19 +392,19 @@ export const Setting: Array<Setting> = [
   },
   {
     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,