-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
b2fc076
commit 5e94f2b
Showing
5 changed files
with
86 additions
and
82 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,86 +1,86 @@ | ||
| // import { mock } from 'jest-mock-extended'; | ||
| import { mock } from 'jest-mock-extended'; | ||
|
|
||
| // import type { Weapon } from '../../../weapon'; | ||
| // import type { Charge } from '../../charge/charge'; | ||
| // import { TickTracker } from '../../tick/tick-tracker'; | ||
| // import { TimeInterval } from '../../time-interval/time-interval'; | ||
| // import { Timeline } from '../../timeline/timeline'; | ||
| // import type { WeaponTracker } from '../../weapon-tracker/weapon-tracker'; | ||
| // import { AttackAbility } from '../attack-ability'; | ||
| // import type { AttackAbility } from '../../../../definitions/types/attack/attack-ability'; | ||
| // import type { AttackEvent } from '../attack-event'; | ||
| import type { Weapon } from '../../../weapon'; | ||
| import type { Charge } from '../../charge/charge'; | ||
| import { TickTracker } from '../../tick/tick-tracker'; | ||
| import { TimeInterval } from '../../time-interval/time-interval'; | ||
| import { Timeline } from '../../timeline/timeline'; | ||
| import type { WeaponTracker } from '../../weapon-tracker/weapon-tracker'; | ||
| import { AttackAbility } from '../attack-ability'; | ||
| import type { AttackEvent } from '../attack-event'; | ||
|
|
||
| // describe('Attack ability', () => { | ||
| // describe('adding attack event', () => { | ||
| // it('cuts the previous attack event short if a new one is added before it has ended', () => { | ||
| // const timeline = new Timeline<AttackEvent>(100); | ||
| // const definition = mock<AttackAbility>({ | ||
| // endedBy: { duration: 20 }, | ||
| // }); | ||
| // const tickTracker = new TickTracker(new TimeInterval(0, 10), 10); | ||
| // TODO: out of date | ||
| describe.skip('Attack ability', () => { | ||
| describe('adding attack event', () => { | ||
| it('cuts the previous attack event short if a new one is added before it has ended', () => { | ||
| const timeline = new Timeline<AttackEvent>(100); | ||
| const definition = mock<AttackAbility>({ | ||
| endedBy: { duration: 20 }, | ||
| }); | ||
| const tickTracker = new TickTracker(new TimeInterval(0, 10), 10); | ||
|
|
||
| // const sut = new AttackAbility( | ||
| // mock<Weapon>(), | ||
| // definition, | ||
| // timeline, | ||
| // tickTracker, | ||
| // mock<WeaponTracker>(), | ||
| // mock<Charge>() | ||
| // ); | ||
| // sut.trigger(); | ||
| // tickTracker.advanceTick(); | ||
| // sut.trigger(); | ||
| const sut = new AttackAbility( | ||
| mock<Weapon>(), | ||
| definition, | ||
| timeline, | ||
| tickTracker, | ||
| mock<WeaponTracker>(), | ||
| mock<Charge>() | ||
| ); | ||
| sut.trigger(); | ||
| tickTracker.advanceTick(); | ||
| sut.trigger(); | ||
|
|
||
| // expect(timeline.events[0].startTime).toBe(0); | ||
| // expect(timeline.events[0].endTime).toBe(10); | ||
| // expect(timeline.events[1].startTime).toBe(10); | ||
| // expect(timeline.events[1].endTime).toBe(30); | ||
| // }); | ||
| // }); | ||
| // describe('resolving elemental type', () => { | ||
| // it('returns the correct elemental type, when there are no special conditions', () => { | ||
| // const sut = newAttack({ defaultElementalType: 'Altered' }); | ||
| // const event = sut.trigger(); | ||
| // expect(event?.elementalType).toBe('Altered'); | ||
| // }); | ||
| expect(timeline.events[0].startTime).toBe(0); | ||
| expect(timeline.events[0].endTime).toBe(10); | ||
| expect(timeline.events[1].startTime).toBe(10); | ||
| expect(timeline.events[1].endTime).toBe(30); | ||
| }); | ||
| }); | ||
| describe('resolving elemental type', () => { | ||
| it('returns the correct elemental type, when there are no special conditions', () => { | ||
| const sut = newAttack({ defaultElementalType: 'Altered' }); | ||
| const event = sut.trigger(); | ||
| expect(event?.elementalType).toBe('Altered'); | ||
| }); | ||
|
|
||
| // it("returns the correct elemental type, when the attack's elemental type follows the active weapon", () => { | ||
| // const sut = newAttack({ | ||
| // followCurrentWeaponElementalType: true, | ||
| // defaultElementalType: 'Flame', | ||
| // }); | ||
| // const event = sut.trigger(); | ||
| // expect(event?.elementalType).toBe('Altered'); | ||
| // }); | ||
| it("returns the correct elemental type, when the attack's elemental type follows the active weapon", () => { | ||
| const sut = newAttack({ | ||
| followCurrentWeaponElementalType: true, | ||
| defaultElementalType: 'Flame', | ||
| }); | ||
| const event = sut.trigger(); | ||
| expect(event?.elementalType).toBe('Altered'); | ||
| }); | ||
|
|
||
| // it("returns the correct elemental type, when the attack's elemental type follows the previous weapon", () => { | ||
| // const sut = newAttack({ | ||
| // followLastWeaponElementalType: true, | ||
| // defaultElementalType: 'Altered', | ||
| // }); | ||
| // const event = sut.trigger(); | ||
| // expect(event?.elementalType).toBe('Frost'); | ||
| // }); | ||
| it("returns the correct elemental type, when the attack's elemental type follows the previous weapon", () => { | ||
| const sut = newAttack({ | ||
| followLastWeaponElementalType: true, | ||
| defaultElementalType: 'Altered', | ||
| }); | ||
| const event = sut.trigger(); | ||
| expect(event?.elementalType).toBe('Frost'); | ||
| }); | ||
|
|
||
| // function newAttack(elementalType: AttackAbility['elementalType']) { | ||
| // const timeline = new Timeline<AttackEvent>(100); | ||
| // const definition = mock<AttackAbility>({ | ||
| // elementalType, | ||
| // triggeredBy: { playerInput: true }, | ||
| // endedBy: { duration: 100 }, | ||
| // }); | ||
| function newAttack(elementalType: AttackAbility['elementalType']) { | ||
| const timeline = new Timeline<AttackEvent>(100); | ||
| const definition = mock<AttackAbility>({ | ||
| elementalType, | ||
| triggeredBy: { playerInput: true }, | ||
| endedBy: { duration: 100 }, | ||
| }); | ||
|
|
||
| // return new AttackAbility( | ||
| // mock<AttackAbility['weapon']>(), | ||
| // definition, | ||
| // timeline, | ||
| // mock<AttackAbility['tickTracker']>(), | ||
| // mock<AttackAbility['weaponTracker']>({ | ||
| // activeWeapon: { damageElement: 'Altered' }, | ||
| // previousWeapon: { damageElement: 'Frost' }, | ||
| // }), | ||
| // mock<AttackAbility['charge']>() | ||
| // ); | ||
| // } | ||
| // }); | ||
| // }); | ||
| return new AttackAbility( | ||
| mock<AttackAbility['weapon']>(), | ||
| definition, | ||
| timeline, | ||
| mock<AttackAbility['tickTracker']>(), | ||
| mock<AttackAbility['weaponTracker']>({ | ||
| activeWeapon: { damageElement: 'Altered' }, | ||
| previousWeapon: { damageElement: 'Frost' }, | ||
| }), | ||
| mock<AttackAbility['charge']>() | ||
| ); | ||
| } | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters