Merge branch 'master' of https://github.com/Tibowl/HuTao

Author: Tibowl

src/data/emojis.json

@@ -66,6 +66,7 @@
     "Thunderclap Fruitcore": "<:Thunderclap_Fruitcore:1012449363731165204>",
     "Perpetual Caliber": "<:Perpetual_Caliber:1024808870314508319>",
     "Light Guiding Tetrahedron": "<:Light_Guiding_Tetrahedron:1024808868372553802>",
+    "Quelled Creeper": "<:Quelled_Creeper:1037678498933907466>",
 
     "Crown of Insight": "<:Crown_of_Insight:827978602674520114>",
 
@@ -127,6 +128,9 @@
     "Mudra of the Malefic General": "<:Mudra_of_the_Malefic_General:943475691993829417>",
     "Tears of the Calamitous God": "<:Tears_of_the_Calamitous_God:943475692039979038>",
     "The Meaning of Aeons": "<:The_Meaning_of_Aeons:943475691993858089>",
+    "Puppet Strings": "<:Puppet_Strings:1037678497109377086>",
+    "Mirror of Mushin": "<:Mirror_of_Mushin:1037678490348167248>",
+    "Daka's Bell": "<:Dakas_Bell:1037678485747023984>",
 
     "Calla Lily": "<:Calla_Lily:827978599838908446>",
     "Cecilia": "<:Cecilia:827978599457751060>",
@@ -305,6 +309,7 @@
     "Electro Hypostasis": "<:Electro_Hypostasis:927627061865111562>",
     "Cryo Hypostasis": "<:Cryo_Hypostasis:927627061131112468>",
     "Geo Hypostasis": "<:Geo_Hypostasis:927627062028693564>",
+    "Dendro Hypostasis": "<:Dendro_Hypostasis:1037678488318128139>",
     "Oceanid": "<:Oceanid:927630041867755590>",
     "Thunder Manifestation": "<:Thunder_Manifestation:927630534484590622>",
     "Pyro Specter": "<:Pyro_Specter:928205887993151498>",
@@ -454,6 +459,7 @@
     "Azhdaha": "<:Azhdaha:927627062263562250>",
     "La Signora": "<:La_Signora:927630042178130000>",
     "Magatsu Mitake Narukami no Mikoto": "<:Magatsu_Mitake_Narukami_no_Mikot:943475691884773407>",
+    "Shouki no Kami, the Prodigal": "<:Shouki_no_Kami_the_Prodigal:1037678501161074748>",
 
     "Hydro Mimic Boar": "<:Hydro_Mimic:927641061755584564>",
     "Hydro Mimic Crane": "<:Hydro_Mimic:927641061755584564>",
@@ -498,6 +504,8 @@
     "Kuki Shinobu": "<:Kuki_Shinobu:988745143240757268>",
     "Lisa": "<:Lisa:929383000637063288>",
     "Mona": "<:Mona:929383000708378705>",
+    "Nahida": "<:Nahida:1037678492483080262>",
+    "Nilou": "<:Nilou:1037678494773153792>",
     "Ningguang": "<:Ningguang:929383001060675604>",
     "Noelle": "<:Noelle:929383001111015475>",
     "Qiqi": "<:Qiqi:929383159185936384>",

src/data/events.json

