Merge branch 'main' into powershell-clarified-arguments

package.json

@@ -31,4 +31,4 @@
     "tailwindcss": "^3.2.4",
     "vite": "^3.0.2"
   }
-}
+}

src/data/banners.js

@@ -895,6 +895,168 @@ export const banners = {
     //   version: '3.8',
     //   timezoneDependent: true,
     // },
+    {
+      name: 'Conjuring Chiaroscuro',
+      image: 1,
+      shortName: 'Lyney',
+      start: '2023-08-16 06:00:00',
+      end: '2023-09-05 17:59:59',
+      color: '#fcc6c8',
+      featured: ['lyney', 'yelan'],
+      featuredRare: ['bennett', 'barbara', 'lynette'],
+      version: '4.0',
+      timezoneDependent: true,
+    },
+    // {
+    //   name: 'Discerner of Enigmas',
+    //   image: 3,
+    //   shortName: 'Yelan',
+    //   start: '2023-08-16 06:00:00',
+    //   end: '2023-09-05 17:59:59',
+    //   color: '#fcc6c8',
+    //   featured: ['lyney', 'yelan'],
+    //   featuredRare: ['bennett', 'barbara', 'lynette'],
+    //   version: '4.0',
+    //   timezoneDependent: true,
+    // },
+    {
+      name: 'Gentry of Hermitage',
+      image: 5,
+      shortName: 'Zhongli',
+      start: '2023-09-05 18:00:00',
+      end: '2023-09-26 14:59:59',
+      color: '#D1A55C',
+      featured: ['tartaglia', 'zhongli'],
+      featuredRare: ['freminet', 'sayu', 'noelle'],
+      version: '4.0',
+    },
+    // {
+    //   name: 'Farewell of Snezhnaya',
+    //   image: 5,
+    //   shortName: 'Tartaglia',
+    //   start: '2023-09-05 18:00:00',
+    //   end: '2023-09-26 14:59:59',
+    //   color: '#4ED8F3',
+    //   featured: ['tartaglia', 'zhongli'],
+    //   featuredRare: ['freminet', 'sayu', 'noelle'],
+    //   version: '4.0',
+    // },
+    {
+      name: 'Decree of the Deeps',
+      image: 1,
+      shortName: 'Neuvillette',
+      start: '2023-09-27 06:00:00',
+      end: '2023-10-17 17:59:59',
+      color: '#D1A55C',
+      featured: ['neuvillette', 'hu_tao'],
+      featuredRare: ['fischl', 'xingqiu', 'diona'],
+      version: '4.1',
+      timezoneDependent: true,
+    },
+    // {
+    //   name: 'Moment of Bloom',
+    //   image: 4,
+    //   shortName: 'Hu Tao',
+    //   start: '2023-09-27 06:00:00',
+    //   end: '2023-10-17 17:59:59',
+    //   color: '#FF7966',
+    //   featured: ['neuvillette', 'hu_tao'],
+    //   featuredRare: ['fischl', 'xingqiu', 'diona'],
+    //   version: '4.1',
+    //   timezoneDependent: true,
+    // },
+    {
+      name: 'Tempestuous Destiny',
+      image: 1,
+      shortName: 'Wriothesley',
+      start: '2023-10-17 18:00:00',
+      end: '2023-11-07 14:59:59',
+      color: '#b3d7f1',
+      featured: ['wriothesley', 'venti'],
+      featuredRare: ['chongyun', 'thoma', 'dori'],
+      version: '4.1',
+    },
+    // {
+    //   name: 'Ballad in Goblets',
+    //   image: 5,
+    //   shortName: 'Venti',
+    //   start: '2023-10-17 18:00:00',
+    //   end: '2023-11-07 14:59:59',
+    //   color: '#96f6de',
+    //   featured: ['wriothesley', 'venti'],
+    //   featuredRare: ['chongyun', 'thoma', 'dori'],
+    //   version: '4.1',
+    // },
+    {
+      name: 'Chanson of Many Waters',
+      image: 1,
+      shortName: 'Furina',
+      start: '2023-11-08 06:00:00',
+      end: '2023-11-28 17:59:59',
+      color: '#95d6fb',
+      featured: ['furina', 'baizhu'],
+      featuredRare: ['charlotte', 'collei', 'beidou'],
+      version: '4.2',
+      timezoneDependent: true,
+    },
+    // {
+    //   name: 'Immaculate Pulse',
+    //   image: 2,
+    //   shortName: 'Baizhu',
+    //   start: '2023-11-08 06:00:00',
+    //   end: '2023-11-28 17:59:59',
+    //   color: '#8fdaa0',
+    //   featured: ['furina', 'baizhu'],
+    //   featuredRare: ['charlotte', 'collei', 'beidou'],
+    //   version: '4.2',
+    //   timezoneDependent: true,
+    // },
+    {
+      name: 'Twilight Arbiter',
+      image: 3,
+      shortName: 'Cyno',
+      start: '2023-11-28 18:00:00',
+      end: '2023-12-19 14:59:59',
+      color: '#d8b8f7',
+      featured: ['cyno', 'kamisato_ayato'],
+      featuredRare: ['kuki_shinobu', 'xiangling', 'kirara'],
+      version: '4.2',
+    },
+    // {
+    //   name: 'Azure Excursion',
+    //   image: 3,
+    //   shortName: 'Ayato',
+    //   start: '2023-11-28 18:00:00',
+    //   end: '2023-12-19 14:59:59',
+    //   color: '#90bce9',
+    //   featured: ['cyno', 'kamisato_ayato'],
+    //   featuredRare: ['kuki_shinobu', 'xiangling', 'kirara'],
+    //   version: '4.2',
+    // },
+    {
+      name: 'In the Name of the Rosula',
+      image: 1,
+      shortName: 'Navia',
+      start: '2023-12-20 06:00:00',
+      end: '2024-01-09 17:59:59',
+      color: '#f6e195',
+      featured: ['navia', 'kamisato_ayaka'],
+      featuredRare: ['sucrose', 'candace', 'rosaria'],
+      version: '4.3',
+      timezoneDependent: true,
+    },
+    // {
+    //   name: 'The Heron's Court',
+    //   image: 4,
+    //   shortName: 'Ayaka',
+    //   start: '2023-12-20 06:00:00',
+    //   end: '2024-01-09 17:59:59',
+    //   color: '#f6e195',
+    //   featured: ['navia', 'kamisato_ayaka'],
+    //   featuredRare: ['sucrose', 'candace', 'rosaria'],
+    //   version: '4.3',
+    //   timezoneDependent: true,
+    // },
   ],
   weapons: [
     {
@@ -1504,5 +1666,98 @@ export const banners = {
       featuredRare: ['wine_and_song', 'lions_roar', 'the_bell', 'dragons_bane', 'favonius_warbow'],
       version: '3.8',
     },
+    {
+      name: 'Epitome Invocation',
+      image: 51,
+      shortName: 'Great Magic',
+      start: '2023-08-16 06:00:00',
+      end: '2023-09-05 17:59:59',
+      color: '#ffb169',
+      featured: ['the_first_great_magic', 'aqua_simulacra'],
+      featuredRare: [
+        'sacrificial_sword',
+        'favonius_greatsword',
+        'favonius_lance',
+        'sacrificial_fragments',
+        'sacrificial_bow',
+      ],
+      version: '4.0',
+      timezoneDependent: true,
+    },
+    {
+      name: 'Epitome Invocation',
+      image: 52,
+      shortName: 'Polar',
+      start: '2023-09-05 18:00:00',
+      end: '2023-09-26 14:59:59',
+      color: '#eae5e1',
+      featured: ['polar_star', 'vortex_vanquisher'],
+      featuredRare: ['the_flute', 'sacrificial_greatsword', 'dragons_bane', 'the_widsith', 'rust'],
+      version: '4.0',
+    },
+    {
+      name: 'Epitome Invocation',
+      image: 53,
+      shortName: 'Polar',
+      start: '2023-09-27 06:00:00',
+      end: '2023-10-17 17:59:59',
+      color: '#ffb169',
+      featured: ['tome_of_the_eternal_flow', 'staff_of_homa'],
+      featuredRare: [
+        'the_dockhands_assistant',
+        'portable_power_saw',
+        'mitternachts_waltz',
+        'favonius_lance',
+        'favonius_codex',
+      ],
+      version: '4.1',
+      timezoneDependent: true,
+    },
+    {
+      name: 'Epitome Invocation',
+      image: 54,
+      shortName: 'Polar',
+      start: '2023-10-17 18:00:00',
+      end: '2023-11-07 14:59:59',
+      color: '#eae5e1',
+      featured: ['cashflow_supervision', 'elegy_for_the_end'],
+      featuredRare: ['prospectors_drill', 'range_gauge', 'favonius_sword', 'rainslasher', 'eye_of_perception'],
+      version: '4.1',
+    },
+    {
+      name: 'Epitome Invocation',
+      image: 55,
+      shortName: 'Tranquil',
+      start: '2023-11-08 06:00:00',
+      end: '2023-11-28 17:59:59',
+      color: '#ffb169',
+      featured: ['splendor_of_tranquil_waters', 'jadefalls_splendor'],
+      featuredRare: ['sacrificial_sword', 'the_bell', 'dragons_bane', 'sacrificial_fragments', 'the_stringless'],
+      version: '4.2',
+      timezoneDependent: true,
+    },
+    {
+      name: 'Epitome Invocation',
+      image: 56,
+      shortName: 'Scarlet',
+      start: '2023-11-28 18:00:00',
+      end: '2023-12-19 14:59:59',
+      color: '#eae5e1',
+      featured: ['staff_of_the_scarlet_sands', 'haran_geppaku_futsu'],
+      featuredRare: ['lions_roar', 'the_widsith', 'favonius_warbow', 'favonius_greatsword', 'favonius_lance'],
+      version: '4.2',
+    },
+    {
+      name: 'Epitome Invocation',
+      image: 57,
+      shortName: 'Verdict',
+      start: '2023-12-20 06:00:00',
+      end: '2024-01-09 17:59:59',
+      color: '#ffb169',
+      featured: ['verdict', 'mistsplitter_reforged'],
+      featuredRare: ['akuoumaru', 'mouuns_moon', 'the_flute', 'dragons_bane', 'favonius_codex'],
+      version: '4.3',
+      timezoneDependent: true,
+    },
   ],
 };

