fix(seasonal): NO FLOWERS

We do not say the F word here. Strange things happen in Habitica when someone uses that word. We speak only of "the smelly things with the petals."

common/locales/en/spells.json

@@ -57,8 +57,8 @@
   "spellSpecialOpaquePotionText": "Opaque Potion",
   "spellSpecialOpaquePotionNotes": "Cancel the effects of Spooky Sparkles.",
 
-  "spellSpecialFlowerText": "Shiny Seed",
-  "spellSpecialFlowerNotes": "Turn a friend into a joyous flower!",
+  "spellSpecialShinySeedText": "Shiny Seed",
+  "spellSpecialShinySeedNotes": "Turn a friend into a joyous flower!",
   "spellSpecialPetalFreePotionText": "Petal-Free Potion",
   "spellSpecialPetalFreePotionNotes": "Cancel the effects of a Shiny Seed."
 

common/script/content.coffee

@@ -694,7 +694,7 @@ api.spells =
       cast: (user, target) ->
         target.stats.buffs.snowball = true
         target.stats.buffs.spookDust = false
-        target.stats.buffs.flower = false
+        target.stats.buffs.shinySeed = false
         target.achievements.snowball ?= 0
         target.achievements.snowball++
         user.items.special.snowball--
@@ -719,7 +719,7 @@ api.spells =
       cast: (user, target) ->
         target.stats.buffs.snowball = false
         target.stats.buffs.spookDust = true
-        target.stats.buffs.flower = false
+        target.stats.buffs.shinySeed = false
         target.achievements.spookDust ?= 0
         target.achievements.spookDust++
         user.items.special.spookDust--
@@ -735,19 +735,19 @@ api.spells =
         user.stats.buffs.spookDust = false
         user.stats.gp -= 5
 
-    flower:
-      text: t('spellSpecialFlowerText')
+    shinySeed:
+      text: t('spellSpecialShinySeedText')
       mana: 0
       value: 15
       target: 'user'
-      notes: t('spellSpecialFlowerNotes')
+      notes: t('spellSpecialShinySeedNotes')
       cast: (user, target) ->
         target.stats.buffs.snowball = false
         target.stats.buffs.spookDust = false
-        target.stats.buffs.flower = true
-        target.achievements.flower ?= 0
-        target.achievements.flower++
-        user.items.special.flower--
+        target.stats.buffs.shinySeed = true
+        target.achievements.shinySeed ?= 0
+        target.achievements.shinySeed++
+        user.items.special.shinySeed--
 
     petalFreePotion:
       text: t('spellSpecialPetalFreePotionText')
@@ -757,7 +757,7 @@ api.spells =
       target: 'self'
       notes: t('spellSpecialPetalFreePotionNotes')
       cast: (user, target) ->
-        user.stats.buffs.flower = false
+        user.stats.buffs.shinySeed = false
         user.stats.gp -= 5
 
     nye:

website/src/models/user.js

