From 167f4f07b83cb812391bae805a79481fb3b15b91 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Fri, 3 Apr 2020 19:25:43 -0500 Subject: [PATCH 1/7] feat(content): Confection Pets --- website/client/src/assets/css/sprites.css | 6 +++ .../animated/Pet-HatchingPotion-Dessert.gif | Bin 0 -> 2039 bytes website/common/locales/en/content.json | 1 + website/common/locales/en/questsContent.json | 12 +++++- .../common/script/content/hatching-potions.js | 8 +++- website/common/script/content/quests.js | 39 ++++++++++++++++++ .../quests/bosses/quest_waffle.png | Bin 0 -> 5349 bytes website/server/models/group.js | 6 ++- 8 files changed, 68 insertions(+), 4 deletions(-) create mode 100644 website/client/src/assets/images/animated/Pet-HatchingPotion-Dessert.gif create mode 100644 website/raw_sprites/spritesmith/quests/bosses/quest_waffle.png diff --git a/website/client/src/assets/css/sprites.css b/website/client/src/assets/css/sprites.css index ae92a2249d..f3ba66580d 100755 --- a/website/client/src/assets/css/sprites.css +++ b/website/client/src/assets/css/sprites.css @@ -4,6 +4,12 @@ height: 219px; } +.Pet_HatchingPotion_Dessert { + background: url("~@/assets/images/animated/Pet_HatchingPotion_Dessert.gif") no-repeat; + width: 68px; + height: 68px; +} + .Pet_HatchingPotion_Veggie { background: url("~@/assets/images/animated/Pet_HatchingPotion_Veggie.gif") no-repeat; width: 68px; diff --git a/website/client/src/assets/images/animated/Pet-HatchingPotion-Dessert.gif b/website/client/src/assets/images/animated/Pet-HatchingPotion-Dessert.gif new file mode 100644 index 0000000000000000000000000000000000000000..4ac1c8e5be5921dedb2f9406cbc6e1539c3c2c04 GIT binary patch literal 2039 zcmZ?wbh9u|bYXB|C}&_${Lk&@8WQa67~pE8XTZ$J02KPk!YKlzb$}SC$c3Q=NdK?D zbEo1(8C%5s6aVYH7-mE=%zxAo$L*2h!0_*X@4x>SzyA4r(0uLRj{u4`zPUcv( zH!^7b@(J|6uH~tqz`L(GH(dKs)xjjA#sWPNo;Ll=*romZ@^;juq|5Q8b8v8S<~3C- z)z>wYGdH!gada?r`EqeJHcd)Yo*p`{ch+o`1)<^b6IiPwqn0zTTpg6MkfXl7ea_}B z+t_#PQi`8Geb1iBp$88g*>=qL#Gymn+&nzIy!B_i&YkDFc=_t}ooAVE-@eQ9;P~Sw z7cM<#zu|r>@H6A|XGb4;eERbB&f6b8`##J*u6k;IR`#_6%1Q+Z4NZ)EW*#014=3pJ z$y|86sZHFq_2(nr6FUMO+@s~SliN%_Jw4dm6O%N{$CH7HrQ0cLUx~tGW#8Er`g{eF z3s+oRWH$L;%uJW(7Z-aq8igvISlY5WV!huC1&{En?2()E-v08Q66w3&ZI12iZEJ6D zFL-=vuJ`tJcXwBOes%Zs_VxF-DI&$I7=r+V1cMSdUV)Jcj8Ra$KI(wPD=<1C@d}Lc z|7Sk_`~MjjyO8MY-d+ieT41DBPst+`ryzN7ygC}pbLd>R^5m*D8XV6P_@B$Xe%#x? zN4POST7-+O+1EpcxBK{$OE+y~x;R{v3eWhthG~bL)~%?2pzW|wV!nS)#cuNx``imf z&TO;wOVqAru4S#)Gc=1#WG^>V>g4F|)iKM->F$o#m^y7n;;eq=X^Xiakrg&;&XT3e zSFUDXyJ-EiWh>TXFs$3YlV|tB#i~aca}LZjKXUB&hF$Z`&mJ{a4O`{xYW+vex*i%5S{(ui4cVgBLz zJpy(KCq686j8oclWAcHG%Evi{Hyyd~@Y|KmGwm10>vm#fT0g8=N1S3|-B-dU}EBziUE< z#^fo}65~szEPy5dd9xNSTC!|K_l(tR)-GMSiFwPE#oIP2ZB{+Vn6rmx`hi1-w;r2o ze)1qN^)Cme{`0CA887o*1*QH&#?D>$u9-i4%=9$z`F&vOe`x&m&3jPl|McbC_xE3X zH!A8k9c*U%s(Gh pet.", "premiumPotionAddlNotes": "Not usable on quest pet eggs. Available for purchase until <%= date(locale) %>.", diff --git a/website/common/locales/en/questsContent.json b/website/common/locales/en/questsContent.json index ce798a7aaf..1db1b182fd 100644 --- a/website/common/locales/en/questsContent.json +++ b/website/common/locales/en/questsContent.json @@ -796,5 +796,15 @@ "questRubyCollectVenusRunes": "Venus Runes", "questRubyCollectRubyGems": "Ruby Gems", "questRubyDropRubyPotion": "Ruby Hatching Potion", - "questRubyUnlockText": "Unlocks Ruby Hatching Potions for purchase in the Market" + "questRubyUnlockText": "Unlocks Ruby Hatching Potions for purchase in the Market", + + "questWaffleText": "Waffling with the Fool: Disaster Breakfast!", + "questWaffleNotes": "“April Fool!” storms a flustered Lady Glaciate. “You said your dessert-themed prank was ‘over with and completely cleaned up’!”

“Why, it was and is, my dear,” replies the Fool, puzzled. “And I am the most honest of Fools. What's wrong?”

“There's a giant sugary monster approaching Habit City!”

“Hmm,” muses the Fool. “I did raid a few lairs for the mystic reagents for my last event. Maybe I attracted some unwanted attention. Is it the Saccharine Serpent? The Torte-oise? Tiramisu Rex?”

“No! It's some sort of... Awful Waffle!”

“Huh. That's a new one! Perhaps it spawned from all the ambient shenanigan energy.” He turns to you and @beffymaroo with a lopsided smile. “I don't suppose you'd be available for some heroics?”", + "questWaffleCompletion": "Battered and buttered but triumphant, you savor sweet victory as the Awful Waffle collapses into a pool of sticky goo.

“Wow, you really creamed that monster,” says Lady Glaciate, impressed.

“A piece of cake!” beams the April Fool.

“Kind of a shame, though,” says @beffymaroo. “It looked good enough to eat.”

The Fool takes a set of potion bottles from somewhere in his cape, fills them with the syrupy leavings of the Waffle, and mixes in a pinch of sparkling dust. The liquid swirls with color--new Hatching Potions! He tosses them into your arms. “All that adventure has given me an appetite. Who wants to join me for breakfast?”", + "questWaffleBoss": "Awful Waffle", + "questWaffleRageTitle": "Maple Mire", + "questWaffleRageDescription": "Maple Mire: This bar fills when you don't complete your Dailies. When it is full, the Awful Waffle will set back the party's attack progress!", + "questWaffleRageEffect": "`Awful Waffle uses MAPLE MIRE!` Sticky sappy syrup slows your swings and spells!", + "questWaffleDropDessertPotion": "Confection Hatching Potion", + "questWaffleUnlockText": "Unlocks Confection Hatching Potions for purchase in the Market", } diff --git a/website/common/script/content/hatching-potions.js b/website/common/script/content/hatching-potions.js index 5229dfb3d5..7ac5b5ba77 100644 --- a/website/common/script/content/hatching-potions.js +++ b/website/common/script/content/hatching-potions.js @@ -286,6 +286,12 @@ const wacky = { limited: true, _season: '_PENDING_', }, + Dessert: { + text: t('hatchingPotionDessert'), + limited: true, + _season: '_PENDING_', + canBuy: hasQuestAchievementFunction('waffle'), + }, }; each(drops, (pot, key) => { @@ -328,7 +334,7 @@ each(wacky, (pot, key) => { notes: t('hatchingPotionNotes', { potText: pot.text, }), - _addlNotes: pot._seasont && pot._season !== '_PENDING_' ? t('eventAvailability', { + _addlNotes: pot._season && pot._season !== '_PENDING_' ? t('eventAvailability', { date: t(`dateEnd${pot._season}`), }) : null, premium: false, diff --git a/website/common/script/content/quests.js b/website/common/script/content/quests.js index dd9330e266..eb85629b6d 100644 --- a/website/common/script/content/quests.js +++ b/website/common/script/content/quests.js @@ -3578,6 +3578,45 @@ const quests = { unlock: t('questRubyUnlockText'), }, }, + waffle: { + text: t('questWaffleText'), + notes: t('questWaffleNotes'), + completion: t('questWaffleCompletion'), + value: 4, + category: 'hatchingPotion', + boss: { + name: t('questWaffleBoss'), + hp: 500, + str: 2, + rage: { + title: t('questWaffleRageTitle'), + description: t('questWaffleRageDescription'), + value: 50, + progressDrain: 0.5, + effect: t('questWaffleRageEffect'), + }, + }, + drop: { + items: [ + { + type: 'hatchingPotions', + key: 'Dessert', + text: t('questWaffleDropDessertPotion'), + }, { + type: 'hatchingPotions', + key: 'Dessert', + text: t('questWaffleDropDessertPotion'), + }, { + type: 'hatchingPotions', + key: 'Dessert', + text: t('questWaffleDropDessertPotion'), + }, + ], + gp: 40, + exp: 500, + unlock: t('questWaffleUnlockText'), + }, + }, }; each(quests, (v, key) => { diff --git a/website/raw_sprites/spritesmith/quests/bosses/quest_waffle.png b/website/raw_sprites/spritesmith/quests/bosses/quest_waffle.png new file mode 100644 index 0000000000000000000000000000000000000000..6d6ba6cd91c8598435648886dbb423fbf7ce18a0 GIT binary patch literal 5349 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 Date: Fri, 3 Apr 2020 19:31:58 -0500 Subject: [PATCH 2/7] fix(content): stray comma --- website/common/locales/en/questsContent.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/common/locales/en/questsContent.json b/website/common/locales/en/questsContent.json index 1db1b182fd..f9a867768c 100644 --- a/website/common/locales/en/questsContent.json +++ b/website/common/locales/en/questsContent.json @@ -806,5 +806,5 @@ "questWaffleRageDescription": "Maple Mire: This bar fills when you don't complete your Dailies. When it is full, the Awful Waffle will set back the party's attack progress!", "questWaffleRageEffect": "`Awful Waffle uses MAPLE MIRE!` Sticky sappy syrup slows your swings and spells!", "questWaffleDropDessertPotion": "Confection Hatching Potion", - "questWaffleUnlockText": "Unlocks Confection Hatching Potions for purchase in the Market", + "questWaffleUnlockText": "Unlocks Confection Hatching Potions for purchase in the Market" } From 23b19853b4bce2a1b251d6ee0b579a691a1cc2c6 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Fri, 3 Apr 2020 20:36:07 -0500 Subject: [PATCH 3/7] fix(image): filename --- ...n-Dessert.gif => Pet_HatchingPotion_Dessert.gif} | Bin 1 file changed, 0 insertions(+), 0 deletions(-) rename website/client/src/assets/images/animated/{Pet-HatchingPotion-Dessert.gif => Pet_HatchingPotion_Dessert.gif} (100%) diff --git a/website/client/src/assets/images/animated/Pet-HatchingPotion-Dessert.gif b/website/client/src/assets/images/animated/Pet_HatchingPotion_Dessert.gif similarity index 100% rename from website/client/src/assets/images/animated/Pet-HatchingPotion-Dessert.gif rename to website/client/src/assets/images/animated/Pet_HatchingPotion_Dessert.gif From 0c640f07d1b59daf14032b2ac1117d797899f7db Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Mon, 6 Apr 2020 12:19:40 -0500 Subject: [PATCH 4/7] fix(waffle): missing scroll --- .../scrolls/inventory_quest_scroll_waffle.png | Bin 0 -> 976 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 website/raw_sprites/spritesmith/quests/scrolls/inventory_quest_scroll_waffle.png diff --git a/website/raw_sprites/spritesmith/quests/scrolls/inventory_quest_scroll_waffle.png b/website/raw_sprites/spritesmith/quests/scrolls/inventory_quest_scroll_waffle.png new file mode 100644 index 0000000000000000000000000000000000000000..65b62f282e2f7a54f64531864322a2922bcee13d GIT binary patch literal 976 zcmV;>126oEP)r0~I3$R!$7K_DVv64a-vo2Iv zTpCE^jd}*&Ms%+!%!H~`vxso_&NlVN+FU;Y0H-geM|B(%Vl*L=jJ>6=0RV^ERsjG` z)ju_*owa6hT;HDwF)C#eO@?gOSJwdm9*vxhDqWZmvk19=v<3jsdSW2}!1}5e01yzF zv%e!>=|9r&LDzPyWH2FS6LM~c7XXl9zX|}zv(h;4jamS}zV`fx&g=I1mA21M^@V*! zq4K$-u`@0*m=L1~2}Q=|v>yO~?25YpfSgPkKh(1k0I*&C@*0`jH*Mn3@!rzw2W3L{g-`z!XE#w=q1hg zfxmHi23M-d>LE4WG629a4H;6qY-!@%21=R90;))VdBkExCB@#3h&)5~>+K~>h}m_> zv>wvxS4@E|lf2@|_j_T}C6qX2lAVyl>01K;&^opf!1RuorP-+t6di%4n_1yuK!JWRM*k&ix`zQOo-luy#F?= zSjQ~uQu?LE2Wz`16?&ZwVHZzdJ#HnHw5bv*O(Z#br419J7a=FduhC?8k*nLC)kMJW zOhE{B%lWolp#6^*>vDpo(U(2VRDX071g$ruwDkwqA<4cUBDFKCDgXf6Hc=hnpU9vK zSX66}?SbW#79WqFp*2nk)ibgFx6At>$-dg{xA};GJ68k=lY)$t;Oz(0E_2)l@c;83 zZMULp1D)(4Gh#o)HRxAn&a5Yg&R25EBxlOVU3aseL!Da7RF3MBE=-8tgh( Date: Mon, 6 Apr 2020 13:08:29 -0500 Subject: [PATCH 5/7] fix(content): feature items --- .../common/script/content/hatching-potions.js | 9 +++++++-- .../script/content/shop-featuredItems.js | 20 +++++++++++-------- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/website/common/script/content/hatching-potions.js b/website/common/script/content/hatching-potions.js index 7ac5b5ba77..2a09886b18 100644 --- a/website/common/script/content/hatching-potions.js +++ b/website/common/script/content/hatching-potions.js @@ -284,12 +284,17 @@ const wacky = { Veggie: { text: t('hatchingPotionVeggie'), limited: true, - _season: '_PENDING_', + _addlNotes: t('eventAvailabilityReturning', { + availableDate: t('dateEndMarch'), + previousDate: t('marchYYYY', { year: 2019 }), + }), + canBuy () { + return moment().isBefore('2020-05-02'); + }, }, Dessert: { text: t('hatchingPotionDessert'), limited: true, - _season: '_PENDING_', canBuy: hasQuestAchievementFunction('waffle'), }, }; diff --git a/website/common/script/content/shop-featuredItems.js b/website/common/script/content/shop-featuredItems.js index 0f6fa8fd8f..572f5cabe7 100644 --- a/website/common/script/content/shop-featuredItems.js +++ b/website/common/script/content/shop-featuredItems.js @@ -23,6 +23,10 @@ const featuredItems = { type: 'premiumHatchingPotion', path: 'premiumHatchingPotions.Celestial', }, + { + type: 'hatchingPotions', + path: 'hatchingPotions.Veggie', + }, ]; } return [ @@ -45,34 +49,34 @@ const featuredItems = { ]; }, quests () { - if (moment().isBefore('2020-04-02')) { + if (moment().isBefore('2020-05-02')) { return [ { - type: 'bundles', - path: 'bundles.hugabug', + type: 'quests', + path: 'quests.waffle', }, { type: 'quests', - path: 'quests.velociraptor', + path: 'quests.trex_undead', }, { type: 'quests', - path: 'quests.taskwoodsTerror1', + path: 'quests.bunny', }, ]; } return [ { type: 'quests', - path: 'quests.badger', + path: 'quests.sheep', }, { type: 'quests', - path: 'quests.ferret', + path: 'quests.seaserpent', }, { type: 'quests', - path: 'quests.sloth', + path: 'quests.silver', }, ]; }, From 903851f1fd7d6ccdea082394202449b0b938c839 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Mon, 6 Apr 2020 14:40:09 -0500 Subject: [PATCH 6/7] fix(content): missing premium potion notes --- website/common/script/content/hatching-potions.js | 1 + 1 file changed, 1 insertion(+) diff --git a/website/common/script/content/hatching-potions.js b/website/common/script/content/hatching-potions.js index 2a09886b18..02b6ab32b8 100644 --- a/website/common/script/content/hatching-potions.js +++ b/website/common/script/content/hatching-potions.js @@ -295,6 +295,7 @@ const wacky = { Dessert: { text: t('hatchingPotionDessert'), limited: true, + _addlNotes: t('premiumPotionUnlimitedNotes'), canBuy: hasQuestAchievementFunction('waffle'), }, }; From ba61da4acb971cf035ebf3467303c9d98fff36c4 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Mon, 6 Apr 2020 15:26:43 -0500 Subject: [PATCH 7/7] fix(stable): wacky sorting --- website/client/src/components/inventory/stable/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/client/src/components/inventory/stable/index.vue b/website/client/src/components/inventory/stable/index.vue index bce64e00be..101ad6f853 100644 --- a/website/client/src/components/inventory/stable/index.vue +++ b/website/client/src/components/inventory/stable/index.vue @@ -183,7 +183,7 @@
@@ -790,7 +790,7 @@ export default { const pets = this.listAnimals(animalGroup, 'pet', hideMissing, sortBy, searchText); // Don't group special - if (animalGroup.key === 'specialPets' || animalGroup.key === 'wackyPets') { + if (animalGroup.key === 'specialPets' || (animalGroup.key === 'wackyPets' && sortBy !== 'sortByColor')) { return { none: pets }; }