src/data/bannersDual.js

@@ -627,4 +627,180 @@ export const bannersDual = {
       version: '3.8',
     },
   ],
+  'Conjuring Chiaroscuro 1': [
+    {
+      name: 'Conjuring Chiaroscuro',
+      image: 1,
+      shortName: 'Lyney',
+      start: '2023-08-16 06:00:00',
+      end: '2023-09-05 17:59:59',
+      color: '#fcc6c8',
+      featured: ['lyney', 'yelan'],
+      featuredRare: ['bennett', 'barbara', 'lynette'],
+      version: '4.0',
+      timezoneDependent: true,
+    },
+    {
+      name: 'Discerner of Enigmas',
+      image: 3,
+      shortName: 'Yelan',
+      start: '2023-08-16 06:00:00',
+      end: '2023-09-05 17:59:59',
+      color: '#fcc6c8',
+      featured: ['lyney', 'yelan'],
+      featuredRare: ['bennett', 'barbara', 'lynette'],
+      version: '4.0',
+      timezoneDependent: true,
+    },
+  ],
+  'Gentry of Hermitage 5': [
+    {
+      name: 'Gentry of Hermitage',
+      image: 5,
+      shortName: 'Zhongli',
+      start: '2023-09-05 18:00:00',
+      end: '2023-09-26 14:59:59',
+      color: '#D1A55C',
+      featured: ['tartaglia', 'zhongli'],
+      featuredRare: ['freminet', 'sayu', 'noelle'],
+      version: '4.0',
+    },
+    {
+      name: 'Farewell of Snezhnaya',
+      image: 5,
+      shortName: 'Tartaglia',
+      start: '2023-09-05 18:00:00',
+      end: '2023-09-26 14:59:59',
+      color: '#4ED8F3',
+      featured: ['tartaglia', 'zhongli'],
+      featuredRare: ['freminet', 'sayu', 'noelle'],
+      version: '4.0',
+    },
+  ],
+  'Decree of the Deeps 1': [
+    {
+      name: 'Decree of the Deeps',
+      image: 1,
+      shortName: 'Neuvillette',
+      start: '2023-09-27 06:00:00',
+      end: '2023-10-17 17:59:59',
+      color: '#D1A55C',
+      featured: ['neuvillette', 'hu_tao'],
+      featuredRare: ['fischl', 'xingqiu', 'diona'],
+      version: '4.1',
+      timezoneDependent: true,
+    },
+    {
+      name: 'Moment of Bloom',
+      image: 4,
+      shortName: 'Hu Tao',
+      start: '2023-09-27 06:00:00',
+      end: '2023-10-17 17:59:59',
+      color: '#FF7966',
+      featured: ['neuvillette', 'hu_tao'],
+      featuredRare: ['fischl', 'xingqiu', 'diona'],
+      version: '4.1',
+      timezoneDependent: true,
+    },
+  ],
+  'Tempestuous Destiny 1': [
+    {
+      name: 'Tempestuous Destiny',
+      image: 1,
+      shortName: 'Wriothesley',
+      start: '2023-10-17 18:00:00',
+      end: '2023-11-07 14:59:59',
+      color: '#b3d7f1',
+      featured: ['wriothesley', 'venti'],
+      featuredRare: ['chongyun', 'thoma', 'dori'],
+      version: '4.1',
+    },
+    {
+      name: 'Ballad in Goblets',
+      image: 5,
+      shortName: 'Venti',
+      start: '2023-10-17 18:00:00',
+      end: '2023-11-07 14:59:59',
+      color: '#96f6de',
+      featured: ['wriothesley', 'venti'],
+      featuredRare: ['chongyun', 'thoma', 'dori'],
+      version: '4.1',
+    },
+  ],
+  'Chanson of Many Waters 1': [
+    {
+      name: 'Chanson of Many Waters',
+      image: 1,
+      shortName: 'Furina',
+      start: '2023-11-08 06:00:00',
+      end: '2023-11-28 17:59:59',
+      color: '#95d6fb',
+      featured: ['furina', 'baizhu'],
+      featuredRare: ['charlotte', 'collei', 'beidou'],
+      version: '4.2',
+      timezoneDependent: true,
+    },
+    {
+      name: 'Immaculate Pulse',
+      image: 2,
+      shortName: 'Baizhu',
+      start: '2023-11-08 06:00:00',
+      end: '2023-11-28 17:59:59',
+      color: '#8fdaa0',
+      featured: ['furina', 'baizhu'],
+      featuredRare: ['charlotte', 'collei', 'beidou'],
+      version: '4.2',
+      timezoneDependent: true,
+    },
+  ],
+  'Twilight Arbiter 3': [
+    {
+      name: 'Twilight Arbiter',
+      image: 3,
+      shortName: 'Cyno',
+      start: '2023-11-28 18:00:00',
+      end: '2023-12-19 14:59:59',
+      color: '#d8b8f7',
+      featured: ['cyno', 'kamisato_ayato'],
+      featuredRare: ['kuki_shinobu', 'xiangling', 'kirara'],
+      version: '4.2',
+    },
+    {
+      name: 'Azure Excursion',
+      image: 3,
+      shortName: 'Ayato',
+      start: '2023-11-28 18:00:00',
+      end: '2023-12-19 14:59:59',
+      color: '#90bce9',
+      featured: ['cyno', 'kamisato_ayato'],
+      featuredRare: ['kuki_shinobu', 'xiangling', 'kirara'],
+      version: '4.2',
+    },
+  ],
+  'In the Name of the Rosula 1': [
+    {
+      name: 'In the Name of the Rosula',
+      image: 1,
+      shortName: 'Navia',
+      start: '2023-12-20 06:00:00',
+      end: '2024-01-09 17:59:59',
+      color: '#f6e195',
+      featured: ['navia', 'kamisato_ayaka'],
+      featuredRare: ['sucrose', 'candace', 'rosaria'],
+      version: '4.3',
+      timezoneDependent: true,
+    },
+    {
+      name: "The Heron's Court",
+      image: 4,
+      shortName: 'Ayaka',
+      start: '2023-12-20 06:00:00',
+      end: '2024-01-09 17:59:59',
+      color: '#f6e195',
+      featured: ['navia', 'kamisato_ayaka'],
+      featuredRare: ['sucrose', 'candace', 'rosaria'],
+      version: '4.3',
+      timezoneDependent: true,
+    },
+  ],
 };

