From 91cbf7a2a97a95d2d4bb94889dcaa60a3f07e09d Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Wed, 23 Nov 2022 13:08:23 -0600
Subject: [PATCH 1/6] fix(shops): show correct countdown outside of Gala

---
 .../client/src/components/shops/buyModal.vue  |  5 +-
 .../components/shops/market/categoryRow.vue   | 51 -------------------
 2 files changed, 3 insertions(+), 53 deletions(-)

diff --git a/website/client/src/components/shops/buyModal.vue b/website/client/src/components/shops/buyModal.vue
index 013c291d55..66c90b182a 100644
--- a/website/client/src/components/shops/buyModal.vue
+++ b/website/client/src/components/shops/buyModal.vue
@@ -385,7 +385,6 @@ import EquipmentAttributesGrid from '../inventory/equipment/attributesGrid.vue';
 import Item from '@/components/inventory/item';
 import Avatar from '@/components/avatar';
 
-import seasonalShopConfig from '@/../../common/script/libs/shops-seasonal.config';
 import { drops as dropEggs } from '@/../../common/script/content/eggs';
 import { drops as dropPotions } from '@/../../common/script/content/hatching-potions';
 
@@ -438,7 +437,6 @@ export default {
 
       selectedAmountToBuy: 1,
       isPinned: false,
-      endDate: seasonalShopConfig.dateRange.end,
     };
   },
   computed: {
@@ -489,6 +487,9 @@ export default {
     nonSubscriberHourglasses () {
       return (!this.user.purchased.plan.customerId && !this.user.purchased.plan.consecutive.trinkets && this.getPriceClass() === 'hourglasses');
     },
+    endDate () {
+      return moment(this.item.event.end);
+    },
   },
   watch: {
     item: function itemChanged () {
diff --git a/website/client/src/components/shops/market/categoryRow.vue b/website/client/src/components/shops/market/categoryRow.vue
index eada1073a0..77610d2ae2 100644
--- a/website/client/src/components/shops/market/categoryRow.vue
+++ b/website/client/src/components/shops/market/categoryRow.vue
@@ -8,16 +8,6 @@
       :popover-position="'top'"
       @click="itemSelected(item)"
     >
-      <span slot="popoverContent">
-        <strong v-if="item.key === 'gem' && gemsLeft === 0">{{ $t('maxBuyGems') }}</strong>
-        <h4 class="popover-content-title">{{ item.text }}</h4>
-        <div
-          v-if="item.event"
-          class="mt-2"
-        >
-          {{ limitedString }}
-        </div>
-      </span>
       <template
         slot="itemBadge"
         slot-scope="ctx"
@@ -32,11 +22,9 @@
 import _filter from 'lodash/filter';
 import _sortBy from 'lodash/sortBy';
 import _map from 'lodash/map';
-import moment from 'moment';
 import { mapState } from '@/libs/store';
 import pinUtils from '@/mixins/pinUtils';
 import planGemLimits from '@/../../common/script/libs/planGemLimits';
-import seasonalShopConfig from '@/../../common/script/libs/shops-seasonal.config';
 
 import ShopItem from '../shopItem';
 import CategoryItem from './categoryItem';
@@ -48,12 +36,6 @@ export default {
   },
   mixins: [pinUtils],
   props: ['hideLocked', 'hidePinned', 'searchBy', 'sortBy', 'category'],
-  data () {
-    return {
-      timer: '',
-      limitedString: '',
-    };
-  },
   computed: {
     ...mapState({
       content: 'content',
@@ -106,43 +88,10 @@ export default {
       return result;
     },
   },
-  mounted () {
-    this.countdownString();
-    this.timer = setInterval(this.countdownString, 1000);
-  },
-  beforeDestroy () {
-    this.cancelAutoUpdate();
-  },
   methods: {
     itemSelected (item) {
       this.$root.$emit('buyModal::showItem', item);
     },
-    countdownString () {
-      const diffDuration = moment.duration(moment(seasonalShopConfig.dateRange.end).diff(moment()));
-
-      if (diffDuration.asSeconds() <= 0) {
-        this.limitedString = this.$t('noLongerAvailable');
-      } else if (diffDuration.days() > 0 || diffDuration.months() > 0) {
-        this.limitedString = this.$t('limitedAvailabilityDays', {
-          days: moment(seasonalShopConfig.dateRange.end).diff(moment(), 'days'),
-          hours: diffDuration.hours(),
-          minutes: diffDuration.minutes(),
-        });
-      } else if (diffDuration.asMinutes() > 2) {
-        this.limitedString = this.$t('limitedAvailabilityHours', {
-          hours: diffDuration.hours(),
-          minutes: diffDuration.minutes(),
-        });
-      } else {
-        this.limitedString = this.$t('limitedAvailabilityMinutes', {
-          minutes: diffDuration.minutes(),
-          seconds: diffDuration.seconds(),
-        });
-      }
-    },
-    cancelAutoUpdate () {
-      clearInterval(this.timer);
-    },
   },
 };
 </script>

From e56b6722263b0ef9b2aee62e1f879a9049c24bb1 Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Wed, 23 Nov 2022 13:08:35 -0600
Subject: [PATCH 2/6] 4.249.7

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e06be5522c..ce732029f6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.249.6",
+  "version": "4.249.7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 625f1c91a9..2b7c7d7042 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.249.6",
+  "version": "4.249.7",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.19.6",

From 96a919ed4b465c63011b5473d90a89afa84497ff Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Wed, 23 Nov 2022 13:13:06 -0600
Subject: [PATCH 3/6] fix(shops): quest countdowns too

---
 website/client/src/components/shops/quests/buyQuestModal.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/website/client/src/components/shops/quests/buyQuestModal.vue b/website/client/src/components/shops/quests/buyQuestModal.vue
index b384773e17..50487f7530 100644
--- a/website/client/src/components/shops/quests/buyQuestModal.vue
+++ b/website/client/src/components/shops/quests/buyQuestModal.vue
@@ -319,7 +319,6 @@ export default {
 
       isPinned: false,
       selectedAmountToBuy: 1,
-      endDate: seasonalShopConfig.dateRange.end,
     };
   },
   computed: {
@@ -343,6 +342,9 @@ export default {
       if (this.priceType === 'hourglasses') return this.icons.hourglass;
       return this.icons.gem;
     },
+    endDate () {
+      return moment(this.item.event.end);
+    },
   },
   watch: {
     item: function itemChanged () {

From 90b34c4dac598e5d9f363840115e8c57f7168faa Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Wed, 23 Nov 2022 13:23:43 -0600
Subject: [PATCH 4/6] fix(shops): correct imports

---
 website/client/src/components/shops/quests/buyQuestModal.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/client/src/components/shops/quests/buyQuestModal.vue b/website/client/src/components/shops/quests/buyQuestModal.vue
index 50487f7530..23c47d7880 100644
--- a/website/client/src/components/shops/quests/buyQuestModal.vue
+++ b/website/client/src/components/shops/quests/buyQuestModal.vue
@@ -263,8 +263,8 @@
 </style>
 
 <script>
+import moment from 'moment';
 import { mapState } from '@/libs/store';
-import seasonalShopConfig from '@/../../common/script/libs/shops-seasonal.config';
 
 import svgClock from '@/assets/svg/clock.svg';
 import svgClose from '@/assets/svg/close.svg';

From 9bd039b17b14d575c85131588cee05db45991c31 Mon Sep 17 00:00:00 2001
From: Natalie L <78037386+CuriousMagpie@users.noreply.github.com>
Date: Mon, 28 Nov 2022 16:34:18 -0500
Subject: [PATCH 5/6] chore(content): add December 2022 Mystery Items (#14379)

* chore(submodule): images

* chore(content): December Mystery Items

* chore(content): sprites

* fix(typo): whitespace

Co-authored-by: Sabe Jones <sabrecat@gmail.com>
---
 habitica-images                               |  2 +-
 .../assets/css/sprites/spritesmith-main.css   | 40 +++++++++++++++++++
 website/common/locales/en/gear.json           |  7 +++-
 website/common/locales/en/subscriber.json     |  1 +
 .../script/content/gear/sets/mystery.js       |  3 ++
 5 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/habitica-images b/habitica-images
index 941bf731d6..fadca5c096 160000
--- a/habitica-images
+++ b/habitica-images
@@ -1 +1 @@
-Subproject commit 941bf731d61b21288e5453705d5718cae02f8af0
+Subproject commit fadca5c09661c51bd5d3c1ec3fd0ad0849f6ef6c
diff --git a/website/client/src/assets/css/sprites/spritesmith-main.css b/website/client/src/assets/css/sprites/spritesmith-main.css
index 8d02728540..508333b2df 100644
--- a/website/client/src/assets/css/sprites/spritesmith-main.css
+++ b/website/client/src/assets/css/sprites/spritesmith-main.css
@@ -27415,6 +27415,46 @@
   width: 114px;
   height: 90px;
 }
+.broad_armor_mystery_202212 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_mystery_202212.png');
+  width: 114px;
+  height: 90px;
+}
+.headAccessory_mystery_202212 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_mystery_202212.png');
+  width: 114px;
+  height: 90px;
+}
+.shop_armor_mystery_202212 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_mystery_202212.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_headAccessory_mystery_202212 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_mystery_202212.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_set_mystery_202212 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_set_mystery_202212.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_weapon_mystery_202212 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_mystery_202212.png');
+  width: 68px;
+  height: 68px;
+}
+.slim_armor_mystery_202212 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_mystery_202212.png');
+  width: 114px;
+  height: 90px;
+}
+.weapon_mystery_202212 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_mystery_202212.png');
+  width: 114px;
+  height: 90px;
+}
 .broad_armor_mystery_301404 {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_mystery_301404.png');
   width: 90px;
diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json
index adaa3ad001..a258217ab4 100644
--- a/website/common/locales/en/gear.json
+++ b/website/common/locales/en/gear.json
@@ -484,6 +484,8 @@
   "weaponMystery202209Notes": "This book will guide you through your journey into magic-making. Confers no benefit. September 2022 Subscriber Item.",
   "weaponMystery202211Text": "Electromancer Staff",
   "weaponMystery202211Notes": "Harness the awesome power of a lightning storm with this staff. Confers no benefit. November 2022 Subscriber Item.",
+  "weaponMystery202212Text": "Glacial Wand",
+  "weaponMystery202212Notes": "The glowing snowflake in this wand holds the power to warm hearts on even the coldest winter night! Confers no benefit. December 2022 Subscriber Item.",  
   "weaponMystery301404Text": "Steampunk Cane",
   "weaponMystery301404Notes": "Excellent for taking a turn about town. March 3015 Subscriber Item. Confers no benefit.",
 
@@ -1218,6 +1220,8 @@
   "armorMystery202207Notes": "This armor will have you looking glamorous and gelatinous. Confers no benefit. July 2022 Subscriber Item.",
   "armorMystery202210Text": "Ominous Ophidian Armor",
   "armorMystery202210Notes": "Try slithering for a change, you may find it's quite an efficient mode of transportation! Confers no benefit. October 2022 Subscriber Item.",
+  "armorMystery202212Text": "Glacial Dress",
+  "armorMystery202212Notes": "The universe can be cold, but this charming dress will keep you cozy as you fly. Confers no benefit. December 2022 Subscriber Item.",
   "armorMystery301404Text": "Steampunk Suit",
   "armorMystery301404Notes": "Dapper and dashing, wot! Confers no benefit. February 3015 Subscriber Item.",
   "armorMystery301703Text": "Steampunk Peacock Gown",
@@ -1972,7 +1976,6 @@
   "headMystery202210Notes": "This scaly hood will surely terrify your To-Do list into submission! Confers no benefit. October 2022 Subscriber Item.",
   "headMystery202211Text": "Electromancer Hat",
   "headMystery202211Notes": "Be careful with this powerful hat, its effect on admirers can be quite shocking! Confers no benefit. November 2022 Subscriber Item.",
-  
   "headMystery301404Text": "Fancy Top Hat",
   "headMystery301404Notes": "A fancy top hat for the finest of gentlefolk! January 3015 Subscriber Item. Confers no benefit.",
   "headMystery301405Text": "Basic Top Hat",
@@ -2816,6 +2819,8 @@
   "headAccessoryMystery202203Notes": "Need an extra boost of speed? The tiny decorative wings on this circlet are more powerful than they look! Confers no benefit. March 2022 Subscriber Item.",
   "headAccessoryMystery202205Text": "Dusk-Winged Dragon Horns",
   "headAccessoryMystery202205Notes": "These dazzling horns are as bright as a desert sunset. Confers no benefit. May 2022 Subscriber Item.",
+  "headAccessoryMystery202212Text": "Glacial Tiara",
+  "headAccessoryMystery202212Notes": "Magnify your warmth and friendship to new heights with this ornate golden tiara. Confers no benefit. December 2022 Subscriber Item.",
   "headAccessoryMystery301405Text": "Headwear Goggles",
   "headAccessoryMystery301405Notes": "\"Goggles are for your eyes,\" they said. \"Nobody wants goggles that you can only wear on your head,\" they said. Hah! You sure showed them! Confers no benefit. August 3015 Subscriber Item.",
 
diff --git a/website/common/locales/en/subscriber.json b/website/common/locales/en/subscriber.json
index c48ffd7dc1..ee1ef8615d 100644
--- a/website/common/locales/en/subscriber.json
+++ b/website/common/locales/en/subscriber.json
@@ -144,6 +144,7 @@
     "mysterySet202209": "Magical Scholar Set",
     "mysterySet202210": "Ominous Ophidian Set",
     "mysterySet202211": "Electromancer Set",
+    "mysterySet202212": "Glacial Guardian Set",
     "mysterySet301404": "Steampunk Standard Set",
     "mysterySet301405": "Steampunk Accessories Set",
     "mysterySet301703": "Peacock Steampunk Set",
diff --git a/website/common/script/content/gear/sets/mystery.js b/website/common/script/content/gear/sets/mystery.js
index ae3b532e76..8d1268646b 100644
--- a/website/common/script/content/gear/sets/mystery.js
+++ b/website/common/script/content/gear/sets/mystery.js
@@ -59,6 +59,7 @@ const armor = {
   202204: { },
   202207: { },
   202210: { },
+  202212: { },
   301404: { },
   301703: { },
   301704: { },
@@ -222,6 +223,7 @@ const headAccessory = {
   202105: { },
   202109: { },
   202203: { },
+  202212: { },
   202205: { },
   301405: { },
 };
@@ -253,6 +255,7 @@ const weapon = {
   202111: { twoHanded: true },
   202211: { twoHanded: true },
   202201: { },
+  202212: { },
   202209: { },
   301404: { },
 };

From f1381878e71eba27dc31f4a294da183fa5a2060f Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Mon, 28 Nov 2022 15:34:44 -0600
Subject: [PATCH 6/6] 4.250.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ce732029f6..fce5c48fed 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.249.7",
+  "version": "4.250.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 2b7c7d7042..c4dcdba881 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.249.7",
+  "version": "4.250.0",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.19.6",