Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Change all instances of spookDust -> spookySparkles

Browse Source
This commit is contained in:
Blade Barringer
2016-05-19 09:53:46 -05:00
parent 42bc4bdd3d
commit 5bd436f3c8
20 changed files with 98 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
website/views/shared/avatar/appearance.jade
+2 -2
View File
@@ -11,13 +11,13 @@ mixin avatar(opts)
span(ng-if='profile.items.currentMount', class='Mount_Body_{{profile.items.currentMount}}')
// Buffs that cause visual changes to avatar: Snowman, Ghost, Flower, etc
- var visualBuffs = { snowball: 'snowman', spookDust: 'spookman', shinySeed: 'avatar_floral_{{profile.stats.class}}', seafoam: 'seafoam_star' }
- var visualBuffs = { snowball: 'snowman', spookySparkles: 'ghost', shinySeed: 'avatar_floral_{{profile.stats.class}}', seafoam: 'seafoam_star' }
each klass, item in visualBuffs
span(ng-if='profile.stats.buffs.#{item}', class='#{klass}')
// Show avatar only if not currently affected by visual buff
- var buffs = '!profile.stats.buffs'
span(ng-if='#{buffs}.snowball && #{buffs}.spookDust && #{buffs}.shinySeed && #{buffs}.seafoam')
span(ng-if='#{buffs}.snowball && #{buffs}.spookySparkles && #{buffs}.shinySeed && #{buffs}.seafoam')
+generatedAvatar
// Mount Head
website/views/shared/new-stuff.jade
+9 -9
View File
@@ -309,7 +309,7 @@ mixin oldNews
tr
td
.promo_spring_classes_2016.pull-right
h3 Limited Edition Class Outfits
h3 Limited Edition Class Outfits
p From now until April 30th, limited edition outfits are available in the Rewards column! Depending on your class, you can be a Springing Bunny, Clever Dog, Grand Malkin, or Brave Mouse. You'd better get productive to earn enough Gold before your time runs out...
p.small.muted by PainterProphet and Balduranne
tr
@@ -863,7 +863,7 @@ mixin oldNews
p Exciting news - for the next three weeks, we are offering <a href='https://teespring.com/stores/habitica' target='_blank'>Habitica T-shirts via Teespring</a>! Show your Habitica pride in purple or black. We are also offering an <a href='https://teespring.com/habitica-gryphon-t-shirt_eu' target='_blank'>EU run for cheaper shipping to Europe</a>!
br
p Whether you're getting them for yourself or as a holiday gift, we hope you enjoy these limited-run T-shirts! As always, thanks for supporting Habitica.
h2 11/5/2015 - HUGE IOS UPDATE AND ANDROID MAILING LIST
tr
td
@@ -893,7 +893,7 @@ mixin oldNews
tr
td
h3 Android Mailing List
p For those of you anxious for news about the new native Android app, we've created a mailing list so that you can be notified about important updates for the Android app. <a href='/static/apps' target='_blank'>You can sign up here!</a>
p For those of you anxious for news about the new native Android app, we've created a mailing list so that you can be notified about important updates for the Android app. <a href='/static/apps' target='_blank'>You can sign up here!</a>
br
p Our staff has been working very hard on it and testing out a new build each week, so progress is definitely advancing. When the beta is ready we will announce it on social media and on the site, but the mailing list is the easiest way to make sure you don't miss it! Thanks very much for your patience.
h2 11/3/2015 - NOVEMBER BACKGROUNDS AND ARMOIRE ITEMS, AND AUTO-EQUIP NEW GEAR
@@ -954,14 +954,14 @@ mixin oldNews
td
.promo_mystery_201510.pull-right
h3 Last Chance for Horned Goblin Set
p Reminder: this is the final day to <a href='/#/options/settings/subscription'>subscribe</a> and receive the Horned Goblin Item Set! If you want the Goblin Horns or the Goblin Tail, now's the time!
p Reminder: this is the final day to <a href='/#/options/settings/subscription'>subscribe</a> and receive the Horned Goblin Item Set! If you want the Goblin Horns or the Goblin Tail, now's the time!
br
p Thanks so much for your supporting the site -- you're helping us keep Habitica alive.
p Thanks so much for your supporting the site -- you're helping us keep Habitica alive.
tr
td
.npc_justin.pull-right
h3 Happy Habitoween!
p Burnout is nearly defeated, so what could be a better way to speed the celebration than to have some fun? In honor of Habitoween and defiance of the looming threat, all of the remaining NPCs have dressed up as monsters from the Flourishing Fields! Be sure to visit them on the site to admire their outfits. If only the three Exhaust Spirits could join them...
p Burnout is nearly defeated, so what could be a better way to speed the celebration than to have some fun? In honor of Habitoween and defiance of the looming threat, all of the remaining NPCs have dressed up as monsters from the Flourishing Fields! Be sure to visit them on the site to admire their outfits. If only the three Exhaust Spirits could join them...
h2 10/27/2015 - BURNOUT STRIKES AGAIN! PLUS, SPOOKY POTIONS VANISHING SOON
tr
@@ -2665,9 +2665,9 @@ mixin oldNews
td
h3 Spooky Sparkles
.pull-right
.inventory_special_spookDust
.achievement-spookDust
.spookman
.inventory_special_spookySparkles
.achievement-spookySparkles
.ghost
p There's a new gold-purchasable item in the <a href='https://habitrpg.com/#/options/inventory/drops' target='_blank'>Market</a>: Spooky Sparkles! Buy some and then cast it on your friends. I wonder what it will do?
br
p If you have Spooky Sparkles cast on you, you will receive the "Alarming Friends" badge! Don't worry, any mysterious effects will wear off the next day.... or you can cancel them early by buying an Opaque Potion!
website/views/shared/profiles/achievements.jade
+3 -3
View File
@@ -183,11 +183,11 @@ div(ng-if='::profile.achievements.snowball')
=env.t('annoyingFriendsText', {snowballs: "{{::profile.achievements.snowball}}"})
hr
div(ng-if='::profile.achievements.spookDust')
.achievement.achievement-spookDust
div(ng-if='::profile.achievements.spookySparkles')
.achievement.achievement-spookySparkles
h5=env.t('alarmingFriends')
small
=env.t('alarmingFriendsText', {spookDust: "{{::profile.achievements.spookDust}}"})
=env.t('alarmingFriendsText', {spookySparkles: "{{::profile.achievements.spookySparkles}}"})
hr
div(ng-if='::profile.achievements.shinySeed')
website/views/shared/tasks/task_view/skills.jade
+1 -1
View File
@@ -1,5 +1,5 @@
// Events
- var seasonalSkills = {'snowball':'salt', 'spookDust':'opaquePotion', 'shinySeed':'petalFreePotion', 'seafoam':'sand'}
- var seasonalSkills = {'snowball':'salt', 'spookySparkles':'opaquePotion', 'shinySeed':'petalFreePotion', 'seafoam':'sand'}
ul.items.rewards
each dispel,skill in seasonalSkills
span(ng-if='main && list.type=="reward" && (user.items.special.#{skill}>0 || user.stats.buffs.#{skill})')