src/data/birthdays.js

@@ -1,18 +1,26 @@
 export const birthdays = {
   thoma: [1, 9],
   diona: [1, 18],
+  kirara: [1, 22],
   rosaria: [1, 24],
+  lynette: [2, 2],
+  lyney: [2, 2],
+  alhaitham: [2, 11],
   beidou: [2, 14],
   sangonomiya_kokomi: [2, 22],
   bennett: [2, 29],
   qiqi: [3, 3],
+  yaoyao: [3, 6],
   shenhe: [3, 10],
   jean: [3, 14],
   noelle: [3, 21],
   kamisato_ayato: [3, 26],
   aloy: [4, 4],
+  dehya: [4, 7],
+  charlotte: [4, 10],
   xiao: [4, 17],
   yelan: [4, 20],
+  baizhu: [4, 25],
   diluc: [4, 30],
   candace: [5, 3],
   collei: [5, 8],
@@ -28,6 +36,7 @@ export const birthdays = {
   raiden_shogun: [6, 26],
   yae_miko: [6, 27],
   barbara: [7, 5],
+  kaveh: [7, 9],
   kujou_sara: [7, 14],
   hu_tao: [7, 15],
   tartaglia: [7, 20],
@@ -41,17 +50,21 @@ export const birthdays = {
   chongyun: [9, 7],
   razor: [9, 9],
   albedo: [9, 13],
+  freminet: [9, 24],
   kamisato_ayaka: [9, 28],
   xingqiu: [10, 9],
+  furina: [10, 13],
   xinyan: [10, 16],
   sayu: [10, 19],
   eula: [10, 25],
   kaedehara_kazuha: [10, 29],
   xiangling: [11, 2],
   keqing: [11, 20],
+  wriothesley: [11, 23],
   sucrose: [11, 26],
   kaeya: [11, 30],
   ganyu: [12, 2],
+  dori: [12, 21],
   tighnari: [12, 29],
   zhongli: [12, 31],
 };

src/data/build.js

@@ -5080,4 +5080,55 @@ export const builds = {
       },
     },
   },
+  lyney: {
+    roles: {
+      TBD: {
+        recommended: false,
+        weapons: [],
+        artifacts: [],
+        mainStats: {
+          sands: ['TBD'],
+          goblet: ['TBD'],
+          circlet: ['TBD'],
+        },
+        subStats: ['TBD'],
+        talent: ['TBD'],
+        note: 'TBD',
+      },
+    },
+  },
+  lynette: {
+    roles: {
+      TBD: {
+        recommended: false,
+        weapons: [],
+        artifacts: [],
+        mainStats: {
+          sands: ['TBD'],
+          goblet: ['TBD'],
+          circlet: ['TBD'],
+        },
+        subStats: ['TBD'],
+        talent: ['TBD'],
+        note: 'TBD',
+      },
+    },
+  },
+  freminet: {
+    roles: {
+      TBD: {
+        recommended: false,
+        weapons: [],
+        artifacts: [],
+        mainStats: {
+          sands: ['TBD'],
+          goblet: ['TBD'],
+          circlet: ['TBD'],
+        },
+        subStats: ['TBD'],
+        talent: ['TBD'],
+        note: 'TBD',
+      },
+    },
+  },
 };

src/data/events.js

@@ -1363,4 +1363,192 @@ export const events = [
     url: 'https://www.hoyolab.com/article/20180483',
     showOnHome: true,
   },
+  {
+    name: 'Relic Records: Creations of the Hydro Nation',
+    pos: '0% 50%',
+    zoom: '300%',
+    image: 'Relic Records Creations of the Hydro Nation.jpg',
+    start: '2023-08-16 06:00:00',
+    end: '2023-08-28 03:59:59',
+    color: '#71d4e7',
+    url: 'https://www.hoyolab.com/article/20856332',
+    showOnHome: true,
+    timezoneDependent: true,
+  },
+  {
+    name: 'Mega Meka Melee',
+    pos: '80% 25%',
+    zoom: '250%',
+    image: 'Mega Meka Melee.jpg',
+    start: '2023-08-24 10:00:00',
+    end: '2023-09-11 03:59:59',
+    color: '#a1dffe',
+    url: 'https://www.hoyolab.com/article/21096726',
+    showOnHome: true,
+  },
+  {
+    name: 'Verdict of Blades',
+    pos: '0% 20%',
+    zoom: '200%',
+    image: 'Verdict of Blades.jpg',
+    start: '2023-09-04 10:00:00',
+    end: '2023-09-18 03:59:59',
+    color: '#2aabff',
+    url: 'https://www.hoyolab.com/article/21344686',
+    showOnHome: true,
+  },
+  {
+    name: 'Studies in Light and Shadow: A Fontaine of Enchantment',
+    pos: '0% 50%',
+    zoom: '200%',
+    image: 'Studies in Light and Shadow A Fontaine of Enchantment temp.jpg',
+    start: '2023-09-14 10:00:00',
+    end: '2023-09-25 03:59:59',
+    color: '#dfd2ab',
+    url: 'https://www.hoyolab.com/article/21297643',
+    showOnHome: true,
+  },
+  {
+    name: 'Ley Line Overflow',
+    pos: '0% 40%',
+    zoom: '200%',
+    image: 'leyline_overflow.jpg',
+    start: '2023-09-18 04:00:00',
+    end: '2023-09-25 03:59:59',
+    color: '#5baced',
+    url: 'https://www.hoyolab.com/article/21297643',
+    showOnHome: true,
+  },
+  {
+    name: 'Radiant Harvest',
+    pos: '0% 20%',
+    zoom: '200%',
+    image: 'Radiant Harvest.jpg',
+    start: '2023-09-28 10:00:00',
+    end: '2023-10-09 03:59:59',
+    color: '#58c3d2',
+    url: 'https://www.hoyolab.com/article/21872780',
+    showOnHome: true,
+  },
+  {
+    name: 'Bathing in Flowing Moonlight: Daily Login',
+    pos: '0% 40%',
+    zoom: '200%',
+    image: 'Bathing in Flowing Moonlight.jpg',
+    start: '2023-09-29 04:00:00',
+    end: '2023-10-16 03:59:59',
+    color: '#ffa2b5',
+    url: 'https://www.hoyolab.com/article/21872779',
+    showOnHome: true,
+  },
+  {
+    name: 'Waterbone Poetry',
+    pos: '0% 30%',
+    zoom: '100%',
+    image: 'Waterbone Poetry tmp.jpg',
+    start: '2023-10-12 10:00:00',
+    end: '2023-10-30 03:59:59',
+    color: '#eeecb9',
+    url: 'https://www.hoyolab.com/article/21853732',
+    showOnHome: true,
+  },
+  {
+    name: 'The Peaks and Troughs of Life',
+    pos: '0% 40%',
+    zoom: '100%',
+    image: 'The Peaks and Troughs of Life.png',
+    start: '2023-10-23 10:00:00',
+    end: '2023-11-06 03:59:59',
+    color: '#a6ceb3',
+    url: 'https://www.hoyolab.com/article/22272349',
+    showOnHome: true,
+  },
+  {
+    name: 'Overflowing Mastery',
+    pos: '0% 50%',
+    image: 'overflowing_mastery.jpg',
+    start: '2023-10-30 04:00:00',
+    end: '2023-11-06 03:59:59',
+    color: '#f5debc',
+    zoom: '200%',
+    url: 'https://www.hoyolab.com/article/22272349',
+    showOnHome: true,
+  },
+  {
+    name: 'Misty Dungeon: Realm of Water',
+    pos: '0% 50%',
+    zoom: '200%',
+    image: 'Misty Dungeon Realm of Water.png',
+    start: '2023-11-09 10:00:00',
+    end: '2023-11-20 03:59:59',
+    color: '#2da6b1',
+    url: 'https://www.hoyolab.com/article/22800499',
+    showOnHome: true,
+  },
+  {
+    name: 'Graph Adversarial Technology Experiment Log',
+    pos: '0% 50%',
+    zoom: '100%',
+    image: 'Graph Adversarial Technology Experiment Log.png',
+    start: '2023-11-17 10:00:00',
+    end: '2023-11-27 03:59:59',
+    color: '#eae4dd',
+    url: 'https://www.hoyolab.com/article/22782228',
+    showOnHome: true,
+  },
+  {
+    name: "Thelxie's Fantastic Adventures",
+    pos: '40% 60%',
+    zoom: '200%',
+    image: 'Thelxies Fantastic Adventures.png',
+    start: '2023-11-23 10:00:00',
+    end: '2023-12-11 03:59:59',
+    color: '#83abe1',
+    url: 'https://www.hoyolab.com/article/23129467',
+    showOnHome: true,
+  },
+  {
+    name: "Lil' Fungi's Fun-Tastic Fiesta",
+    pos: '0% 60%',
+    zoom: '200%',
+    image: 'fungus_mechanicus.jpg',
+    start: '2023-12-06 10:00:00',
+    end: '2023-12-18 03:59:59',
+    color: '#5cbcad',
+    url: 'https://www.hoyolab.com/article/23172422',
+    showOnHome: true,
+  },
+  {
+    name: 'Ley Line Overflow',
+    pos: '0% 40%',
+    zoom: '200%',
+    image: 'leyline_overflow.jpg',
+    start: '2023-12-11 04:00:00',
+    end: '2023-12-18 03:59:59',
+    color: '#5baced',
+    url: 'https://www.hoyolab.com/article/23172422',
+    showOnHome: true,
+  },
+  {
+    name: 'Roses and Muskets',
+    pos: '0% 40%',
+    zoom: '200%',
+    image: 'Roses and Muskets.png',
+    start: '2023-12-21 10:00:00',
+    end: '2024-01-08 03:59:59',
+    color: '#9ac4ee',
+    url: 'https://www.hoyolab.com/article/23689256',
+    showOnHome: true,
+  },
+  {
+    name: 'Lost Riches',
+    pos: '0% 50%',
+    image: 'lost_riches_2.jpg',
+    start: '2024-01-02 10:00:00',
+    end: '2024-01-15 03:59:59',
+    color: '#FFF2DC',
+    zoom: '170%',
+    url: 'https://www.hoyolab.com/article/23668604',
+    showOnHome: true,
+  },
 ];

