Merge v4 progress

src/components/WeaponDefinitionSelector/WeaponDefinitionSelector.tsx

@@ -1,7 +1,7 @@
 import { Autocomplete, TextField } from '@mui/material';
 
+import type { Weapon as WeaponDefinition } from '../../definitions/types/weapon/weapon';
 import { weaponDefinitions } from '../../definitions/weapons/weapon-definitions';
-import type { WeaponDefinition } from '../../models/weapon-definition';
 
 export interface WeaponDefinitionSelectorProps {
   selectedWeaponDefinition: WeaponDefinition | undefined;

src/models/weapon-definition.ts → src/definitions/types/weapon/weapon.ts

@@ -1,25 +1,25 @@
-import type {
-  FusionWeaponElementalType,
-  WeaponElementalType,
-} from '../definitions/elemental-type';
-import type { WeaponName } from '../definitions/weapons/weapon-definitions';
-import { weaponDefinitions } from '../definitions/weapons/weapon-definitions';
-import type { WeaponType } from '../definitions/weapons/weapon-type';
 import type {
   DischargeAttackDefinition,
   DodgeAttackDefinition,
   NormalAttackDefinition,
   SkillAttackDefinition,
-} from './v4/weapon/weapon-attack-definition';
-import type { WeaponBuffDefinition } from './v4/weapon/weapon-buff-definition';
-import type { WeaponResourceDefinition } from './v4/weapon/weapon-resource-definition';
+} from '../../../models/v4/weapon/weapon-attack-definition';
+import type { WeaponBuffDefinition } from '../../../models/v4/weapon/weapon-buff-definition';
+import type { WeaponResourceDefinition } from '../../../models/v4/weapon/weapon-resource-definition';
 import type {
   WeaponAttackPercentBuffDefinition,
   WeaponCritDamageBuffDefinition,
   WeaponCritRateBuffDefinition,
-} from './weapon-buff-definition';
+} from '../../../models/weapon-buff-definition';
+import type {
+  FusionWeaponElementalType,
+  WeaponElementalType,
+} from '../../elemental-type';
+import type { WeaponName } from '../../weapons/weapon-definitions';
+import { weaponDefinitions } from '../../weapons/weapon-definitions';
+import type { WeaponType } from '../../weapons/weapon-type';
 
