Merge v4 progress (#115)

apache1123 · Mar 23, 2024 · cda369d · cda369d
2 parents 400729c + 89a017d
commit cda369d
Show file tree

Hide file tree

Showing 38 changed files with 1,420 additions and 802 deletions.
diff --git a/src/constants/common-weapon-attack-buffs.ts b/src/constants/common-weapon-attack-buffs.ts
@@ -1,4 +1,4 @@
-import type { CommonWeaponAttackBuffDefinition } from '../models/v4/common-weapon-attack-buff-definition';
+import type { CommonWeaponAttackBuffDefinition } from '../models/v4/buffs/common-weapon-attack-buff-definition';
 
 export type CommonWeaponAttackBuffId = 'volt-resonance' | 'frost-resonance';
 

diff --git a/src/constants/elemental-type.ts b/src/constants/elemental-type.ts
@@ -3,5 +3,3 @@ export type CoreElementalType = 'Flame' | 'Frost' | 'Physical' | 'Volt';
 export type WeaponElementalType = CoreElementalType | 'Altered';
 
 export type ElementalType = WeaponElementalType | 'None' | 'All';
-
-export type AttackDefinitionElementalType = WeaponElementalType | 'LastWeapon';
diff --git a/src/constants/simulacrum-traits.ts b/src/constants/simulacrum-traits.ts
@@ -1026,7 +1026,6 @@ export const simulacrumTraits: Data<SimulacrumName, SimulacrumTrait> = {
           duration: {
             value: 8000,
           },
-          // TODO: implement cooldown logic on buffs
           cooldown: 16000,
         },
         {
@@ -1044,7 +1043,6 @@ export const simulacrumTraits: Data<SimulacrumName, SimulacrumTrait> = {
           duration: {
             value: 8000,
           },
-          // TODO: implement cooldown logic on buffs
           cooldown: 16000,
         },
       ],
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,5 +3,3 @@ export type CoreElementalType = 'Flame' \| 'Frost' \| 'Physical' \| 'Volt';
		export type WeaponElementalType = CoreElementalType \| 'Altered';

		export type ElementalType = WeaponElementalType \| 'None' \| 'All';

		export type AttackDefinitionElementalType = WeaponElementalType \| 'LastWeapon';