src/data/itemGroup.js

@@ -361,4 +361,19 @@ export const itemGroup = {
     name: 'Damaged Prism',
     items: [itemList.damaged_prism, itemList.turbid_prism, itemList.radiant_prism],
   },
+  teachings_of_order: {
+    name: 'Order',
+    items: [itemList.teachings_of_order, itemList.guide_to_order, itemList.philosophies_of_order],
+    type: 'book',
+  },
+  teachings_of_equity: {
+    name: 'Equity',
+    items: [itemList.teachings_of_equity, itemList.guide_to_equity, itemList.philosophies_of_equity],
+    type: 'book',
+  },
+  teachings_of_justice: {
+    name: 'Justice',
+    items: [itemList.teachings_of_justice, itemList.guide_to_justice, itemList.philosophies_of_justice],
+    type: 'book',
+  },
 };

src/data/itemList.js

@@ -1172,4 +1172,287 @@ export const itemList = {
   },
 
   everamber: { id: 'everamber', name: 'Everamber' },
+
+  artificed_spare_clockwork_component_coppelius: {
+    id: 'artificed_spare_clockwork_component_coppelius',
+    name: 'Artificed Spare Clockwork Component — Coppelius',
+    rarity: 4,
+  },
+  lumidouce_bell: {
+    id: 'lumidouce_bell',
+    name: 'Lumidouce Bell',
+  },
+  mechanical_spur_gear: {
+    id: 'mechanical_spur_gear',
+    name: 'Mechanical Spur Gear',
+    rarity: 2,
+  },
+  artificed_dynamic_gear: {
+    id: 'artificed_dynamic_gear',
+    name: 'Artificed Dynamic Gear',
+    rarity: 3,
+  },
+  meshing_gear: {
+    id: 'meshing_gear',
+    name: 'Meshing Gear',
+    rarity: 1,
+  },
+  rainbow_rose: {
+    id: 'rainbow_rose',
+    name: 'Rainbow Rose',
+  },
+  emperors_resolution: {
+    id: 'emperors_resolution',
+    name: "Emperor's Resolution",
+    rarity: 4,
+  },
+
+  teachings_of_order: {
+    id: 'teachings_of_order',
+    name: 'Teachings of Order',
+    day: ['wednesday', 'saturday'],
+    rarity: 2,
+  },
+  guide_to_order: {
+    id: 'guide_to_order',
+    name: 'Guide to Order',
+    day: ['wednesday', 'saturday'],
+    rarity: 3,
+    parent: 'teachings_of_order',
+  },
+  philosophies_of_order: {
+    id: 'philosophies_of_order',
+    name: 'Philosophies of Order',
+    day: ['wednesday', 'saturday'],
+    rarity: 4,
+    parent: 'teachings_of_order',
+  },
+
+  teachings_of_equity: {
+    id: 'teachings_of_equity',
+    name: 'Teachings of Equity',
+    day: ['monday', 'thursday'],
+    rarity: 2,
+  },
+  guide_to_equity: {
+    id: 'guide_to_equity',
+    name: 'Guide to Equity',
+    day: ['monday', 'thursday'],
+    rarity: 3,
+    parent: 'teachings_of_equity',
+  },
+  philosophies_of_equity: {
+    id: 'philosophies_of_equity',
+    name: 'Philosophies of Equity',
+    day: ['monday', 'thursday'],
+    rarity: 4,
+    parent: 'teachings_of_equity',
+  },
+
+  teachings_of_justice: {
+    id: 'teachings_of_justice',
+    name: 'Teachings of Justice',
+    day: ['tuesday', 'friday'],
+    rarity: 2,
+  },
+  guide_to_justice: {
+    id: 'guide_to_justice',
+    name: 'Guide to Justice',
+    day: ['tuesday', 'friday'],
+    rarity: 3,
+    parent: 'teachings_of_justice',
+  },
+  philosophies_of_justice: {
+    id: 'philosophies_of_justice',
+    name: 'Philosophies of Justice',
+    day: ['tuesday', 'friday'],
+    rarity: 4,
+    parent: 'teachings_of_justice',
+  },
+
+  fragment_of_an_ancient_chord: {
+    id: 'fragment_of_an_ancient_chord',
+    name: 'Fragment of an Ancient Chord',
+    rarity: 2,
+  },
+  chapter_of_an_ancient_chord: {
+    id: 'chapter_of_an_ancient_chord',
+    name: 'Chapter of an Ancient Chord',
+    rarity: 3,
+  },
+  movement_of_an_ancient_chord: {
+    id: 'movement_of_an_ancient_chord',
+    name: 'Movement of an Ancient Chord',
+    rarity: 4,
+  },
+  echo_of_an_ancient_chord: {
+    id: 'echo_of_an_ancient_chord',
+    name: 'Echo of an Ancient Chord',
+    rarity: 5,
+  },
+  transoceanic_pearl: {
+    id: 'transoceanic_pearl',
+    name: 'Transoceanic Pearl',
+    rarity: 1,
+  },
+  transoceanic_chunk: {
+    id: 'transoceanic_chunk',
+    name: 'Transoceanic Chunk',
+    rarity: 2,
+  },
+  xenochromatic_crystal: {
+    id: 'xenochromatic_crystal',
+    name: 'Xenochromatic Crystal',
+    rarity: 3,
+  },
+  dross_of_pure_sacred_dewdrop: {
+    id: 'dross_of_pure_sacred_dewdrop',
+    name: 'Dross of Pure Sacred Dewdrop',
+    rarity: 2,
+  },
+  drop_of_tainted_water: {
+    id: 'drop_of_tainted_water',
+    name: 'Drop of Tainted Water',
+    rarity: 2,
+  },
+  sublimation_of_pure_sacred_dewdrop: {
+    id: 'sublimation_of_pure_sacred_dewdrop',
+    name: 'Sublimation of Pure Sacred Dewdrop',
+    rarity: 3,
+  },
+  scoop_of_tainted_water: {
+    id: 'scoop_of_tainted_water',
+    name: 'Scoop of Tainted Water',
+    rarity: 3,
+  },
+  spring_of_pure_sacred_dewdrop: {
+    id: 'spring_of_pure_sacred_dewdrop',
+    name: 'Spring of Pure Sacred Dewdrop',
+    rarity: 4,
+  },
+  newborn_tainted_hydro_phantasm: {
+    id: 'newborn_tainted_hydro_phantasm',
+    name: 'Newborn Tainted Hydro Phantasm',
+    rarity: 4,
+  },
+
+  broken_goblet_of_the_pristine_sea: {
+    id: 'broken_goblet_of_the_pristine_sea',
+    name: 'Broken Goblet of the Pristine Sea',
+    rarity: 2,
+  },
+  wine_goblet_of_the_pristine_sea: {
+    id: 'wine_goblet_of_the_pristine_sea',
+    name: 'Wine Goblet of the Pristine Sea',
+    rarity: 3,
+  },
+  silver_goblet_of_the_pristine_sea: {
+    id: 'silver_goblet_of_the_pristine_sea',
+    name: 'Silver Goblet of the Pristine Sea',
+    rarity: 4,
+  },
+  golden_goblet_of_the_pristine_sea: {
+    id: 'golden_goblet_of_the_pristine_sea',
+    name: 'Golden Goblet of the Pristine Sea',
+    rarity: 5,
+  },
+
+  dross_of_pure_sacred_dewdrop: {
+    id: 'dross_of_pure_sacred_dewdrop',
+    name: 'Dross of Pure Sacred Dewdrop',
+    rarity: 2,
+  },
+  sublimation_of_pure_sacred_dewdrop: {
+    id: 'sublimation_of_pure_sacred_dewdrop',
+    name: 'Sublimation of Pure Sacred Dewdrop',
+    rarity: 3,
+  },
+  spring_of_pure_sacred_dewdrop: {
+    id: 'spring_of_pure_sacred_dewdrop',
+    name: 'Spring of Pure Sacred Dewdrop',
+    rarity: 4,
+  },
+  essence_of_pure_sacred_dewdrop: {
+    id: 'essence_of_pure_sacred_dewdrop',
+    name: 'Essence of Pure Sacred Dewdrop',
+    rarity: 5,
+  },
+
+  rift_core: {
+    id: 'rift_core',
+    name: 'Rift Core',
+    rarity: 2,
+  },
+  foreign_synapse: {
+    id: 'foreign_synapse',
+    name: 'Foreign Synapse',
+    rarity: 3,
+  },
+  alien_life_core: {
+    id: 'alien_life_core',
+    name: 'Alien Life Core',
+    rarity: 4,
+  },
+
+  romaritime_flower: {
+    id: 'romaritime_flower',
+    name: 'Romaritime Flower',
+  },
+
+  fontemer_unihorn: {
+    id: 'fontemer_unihorn',
+    name: 'Fontemer Unihorn',
+    rarity: 4,
+  },
+  lumitoile: {
+    id: 'lumitoile',
+    name: 'Lumitoile',
+  },
+
+  old_operatives_pocket_watch: {
+    id: 'old_operatives_pocket_watch',
+    name: "Old Operative's Pocket Watch",
+    rarity: 2,
+  },
+  operatives_standard_pocket_watch: {
+    id: 'operatives_standard_pocket_watch',
+    name: "Operative's Standard Pocket Watch",
+    rarity: 3,
+  },
+  operatives_constancy: {
+    id: 'operatives_constancy',
+    name: "Operative's Constancy",
+    rarity: 4,
+  },
+
+  subdetection_unit: {
+    id: 'subdetection_unit',
+    name: 'Subdetection Unit',
+  },
+  tourbillon_device: {
+    id: 'tourbillon_device',
+    name: '"Tourbillon Device"',
+    rarity: 4,
+  },
+
+  beryl_conch: {
+    id: 'beryl_conch',
+    name: 'Beryl Conch',
+  },
+  lakelight_lily: {
+    id: 'lakelight_lily',
+    name: 'Lakelight Lily',
+  },
+  water_that_failed_to_transcend: {
+    id: 'water_that_failed_to_transcend',
+    name: 'Water That Failed To Transcend',
+    rarity: 4,
+  },
+  lightless_silk_string: { id: 'lightless_silk_string', name: 'Lightless Silk String' },
+  lightless_mass: { id: 'lightless_mass', name: 'Lightless Mass' },
+
+  spring_of_the_first_dewdrop: {
+    id: 'spring_of_the_first_dewdrop',
+    name: 'Spring of the First Dewdrop',
+  },
 };

