Skip to content

Commit

Permalink
fix(combat): items with multiple effects will trigger correctly
Browse files Browse the repository at this point in the history
  • Loading branch information
@seiyria
seiyria committed Mar 23, 2023
1 parent 1a9f404 commit d8bb5db
Showing 1 changed file with 60 additions and 53 deletions.
113 changes: 60 additions & 53 deletions src/app/pages/tradeskills/peripheral/combat/combat-display/combat-display.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,14 @@ export class CombatDisplayComponent implements OnInit, OnDestroy {
public readonly selfTargets = [CombatAbilityTarget.All, CombatAbilityTarget.Self];
public readonly enemyTargets = [CombatAbilityTarget.All, CombatAbilityTarget.AllEnemies, CombatAbilityTarget.Single];

// TODO: activeAbilityInfo needs to be an array so all effects can happen - items that have multiple effects don't trigger correctly
public activeItemIndex = -1;
public activeAbilityIndex = -1;
public activeAbilityInfo: IGameCombatAbility | undefined;
public activeAbilityInfo: IGameCombatAbility[] | undefined;

public get firstAbilityForTargetting(): IGameCombatAbility | undefined {
return this.activeAbilityInfo?.[0];
}

private hpSub!: Subscription;
public hpDeltas: Record<string, Array<{ value: number }>> = {};
Expand Down Expand Up @@ -70,23 +75,23 @@ export class CombatDisplayComponent implements OnInit, OnDestroy {
}

canTargetSelf() {
if(!this.activeAbilityInfo) {
if(!this.firstAbilityForTargetting) {
return false;
}

return this.selfTargets.includes(this.activeAbilityInfo.target);
return this.selfTargets.includes(this.firstAbilityForTargetting.target);
}

canTargetEnemy(enemy: IGameEncounterCharacter) {
if(!this.activeAbilityInfo) {
if(!this.firstAbilityForTargetting) {
return false;
}

if(enemy.currentHealth <= 0) {
return false;
}

return this.enemyTargets.includes(this.activeAbilityInfo.target);
return this.enemyTargets.includes(this.firstAbilityForTargetting.target);
}

unselectAbility() {
Expand All @@ -103,7 +108,7 @@ export class CombatDisplayComponent implements OnInit, OnDestroy {
}

this.activeAbilityIndex = abilityIndex;
this.activeAbilityInfo = this.getAbility(ability);
this.activeAbilityInfo = [this.getAbility(ability)];
}

unselectItem() {
Expand All @@ -120,7 +125,9 @@ export class CombatDisplayComponent implements OnInit, OnDestroy {
}

this.activeItemIndex = itemIndex;
this.activeAbilityInfo = this.getAbility(item.effects?.[0]?.effect || '');
if(item.effects) {
this.activeAbilityInfo = item.effects.map(effect => this.getAbility(effect.effect));
}
}

displayDamageNumber(slot: string, damage: number) {
Expand Down Expand Up @@ -151,39 +158,40 @@ export class CombatDisplayComponent implements OnInit, OnDestroy {
this.unselectItem();
};

const ability = this.activeAbilityInfo;
const targetting = ability.target;

// hit all enemies only
if(targetting === CombatAbilityTarget.AllEnemies) {
this.store.dispatch([
new LowerPlayerCooldown(),
...encounter.enemies.map((x, i) => new TargetEnemyWithAbility(i, source, ability, this.activeAbilityIndex, useItem))
]);

finish();
return;
}

// hit self and all enemies
if(targetting === CombatAbilityTarget.All) {
this.activeAbilityInfo.forEach(ability => {
const targetting = ability.target;

// hit all enemies only
if(targetting === CombatAbilityTarget.AllEnemies) {
this.store.dispatch([
new LowerPlayerCooldown(),
...encounter.enemies.map((x, i) => new TargetEnemyWithAbility(i, source, ability, this.activeAbilityIndex, useItem))
]);

finish();
return;
}

// hit self and all enemies
if(targetting === CombatAbilityTarget.All) {
this.store.dispatch([
new LowerPlayerCooldown(),
...encounter.enemies.map((x, i) => new TargetEnemyWithAbility(i, source, ability, this.activeAbilityIndex, useItem)),
new TargetSelfWithAbility(ability, this.activeAbilityIndex, useItem)
]);

finish();
return;
}

// default: hit this enemy only
this.store.dispatch([
new LowerPlayerCooldown(),
...encounter.enemies.map((x, i) => new TargetEnemyWithAbility(i, source, ability, this.activeAbilityIndex, useItem)),
new TargetSelfWithAbility(this.activeAbilityInfo, this.activeAbilityIndex, useItem)
new TargetEnemyWithAbility(index, source, ability, this.activeAbilityIndex, useItem)
]);

finish();
return;
}

// default: hit this enemy only
this.store.dispatch([
new LowerPlayerCooldown(),
new TargetEnemyWithAbility(index, source, this.activeAbilityInfo, this.activeAbilityIndex, useItem)
]);

finish();
});
}

targetSelf(self: IGameEncounterCharacter, encounter: IGameEncounter) {
Expand All @@ -197,35 +205,34 @@ export class CombatDisplayComponent implements OnInit, OnDestroy {
this.store.dispatch(new UseItemInSlot(this.activeItemIndex));
}

const oldState = this.store.snapshot().combat;

const finish = () => {
this.unselectAbility();
this.unselectItem();
};

const ability = this.activeAbilityInfo;
const targetting = ability.target;
this.activeAbilityInfo.forEach(ability => {
const targetting = ability.target;

// hit self and all enemies
if(targetting === CombatAbilityTarget.All) {
// hit self and all enemies
if(targetting === CombatAbilityTarget.All) {
this.store.dispatch([
new LowerPlayerCooldown(),
...encounter.enemies.map((x, i) => new TargetEnemyWithAbility(i, self, ability, this.activeAbilityIndex, useItem)),
new TargetSelfWithAbility(ability, this.activeAbilityIndex, useItem)
]);

finish();
return;
}

// default: hit self only
this.store.dispatch([
new LowerPlayerCooldown(),
...encounter.enemies.map((x, i) => new TargetEnemyWithAbility(i, self, ability, this.activeAbilityIndex, useItem)),
new TargetSelfWithAbility(this.activeAbilityInfo, this.activeAbilityIndex, useItem)
new TargetSelfWithAbility(ability, this.activeAbilityIndex, useItem)
]);

finish();
return;
}

// default: hit self only
this.store.dispatch([
new LowerPlayerCooldown(),
new TargetSelfWithAbility(this.activeAbilityInfo, this.activeAbilityIndex, useItem)
]);

finish();
});
}

}

0 comments on commit d8bb5db

Please sign in to comment.