sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-05-21 13:18:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

#11828: Show a boss damage notification for skills (#12173)

Browse source 
* #11828: Show a boss damage notification for skills

Brutal Smash and Burst of Flames skills should show a
boss damage notification

Fixes #11828

* Calculate quest progress regardless of spell target.
This commit is contained in:
Frank Maximus 2020-05-20 12:32:44 +02:00 committed by GitHub
parent c9bed96077
commit 8674ea55f9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
website/client/src/components/tasks/spells.vue
View file

@ -300,7 +300,7 @@ export default {
const { user } = this;
if (!user.party.quest) return 0;
const userQuest = this.quests[user.party.quest.key];
const userQuest = this.quests.quests[user.party.quest.key];
if (!userQuest) {
return 0;

7
website/client/src/mixins/spells.js
View file

@ -77,8 +77,7 @@ export default {
},
async castEnd (target, type) {
if (!this.$store.state.spellOptions.castingSpell) return null;
let beforeQuestProgress;
if (this.spell.target === 'party') beforeQuestProgress = this.questProgress();
const beforeQuestProgress = this.questProgress();
if (!this.applyingAction) return 'No applying action';
@ -153,10 +152,10 @@ export default {
this.markdown(msg); // @TODO: mardown directive?
if (!beforeQuestProgress) return null;
const questProgress = this.questProgress() - beforeQuestProgress;
if (questProgress > 0) {
const userQuest = this.quests[this.user.party.quest.key];
const userQuest = this.quests.quests[this.user.party.quest.key];
if (userQuest.boss) {
this.quest('questDamage', questProgress.toFixed(1));
} else if (userQuest.collection && userQuest.collect) {