sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-13 15:38:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Quest Sidebar: Boss Pending Health inside the normal Bar (#13317)

Browse source
This commit is contained in:
negue 2021-08-27 02:22:56 +02:00 committed by GitHub
parent 572e709d63
commit 30c202dbbe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 60 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
website/client/config/storybook/config.js
View file

@ -38,6 +38,7 @@ import Vue from 'vue';
import BootstrapVue from 'bootstrap-vue'; import BootstrapVue from 'bootstrap-vue';
import StoreModule from '@/libs/store'; import StoreModule from '@/libs/store';
import getStore from '@/store'; import getStore from '@/store';
import '../../src/filters/registerGlobals';
import i18n from '../../../common/script/i18n'; import i18n from '../../../common/script/i18n';
@ -65,6 +66,9 @@ store.state.user.data = {
}, },
}, },
preferences: {
},
}; };
Vue.prototype.$store = store; Vue.prototype.$store = store;

39
website/client/src/components/groups/group.stories.js
View file

@ -37,6 +37,9 @@ storiesOf('Group Components|Party/Quest States', module)
_id: 'some-user', _id: 'some-user',
party: { party: {
},
preferences: {
}, },
}, },
}, },
@ -68,6 +71,9 @@ storiesOf('Group Components|Party/Quest States', module)
_id: 'some-user', _id: 'some-user',
party: { party: {
},
preferences: {
}, },
}, },
}, },
@ -101,6 +107,9 @@ storiesOf('Group Components|Party/Quest States', module)
_id: 'some-user', _id: 'some-user',
party: { party: {
},
preferences: {
}, },
}, },
}, },
@ -122,6 +131,9 @@ storiesOf('Group Components|Party/Quest States', module)
_id: '05ca98f4-4706-47b5-8d02-142e6e78ba2e', _id: '05ca98f4-4706-47b5-8d02-142e6e78ba2e',
party: { party: {
},
preferences: {
}, },
}, },
}, },
@ -143,6 +155,9 @@ storiesOf('Group Components|Party/Quest States', module)
_id: 'just-a-member', _id: 'just-a-member',
party: { party: {
},
preferences: {
}, },
}, },
}, },
@ -164,6 +179,9 @@ storiesOf('Group Components|Party/Quest States', module)
_id: 'just-a-member', _id: 'just-a-member',
party: { party: {
},
preferences: {
}, },
}, },
}, },
@ -190,6 +208,9 @@ storiesOf('Group Components|Party/Quest States', module)
RSVPNeeded: true, RSVPNeeded: true,
}, },
}, },
preferences: {
},
}, },
}, },
challengeOptions: {}, challengeOptions: {},
@ -218,6 +239,9 @@ storiesOf('Group Components|Party/Quest States', module)
}, },
}, },
}, },
preferences: {
},
}, },
}, },
challengeOptions: {}, challengeOptions: {},
@ -246,6 +270,9 @@ storiesOf('Group Components|Party/Quest States', module)
}, },
}, },
}, },
preferences: {
},
}, },
}, },
challengeOptions: {}, challengeOptions: {},
@ -274,6 +301,9 @@ storiesOf('Group Components|Party/Quest States', module)
}, },
}, },
}, },
preferences: {
},
}, },
}, },
challengeOptions: {}, challengeOptions: {},
@ -302,6 +332,9 @@ storiesOf('Group Components|Party/Quest States', module)
}, },
}, },
}, },
preferences: {
},
}, },
}, },
challengeOptions: {}, challengeOptions: {},
@ -330,6 +363,9 @@ storiesOf('Group Components|Party/Quest States', module)
}, },
}, },
}, },
preferences: {
},
}, },
}, },
challengeOptions: {}, challengeOptions: {},
@ -355,6 +391,9 @@ storiesOf('Group Components|Party/Quest States', module)
_id: 'some-user', _id: 'some-user',
party: { party: {
},
preferences: {
}, },
}, },
}, },

21
website/client/src/components/groups/questSidebarSection.vue
View file

@ -113,11 +113,11 @@
<div <div
class="boss-health-bar" class="boss-health-bar"
:style="{width: bossHpPercent + '%'}" :style="{width: bossHpPercent + '%'}"
></div>
<div
class="pending-health-bar"
:style="{width: pendingHpPercent + '%'}"
> >
<div
class="pending-health-bar"
:style="{width: pendingHpInBossHpPercent + '%'}"
></div>
</div> </div>
</div> </div>
</div> </div>
@ -291,12 +291,16 @@
height: 0.75rem; height: 0.75rem;
display: inline-block; display: inline-block;
position: relative;
} }
.pending-health-bar { .pending-health-bar {
height: 0.75rem; height: 0.75rem;
background-color: $yellow-50; background-color: $yellow-50;
display: inline-block; display: inline-block;
position: absolute;
right: 0;
} }
.rage-details { .rage-details {
@ -677,6 +681,15 @@ export default {
pendingHpPercent () { pendingHpPercent () {
return percent(this.user.party.quest.progress.up, this.questData.boss.hp); return percent(this.user.party.quest.progress.up, this.questData.boss.hp);
}, },
pendingHpInBossHpPercent () {
// Pending more than the current hp left, it is the full % of the pending bar
if (this.user.party.quest.progress.up > this.group.quest.progress.hp) {
return 100;
}
// otherwise the percent inside that hp bar is needed
return percent(this.user.party.quest.progress.up, this.group.quest.progress.hp);
},
questData () { questData () {
if (!this.group.quest) return {}; if (!this.group.quest) return {};
return quests.quests[this.group.quest.key]; return quests.quests[this.group.quest.key];