@@ -44,7 +44,7 @@ var UserSchema = new Schema({
     veteran: Boolean,
     snowball: Number,
     spookDust: Number,
-    flower: Number,
+    shinySeed: Number,
     streak: Number,
     challenges: Array,
     quests: Schema.Types.Mixed,
@@ -192,7 +192,7 @@ var UserSchema = new Schema({
     special:{
       snowball: {type: Number, 'default': 0},
       spookDust: {type: Number, 'default': 0},
-      flower: {type: Number, 'default': 0},
+      shinySeed: {type: Number, 'default': 0},
       valentine: Number,
       valentineReceived: Array, // array of strings, by sender name
       nye: Number,
@@ -359,7 +359,7 @@ var UserSchema = new Schema({
       streaks: {type: Boolean, 'default': false},
       snowball: {type: Boolean, 'default': false},
       spookDust: {type: Boolean, 'default': false},
-      flower: {type: Boolean, 'default': false}
+      shinySeed: {type: Boolean, 'default': false}
     },
     training: {
       int: {type: Number, 'default': 0},

website/views/options/inventory/inventory.jade

@@ -55,9 +55,9 @@ script(type='text/ng-template', id='partials/options.inventory.seasonalshop.html
             span.Pet_Currency_Gem1x.inline-gems
       menu.pets-menu(label=env.t('seasonalItems'))
         div
-          button.customize-option(popover='{{::Content.spells.special.flower.notes()}}', popover-title='{{::Content.spells.special.flower.text()}}', popover-trigger='mouseenter', popover-placement='right', popover-append-to-body='true', ng-click='purchase("special", Content.spells.special.flower)', class='inventory_special_flower')
+          button.customize-option(popover='{{::Content.spells.special.shinySeed.notes()}}', popover-title='{{::Content.spells.special.shinySeed.text()}}', popover-trigger='mouseenter', popover-placement='right', popover-append-to-body='true', ng-click='purchase("special", Content.spells.special.shinySeed)', class='inventory_special_shinySeed')
           p
-            | {{::Content.spells.special.flower.value}}
+            | {{::Content.spells.special.shinySeed.value}}
             span(class='shop_gold')
         // div
           button.customize-option(popover='{{::Content.spells.special.snowball.notes()}}', popover-title='{{::Content.spells.special.snowball.text()}}', popover-trigger='mouseenter', popover-placement='right', popover-append-to-body='true', ng-click='purchase("special", Content.spells.special.snowball)', class='inventory_special_snowball')
@@ -148,7 +148,7 @@ script(type='text/ng-template', id='partials/options.inventory.drops.html')
                     .badge.badge-info.stack-count {{user.items.special.#{k}}}
               +specialItem('snowball')
               +specialItem('spookDust')
-              +specialItem('flower')
+              +specialItem('shinySeed')
 
               div(ng-if='user.items.special.valentineReceived[0]')
                 button.customize-option(popover="Valentine's Day Card from {{User.user.items.special.valentineReceived[0]}}", popover-trigger='mouseenter', popover-placement='right', popover-append-to-body='true', ng-click='openModal("valentine")', class='inventory_special_valentine')

website/views/shared/header/avatar.jade

@@ -17,9 +17,9 @@ mixin avatar(opts)
       span.snowman
     span(ng-if='profile.stats.buffs.spookDust')
       span.spookman
-    span(ng-if='profile.stats.buffs.flower')
-      span(class='avatar_flower_{{profile.stats.class}}')
-    span(ng-if='!profile.stats.buffs.snowball && !profile.stats.buffs.spookDust && !profile.stats.buffs.flower')
+    span(ng-if='profile.stats.buffs.shinySeed')
+      span(class='avatar_floral_{{profile.stats.class}}')
+    span(ng-if='!profile.stats.buffs.snowball && !profile.stats.buffs.spookDust && !profile.stats.buffs.shinySeed')
 
       // Back Accessory
       span(class='{{profile.items.gear.equipped.back}}', ng-if='!profile.preferences.costume')

website/views/shared/new-stuff.jade

@@ -15,7 +15,7 @@ h5 4/2/2015 - LAST CHANCE FOR MARCH ITEM SET; SHINY SEEDS; MESSAGE CHALLENGE CRE
       h5 Shiny Seeds
       p Phew! Was that whole incident with the flowers just a colorful bad dream? But wait... what are these Shiny Seeds in the Seasonal Shop?
       br
-      .inventory_special_flower.pull-right
+      .inventory_special_shinySeed.pull-right
       p Whatever you do, don't drop one of these on a party member! Or yourself! That could be floral, I mean, <i>dangerous.</i>
       p.small.muted by Lemoness and SabreCat
   tr
@@ -39,7 +39,7 @@ mixin oldNews
       td
         h5 Joy and Doom to All!
         p THE SPRING FLING HAS FLUNG TOO FAR! Run while you can, Habiticans! The floral theme has come to life and is taking over Habitica with horrifying cheer, repeat, the flowers are taking over HMMMPH MMPH MMMHPPPH....
-        .avatar_flower_wizard
+        .avatar_floral_wizard
         p CELEBRATE FLOWER POWER.
         br
         p RESISTANCE IS SILLY.

website/views/shared/profiles/achievements.jade

@@ -178,11 +178,11 @@ div(ng-if='profile.achievements.spookDust')
     =env.t('alarmingFriendsText', {spookDust: "{{profile.achievements.spookDust}}"})
   hr
 
-div(ng-if='profile.achievements.flower')
-  .achievement.achievement-flower
+div(ng-if='profile.achievements.shinySeed')
+  .achievement.achievement-shinySeed
   h5=env.t('agriculturalFriends')
   small
-    =env.t('agriculturalFriendsText', {flowers: "{{profile.achievements.flower}}"})
+    =env.t('agriculturalFriendsText', {seeds: "{{profile.achievements.shinySeed}}"})
   hr
 
 div(ng-if='::profile.achievements.habitBirthdays')

website/views/shared/tasks/lists.jade

@@ -97,7 +97,7 @@ script(id='templates/habitrpg-tasks.html', type="text/ng-template")
               p.task-text {{item.text()}}
 
           // Events
-          ul.items.rewards(ng-if='main && list.type=="reward" && (user.items.special.snowball>0 || user.stats.buffs.snowball || user.items.special.spookDust>0 || user.stats.buffs.spookDust || user.items.special.flower>0 || user.stats.buffs.flower)')
+          ul.items.rewards(ng-if='main && list.type=="reward" && (user.items.special.snowball>0 || user.stats.buffs.snowball || user.items.special.spookDust>0 || user.stats.buffs.spookDust || user.items.special.shinySeed>0 || user.stats.buffs.shinySeed)')
 
             mixin specialSpell(k,canceler)
               li.task.reward-item(ng-if='#{canceler ? "user.stats.buffs."+canceler : "user.items.special."+k+">0"}',popover-trigger='mouseenter', popover-placement='top', popover='{{Content.spells.special.#{k}.notes()}}')
@@ -118,10 +118,10 @@ script(id='templates/habitrpg-tasks.html', type="text/ng-template")
 
             +specialSpell('snowball')
             +specialSpell('spookDust')
-            +specialSpell('flower')
+            +specialSpell('shinySeed')
             +specialSpell('salt','snowball')
             +specialSpell('opaquePotion','spookDust')
-            +specialSpell('petalFreePotion','flower')
+            +specialSpell('petalFreePotion','shinySeed')
 
           // Actual List
           ul(class='{{list.type}}s main-list', ng-show='obj[list.type + "s"].length > 0', hrpg-sort-tasks)