-export interface WeaponDefinition {
+export interface Weapon {
   id: WeaponName;
   displayName: string;
   /** Optional. The weapon's icon will be inferred from the id if not provided */
@@ -51,6 +51,6 @@ export interface WeaponDefinition {
   resources: WeaponResourceDefinition[];
 }
 
-export function getWeaponDefinition(id: WeaponName): WeaponDefinition {
+export function getWeaponDefinition(id: WeaponName): Weapon {
   return weaponDefinitions.byId[id];
 }

src/definitions/weapons/definitions/alyss.ts

@@ -1,4 +1,4 @@
-import type { WeaponDefinition } from '../../../models/weapon-definition';
+import type { Weapon } from '../../types/weapon/weapon';
 
 export const alyss = {
   id: 'Alyss',
@@ -30,4 +30,4 @@ export const alyss = {
   discharges: [],
   buffs: [],
   resources: [],
-} satisfies WeaponDefinition;
+} satisfies Weapon;

src/definitions/weapons/definitions/anka.ts

@@ -1,4 +1,4 @@
-import type { WeaponDefinition } from '../../../models/weapon-definition';
+import type { Weapon } from '../../types/weapon/weapon';
 
 export const anka = {
   id: 'Anka',
@@ -43,4 +43,4 @@ export const anka = {
   discharges: [],
   buffs: [],
   resources: [],
-} as const satisfies WeaponDefinition;
+} as const satisfies Weapon;

src/definitions/weapons/definitions/annabella.ts

@@ -1,4 +1,4 @@
-import type { WeaponDefinition } from '../../../models/weapon-definition';
+import type { Weapon } from '../../types/weapon/weapon';
 
 export const annabella = {
   id: 'Annabella',
@@ -53,4 +53,4 @@ export const annabella = {
   discharges: [],
   buffs: [],
   resources: [],
-} satisfies WeaponDefinition;
+} satisfies Weapon;

src/definitions/weapons/definitions/asuka.ts

@@ -1,4 +1,4 @@
-import type { WeaponDefinition } from '../../../models/weapon-definition';
+import type { Weapon } from '../../types/weapon/weapon';
 
 export const asuka = {
   id: 'Asuka',
@@ -43,4 +43,4 @@ export const asuka = {
   discharges: [],
   buffs: [],
   resources: [],
-} satisfies WeaponDefinition;
+} satisfies Weapon;

src/definitions/weapons/definitions/brevey.ts

@@ -1,4 +1,4 @@
-import type { WeaponDefinition } from '../../../models/weapon-definition';
+import type { Weapon } from '../../types/weapon/weapon';
 
 export const brevey = {
   id: 'Brevey',
@@ -63,4 +63,4 @@ export const brevey = {
         'Used to track the amount of damage accumulated, one unit is 1 times the total ATK',
     },
   ],
-} satisfies WeaponDefinition;
+} satisfies Weapon;

src/definitions/weapons/definitions/claudia.ts

@@ -1,4 +1,4 @@
-import type { WeaponDefinition } from '../../../models/weapon-definition';
+import type { Weapon } from '../../types/weapon/weapon';
 
 export const claudia = {
   id: 'Claudia',
@@ -31,4 +31,4 @@ export const claudia = {
   discharges: [],
   buffs: [],
   resources: [],
-} satisfies WeaponDefinition;
+} satisfies Weapon;

src/definitions/weapons/definitions/cobalt-b.ts

@@ -1,4 +1,4 @@
-import type { WeaponDefinition } from '../../../models/weapon-definition';
+import type { Weapon } from '../../types/weapon/weapon';
 
 export const cobaltB = {
   id: 'Cobalt-B',
@@ -30,4 +30,4 @@ export const cobaltB = {
   discharges: [],
   buffs: [],
   resources: [],
-} satisfies WeaponDefinition;
+} satisfies Weapon;

src/definitions/weapons/definitions/cocoritter.ts

@@ -1,4 +1,4 @@
-import type { WeaponDefinition } from '../../../models/weapon-definition';
+import type { Weapon } from '../../types/weapon/weapon';
 
 export const cocoritter = {
   id: 'Cocoritter',
@@ -43,4 +43,4 @@ export const cocoritter = {
   discharges: [],
   buffs: [],
   resources: [],
-} satisfies WeaponDefinition;
+} satisfies Weapon;

src/definitions/weapons/definitions/crow.ts

@@ -1,4 +1,4 @@
-import type { WeaponDefinition } from '../../../models/weapon-definition';
+import type { Weapon } from '../../types/weapon/weapon';
 
 export const crow = {
   id: 'Crow',
@@ -17,4 +17,4 @@ export const crow = {
   discharges: [],
   buffs: [],
   resources: [],
-} satisfies WeaponDefinition;
+} satisfies Weapon;

src/definitions/weapons/definitions/fei-se.ts

@@ -1,4 +1,4 @@
-import type { WeaponDefinition } from '../../../models/weapon-definition';
+import type { Weapon } from '../../types/weapon/weapon';
 
 export const feiSe = {
   id: 'Fei Se',
@@ -30,4 +30,4 @@ export const feiSe = {
   discharges: [],
   buffs: [],
   resources: [],
-} satisfies WeaponDefinition;
+} satisfies Weapon;

src/definitions/weapons/definitions/fenrir.ts

@@ -1,4 +1,4 @@
-import type { WeaponDefinition } from '../../../models/weapon-definition';
+import type { Weapon } from '../../types/weapon/weapon';
 
 export const fenrir = {
   id: 'Fenrir',
@@ -53,4 +53,4 @@ export const fenrir = {
   discharges: [],
   buffs: [],
   resources: [],
-} satisfies WeaponDefinition;
+} satisfies Weapon;

src/definitions/weapons/definitions/fiona.ts

@@ -1,4 +1,4 @@
-import type { WeaponDefinition } from '../../../models/weapon-definition';
+import type { Weapon } from '../../types/weapon/weapon';
 
 export const fiona = {
   id: 'Fiona',
@@ -42,4 +42,4 @@ export const fiona = {
   discharges: [],
   buffs: [],
   resources: [],
-} satisfies WeaponDefinition;
+} satisfies Weapon;

src/definitions/weapons/definitions/frigg.ts

@@ -1,4 +1,4 @@
-import type { WeaponDefinition } from '../../../models/weapon-definition';
+import type { Weapon } from '../../types/weapon/weapon';
 
 export const frigg = {
   id: 'Frigg',
@@ -52,4 +52,4 @@ export const frigg = {
   discharges: [],
   buffs: [],
   resources: [],
-} satisfies WeaponDefinition;
+} satisfies Weapon;

src/definitions/weapons/definitions/gnonno.ts

@@ -1,4 +1,4 @@
-import type { WeaponDefinition } from '../../../models/weapon-definition';
+import type { Weapon } from '../../types/weapon/weapon';
 
 export const gnonno = {
   id: 'Gnonno',
@@ -31,4 +31,4 @@ export const gnonno = {
   discharges: [],
   buffs: [],
   resources: [],
-} satisfies WeaponDefinition;
+} satisfies Weapon;

src/definitions/weapons/definitions/huma.ts

@@ -1,4 +1,4 @@
-import type { WeaponDefinition } from '../../../models/weapon-definition';
+import type { Weapon } from '../../types/weapon/weapon';
 
 export const huma = {
   id: 'Huma',
@@ -17,4 +17,4 @@ export const huma = {
   discharges: [],
   buffs: [],
   resources: [],
-} satisfies WeaponDefinition;
+} satisfies Weapon;

src/definitions/weapons/definitions/icarus.ts

@@ -1,4 +1,4 @@
-import type { WeaponDefinition } from '../../../models/weapon-definition';
+import type { Weapon } from '../../types/weapon/weapon';
 
 export const icarus = {
   id: 'Icarus',
@@ -30,4 +30,4 @@ export const icarus = {
   discharges: [],
   buffs: [],
   resources: [],
-} satisfies WeaponDefinition;
+} satisfies Weapon;

src/definitions/weapons/definitions/ji-yu.ts

@@ -1,4 +1,4 @@
-import type { WeaponDefinition } from '../../../models/weapon-definition';
+import type { Weapon } from '../../types/weapon/weapon';
 
 export const jiYu = {
   id: 'Ji Yu',
@@ -43,4 +43,4 @@ export const jiYu = {
   discharges: [],
   buffs: [],
   resources: [],
-} satisfies WeaponDefinition;
+} satisfies Weapon;

src/definitions/weapons/definitions/king.ts

@@ -1,4 +1,4 @@
-import type { WeaponDefinition } from '../../../models/weapon-definition';
+import type { Weapon } from '../../types/weapon/weapon';
 
 export const king = {
   id: 'King',
@@ -17,4 +17,4 @@ export const king = {
   discharges: [],
   buffs: [],
   resources: [],
-} satisfies WeaponDefinition;
+} satisfies Weapon;

src/definitions/weapons/definitions/lan.ts

@@ -1,4 +1,4 @@
-import type { WeaponDefinition } from '../../../models/weapon-definition';
+import type { Weapon } from '../../types/weapon/weapon';
 
 export const lan = {
   id: 'Lan',
@@ -30,4 +30,4 @@ export const lan = {
   discharges: [],
   buffs: [],
   resources: [],
-} satisfies WeaponDefinition;
+} satisfies Weapon;

src/definitions/weapons/definitions/lin.ts

@@ -1,4 +1,4 @@
-import type { WeaponDefinition } from '../../../models/weapon-definition';
+import type { Weapon } from '../../types/weapon/weapon';
 
 export const lin = {
   id: 'Lin',
@@ -65,4 +65,4 @@ export const lin = {
   discharges: [],
   buffs: [],
   resources: [],
-} satisfies WeaponDefinition;
+} satisfies Weapon;

src/definitions/weapons/definitions/ling-han.ts

@@ -1,4 +1,4 @@
-import type { WeaponDefinition } from '../../../models/weapon-definition';
+import type { Weapon } from '../../types/weapon/weapon';
 
 export const lingHan = {
   id: 'Ling Han',
@@ -41,4 +41,4 @@ export const lingHan = {
   discharges: [],
   buffs: [],
   resources: [],
-} satisfies WeaponDefinition;
+} satisfies Weapon;

src/definitions/weapons/definitions/liu-huo.ts

@@ -1,4 +1,4 @@
-import type { WeaponDefinition } from '../../../models/weapon-definition';
+import type { Weapon } from '../../types/weapon/weapon';
 
 export const liuHuo = {
   id: 'Liu Huo',
@@ -30,4 +30,4 @@ export const liuHuo = {
   discharges: [],
   buffs: [],
   resources: [],
-} satisfies WeaponDefinition;
+} satisfies Weapon;

src/definitions/weapons/definitions/lyra.ts

@@ -1,4 +1,4 @@
-import type { WeaponDefinition } from '../../../models/weapon-definition';
+import type { Weapon } from '../../types/weapon/weapon';
 
 export const lyra = {
   id: 'Lyra',
@@ -44,4 +44,4 @@ export const lyra = {
   discharges: [],
   buffs: [],
   resources: [],
-} satisfies WeaponDefinition;
+} satisfies Weapon;

src/definitions/weapons/definitions/meryl.ts

@@ -1,4 +1,4 @@
-import type { WeaponDefinition } from '../../../models/weapon-definition';
+import type { Weapon } from '../../types/weapon/weapon';
 
 export const meryl = {
   id: 'Meryl',
@@ -17,4 +17,4 @@ export const meryl = {
   discharges: [],
   buffs: [],
   resources: [],
-} satisfies WeaponDefinition;
+} satisfies Weapon;

src/definitions/weapons/definitions/mimi.ts

@@ -1,4 +1,4 @@
-import type { WeaponDefinition } from '../../../models/weapon-definition';
+import type { Weapon } from '../../types/weapon/weapon';
 
 export const mimi = {
   id: 'Huang (Mimi)',
@@ -30,4 +30,4 @@ export const mimi = {
   discharges: [],
   buffs: [],
   resources: [],
-} satisfies WeaponDefinition;
+} satisfies Weapon;

src/definitions/weapons/definitions/ming-jing.ts

@@ -1,4 +1,4 @@
-import type { WeaponDefinition } from '../../../models/weapon-definition';
+import type { Weapon } from '../../types/weapon/weapon';
 
 export const mingJing = {
   id: 'Ming Jing',
@@ -43,4 +43,4 @@ export const mingJing = {
   discharges: [],
   buffs: [],
   resources: [],
-} satisfies WeaponDefinition;
+} satisfies Weapon;

src/definitions/weapons/definitions/nan-yin.ts

@@ -1,4 +1,4 @@
-import type { WeaponDefinition } from '../../../models/weapon-definition';
+import type { Weapon } from '../../types/weapon/weapon';
 
 export const nanYin = {
   id: 'Nan Yin',
@@ -36,4 +36,4 @@ export const nanYin = {
   discharges: [],
   buffs: [],
   resources: [],
-} satisfies WeaponDefinition;
+} satisfies Weapon;

src/definitions/weapons/definitions/nemesis.ts

@@ -1,4 +1,4 @@
-import type { WeaponDefinition } from '../../../models/weapon-definition';
+import type { Weapon } from '../../types/weapon/weapon';
 
 export const nemesis = {
   id: 'Nemesis',
@@ -65,4 +65,4 @@ export const nemesis = {
   discharges: [],
   buffs: [],
   resources: [],
-} satisfies WeaponDefinition;
+} satisfies Weapon;