src/data/timeline.js

@@ -1,217 +1,169 @@
 export const eventsData = [
   [
     {
-      name: 'Perilous Expedition',
-      pos: '0% 20%',
-      zoom: '200%',
-      image: 'Perilous Expedition.jpg',
-      start: '2023-07-27 10:00:00',
-      end: '2023-08-07 03:59:59',
-      color: '#edfbad',
-      url: 'https://www.hoyolab.com/article/20360979',
-      showOnHome: true,
-    },
-    {
-      name: 'Overflowing Mastery',
+      name: 'Graph Adversarial Technology Experiment Log',
       pos: '0% 50%',
-      image: 'overflowing_mastery.jpg',
-      start: '2023-08-07 04:00:00',
-      end: '2023-08-14 03:59:59',
-      color: '#f5debc',
-      zoom: '200%',
-      url: 'https://www.hoyolab.com/article/20180483',
-      showOnHome: true,
-    },
-  ],
-  [
-    {
-      name: "Divine Ingenuity: Collector's Chapter",
-      pos: '0% 20%',
-      zoom: '200%',
-      image: 'Divine Ingenuity 2.png',
-      start: '2023-06-08 10:00:00',
-      end: '2023-06-29 03:59:59',
-      color: '#cbfeff',
-      url: 'https://www.hoyolab.com/article/18699187',
-      showOnHome: true,
-    },
-    {
-      name: "Adventurer's Trials: Advanced",
-      pos: '0% 50%',
-      zoom: '200%',
-      image: 'Adventurers Trials Advanced.jpg',
-      start: '2023-07-20 10:00:00',
-      end: '2023-07-31 03:59:59',
-      color: '#fffa86',
-      url: 'https://www.hoyolab.com/article/20113425',
-      showOnHome: true,
-    },
-    {
-      name: 'Shared Sight',
-      pos: '0% 50%',
-      zoom: '100%',
-      image: 'Shared Sight Temp.png',
-      start: '2023-08-03 10:00:00',
-      end: '2023-08-14 03:59:59',
-      color: '#d1f6a2',
-      url: 'https://www.hoyolab.com/article/20180483',
-      showOnHome: true,
-    },
-  ],
-  [
-    {
-      name: "Duel! The Summoners' Summit!",
-      pos: '35% 20%',
       zoom: '250%',
-      image: 'Duel The Summoners Summit.png',
-      start: '2023-05-25 10:00:00',
-      end: '2023-06-12 03:59:59',
-      color: '#d8e29d',
-      url: 'https://www.hoyolab.com/article/18699059',
+      image: 'Graph Adversarial Technology Experiment Log.png',
+      start: '2023-11-17 10:00:00',
+      end: '2023-11-27 03:59:59',
+      color: '#eae4dd',
+      url: 'https://www.hoyolab.com/article/22782228',
       showOnHome: true,
     },
     {
-      name: 'Feast of the Departed Warriors',
-      pos: '0% 20%',
-      zoom: '250%',
-      image: 'Feast of the Departed Warriors.png',
-      start: '2023-06-14 10:00:00',
-      end: '2023-06-26 03:59:59',
-      color: '#4f7eed',
-      url: 'https://www.hoyolab.com/article/19277582',
+      name: "Lil' Fungi's Fun-Tastic Fiesta",
+      pos: '0% 60%',
+      zoom: '200%',
+      image: 'fungus_mechanicus.jpg',
+      start: '2023-12-06 10:00:00',
+      end: '2023-12-18 03:59:59',
+      color: '#5cbcad',
+      url: 'https://www.hoyolab.com/article/23172422',
       showOnHome: true,
     },
     {
-      name: 'Secret Summer Paradise',
-      pos: '20% 10%',
-      zoom: '150%',
-      image: 'Secret Summer Paradise.jpg',
-      start: '2023-07-05 06:00:00',
-      end: '2023-08-16 03:59:59',
-      color: '#9ceddf',
-      url: 'https://www.hoyolab.com/article/19771436',
+      name: 'Lost Riches',
+      pos: '0% 50%',
+      image: 'lost_riches_2.jpg',
+      start: '2024-01-02 10:00:00',
+      end: '2024-01-15 03:59:59',
+      color: '#FFF2DC',
+      zoom: '170%',
+      url: 'https://www.hoyolab.com/article/23668604',
+      showOnHome: true,
+    },
+  ],
+  [
+    {
+      name: 'Misty Dungeon: Realm of Water',
+      pos: '0% 50%',
+      zoom: '200%',
+      image: 'Misty Dungeon Realm of Water.png',
+      start: '2023-11-09 10:00:00',
+      end: '2023-11-20 03:59:59',
+      color: '#2da6b1',
+      url: 'https://www.hoyolab.com/article/22800499',
+      showOnHome: true,
+    },
+    {
+      name: "Thelxie's Fantastic Adventures",
+      pos: '0% 50%',
+      zoom: '200%',
+      image: 'Thelxies Fantastic Adventures.png',
+      start: '2023-11-23 10:00:00',
+      end: '2023-12-11 03:59:59',
+      color: '#83abe1',
+      url: 'https://www.hoyolab.com/article/23129467',
+      showOnHome: true,
+    },
+    {
+      name: 'Ley Line Overflow',
+      pos: '0% 40%',
+      zoom: '200%',
+      image: 'leyline_overflow.jpg',
+      start: '2023-12-11 04:00:00',
+      end: '2023-12-18 03:59:59',
+      color: '#5baced',
+      url: 'https://www.hoyolab.com/article/23172422',
+      showOnHome: true,
+    },
+    {
+      name: 'Roses and Muskets',
+      pos: '0% 40%',
+      zoom: '200%',
+      image: 'Roses and Muskets.png',
+      start: '2023-12-21 10:00:00',
+      end: '2024-01-08 03:59:59',
+      color: '#9ac4ee',
+      url: 'https://www.hoyolab.com/article/23689256',
+      showOnHome: true,
+    },
+  ],
+  [
+    {
+      name: 'Chanson of Many Waters - Furina Banner',
+      pos: '40% 15%',
+      zoom: '200%',
+      image: 'Chanson of Many Waters 1.jpg',
+      start: '2023-11-08 06:00:00',
+      end: '2023-11-28 17:59:59',
+      color: '#95d6fb',
+      url: 'https://www.hoyolab.com/article/22782167',
+      showOnHome: true,
+      timezoneDependent: true,
+    },
+    {
+      name: 'Twilight Arbiter - Cyno Banner',
+      pos: '40% 15%',
+      zoom: '200%',
+      image: 'Twilight Arbiter 3.jpg',
+      start: '2023-11-28 18:00:00',
+      end: '2023-12-19 14:59:59',
+      color: '#d8b8f7',
+      url: 'https://www.hoyolab.com/article/23172294',
+      showOnHome: true,
+    },
+    {
+      name: 'In the Name of the Rosula - Navia Banner',
+      pos: '40% 17%',
+      zoom: '200%',
+      image: 'In the Name of the Rosula 1.png',
+      start: '2023-12-20 06:00:00',
+      end: '2024-01-09 17:59:59',
+      color: '#f6e195',
+      url: 'https://www.hoyolab.com/article/23668466',
       showOnHome: true,
       timezoneDependent: true,
     },
   ],
   [
     {
-      name: 'Tapestry of Golden Flames - Yoimiya Banner',
-      pos: '10% 15%',
-      zoom: '150%',
-      image: 'Tapestry of Golden Flames 4.png',
-      start: '2023-05-24 06:00:00',
-      end: '2023-06-13 17:59:59',
-      color: '#fc8976',
-      url: 'https://www.hoyolab.com/article/18699067',
+      name: 'Immaculate Pulse - Baizhu Banner',
+      pos: '30% 15%',
+      zoom: '200%',
+      image: 'Immaculate Pulse 2.jpg',
+      start: '2023-11-08 06:00:00',
+      end: '2023-11-28 17:59:59',
+      color: '#8fdaa0',
+      url: 'https://www.hoyolab.com/article/22782167',
       showOnHome: true,
       timezoneDependent: true,
     },
     {
-      name: 'Caution in Confidence - Alhaitham Banner',
-      pos: '10% 5%',
-      zoom: '150%',
-      image: 'Caution in Confidence 2.png',
-      start: '2023-06-13 18:00:00',
-      end: '2023-07-04 14:59:59',
-      color: '#5bcbd1',
-      url: 'https://www.hoyolab.com/article/19181094',
+      name: 'Azure Excursion - Ayato Banner',
+      pos: '40% 15%',
+      zoom: '200%',
+      image: 'Azure Excursion 3.jpg',
+      start: '2023-11-28 18:00:00',
+      end: '2023-12-19 14:59:59',
+      color: '#90bce9',
+      url: 'https://www.hoyolab.com/article/23172294',
       showOnHome: true,
     },
     {
-      name: 'Born of Ocean Swell - Eula Banner',
-      pos: '10% 15%',
-      zoom: '150%',
-      image: 'Born of Ocean Swell 3.jpg',
-      start: '2023-07-05 06:00:00',
-      end: '2023-07-25 17:59:59',
-      color: '#A6D6E0',
-      url: 'https://www.hoyolab.com/article/19771439',
+      name: 'In the Name of the Rosula - Ayaka Banner',
+      pos: '40% 17%',
+      zoom: '200%',
+      image: 'The Herons Court 4.png',
+      start: '2023-12-20 06:00:00',
+      end: '2024-01-09 17:59:59',
+      color: '#FFFBF7',
+      url: 'https://www.hoyolab.com/article/23668466',
       showOnHome: true,
       timezoneDependent: true,
     },
-    {
-      name: 'Born of Ocean Swell - Eula Banner',
-      pos: '10% 15%',
-      zoom: '150%',
-      image: 'Born of Ocean Swell 3.jpg',
-      start: '2023-07-05 06:00:00',
-      end: '2023-07-25 17:59:59',
-      color: '#A6D6E0',
-      url: 'https://www.hoyolab.com/article/19771439',
-      showOnHome: true,
-      timezoneDependent: true,
-    },
-    {
-      name: 'Drifting Luminescence - Kokomi Banner',
-      pos: '10% 15%',
-      zoom: '150%',
-      image: 'Drifting Luminescence 4.jpg',
-      start: '2023-07-25 18:00:00',
-      end: '2023-08-15 17:59:59',
-      color: '#53caf3',
-      url: 'https://www.hoyolab.com/article/20180298',
-      showOnHome: true,
-    },
-  ],
-  [
-    {
-      name: 'Everbloom Violet - Yae Miko Banner',
-      pos: '10% 15%',
-      zoom: '150%',
-      image: 'Everbloom Violet 3.png',
-      start: '2023-05-24 06:00:00',
-      end: '2023-06-13 17:59:59',
-      color: '#ffd1f9',
-      url: 'https://www.hoyolab.com/article/18699067',
-      showOnHome: true,
-      timezoneDependent: true,
-    },
-    {
-      name: 'Leaves in the Wind - Kazuha Banner',
-      pos: '10% 5%',
-      zoom: '150%',
-      image: 'Leaves in the Wind 3.png',
-      start: '2023-06-13 18:00:00',
-      end: '2023-07-04 14:59:59',
-      color: '#7edec3',
-      url: 'https://www.hoyolab.com/article/19181094',
-      showOnHome: true,
-    },
-    {
-      name: 'Sparkling Steps - Klee Banner',
-      pos: '10% 15%',
-      zoom: '150%',
-      image: 'Sparkling Steps 4.jpg',
-      start: '2023-07-05 06:00:00',
-      end: '2023-07-25 17:59:59',
-      color: '#f26c36',
-      url: 'https://www.hoyolab.com/article/19771439',
-      showOnHome: true,
-      timezoneDependent: true,
-    },
-    {
-      name: 'From Ashes Reborn - Wanderer Banner',
-      pos: '10% 15%',
-      zoom: '150%',
-      image: 'From Ashes Reborn 2.jpg',
-      start: '2023-07-25 18:00:00',
-      end: '2023-08-15 17:59:59',
-      color: '#53caf3',
-      url: 'https://www.hoyolab.com/article/20180298',
-      showOnHome: true,
-    },
   ],
   [
     {
       name: 'Epitome Invocation - Weapon Banner',
-      pos: '30% 35%',
+      pos: '30% 25%',
       zoom: '150%',
-      image: 'Epitome Invocation 47.png',
-      start: '2023-05-24 06:00:00',
-      end: '2023-06-13 17:59:59',
+      image: 'Epitome Invocation 55.jpg',
+      start: '2023-11-08 06:00:00',
+      end: '2023-11-28 17:59:59',
       color: '#FFAA4B',
-      url: 'https://www.hoyolab.com/article/18699067',
+      url: 'https://www.hoyolab.com/article/22782167',
       showOnHome: true,
       timezoneDependent: true,
     },
@@ -219,107 +171,86 @@ export const eventsData = [
       name: 'Epitome Invocation - Weapon Banner',
       pos: '30% 25%',
       zoom: '150%',
-      image: 'Epitome Invocation 48.png',
-      start: '2023-06-13 18:00:00',
-      end: '2023-07-04 14:59:59',
+      image: 'Epitome Invocation 56.jpg',
+      start: '2023-11-28 18:00:00',
+      end: '2023-12-19 14:59:59',
       color: '#FFAA4B',
-      url: 'https://www.hoyolab.com/article/19181094',
+      url: 'https://www.hoyolab.com/article/23172294',
       showOnHome: true,
     },
     {
       name: 'Epitome Invocation - Weapon Banner',
-      pos: '30% 35%',
+      pos: '30% 25%',
       zoom: '150%',
-      image: 'Epitome Invocation 49.jpg',
-      start: '2023-07-05 06:00:00',
-      end: '2023-07-25 17:59:59',
+      image: 'Epitome Invocation 57.png',
+      start: '2023-12-20 06:00:00',
+      end: '2024-01-09 17:59:59',
       color: '#FFAA4B',
-      url: 'https://www.hoyolab.com/article/19771439',
+      url: 'https://www.hoyolab.com/article/23668466',
       showOnHome: true,
       timezoneDependent: true,
     },
-    {
-      name: 'Epitome Invocation - Weapon Banner',
-      pos: '30% 35%',
-      zoom: '150%',
-      image: 'Epitome Invocation 50.jpg',
-      start: '2023-07-25 18:00:00',
-      end: '2023-08-15 17:59:59',
-      color: '#FFAA4B',
-      url: 'https://www.hoyolab.com/article/20180298',
-      showOnHome: true,
-    },
   ],
   [
     {
       name: 'Spiral Abyss',
       image: 'spiral_abyss.jpg',
       pos: '50% 20%',
-      start: '2023-05-16 04:00:00',
-      end: '2023-06-01 04:00:00',
+      start: '2023-11-01 04:00:00',
+      end: '2023-11-16 04:00:00',
       color: '#4299E1',
       description:
-        'When DMG dealt by Dendro Cores (including DMG from Hyperbloom and Burgeon reactions) hits a character, Elemental Mastery will be increased by 200 for all characters in the party for 4s.',
+        "After the active character's Normal or Charged Attack hits an opponent, that character's Normal and Charged Attack CRIT Rate is increased by 6% for 5s. This effect can be triggered once every 0.1s. Max 5 stacks. Each stack's duration is counted independently. This effect will be cleared if the character leaves the field.",
     },
     {
       name: 'Spiral Abyss',
       image: 'spiral_abyss.jpg',
       pos: '50% 20%',
-      start: '2023-06-01 04:00:00',
-      end: '2023-06-16 04:00:00',
+      start: '2023-11-16 04:00:00',
+      end: '2023-12-01 04:00:00',
       color: '#4299E1',
       description:
-        "After the character's Normal Attack hits an opponent, this opponent will be afflicted with a Sign of Snaring. After 3s, the Sign will be removed, dealing True DMG to this opponent. After a character's Normal Attack hits an opponent with a Sign of Snaring, the DMG dealt by the Sign's removal will be increased. This DMG can be increased for no more than 9 times.",
+        "When a character's HP increases or decreases, it will be counted. When it reaches a total of 12, a shockwave will be unleashed at the character's position, dealing True DMG to nearby opponents and clearing the count. 1 such shockwave can be unleashed every 4s.",
     },
     {
       name: 'Spiral Abyss',
       image: 'spiral_abyss.jpg',
       pos: '50% 20%',
-      start: '2023-06-16 04:00:00',
-      end: '2023-07-01 04:00:00',
+      start: '2023-12-01 04:00:00',
+      end: '2023-12-16 04:00:00',
       color: '#4299E1',
       description:
-        "After the active character's Normal Attacks hit opponents, the DMG dealt by this character will increase by 12% for 2s. This effect can stack up to 5 times. Each stack's duration is counted independently. This effect can be triggered once every 0.05s. This effect will be canceled when the character leaves the field.will be removed, dealing True DMG to this opponent. After a character's Normal Attack hits an opponent with a Sign of Snaring, the DMG dealt by the Sign's removal will be increased. This DMG can be increased for no more than 9 times.",
+        "When off-field characters deal Elemental Skill DMG to an opponent, an Uncanny Mark will be placed upon that opponent. When another active character hits a marked opponent with an attack of the same Elemental Type, a shockwave will be unleashed at that opponent's position, dealing True DMG. The Uncanny Mark lasts 5s, and Marks created through different attacks with different Elemental Types can exist independently. 1 such shockwave can be unleashed every 2s. When a character enters the field, the Uncanny Marks placed by that character on opponents will be removed.",
     },
     {
       name: 'Spiral Abyss',
       image: 'spiral_abyss.jpg',
       pos: '50% 20%',
-      start: '2023-07-01 04:00:00',
-      end: '2023-07-16 04:00:00',
+      start: '2023-12-16 04:00:00',
+      end: '2024-01-01 04:00:00',
       color: '#4299E1',
       description:
-        "After the character's Normal Attack hits an opponent, the Physical or Elemental RES of this opponent will decrease by 6% for 2s, matching the Attribute of that attack. This can stack up to 6 times. RES decreases of different types can co-exist, and their stacks and timers will be independent of each other.",
+        "After a character takes the field, they will gain one stack of Soar every 2.5s. Each stack will increase the DMG dealt by this character by 8%. Max 3 stacks. A character with 3 stacks will unleash a shockwave at an opponent's position when they deal DMG to that opponent, dealing True DMG. This effect will be cleared when the character leaves the field. 1 such shockwave can be unleashed every 1s",
     },
     {
       name: 'Spiral Abyss',
       image: 'spiral_abyss.jpg',
       pos: '50% 20%',
-      start: '2023-07-16 04:00:00',
-      end: '2023-08-01 04:00:00',
+      start: '2024-01-01 04:00:00',
+      end: '2024-01-16 04:00:00',
       color: '#4299E1',
       description:
-        "Within 10s after the character enters the field, the character's Normal, Charged, and Plunging Attacks will deal 30% increased DMG. Their ATK SPD will also be increased by 10%. This effect will be canceled when the character leaves the field.",
+        'After a character obtains an Elemental Shard created by the Crystallize reaction, they will gain the Redoubtable state. Active characters in this state deal 15% increased DMG. This state lasts for 8s and can stack up to 3 times, with the duration of each stack counted independently.',
     },
     {
       name: 'Spiral Abyss',
       image: 'spiral_abyss.jpg',
       pos: '50% 20%',
-      start: '2023-08-01 04:00:00',
-      end: '2023-08-16 04:00:00',
+      start: '2024-01-16 04:00:00',
+      end: '2024-02-01 04:00:00',
       color: '#4299E1',
       description:
-        'When a character loses or restores HP, all party members will gain 7.5% increased ATK for 10s. This effect can be triggered once every 0.1s. Max 4 stacks. Each stack will be counted independently.',
-    },
-    {
-      name: 'Spiral Abyss',
-      image: 'spiral_abyss.jpg',
-      pos: '50% 20%',
-      start: '2023-08-16 04:00:00',
-      end: '2023-09-01 04:00:00',
-      color: '#4299E1',
-      description:
-        "When the active character deals consecutive instances of Elemental DMG of the same Elemental Type or Physical DMG using Normal, Charged, or Plunging Attacks to an opponent, they will gain 1 count stack. 1 stack can be gained every 0.3s. The stacks for every Elemental and Physical DMG will be counted independently. After 6 stacks have been gained, a shockwave will be unleashed at the opponent's position, dealing True DMG and clearing all previously accumulated stacks for this DMG type. Should the active character leave the field, these stacks will be cleared.",
+        "After a character obtains an Elemental Shard created by the Crystallize reaction, it will be counted. When the count reaches 3, a shockwave will be released at the character's location, dealing True DMG to nearby opponents, and resetting the count. 1 such shockwave can be triggered every 6s.",
     },
   ],
   [
@@ -327,52 +258,42 @@ export const eventsData = [
       name: "Paimon's Bargain - Bennett, Lisa, and Blackcliff",
       pos: '0% 50%',
       zoom: '150%',
-      start: '2023-05-01 04:00:00',
-      end: '2023-06-01 04:00:00',
+      start: '2023-11-01 04:00:00',
+      end: '2023-12-01 04:00:00',
       color: '#B6A1EA',
       image: 'paimon_bargain.png',
-      description: 'Now selling: Razor, Amber, and Blackcliff Weapons.',
+      description: 'Now selling: Bennett, Lisa, and Blackcliff Weapons.',
     },
     {
-      name: "Paimon's Bargain - Barbara, Kaeya, and Royal",
+      name: "Paimon's Bargain - Bennett, Lisa, and Royal",
       pos: '0% 50%',
       zoom: '150%',
-      start: '2023-06-01 04:00:00',
-      end: '2023-07-01 04:00:00',
+      start: '2023-12-01 04:00:00',
+      end: '2024-01-01 04:00:00',
       color: '#B6A1EA',
       image: 'paimon_bargain.png',
       description: 'Now selling: Barbara, Kaeya, and Royal Weapons.',
     },
-    {
-      name: "Paimon's Bargain - Fischl, Xiangling, and Blackcliff",
-      pos: '0% 50%',
-      zoom: '150%',
-      start: '2023-07-01 04:00:00',
-      end: '2023-08-01 04:00:00',
-      color: '#B6A1EA',
-      image: 'paimon_bargain.png',
-      description: 'Now selling: Fischl, Xiangling, and Blackcliff Weapons.',
-    },
   ],
   [
     {
-      name: "Battle Pass - Invoker's Secrets",
-      pos: '0% 12%',
-      image: 'Invokers Secrets.png',
-      start: '2023-05-24 06:00:00',
-      end: '2023-07-03 03:59:59',
-      color: '#e4e574',
-      url: 'https://www.hoyolab.com/article/18699187',
+      name: 'Battle Pass - Whirling Waltz',
+      pos: '0% 25%',
+      image: 'Whirling Waltz.jpg',
+      start: '2023-11-08 06:00:00',
+      end: '2023-12-18 03:59:59',
+      color: '#46ace8',
+      url: 'https://www.hoyolab.com/article/21853732',
       timezoneDependent: true,
     },
     {
-      name: 'Battle Pass - Vivid Illumination',
-      pos: '0% 15%',
-      image: 'Vivid Illumination.jpg',
-      start: '2023-07-05 06:00:00',
-      end: '2023-08-14 03:59:59',
-      color: '#e0fbf8',
-      url: 'https://www.hoyolab.com/article/19771440',
+      name: 'Battle Pass - Fontinalia',
+      pos: '0% 25%',
+      image: 'Fontinalia.png',
+      start: '2023-12-20 06:00:00',
+      end: '2024-01-29 03:59:59',
+      color: '#dfb790',
+      url: 'https://www.hoyolab.com/article/23668604',
       timezoneDependent: true,
     },
   ],

src/routes/_index/banner.svelte

@@ -13,25 +13,25 @@
   const dispatch = createEventDispatcher();
 
   const featured = {
-    wanderer: {
-      name: 'Wanderer',
+    kamisato_ayaka: {
+      name: 'Kamisato Ayaka',
       rarity: 'legendary',
       count: 0,
       average: '...',
       percentage: '...',
     },
-    sangonomiya_kokomi: {
-      name: 'Sangonomiya Kokomi',
+    navia: {
+      name: 'Navia',
       rarity: 'legendary',
       count: 0,
       average: '...',
       percentage: '...',
     },
   };
-  const bannerId = 300051;
-  const image = 'wanderer_kokomi.png';
+  const bannerId = 300058;
+  const image = 'navia ayaka.png';
   const width = 800;
-  const height = 409;
+  const height = 576;
 
   let loading = true;
   let user = '';

src/routes/achievement/index.svelte

@@ -67,6 +67,10 @@
     '3.6',
     '3.7',
     '3.8',
+    '4.0',
+    '4.1',
+    '4.2',
+    '4.3',
   ].map((e) => ({
     label: e,
     value: e,

src/routes/characters/[id].svelte

@@ -233,9 +233,12 @@
 
   onMount(async () => {
     const buildHash = window.location.hash.substring(1);
-    const foundBuild = builds.findIndex((e) => e.name.replace(/[ /]/g, '_').toLowerCase() === buildHash);
-    if (foundBuild > -1) {
-      currentBuild = foundBuild;
+
+    if (builds) {
+      const foundBuild = builds.findIndex((e) => e.name.replace(/[ /]/g, '_').toLowerCase() === buildHash);
+      if (foundBuild > -1) {
+        currentBuild = foundBuild;
+      }
     }
 
     await getConstellationCount();

src/routes/index.svelte

@@ -1,6 +1,6 @@
 <script context="module">
   export async function load({ fetch }) {
-    const promoted = ['sangonomiya_kokomi', 'wanderer'];
+    const promoted = ['kamisato_ayaka', 'sucrose', 'candace', 'rosaria'];
     const builds = {};
     for (const p of promoted) {
       const response = await fetch(`/characters/build/${p}.json`);
@@ -29,7 +29,7 @@
   import Item from './_index/item.svelte';
   import Calculator from './_index/calculator.svelte';
   import Discord from './_index/discord.svelte';
-  import Twitter from './_index/twitter.svelte';
+  // import Twitter from './_index/twitter.svelte';
   import Achievement from './_index/achievement.svelte';
   import Furnishing from './_index/furnishing.svelte';
   import Build from './_index/build.svelte';

src/routes/wish/import.svelte

@@ -94,8 +94,8 @@
     },
   };
 
-  let powershellScript = `Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12; iex "&{$((New-Object System.Net.WebClient).DownloadString('https://gist.githubusercontent.com/MadeBaruna/1d75c1d37d19eca71591ec8a31178235/raw/649a9e3a4e88f3bffdd0fe6dd8eeed23737b15da/getlink.ps1'))} global"`;
-  let powershellScriptChina = `Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12; iex "&{$((New-Object System.Net.WebClient).DownloadString('https://gist.githubusercontent.com/MadeBaruna/1d75c1d37d19eca71591ec8a31178235/raw/649a9e3a4e88f3bffdd0fe6dd8eeed23737b15da/getlink.ps1'))} china"`;
+  let powershellScript = `Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12; iex "&{$((New-Object System.Net.WebClient).DownloadString('https://gist.github.com/MadeBaruna/1d75c1d37d19eca71591ec8a31178235/raw/getlink.ps1'))} global"`;
+  let powershellScriptChina = `Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12; iex "&{$((New-Object System.Net.WebClient).DownloadString('https://gist.github.com/MadeBaruna/1d75c1d37d19eca71591ec8a31178235/raw/getlink.ps11'))} china"`;
   let powershellScriptSource = 'https://gist.github.com/MadeBaruna/1d75c1d37d19eca71591ec8a31178235';
   let powershellScriptAlt = `iex('Write-Host "Copy the wish history table!";while(1) { $c = Get-Clipboard -TextFormatType Html; if ($c -match "^SourceURL:https:/.+log") { break; }; for($i=5; $i -gt 0; $i--) { Write-Host "\`rChecking in $i" -NoNewline; Sleep 1; }; }; Write-Host " OK"; $m=(((Get-Clipboard -TextFormatType Html) | Select-String "(https:/.+log)").Matches[0].Value);$m; Set-Clipboard -Value $m;')`;
   let powershellScriptAlt2 =

src/service-worker.js

@@ -7,7 +7,7 @@ const IMAGE_CACHE = `cacheimg${IMAGE_CACHE_VER}`;
 
 const IMAGE_URL = `${self.location.origin}/images/`;
 
-const changelog = ['Update banners', 'Update timeline'];
+const changelog = ['Update banners', 'Update timelines', 'Update Navia', 'Update weapons', 'Bug fixes'];
 
 const channel = new BroadcastChannel('paimonmoe-sw');