Merge branch 'main' into feat/character-local-storage

discretize · Oct 16, 2024 · 3572bb6 · 3572bb6
2 parents 94c6ea5 + 868fa0e
commit 3572bb6
Show file tree

Hide file tree

Showing 31 changed files with 922 additions and 951 deletions.
diff --git a/locales/en/translation.json b/locales/en/translation.json
@@ -117,8 +117,7 @@
   "Increase table height": "Increase table height",
   "Indicators": "Indicators",
   "Infusion Helper (WIP)": "Infusion Helper (WIP)",
-  "Infusion Type #1": "Infusion Type #1",
-  "Infusion Type #2": "Infusion Type #2",
+  "Infusion Type #": "Infusion Type #",
   "Infusions": "Infusions",
   "Infusions: ": "Infusions: ",
   "Invalid Format.": "Invalid Format.",
@@ -173,7 +172,7 @@
   "Select multiple options if desired and every combination will be tested.": "Select multiple options if desired and every combination will be tested.",
   "Select skills:": "Select skills:",
   "Select the affixes, or gear stat combinations, you want the optimizer to test. Keep in mind that optimizing more than 3 affixes may be prohibitively slow.": "Select the affixes, or gear stat combinations, you want the optimizer to test. Keep in mind that optimizing more than 3 affixes may be prohibitively slow.",
-  "Select up to 2 types of stat infusions, and optionally limit the quantity allowed.": "Select up to 2 types of stat infusions, and optionally limit the quantity allowed.",
+  "Select types of stat infusions, and optionally limit the quantity allowed.": "Select types of stat infusions, and optionally limit the quantity allowed.",
   "Select visible": "Select visible",
   "Select weapons and skills as you please.": "Select weapons and skills as you please.",
   "Select weapons:": "Select weapons:",
@@ -730,6 +729,7 @@
   "preset_extra_Power (Fractal)": "Power (Fractal)",
   "preset_extra_Power (Raid)": "Power (Raid)",
   "preset_extra_Power (Raid, air)": "Power (Raid, air)",
+  "preset_extra_Power (Raid, claw)": "Power (Raid, claw)",
   "preset_extra_Power (Raid, fireworks)": "Power (Raid, fireworks)",
   "preset_extra_Power (Raid, furious)": "Power (Raid, furious)",
   "preset_extra_Power Alac Ren (Raid)": "Power Alac Ren (Raid)",

diff --git a/src/assets/presetdata/metadata.ts b/src/assets/presetdata/metadata.ts
@@ -1,6 +1,15 @@
-import type { ProfessionName, ProfessionOrSpecializationName } from '../../utils/gw2-data';
-
-type JSON = string;
+import type { BuffsSlice } from '../../state/slices/buffs';
+import type { Distribution } from '../../state/slices/distribution';
+import type { ExtrasSlice } from '../../state/slices/extras';
+import type { PrioritiesSlice } from '../../state/slices/priorities';
+import type { SkillsSlice } from '../../state/slices/skills';
+import type { TraitsSlice } from '../../state/slices/traits';
+import type {
+  InfusionName,
+  ProfessionName,
+  ProfessionOrSpecializationName,
+  WeaponHandednessType,
+} from '../../utils/gw2-data';
 
 interface TemplateEntryBase {
   name: string;
@@ -11,7 +20,7 @@ interface TemplateEntryBase {
   distribution?: string;
   traits?: string;
   extras?: string;
-  weaponType?: string;
+  weaponType: WeaponHandednessType;
   outdated: boolean;
 }
 export type TemplateEntry = TemplateEntryBase & {
@@ -33,15 +42,15 @@ export interface PresetEntry {
 }
 
 export type PresetBuffsEntry = PresetEntry & {
-  value: JSON;
+  value: Partial<BuffsSlice['buffs']>;
 };
 export interface PresetBuffs {
   'GraphQL ID': string;
   list: PresetBuffsEntry[];
 }
 
 export type PresetAffixesEntry = Exclude<PresetEntry, 'profession'> & {
-  value: JSON;
+  value: Partial<PrioritiesSlice>;
 };
 export interface PresetAffixes {
   'GraphQL ID': string;
@@ -54,7 +63,7 @@ export interface Credit {
   log?: string;
 }
 export type PresetDistributionEntry = PresetEntry & {
-  value: JSON;
+  value: { values2: Distribution };
   noCreditOkay?: true;
   credit?: Credit[];
 };
@@ -64,24 +73,24 @@ export interface PresetDistribution {
 }
 
 export type PresetExtrasEntry = PresetEntry & {
-  value: JSON;
+  value: Partial<ExtrasSlice>;
 };
 export interface PresetExtras {
   'GraphQL ID': string;
   list: PresetExtrasEntry[];
 }
 
 export type PresetInfusionsEntry = Exclude<PresetEntry, 'profession'> & {
-  value: JSON;
+  value: { type: InfusionName | ''; count: string }[];
 };
 export interface PresetInfusions {
   'GraphQL ID': string;
   list: PresetInfusionsEntry[];
 }
 
 export type PresetTraitsEntry = PresetEntry & {
-  traits: JSON;
-  skills: JSON;
+  traits: Partial<TraitsSlice>;
+  skills: Partial<SkillsSlice>;
 };
 export interface PresetTraits {
   'GraphQL ID': string;