From 265dfbbb9827dbb4dea1d4b2d3cc4857a6a82b6f Mon Sep 17 00:00:00 2001 From: CuriousMagpie Date: Tue, 29 Mar 2022 16:08:25 -0400 Subject: [PATCH 1/4] 2022-04 Subscriber Items --- website/common/locales/en/gear.json | 6 ++++++ website/common/locales/en/subscriber.json | 1 + website/common/script/content/gear/sets/mystery.js | 3 +++ 3 files changed, 10 insertions(+) diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json index eb78d244fc..87e76a78e1 100644 --- a/website/common/locales/en/gear.json +++ b/website/common/locales/en/gear.json @@ -1152,6 +1152,8 @@ "armorMystery202110Notes": "Velvety moss makes you seem soft on the outside, but you're protected by solid stone. Confers no benefit. October 2021 Subscriber Item.", "armorMystery202112Text": "Antarctic Undine Tail", "armorMystery202112Notes": "Glide through icy seas and never get cold with this glimmering tail. Confers no benefit. December 2021 Subscriber Item.", + "armorMystery202204Text":"Virtual Adventurer Capsule", + "armorMystery202204Notes":"Looks like doing your tasks now requires pushing these mysterious buttons! What could they do? Confers no benefit. April 2022 Subscriber Item.", "armorMystery301404Text": "Steampunk Suit", "armorMystery301404Notes": "Dapper and dashing, wot! Confers no benefit. February 3015 Subscriber Item.", "armorMystery301703Text": "Steampunk Peacock Gown", @@ -2762,6 +2764,10 @@ "eyewearMystery202201Notes": "Ring in the new year with an air of mystery in this stylish feathered mask. Confers no benefit. January 2022 Subscriber Item.", "eyewearMystery202202Text":"Turquoise Eyes with Blush", "eyewearMystery202202Notes":"Cheerful singing brings color to your cheeks. Confers no benefit. February 2022 Subscriber Item", + "eyewearMystery202204AText":"Virtual Face", + "eyewearMystery202204ANotes":"What's your mood today? Express yourself with these fun screens. Confers no benefit. April 2022 Subscriber Item.", + "eyewearMystery202204BText":"Virtual Face", + "eyewearMystery202204BNotes":"What's your mood today? Express yourself with these fun screens. Confers no benefit. April 2022 Subscriber Item.", "eyewearMystery301404Text": "Eyewear Goggles", "eyewearMystery301404Notes": "No eyewear could be fancier than a pair of goggles - except, perhaps, for a monocle. Confers no benefit. April 3015 Subscriber Item.", "eyewearMystery301405Text": "Monocle", diff --git a/website/common/locales/en/subscriber.json b/website/common/locales/en/subscriber.json index 378d17207b..43c0250bf2 100644 --- a/website/common/locales/en/subscriber.json +++ b/website/common/locales/en/subscriber.json @@ -132,6 +132,7 @@ "mysterySet202201": "Midnight Merrymaker Set", "mysterySet202202": "Turquoise Twintails Set", "mysterySet202203": "Dauntless Dragonfly Set", + "mysterySet202204": "Virtual Adventurer 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 fc9b167cb8..0e89c0744f 100644 --- a/website/common/script/content/gear/sets/mystery.js +++ b/website/common/script/content/gear/sets/mystery.js @@ -56,6 +56,7 @@ const armor = { 202106: { }, 202110: { }, 202112: { }, + 202204: { }, 301404: { }, 301703: { }, 301704: { }, @@ -113,6 +114,8 @@ const eyewear = { 202108: { }, 202201: { }, 202202: { }, + '202204A': { mystery: '202204' }, + '202204B': { mystery: '202204' }, 301404: { }, 301405: { }, 301703: { }, From 976e8cf242bce939660b3be9df1f014af5165b58 Mon Sep 17 00:00:00 2001 From: Weblate Date: Wed, 30 Mar 2022 12:18:52 +0200 Subject: [PATCH 2/4] Translated using Weblate (Spanish) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 100.0% (131 of 131 strings) Translated using Weblate (Spanish) Currently translated at 100.0% (206 of 206 strings) Translated using Weblate (Spanish) Currently translated at 100.0% (219 of 219 strings) Translated using Weblate (Spanish) Currently translated at 100.0% (22 of 22 strings) Translated using Weblate (Spanish) Currently translated at 100.0% (131 of 131 strings) Translated using Weblate (Spanish) Currently translated at 100.0% (131 of 131 strings) Translated using Weblate (German) Currently translated at 100.0% (206 of 206 strings) Co-authored-by: Mara Dolichotis Co-authored-by: Pardinus Co-authored-by: Sara López Co-authored-by: Weblate Translate-URL: https://translate.habitica.com/projects/habitica/achievements/es/ Translate-URL: https://translate.habitica.com/projects/habitica/limited/es/ Translate-URL: https://translate.habitica.com/projects/habitica/loginincentives/es/ Translate-URL: https://translate.habitica.com/projects/habitica/settings/de/ Translate-URL: https://translate.habitica.com/projects/habitica/settings/es/ Translation: Habitica/Achievements Translation: Habitica/Limited Translation: Habitica/Loginincentives Translation: Habitica/Settings --- website/common/locales/de/settings.json | 2 +- website/common/locales/es/achievements.json | 7 ++++--- website/common/locales/es/limited.json | 6 +++++- website/common/locales/es/loginincentives.json | 2 +- website/common/locales/es/settings.json | 4 ++-- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/website/common/locales/de/settings.json b/website/common/locales/de/settings.json index 581ba27aef..4233d5e17e 100644 --- a/website/common/locales/de/settings.json +++ b/website/common/locales/de/settings.json @@ -55,7 +55,7 @@ "newUsername": "Neuer Benutzername", "dangerZone": "Gefahrenzone", "resetText1": "WARNUNG! Es werden große Teile Deines Accounts zurückgesetzt. Wir raten dringend davon ab. Jedoch finden einige Spieler diese Funktion sinnvoll, um nach einem anfänglichen Testen der Seite neu beginnen zu können.", - "resetText2": "Du verlierst alle Deine Level, Gold- und Erfahrungspunkte. Alle Deine Aufgaben (außer Aufgaben aus Herausforderungen) werden permanent gelöscht, und Du verlierst alle ihre historischen Daten. Du verlierst Deine gesamte Ausrüstung außer Abonnement-Überraschungsgegenstände und gratis Erinnerungsgegenstände. Du wirst die Möglichkeit haben, alle gelöschten Gegenstände zurückzukaufen, inklusive allen Gegenständen limitierter Ausgabe (Du musst für klassenspezifische Ausrüstung der richtigen Klasse angehören, um sie zurückzukaufen). Du behältst Deine aktuelle Klasse, Deine Erfolge, und Deine Haus- und Reittiere. Möglicherweise möchtest Du lieber die Sphäre der Wiedergeburt nutzen, die eine weit sicherere Option darstellt und Deine Aufgaben und Ausrüstung beibehält.", + "resetText2": "Du verlierst alle Deine Level, Dein Gold und Deine Erfahrungspunkte. Alle Deine Aufgaben (außer Aufgaben aus Herausforderungen) werden permanent gelöscht, und Du verlierst alle ihre historischen Daten. Du verlierst Deine gesamte Ausrüstung außer Abonnement-Überraschungsgegenstände und gratis Erinnerungsgegenstände. Du wirst die Möglichkeit haben, alle gelöschten Gegenstände zurückzukaufen, inklusive allen Gegenständen limitierter Ausgabe (Du musst für klassenspezifische Ausrüstung der richtigen Klasse angehören, um sie zurückzukaufen). Du behältst Deine aktuelle Klasse, Deine Erfolge, und Deine Haus- und Reittiere. Möglicherweise möchtest Du lieber die Sphäre der Wiedergeburt nutzen, die eine weit sicherere Option darstellt und Deine Aufgaben und Ausrüstung beibehält.", "deleteLocalAccountText": "Bist Du sicher? Dies wird Dein Konto für immer löschen und es kann nicht wiederhergestellt werden! Wenn Du Habitica wieder verwenden möchtest, musst Du ein neues Konto registrieren. Gesparte oder verbrauchte Edelsteine werden nicht ersetzt. Wenn Du absolut sicher bist, dann tippe Dein Passwort in das Textfeld unten ein.", "deleteSocialAccountText": "Bist Du sicher? Dies wird Dein Konto für immer löschen und es kann nicht wiederhergestellt werden! Wenn Du Habitica wieder verwenden möchtest, musst Du ein neues Konto registrieren. Gesparte oder verbrauchte Edelsteine werden nicht ersetzt. Wenn Du absolut sicher bist, dann tippe \"<%= magicWord %>\" in das Textfeld unten ein.", "API": "API", diff --git a/website/common/locales/es/achievements.json b/website/common/locales/es/achievements.json index b721ed268d..48fba57151 100644 --- a/website/common/locales/es/achievements.json +++ b/website/common/locales/es/achievements.json @@ -124,9 +124,10 @@ "achievementShadeOfItAllModalText": "¡Has domado todas las monturas sombrías!", "achievementShadyCustomerText": "Ha conseguido todas las mascotas sombrías.", "achievementShadyCustomer": "Cliente sombrío", - "achievementZodiacZookeeper": "Cuidador del Zodíaco", + "achievementZodiacZookeeper": "Cuidador del Zodiaco", "achievementZodiacZookeeperText": "¡Has eclosionado todas las mascotas del zodíaco: Rata, Vaca, Conejo, Serpiente, Caballo, Oveja, Mono, Gallo, Lobo, Tigre, Cerdo Volador y Dragón!", "achievementZodiacZookeeperModalText": "¡Has conseguido todas las mascotas del zodíaco!", - "achievementBirdsOfAFeatherText": "Has eclosionado todas las mascotas voladoras: Cerdo volador, Búho, Loro, Pterodáctilo, Grifo y Halcón.", - "achievementBirdsOfAFeatherModalText": "¡Has conseguido todas las mascotas voladoras!" + "achievementBirdsOfAFeatherText": "Has eclosionado todas las mascotas voladoras: Cerdo Volador, Búho, Loro, Pterodáctilo, Grifo, Halcón, Pavo Real y Gallo.", + "achievementBirdsOfAFeatherModalText": "¡Has conseguido todas las mascotas voladoras!", + "achievementBirdsOfAFeather": "Aves de Pluma" } diff --git a/website/common/locales/es/limited.json b/website/common/locales/es/limited.json index 13edce809d..f887d67ca2 100644 --- a/website/common/locales/es/limited.json +++ b/website/common/locales/es/limited.json @@ -216,5 +216,9 @@ "winter2022FireworksRogueSet": "Fuegos Artificiales (Pícaro)", "winter2022StockingWarriorSet": "Calcetín (Guerrero)", "winter2022PomegranateMageSet": "Granada (Mago)", - "winter2022IceCrystalHealerSet": "Cristal de Hielo (Sanador)" + "winter2022IceCrystalHealerSet": "Cristal de Hielo (Sanador)", + "spring2022MagpieRogueSet": "Urraca (Pícaro)", + "spring2022RainstormWarriorSet": "Tempestad (Guerrero)", + "spring2022ForsythiaMageSet": "Forsitia (Mago)", + "spring2022PeridotHealerSet": "Peridoto (Sanador)" } diff --git a/website/common/locales/es/loginincentives.json b/website/common/locales/es/loginincentives.json index 3541549b7e..ec31479bc2 100644 --- a/website/common/locales/es/loginincentives.json +++ b/website/common/locales/es/loginincentives.json @@ -1,6 +1,6 @@ { "unlockedReward": "Has recibido <%= reward %>", - "earnedRewardForDevotion": "Has ganado <%= reward %> por siendo committed por mejorado su vida.", + "earnedRewardForDevotion": "Has ganado <%= reward %> por haberte comprometido a mejorar tu vida.", "nextRewardUnlocksIn": "Registros hasta tu próximo premio: <%= numberOfCheckinsLeft %>", "awesome": "¡Genial!", "countLeft": "Registros hasta la próxima recompensa: <%= count %>", diff --git a/website/common/locales/es/settings.json b/website/common/locales/es/settings.json index 8857ac60a7..99b22e02e4 100644 --- a/website/common/locales/es/settings.json +++ b/website/common/locales/es/settings.json @@ -200,9 +200,9 @@ "transaction_create_challenge": "Desafío creado", "transaction_create_guild": "Gremio creado", "transaction_change_class": "Clase cambiada", - "transaction_rebirth": "Orbe de renacimiento usado", + "transaction_rebirth": "Orbe de Renacimiento usado", "transaction_release_pets": "Mascotas soltadas", - "transaction_reroll": "Poción de fortalecimiento usada", + "transaction_reroll": "Poción de Fortalecimiento usada", "hourglassTransactions": "Transacciones de Relojes de Arena", "transaction_gift_receive": "Recibido de", "transaction_debug": "Depuración", From 2b93ea37403300a5f7d7733f0f6b2d57b169e913 Mon Sep 17 00:00:00 2001 From: SabreCat Date: Wed, 30 Mar 2022 09:44:36 -0500 Subject: [PATCH 3/4] chore(sprites): compile --- habitica-images | 2 +- .../assets/css/sprites/spritesmith-main.css | 85 +++++++++++++++++++ .../script/content/gear/sets/mystery.js | 8 +- 3 files changed, 88 insertions(+), 7 deletions(-) diff --git a/habitica-images b/habitica-images index 5a79037fca..b038e469b6 160000 --- a/habitica-images +++ b/habitica-images @@ -1 +1 @@ -Subproject commit 5a79037fca74f76c9342190b584baeda419c6c47 +Subproject commit b038e469b6ac4ca028852fe2a8c3b9e4b543611a diff --git a/website/client/src/assets/css/sprites/spritesmith-main.css b/website/client/src/assets/css/sprites/spritesmith-main.css index 1e5c04e4e6..8c6f3565ab 100644 --- a/website/client/src/assets/css/sprites/spritesmith-main.css +++ b/website/client/src/assets/css/sprites/spritesmith-main.css @@ -25208,6 +25208,46 @@ width: 68px; height: 68px; } +.broad_armor_mystery_202204 { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_mystery_202204.png'); + width: 114px; + height: 90px; +} +.eyewear_mystery_202204A { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/eyewear_mystery_202204A.png'); + width: 114px; + height: 90px; +} +.eyewear_mystery_202204B { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/eyewear_mystery_202204B.png'); + width: 114px; + height: 90px; +} +.shop_armor_mystery_202204 { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_mystery_202204.png'); + width: 68px; + height: 68px; +} +.shop_eyewear_mystery_202204A { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_eyewear_mystery_202204A.png'); + width: 68px; + height: 68px; +} +.shop_eyewear_mystery_202204B { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_eyewear_mystery_202204B.png'); + width: 68px; + height: 68px; +} +.shop_set_mystery_202204 { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_set_mystery_202204.png'); + width: 68px; + height: 68px; +} +.slim_armor_mystery_202204 { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_mystery_202204.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; @@ -50008,6 +50048,11 @@ width: 81px; height: 99px; } +.Pet-BearCub-Virtual { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-BearCub-Virtual.png'); + width: 81px; + height: 99px; +} .Pet-BearCub-Watery { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-BearCub-Watery.png'); width: 81px; @@ -50433,6 +50478,11 @@ width: 81px; height: 99px; } +.Pet-Cactus-Virtual { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Cactus-Virtual.png'); + width: 81px; + height: 99px; +} .Pet-Cactus-Watery { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Cactus-Watery.png'); width: 81px; @@ -50963,6 +51013,11 @@ width: 81px; height: 99px; } +.Pet-Dragon-Virtual { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Dragon-Virtual.png'); + width: 81px; + height: 99px; +} .Pet-Dragon-Watery { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Dragon-Watery.png'); width: 81px; @@ -51388,6 +51443,11 @@ width: 81px; height: 99px; } +.Pet-FlyingPig-Virtual { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-FlyingPig-Virtual.png'); + width: 81px; + height: 99px; +} .Pet-FlyingPig-Watery { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-FlyingPig-Watery.png'); width: 81px; @@ -51668,6 +51728,11 @@ width: 81px; height: 99px; } +.Pet-Fox-Virtual { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Fox-Virtual.png'); + width: 81px; + height: 99px; +} .Pet-Fox-Watery { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Fox-Watery.png'); width: 81px; @@ -52333,6 +52398,11 @@ width: 81px; height: 99px; } +.Pet-LionCub-Virtual { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-LionCub-Virtual.png'); + width: 81px; + height: 99px; +} .Pet-LionCub-Watery { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-LionCub-Watery.png'); width: 81px; @@ -52828,6 +52898,11 @@ width: 81px; height: 99px; } +.Pet-PandaCub-Virtual { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-PandaCub-Virtual.png'); + width: 81px; + height: 99px; +} .Pet-PandaCub-Watery { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-PandaCub-Watery.png'); width: 81px; @@ -54068,6 +54143,11 @@ width: 81px; height: 99px; } +.Pet-TigerCub-Virtual { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-TigerCub-Virtual.png'); + width: 81px; + height: 99px; +} .Pet-TigerCub-Watery { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-TigerCub-Watery.png'); width: 81px; @@ -54663,6 +54743,11 @@ width: 81px; height: 99px; } +.Pet-Wolf-Virtual { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Wolf-Virtual.png'); + width: 81px; + height: 99px; +} .Pet-Wolf-Watery { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Wolf-Watery.png'); width: 81px; diff --git a/website/common/script/content/gear/sets/mystery.js b/website/common/script/content/gear/sets/mystery.js index 0e89c0744f..d0da7caa69 100644 --- a/website/common/script/content/gear/sets/mystery.js +++ b/website/common/script/content/gear/sets/mystery.js @@ -237,12 +237,8 @@ const weapon = { 201911: { }, 202002: { }, 202102: { }, - 202104: { - twoHanded: true, - }, - 202111: { - twoHanded: true, - }, + 202104: { twoHanded: true }, + 202111: { twoHanded: true }, 202201: { }, 301404: { }, }; From 5c4b8ce58b7f6c52d02ce550caef470eb03400cf Mon Sep 17 00:00:00 2001 From: SabreCat Date: Wed, 30 Mar 2022 09:45:06 -0500 Subject: [PATCH 4/4] 4.226.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 e5a8dd39c0..2e3d7dd815 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "4.225.4", + "version": "4.226.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 47c40fb5b1..4ed410d8ae 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.225.4", + "version": "4.226.0", "main": "./website/server/index.js", "dependencies": { "@babel/core": "^7.17.8",