diff --git a/renderer/public/data/cmn-Hant/app_i18n.json b/renderer/public/data/cmn-Hant/app_i18n.json index 42019d31..c8fce8b0 100644 --- a/renderer/public/data/cmn-Hant/app_i18n.json +++ b/renderer/public/data/cmn-Hant/app_i18n.json @@ -413,7 +413,8 @@ "tier_numbering_help": "為了減少因遊戲內命名衝突而導致的混淆,POE1的層級將使用\"Grade\"而非\"Tier\"來命名。", "always_show_tier": "始終顯示階級", "remember_ratio": "記住通貨比例", - "open_editor_above": "Open rune socket selector upwards" + "open_editor_above": "Open rune socket selector upwards", + "primary_currency": "Primary base currency" }, "poe2_new": { "beta_warning": "這是 POE2 的測試版,某些功能可能無法正常運作。", diff --git a/renderer/public/data/de/app_i18n.json b/renderer/public/data/de/app_i18n.json index 41d72182..01d77855 100644 --- a/renderer/public/data/de/app_i18n.json +++ b/renderer/public/data/de/app_i18n.json @@ -402,7 +402,8 @@ "tier_numbering_help": "Um Verwirrung durch widersprüchliche Namenskonventionen im Spiel zu reduzieren, werden PoE1-Tiers als \"Grad\" bezeichnet, anstatt \"Stufe\".", "always_show_tier": "Tier immer anzeigen", "remember_ratio": "Währungs-Verhältnis merken", - "open_editor_above": "Open rune socket selector upwards" + "open_editor_above": "Open rune socket selector upwards", + "primary_currency": "Primary base currency" }, "poe2_new": { "beta_warning": "Dies ist eine BETA für POE2, es wird nicht immer wie erwartet funktionieren.", diff --git a/renderer/public/data/en/app_i18n.json b/renderer/public/data/en/app_i18n.json index 5b6a644d..8f6d20d8 100644 --- a/renderer/public/data/en/app_i18n.json +++ b/renderer/public/data/en/app_i18n.json @@ -430,7 +430,8 @@ "tier_numbering_help": "To try to reduce confusion due to conflicting naming conventions with the game, PoE1 tiers will use the name \"Grade\" instead of \"Tier\". ", "always_show_tier": "Always show tier", "remember_ratio": "Remember currency ratio", - "open_editor_above": "Open rune socket selector upwards" + "open_editor_above": "Open rune socket selector upwards", + "primary_currency": "Primary base currency" }, "poe2_new": { "beta_warning": "This is in BETA for POE2, things will not work always as expected.", diff --git a/renderer/public/data/es/app_i18n.json b/renderer/public/data/es/app_i18n.json index 27916778..6689b13f 100644 --- a/renderer/public/data/es/app_i18n.json +++ b/renderer/public/data/es/app_i18n.json @@ -426,7 +426,8 @@ "tier_numbering_help": "To try to reduce confusion due to conflicting naming conventions with the game, PoE1 tiers will use the name \"Grade\" instead of \"Tier\". ", "always_show_tier": "Always show tier", "remember_ratio": "Remember currency ratio", - "open_editor_above": "Open rune socket selector upwards" + "open_editor_above": "Open rune socket selector upwards", + "primary_currency": "Primary base currency" }, "poe2_new": { "beta_warning": "Esto está en BETA para POE2, las cosas no siempre funcionarán como se espera.", diff --git a/renderer/public/data/ja/app_i18n.json b/renderer/public/data/ja/app_i18n.json index 6da96cc1..0aaa2438 100644 --- a/renderer/public/data/ja/app_i18n.json +++ b/renderer/public/data/ja/app_i18n.json @@ -413,7 +413,8 @@ "tier_numbering_help": "ゲーム内の命名規則との衝突による混乱を減らすため、PoE1のティアは\"Tier\"ではなく\"Grade\"という名称を使用します。", "always_show_tier": "Always show tier", "remember_ratio": "Remember currency ratio", - "open_editor_above": "Open rune socket selector upwards" + "open_editor_above": "Open rune socket selector upwards", + "primary_currency": "Primary base currency" }, "poe2_new": { "beta_warning": "これはPOE2のベータ版です、期待通りに動作しないことがあります。", diff --git a/renderer/public/data/ko/app_i18n.json b/renderer/public/data/ko/app_i18n.json index e76db10e..5576e26a 100644 --- a/renderer/public/data/ko/app_i18n.json +++ b/renderer/public/data/ko/app_i18n.json @@ -406,7 +406,8 @@ "tier_numbering_help": "혼란을 방지하기 위해서 POE 1의 아이템 티어는 \"티어\"가아닌\"등급\"으로 표시됩니다.", "always_show_tier": "常にティアを表示", "remember_ratio": "通貨比率を記憶する", - "open_editor_above": "Open rune socket selector upwards" + "open_editor_above": "Open rune socket selector upwards", + "primary_currency": "Primary base currency" }, "poe2_new": { "beta_warning": "이 버전은 베타버전입니다. 예기치 못한 버그가 있을 수 있습니다.", diff --git a/renderer/public/data/ru/app_i18n.json b/renderer/public/data/ru/app_i18n.json index 48849f42..8a07bf21 100644 --- a/renderer/public/data/ru/app_i18n.json +++ b/renderer/public/data/ru/app_i18n.json @@ -428,7 +428,8 @@ "tier_numbering_help": "Во избежание недоразумений связанных с системой наименований в игре, тиры из PoE1 будут называться \"Grade\" вместо \"Tier\". ", "always_show_tier": "Always show tier", "remember_ratio": "Remember currency ratio", - "open_editor_above": "Open rune socket selector upwards" + "open_editor_above": "Open rune socket selector upwards", + "primary_currency": "Primary base currency" }, "poe2_new": { "beta_warning": "Функционал для PoE2 находится в стадии бета тестирования и не всегда работает так, как задумано.", diff --git a/renderer/src/web/Config.ts b/renderer/src/web/Config.ts index 0123e692..a2f41111 100644 --- a/renderer/src/web/Config.ts +++ b/renderer/src/web/Config.ts @@ -152,7 +152,7 @@ export interface Config { } export const defaultConfig = (): Config => ({ - configVersion: 28, + configVersion: 29, overlayKey: "Shift + Space", overlayBackground: "rgba(129, 139, 149, 0.15)", overlayBackgroundClose: true, @@ -593,6 +593,14 @@ function upgradeConfig(_config: Config): Config { config.configVersion = 28; } + if (config.configVersion < 29) { + // NOTE: v0.13.0 || poe0.3.1b + const priceCheck = config.widgets.find( + (w) => w.wmType === "price-check", + ) as widget.PriceCheckWidget; + priceCheck.primaryCurrency = "exalted"; + config.configVersion = 29; + } return config as unknown as Config; } diff --git a/renderer/src/web/background/Prices.ts b/renderer/src/web/background/Prices.ts index 452b5e50..a1a0fc32 100644 --- a/renderer/src/web/background/Prices.ts +++ b/renderer/src/web/background/Prices.ts @@ -29,8 +29,6 @@ export const usePoeninja = createGlobalState(() => { const leagues = useLeagues(); const xchgRate = shallowRef(undefined); - // const xchgRate1 = shallowRef(undefined); - // xchgRate1.value = undefined; const isLoading = shallowRef(false); let PRICES_DB: PriceDatabase = []; diff --git a/renderer/src/web/overlay/widgets.ts b/renderer/src/web/overlay/widgets.ts index 29a8b604..027fb72c 100644 --- a/renderer/src/web/overlay/widgets.ts +++ b/renderer/src/web/overlay/widgets.ts @@ -56,6 +56,7 @@ export interface PriceCheckWidget extends Widget { autoFillEmptyRuneSockets: "Iron Rune" | false; alwaysShowTier: boolean; openItemEditorAbove: boolean; + primaryCurrency: "exalted" | "chaos"; } export interface StopwatchWidget extends Widget { diff --git a/renderer/src/web/price-check/PriceCheckWindow.vue b/renderer/src/web/price-check/PriceCheckWindow.vue index dfa392fc..6e942219 100644 --- a/renderer/src/web/price-check/PriceCheckWindow.vue +++ b/renderer/src/web/price-check/PriceCheckWindow.vue @@ -228,6 +228,7 @@ export default defineComponent({ autoFillEmptyRuneSockets: false, alwaysShowTier: false, openItemEditorAbove: false, + primaryCurrency: "exalted", }; }, } satisfies WidgetSpec, diff --git a/renderer/src/web/price-check/settings-price-check.vue b/renderer/src/web/price-check/settings-price-check.vue index c2a49352..7240996a 100644 --- a/renderer/src/web/price-check/settings-price-check.vue +++ b/renderer/src/web/price-check/settings-price-check.vue @@ -86,6 +86,13 @@ {{ t(":remember_currency") }} +
+
{{ t(":primary_currency") }}
+ +
{{ t(":select_stock") }} @@ -261,6 +268,10 @@ export default defineComponent({ () => configWidget.value, "rememberCurrency", ), + primaryCurrency: configModelValue( + () => configWidget.value, + "primaryCurrency", + ), searchStatRange: computed({ get() { return configWidget.value.searchStatRange;