From a973db29f471c22a768e597aaab1fcc4ecdd0a81 Mon Sep 17 00:00:00 2001 From: MathWhiz Date: Tue, 31 May 2016 18:39:06 -0400 Subject: [PATCH] Show flower when using visual buffs Fixes #7133 Closes #7604 --- website/views/shared/avatar/appearance.jade | 4 ++++ website/views/shared/avatar/generated_avatar.jade | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/website/views/shared/avatar/appearance.jade b/website/views/shared/avatar/appearance.jade index 14f69414a0..278ebd6c2e 100644 --- a/website/views/shared/avatar/appearance.jade +++ b/website/views/shared/avatar/appearance.jade @@ -15,6 +15,10 @@ mixin avatar(opts) each klass, item in visualBuffs span(ng-if='profile.stats.buffs.#{item}', class='#{klass}') + // Show flower ALL THE TIME!!! + // See https://github.com/HabitRPG/habitrpg/issues/7133 + span(class='hair_flower_{{profile.preferences.hair.flower}}') + // Show avatar only if not currently affected by visual buff - var buffs = '!profile.stats.buffs' span(ng-if='#{buffs}.snowball && #{buffs}.spookySparkles && #{buffs}.shinySeed && #{buffs}.seafoam') diff --git a/website/views/shared/avatar/generated_avatar.jade b/website/views/shared/avatar/generated_avatar.jade index 02822a4457..672530c659 100644 --- a/website/views/shared/avatar/generated_avatar.jade +++ b/website/views/shared/avatar/generated_avatar.jade @@ -23,6 +23,5 @@ mixin generatedAvatar(options) +costumeSetting('eyewear') +costumeSetting('head') +costumeSetting('headAccessory') - span(class='hair_flower_{{profile.preferences.hair.flower}}') +costumeSetting('shield') +costumeSetting('weapon')