@@ -1924,61 +1924,72 @@
     {
         "name": "Event Wish \"Everbloom Violet\"",
         "type": "Banner",
-        "img": "https://i.imgur.com/RYDwyUZ.jpeg",
-        "prediction": true,
+        "img": "https://upload-os-bbs.hoyolab.com/upload/2022/11/15/3a73e2e3443e36dafa613b1059953739_7629147073467734600.jpg",
+        "link": "https://www.hoyolab.com/article/13736827",
         "start": "2022-11-18 18:00:00",
         "end": "2022-12-06 14:59:00",
         "reminder": "end"
     },
     {
         "name": "Event Wish \"Farewell of Snezhnaya\"",
         "type": "Banner",
-        "img": "https://i.imgur.com/RYDwyUZ.jpeg",
-        "prediction": true,
+        "img": "https://upload-os-bbs.hoyolab.com/upload/2022/11/15/d5ef349475c1ddd262be5f396e206994_750297246136169784.jpg",
+        "link": "https://www.hoyolab.com/article/13736827",
         "start": "2022-11-18 18:00:00",
-        "end": "2022-12-06 17:59:00",
+        "end": "2022-12-06 14:59:00",
         "reminder": "end"
     },
     {
         "name": "Event Wish \"Epitome Invocation\"",
         "type": "Banner",
-        "prediction": true,
+        "img": "https://upload-os-bbs.hoyolab.com/upload/2022/11/15/e001506684341289149b28694b311a11_3623395904205130892.png",
+        "link": "https://www.hoyolab.com/article/13736827",
         "start": "2022-11-18 18:00:00",
-        "end": "2022-12-06 17:59:00",
+        "end": "2022-12-06 14:59:00",
         "reminder": "end"
     },
     {
         "name": "\"Fabulous Fungus Frenzy\" Event",
         "type": "In-game",
-        "img": "https://upload-os-bbs.hoyolab.com/upload/2022/10/31/ac98b4a7a3648ebabe23ec934112b6ae_5592817635730914991.jpg",
+        "link": "https://www.hoyolab.com/article/13595311",
+        "img": "https://upload-os-bbs.hoyolab.com/upload/2022/11/07/8b644af425bb806db4e3d57929126a8a_3030015466286797666.jpg",
         "start": "2022-11-10 10:00:00",
         "end": "2022-11-28 03:59:00",
         "reminder": "end"
     },
     {
         "name": "\"Adventure's Trials\" Event",
         "type": "In-game",
-        "img": "https://upload-os-bbs.hoyolab.com/upload/2022/10/31/6cce4be7c9cdb11cc4d4c0d518f76e4d_2882471429181539143.jpg",
+        "link": "https://www.hoyolab.com/article/13297789",
+        "img": "https://upload-os-bbs.hoyolab.com/upload/2022/11/01/479f9a47d340e93ba90d31a5b21fb320_5380949301706129920.jpg",
         "start": "2022-11-04 10:00:00",
         "end": "2022-11-21 03:59:00",
         "reminder": "end"
     },
     {
         "name": "\"Hypostatic Symphony: Dissonant Verse\" Event",
         "type": "In-game",
-        "img": "https://i.imgur.com/n0k6XeL.jpeg",
+        "link": "https://www.hoyolab.com/article/13880027",
+        "img": "https://upload-os-bbs.hoyolab.com/upload/2022/11/21/dedcb051595a2e42189bf183d3418d57_4258745643534506910.jpg",
+        "start": "2022-11-24 10:00:00",
+        "end": "2022-12-05 03:59:00",
         "reminder": "end"
     },
     {
         "name": "\"Outside the Canvas, Inside the Lens: Greenery Chapter\" Event",
         "type": "In-game",
-        "img": "https://i.imgur.com/0SSRaL5.jpeg",
+        "link": "https://www.hoyolab.com/article/13718763",
+        "img": "https://upload-os-bbs.hoyolab.com/upload/2022/11/14/27fc29223ecfb9c24996ed7e0224059a_1087079389391647107.jpg",
+        "start": "2022-11-16 10:00:00",
+        "end": "2022-12-05 03:59:59",
         "reminder": "end"
     },
     {
         "name": "\"Marvelous Merchandise\" Event",
         "type": "In-game",
         "img": "https://upload-os-bbs.hoyolab.com/upload/2022/05/03/1015537/7b928f530c5fd8f641bbc3ef4a871fdd_1572653224675820782.jpg",
+        "start": "2022-11-28 10:00:00",
+        "end": "2022-12-05 03:59:59",
         "reminder": "daily"
     },
     {
@@ -1990,6 +2001,14 @@
         "end": "2022-12-04 23:59:00",
         "reminder": "end"
     },
+    {
+        "name": "3.3 Special Program",
+        "type": "Stream",
+        "link": "https://www.hoyolab.com/article/13920721",
+        "img": "https://upload-os-bbs.hoyolab.com/upload/2022/11/23/3e64a432df0f02d6a5b2a11c0b899d2e_7928635679887452826.jpg",
+        "start": "2022-11-25 07:00:00",
+        "timezone": "-05:00"
+    },
     {
         "name": "3.3 Maintenance",
         "type": "Maintenance",

src/data/gamedata/abyss_floors.json

@@ -2900,5 +2900,13 @@
         ]
       }
     ]
+  },
+  "50": {
+    "teams": 2,
+    "leyline": "All party members have their Elemental Mastery increased by 200."
+  },
+  "51": {
+    "teams": 2,
+    "leyline": "For this floor only, the Ley Line flow will be normal."
   }
 }

src/data/gamedata/abyss_schedule.json

@@ -1142,5 +1142,49 @@
       48,
       49
     ]
+  },
+  "52": {
+    "start": "2022-11-16 04:00:00",
+    "end": "2022-12-01 03:59:59",
+    "buff": "Hailing Moon",
+    "buffDesc": "When characters deal DMG to an opponent, a shockwave will be unleashed at that opponent's position, dealing True DMG. Each Elemental DMG Type (including Physical DMG) can unleash a shockwave this way every 8s.",
+    "regularFloors": [
+      1,
+      2,
+      3,
+      4,
+      5,
+      6,
+      7,
+      8
+    ],
+    "spiralAbyssFloors": [
+      44,
+      45,
+      50,
+      51
+    ]
+  },
+  "53": {
+    "start": "2022-12-01 04:00:00",
+    "end": "2022-12-16 03:59:59",
+    "buff": "Lush Moon",
+    "buffDesc": "When characters trigger Burning, Quicken, Aggravate, Spread, Bloom, Hyperbloom, or Burgeon on an opponent, all party members will gain 10% Dendro DMG Bonus for 10s. This bonus can be triggered once every 5s. Max 4 stacks. Once 4 stacks have been gained, when characters deal Dendro DMG to an opponent, a shockwave will be unleashed at that opponent's position, dealing True DMG. A shockwave can be unleashed in this way once every 5s.",
+    "regularFloors": [
+      1,
+      2,
+      3,
+      4,
+      5,
+      6,
+      7,
+      8
+    ],
+    "spiralAbyssFloors": [
+      44,
+      45,
+      50,
+      51
+    ]
   }
 }