Merge branch 'MadeBaruna:main' into import-tcg-deck

src/data/banners.js

@@ -780,6 +780,52 @@ export const banners = {
     //   timezoneDependent: true,
     //   version: '3.6',
     // },
+    {
+      name: 'Immaculate Pulse',
+      image: 1,
+      shortName: 'Baizhu',
+      start: '2023-05-02 18:00:00',
+      end: '2023-05-23 14:59:59',
+      color: '#8fdaa0',
+      featured: ['baizhu', 'ganyu'],
+      featuredRare: ['kaveh', 'candace', 'fischl'],
+      version: '3.6',
+    },
+    // {
+    //   name: "Adrift in the Harbor",
+    //   image: 4,
+    //   shortName: 'Ganyu',
+    //   start: '2023-04-12 06:00:00',
+    //   end: '2023-05-02 17:59:59',
+    //   color: '#6994DF',
+    //   featured: ['baizhu', 'ganyu'],
+    //   featuredRare: ['kaveh', 'candace', 'fischl'],
+    //   version: '3.6',
+    // },
+    {
+      name: 'Tapestry of Golden Flames',
+      image: 4,
+      shortName: 'Yoimiya',
+      start: '2023-05-24 06:00:00',
+      end: '2023-06-13 17:59:59',
+      color: '#fc8976',
+      featured: ['yoimiya', 'yae_miko'],
+      featuredRare: ['kirara', 'yun_jin', 'chongyun'],
+      timezoneDependent: true,
+      version: '3.7',
+    },
+    // {
+    //   name: 'Everbloom Violet',
+    //   image: 3,
+    //   shortName: 'Yae Miko',
+    //   start: '2023-05-24 06:00:00',
+    //   end: '2023-06-13 17:59:59',
+    //   color: '#ffd1f9',
+    //   featured: ['yoimiya', 'yae_miko'],
+    //   featuredRare: ['kirara', 'yun_jin', 'chongyun'],
+    //   timezoneDependent: true,
+    //   version: '3.7',
+    // },
   ],
   weapons: [
     {
@@ -1320,7 +1366,7 @@ export const banners = {
       shortName: 'Dreams',
       start: '2023-04-12 06:00:00',
       end: '2023-05-02 17:59:59',
-      color: '#eae5e1',
+      color: '#ffb169',
       featured: ['key_of_khaj-nisut', 'a_thousand_floating_dreams'],
       featuredRare: [
         'xiphos_moonlight',
@@ -1332,5 +1378,28 @@ export const banners = {
       timezoneDependent: true,
       version: '3.6',
     },
+    {
+      name: 'Epitome Invocation',
+      image: 46,
+      shortName: 'jadefalls_splendor',
+      start: '2023-05-02 18:00:00',
+      end: '2023-05-23 14:59:59',
+      color: '#eae5e1',
+      featured: ['jadefalls_splendor', 'amos_bow'],
+      featuredRare: ['makhaira_aquamarine', 'wandering_evenstar', 'lions_roar', 'favonius_lance', 'sacrificial_bow'],
+      version: '3.6',
+    },
+    {
+      name: 'Epitome Invocation',
+      image: 47,
+      shortName: 'Thundering',
+      start: '2023-05-24 06:00:00',
+      end: '2023-06-13 17:59:59',
+      color: '#ffb169',
+      featured: ['thundering_pulse', 'kaguras_verity'],
+      featuredRare: ['akuoumaru', 'the_flute', 'dragons_bane', 'the_widsith', 'rust'],
+      timezoneDependent: true,
+      version: '3.7',
+    },
   ],
 };

src/data/bannersDual.js

@@ -503,4 +503,54 @@ export const bannersDual = {
       version: '3.6',
     },
   ],
+  'Immaculate Pulse 1': [
+    {
+      name: 'Immaculate Pulse',
+      image: 1,
+      shortName: 'Baizhu',
+      start: '2023-05-02 18:00:00',
+      end: '2023-05-23 14:59:59',
+      color: '#8fdaa0',
+      featured: ['baizhu', 'ganyu'],
+      featuredRare: ['kaveh', 'candace', 'fischl'],
+      version: '3.6',
+    },
+    {
+      name: 'Adrift in the Harbor',
+      image: 4,
+      shortName: 'Ganyu',
+      start: '2023-05-02 18:00:00',
+      end: '2023-05-23 14:59:59',
+      color: '#6994DF',
+      featured: ['baizhu', 'ganyu'],
+      featuredRare: ['kaveh', 'candace', 'fischl'],
+      version: '3.6',
+    },
+  ],
+  'Tapestry of Golden Flames 4': [
+    {
+      name: 'Tapestry of Golden Flames',
+      image: 4,
+      shortName: 'Yoimiya',
+      start: '2023-05-24 06:00:00',
+      end: '2023-06-13 17:59:59',
+      color: '#fc8976',
+      featured: ['yoimiya', 'yae_miko'],
+      featuredRare: ['kirara', 'yun_jin', 'chongyun'],
+      timezoneDependent: true,
+      version: '3.7',
+    },
+    {
+      name: 'Everbloom Violet',
+      image: 3,
+      shortName: 'Yae Miko',
+      start: '2023-05-24 06:00:00',
+      end: '2023-06-13 17:59:59',
+      color: '#ffd1f9',
+      featured: ['yoimiya', 'yae_miko'],
+      featuredRare: ['kirara', 'yun_jin', 'chongyun'],
+      timezoneDependent: true,
+      version: '3.7',
+    },
+  ],
 };

src/data/build.js

@@ -4600,4 +4600,58 @@ export const builds = {
       },
     },
   },
+  baizhu: {
+    roles: {
+      TBD: {
+        recommended: false,
+        weapons: [],
+        artifacts: [],
+        mainStats: {
+          sands: ['TBD'],
+          goblet: ['TBD'],
+          circlet: ['TBD'],
+        },
+        subStats: ['TBD'],
+        talent: ['TBD'],
+        tip: '',
+        note: 'TBD',
+      },
+    },
+  },
+  kaveh: {
+    roles: {
+      TBD: {
+        recommended: false,
+        weapons: [],
+        artifacts: [],
+        mainStats: {
+          sands: ['TBD'],
+          goblet: ['TBD'],
+          circlet: ['TBD'],
+        },
+        subStats: ['TBD'],
+        talent: ['TBD'],
+        tip: '',
+        note: 'TBD',
+      },
+    },
+  },
+  kirara: {
+    roles: {
+      TBD: {
+        recommended: false,
+        weapons: [],
+        artifacts: [],
+        mainStats: {
+          sands: ['TBD'],
+          goblet: ['TBD'],
+          circlet: ['TBD'],
+        },
+        subStats: ['TBD'],
+        talent: ['TBD'],
+        tip: '',
+        note: 'TBD',
+      },
+    },
+  },
 };

src/data/characters.js

@@ -729,6 +729,151 @@ export const characters = {
     },
     element: elements.geo,
   },
+  baizhu: {
+    id: 'baizhu',
+    name: 'Baizhu',
+    rarity: 5,
+    weapon: weapons.catalyst,
+    stats: {
+      hp: 13348,
+      atk: 193,
+      def: 500,
+    },
+    ascension: [
+      {
+        items: [
+          {
+            item: itemList.nagadus_emerald_sliver,
+            amount: 1,
+          },
+          {
+            item: itemList.none,
+            amount: null,
+          },
+          {
+            item: itemList.violetgrass,
+            amount: 3,
+          },
+          {
+            item: itemList.fungal_spores,
+            amount: 3,
+          },
+        ],
+        mora: 20000,
+      },
+      {
+        items: [
+          {
+            item: itemList.nagadus_emerald_fragment,
+            amount: 3,
+          },
+          {
+            item: itemList.evergloom_ring,
+            amount: 2,
+          },
+          {
+            item: itemList.violetgrass,
+            amount: 10,
+          },
+          {
+            item: itemList.fungal_spores,
+            amount: 15,
+          },
+        ],
+        mora: 40000,
+      },
+      {
+        items: [
+          {
+            item: itemList.nagadus_emerald_fragment,
+            amount: 6,
+          },
+          {
+            item: itemList.evergloom_ring,
+            amount: 4,
+          },
+          {
+            item: itemList.violetgrass,
+            amount: 20,
+          },
+          {
+            item: itemList.luminescent_pollen,
+            amount: 12,
+          },
+        ],
+        mora: 60000,
+      },
+      {
+        items: [
+          {
+            item: itemList.nagadus_emerald_chunk,
+            amount: 3,
+          },
+          {
+            item: itemList.evergloom_ring,
+            amount: 8,
+          },
+          {
+            item: itemList.violetgrass,
+            amount: 30,
+          },
+          {
+            item: itemList.luminescent_pollen,
+            amount: 18,
+          },
+        ],
+        mora: 80000,
+      },
+      {
+        items: [
+          {
+            item: itemList.nagadus_emerald_chunk,
+            amount: 6,
+          },
+          {
+            item: itemList.evergloom_ring,
+            amount: 12,
+          },
+          {
+            item: itemList.violetgrass,
+            amount: 45,
+          },
+          {
+            item: itemList.crystalline_cyst_dust,
+            amount: 12,
+          },
+        ],
+        mora: 100000,
+      },
+      {
+        items: [
+          {
+            item: itemList.nagadus_emerald_gemstone,
+            amount: 6,
+          },
+          {
+            item: itemList.evergloom_ring,
+            amount: 20,
+          },
+          {
+            item: itemList.violetgrass,
+            amount: 60,
+          },
+          {
+            item: itemList.crystalline_cyst_dust,
+            amount: 24,
+          },
+        ],
+        mora: 120000,
+      },
+    ],
+    material: {
+      material: [itemList.fungal_spores, itemList.luminescent_pollen, itemList.crystalline_cyst_dust],
+      book: [itemList.teachings_of_gold, itemList.guide_to_gold, itemList.philosophies_of_gold],
+      boss: itemList.worldspan_fern,
+    },
+    element: elements.dendro,
+  },
   barbara: {
     id: 'barbara',
     name: 'Barbara',
@@ -3919,6 +4064,151 @@ export const characters = {
     },
     element: elements.hydro,
   },
+  kaveh: {
+    id: 'kaveh',
+    name: 'Kaveh',
+    rarity: 4,
+    weapon: weapons.claymore,
+    stats: {
+      hp: 11962,
+      atk: 234,
+      def: 751,
+    },
+    ascension: [
+      {
+        items: [
+          {
+            item: itemList.nagadus_emerald_sliver,
+            amount: 1,
+          },
+          {
+            item: itemList.none,
+            amount: null,
+          },
+          {
+            item: itemList.mourning_flower,
+            amount: 3,
+          },
+          {
+            item: itemList.fungal_spores,
+            amount: 3,
+          },
+        ],
+        mora: 20000,
+      },
+      {
+        items: [
+          {
+            item: itemList.nagadus_emerald_fragment,
+            amount: 3,
+          },
+          {
+            item: itemList.quelled_creeper,
+            amount: 2,
+          },
+          {
+            item: itemList.mourning_flower,
+            amount: 10,
+          },
+          {
+            item: itemList.fungal_spores,
+            amount: 15,
+          },
+        ],
+        mora: 40000,
+      },
+      {
+        items: [
+          {
+            item: itemList.nagadus_emerald_fragment,
+            amount: 6,
+          },
+          {
+            item: itemList.quelled_creeper,
+            amount: 4,
+          },
+          {
+            item: itemList.mourning_flower,
+            amount: 20,
+          },
+          {
+            item: itemList.luminescent_pollen,
+            amount: 12,
+          },
+        ],
+        mora: 60000,
+      },
+      {
+        items: [
+          {
+            item: itemList.nagadus_emerald_chunk,
+            amount: 3,
+          },
+          {
+            item: itemList.quelled_creeper,
+            amount: 8,
+          },
+          {
+            item: itemList.mourning_flower,
+            amount: 30,
+          },
+          {
+            item: itemList.luminescent_pollen,
+            amount: 18,
+          },
+        ],
+        mora: 80000,
+      },
+      {
+        items: [
+          {
+            item: itemList.nagadus_emerald_chunk,
+            amount: 6,
+          },
+          {
+            item: itemList.quelled_creeper,
+            amount: 12,
+          },
+          {
+            item: itemList.mourning_flower,
+            amount: 45,
+          },
+          {
+            item: itemList.crystalline_cyst_dust,
+            amount: 12,
+          },
+        ],
+        mora: 100000,
+      },
+      {
+        items: [
+          {
+            item: itemList.nagadus_emerald_gemstone,
+            amount: 6,
+          },
+          {
+            item: itemList.quelled_creeper,
+            amount: 20,
+          },
+          {
+            item: itemList.mourning_flower,
+            amount: 60,
+          },
+          {
+            item: itemList.crystalline_cyst_dust,
+            amount: 24,
+          },
+        ],
+        mora: 120000,
+      },
+    ],
+    material: {
+      material: [itemList.fungal_spores, itemList.luminescent_pollen, itemList.crystalline_cyst_dust],
+      book: [itemList.teachings_of_ingenuity, itemList.guide_to_ingenuity, itemList.philosophies_of_ingenuity],
+      boss: itemList.primordial_greenbloom,
+    },
+    element: elements.dendro,
+  },
   keqing: {
     id: 'keqing',
     name: 'Keqing',
@@ -4064,6 +4354,151 @@ export const characters = {
     },
     element: elements.electro,
   },
+  kirara: {
+    id: 'kirara',
+    name: 'Kirara',
+    rarity: 4,
+    weapon: weapons.sword,
+    stats: {
+      hp: 12180,
+      atk: 223,
+      def: 546,
+    },
+    ascension: [
+      {
+        items: [
+          {
+            item: itemList.nagadus_emerald_sliver,
+            amount: 1,
+          },
+          {
+            item: itemList.none,
+            amount: null,
+          },
+          {
+            item: itemList.amakumo_fruit,
+            amount: 3,
+          },
+          {
+            item: itemList.spectral_husk,
+            amount: 3,
+          },
+        ],
+        mora: 20000,
+      },
+      {
+        items: [
+          {
+            item: itemList.nagadus_emerald_fragment,
+            amount: 3,
+          },
+          {
+            item: itemList.evergloom_ring,
+            amount: 2,
+          },
+          {
+            item: itemList.amakumo_fruit,
+            amount: 10,
+          },
+          {
+            item: itemList.spectral_husk,
+            amount: 15,
+          },
+        ],
+        mora: 40000,
+      },
+      {
+        items: [
+          {
+            item: itemList.nagadus_emerald_fragment,
+            amount: 6,
+          },
+          {
+            item: itemList.evergloom_ring,
+            amount: 4,
+          },
+          {
+            item: itemList.amakumo_fruit,
+            amount: 20,
+          },
+          {
+            item: itemList.spectral_heart,
+            amount: 12,
+          },
+        ],
+        mora: 60000,
+      },
+      {
+        items: [
+          {
+            item: itemList.nagadus_emerald_chunk,
+            amount: 3,
+          },
+          {
+            item: itemList.evergloom_ring,
+            amount: 8,
+          },
+          {
+            item: itemList.amakumo_fruit,
+            amount: 30,
+          },
+          {
+            item: itemList.spectral_heart,
+            amount: 18,
+          },
+        ],
+        mora: 80000,
+      },
+      {
+        items: [
+          {
+            item: itemList.nagadus_emerald_chunk,
+            amount: 6,
+          },
+          {
+            item: itemList.evergloom_ring,
+            amount: 12,
+          },
+          {
+            item: itemList.amakumo_fruit,
+            amount: 45,
+          },
+          {
+            item: itemList.spectral_nucleus,
+            amount: 12,
+          },
+        ],
+        mora: 100000,
+      },
+      {
+        items: [
+          {
+            item: itemList.nagadus_emerald_gemstone,
+            amount: 6,
+          },
+          {
+            item: itemList.evergloom_ring,
+            amount: 20,
+          },
+          {
+            item: itemList.amakumo_fruit,
+            amount: 60,
+          },
+          {
+            item: itemList.spectral_nucleus,
+            amount: 24,
+          },
+        ],
+        mora: 120000,
+      },
+    ],
+    material: {
+      material: [itemList.spectral_husk, itemList.spectral_heart, itemList.spectral_nucleus],
+      book: [itemList.teachings_of_transience, itemList.guide_to_transience, itemList.philosophies_of_transience],
+      boss: itemList.everamber,
+    },
+    element: elements.dendro,
+  },
   klee: {
     id: 'klee',
     name: 'Klee',

src/data/events.js

@@ -1245,11 +1245,33 @@ export const events = [
     name: 'A Parade of Providence',
     pos: '20% 20%',
     zoom: '150%',
-    image: 'a_parade_of_providence.png',
+    image: 'a_parade_of_providence_full.jpg',
     start: '2023-04-27 10:00:00',
     end: '2023-05-15 03:59:59',
     color: '#e98a4a',
-    url: 'https://www.hoyolab.com/article/17591460',
+    url: 'https://www.hoyolab.com/article/17950597',
+    showOnHome: true,
+  },
+  {
+    name: "The Recollector's Path",
+    pos: '50% 40%',
+    zoom: '200%',
+    image: 'the_recollectors_path_temp.png',
+    start: '2023-05-08 10:00:00',
+    end: '2023-05-22 03:59:59',
+    color: '#efa7a9',
+    url: 'https://www.hoyolab.com/article/18031376',
+    showOnHome: true,
+  },
+  {
+    name: 'Overflowing Mastery',
+    pos: '0% 50%',
+    image: 'overflowing_mastery.jpg',
+    start: '2023-05-15 04:00:00',
+    end: '2023-05-22 03:59:59',
+    color: '#f5debc',
+    zoom: '200%',
+    url: 'https://www.hoyolab.com/article/18031376',
     showOnHome: true,
   },
 ];

src/data/itemList.js

@@ -1143,4 +1143,33 @@ export const itemList = {
     name: 'Marked Shell',
     rarity: 4,
   },
+
+  mourning_flower: {
+    id: 'mourning_flower',
+    name: 'Mourning Flower',
+  },
+  evergloom_ring: {
+    id: 'evergloom_ring',
+    name: 'Evergloom Ring',
+    rarity: 4,
+  },
+  worldspan_fern: { id: 'worldspan_fern', name: 'Worldspan Fern' },
+  primordial_greenbloom: { id: 'primordial_greenbloom', name: 'Primordial Greenbloom' },
+  a_flower_yet_to_bloom: {
+    id: 'a_flower_yet_to_bloom',
+    name: 'A Flower Yet to Bloom',
+    rarity: 2,
+  },
+  treasured_flower: {
+    id: 'treasured_flower',
+    name: 'Treasured Flower',
+    rarity: 3,
+  },
+  wanderers_blooming_flower: {
+    id: 'wanderers_blooming_flower',
+    name: "Wanderer's Blooming Flower",
+    rarity: 4,
+  },
+
+  everamber: { id: 'everamber', name: 'Everamber' },
 };

src/data/timeline.js

@@ -1,38 +1,5 @@
 export const eventsData = [
   [
-    {
-      name: "Windblume's Breath",
-      pos: '0% 20%',
-      zoom: '100%',
-      image: 'windblumes_breath.jpg',
-      start: '2023-03-03 10:00:00',
-      end: '2023-03-20 03:59:59',
-      color: '#4a9dff',
-      url: 'https://www.hoyolab.com/article/16631602',
-      showOnHome: true,
-    },
-    {
-      name: 'Fungus Mechanicus',
-      pos: '0% 60%',
-      zoom: '200%',
-      image: 'fungus_mechanicus.jpg',
-      start: '2023-03-23 10:00:00',
-      end: '2023-04-03 03:59:59',
-      color: '#5cbcad',
-      url: 'https://www.hoyolab.com/article/17144800',
-      showOnHome: true,
-    },
-    {
-      name: 'Ley Line Overflow',
-      pos: '0% 40%',
-      zoom: '200%',
-      image: 'leyline_overflow.jpg',
-      start: '2023-04-03 04:00:00',
-      end: '2023-04-10 03:59:59',
-      color: '#5baced',
-      url: 'https://www.hoyolab.com/article/17374982',
-      showOnHome: true,
-    },
     {
       name: 'Fulminating Sandstorm',
       pos: '0% 20%',
@@ -44,30 +11,30 @@ export const eventsData = [
       url: 'https://www.hoyolab.com/article/17591460',
       showOnHome: true,
     },
+    {
+      name: "The Recollector's Path",
+      pos: '50% 40%',
+      zoom: '200%',
+      image: 'the_recollectors_path_temp.png',
+      start: '2023-05-08 10:00:00',
+      end: '2023-05-22 03:59:59',
+      color: '#efa7a9',
+      url: 'https://www.hoyolab.com/article/18031376',
+      showOnHome: true,
+    },
+    {
+      name: "Divine Ingenuity: Collector's Chapter",
+      pos: '0% 30%',
+      zoom: '150%',
+      image: 'Divine Ingenuity 2 Temp.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: 'Vibro Crystal Verification',
-      pos: '0% 0%',
-      zoom: '230%',
-      image: 'vibro_crysta_research_2.jpg',
-      start: '2023-03-14 10:00:00',
-      end: '2023-03-27 03:59:59',
-      color: '#38c2f9',
-      url: 'https://www.hoyolab.com/article/16959444',
-      showOnHome: true,
-    },
-    {
-      name: 'Spices From the West: Northerly Search',
-      pos: '0% 40%',
-      zoom: '200%',
-      image: 'spices_from_the_west_northerly_search.jpg',
-      start: '2023-03-31 10:00:00',
-      end: '2023-04-10 03:59:59',
-      color: '#83bfb4',
-      url: 'https://www.hoyolab.com/article/17337582',
-      showOnHome: true,
-    },
     {
       name: 'Brewing Developments',
       pos: '0% 20%',
@@ -81,40 +48,39 @@ export const eventsData = [
     },
     {
       name: 'A Parade of Providence',
-      pos: '20% 20%',
-      zoom: '150%',
-      image: 'a_parade_of_providence.png',
+      pos: '40% 20%',
+      zoom: '100%',
+      image: 'a_parade_of_providence_full.jpg',
       start: '2023-04-27 10:00:00',
       end: '2023-05-15 03:59:59',
       color: '#e98a4a',
-      url: 'https://www.hoyolab.com/article/17591460',
+      url: 'https://www.hoyolab.com/article/17950597',
+      showOnHome: true,
+    },
+    {
+      name: 'Overflowing Mastery',
+      pos: '0% 50%',
+      image: 'overflowing_mastery.jpg',
+      start: '2023-05-15 04:00:00',
+      end: '2023-05-22 03:59:59',
+      color: '#f5debc',
+      zoom: '200%',
+      url: 'https://www.hoyolab.com/article/18031376',
+      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',
       showOnHome: true,
     },
   ],
   [
-    {
-      name: 'Auric Blaze - Dehya Banner',
-      pos: '30% 15%',
-      zoom: '150%',
-      image: 'auric_blaze_1.jpg',
-      start: '2023-03-01 06:00:00',
-      end: '2023-03-21 17:59:59',
-      color: '#ec614f',
-      url: 'https://www.hoyolab.com/article/16631471',
-      showOnHome: true,
-      timezoneDependent: true,
-    },
-    {
-      name: 'The Transcendent One Returns - Shenhe Banner',
-      pos: '30% 15%',
-      zoom: '150%',
-      image: 'the_transcendent_one_returns_2.jpg',
-      start: '2023-03-21 18:00:00',
-      end: '2023-04-11 14:59:59',
-      color: '#81DDF0',
-      url: 'https://www.hoyolab.com/article/17043829',
-      showOnHome: true,
-    },
     {
       name: "The Moongrass' Enlightenment - Nahida Banner",
       pos: '10% 15%',
@@ -127,31 +93,31 @@ export const eventsData = [
       showOnHome: true,
       timezoneDependent: true,
     },
-  ],
-  [
     {
-      name: 'Twilight Arbiter - Cyno Banner',
-      pos: '30% 15%',
+      name: 'Immaculate Pulse - Baizhu Banner',
+      pos: '20% 15%',
+      zoom: '200%',
+      image: 'immaculate_pulse_1.jpg',
+      start: '2023-05-02 18:00:00',
+      end: '2023-05-23 14:59:59',
+      color: '#8fdaa0',
+      url: 'https://www.hoyolab.com/article/18031187',
+      showOnHome: true,
+    },
+    {
+      name: 'Tapestry of Golden Flames - Yoimiya Banner',
+      pos: '10% 15%',
       zoom: '150%',
-      image: 'twilight_arbiter_2.jpg',
-      start: '2023-03-01 06:00:00',
-      end: '2023-03-21 17:59:59',
-      color: '#d8b8f7',
-      url: 'https://www.hoyolab.com/article/16631471',
+      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',
       showOnHome: true,
       timezoneDependent: true,
     },
-    {
-      name: "The Heron's Court - Ayaka Banner",
-      pos: '30% 15%',
-      zoom: '150%',
-      image: 'the_herons_court_3.jpg',
-      start: '2023-03-21 18:00:00',
-      end: '2023-04-11 14:59:59',
-      color: '#FFFBF7',
-      url: 'https://www.hoyolab.com/article/17043829',
-      showOnHome: true,
-    },
+  ],
+  [
     {
       name: 'Twirling Lotus - Nilou Banner',
       pos: '10% 15%',
@@ -164,31 +130,31 @@ export const eventsData = [
       showOnHome: true,
       timezoneDependent: true,
     },
-  ],
-  [
     {
-      name: 'Epitome Invocation - Weapon Banner',
-      pos: '30% 15%',
+      name: 'Adrift in the Harbor - Ganyu Banner',
+      pos: '10% 15%',
       zoom: '150%',
-      image: 'epitome_invocation_43.jpg',
-      start: '2023-03-01 06:00:00',
-      end: '2023-03-21 17:59:59',
-      color: '#FFAA4B',
-      url: 'https://www.hoyolab.com/article/16631471',
+      image: 'adrift_in_the_harbor_4.jpg',
+      start: '2023-05-02 18:00:00',
+      end: '2023-05-23 14:59:59',
+      color: '#6994DF',
+      url: 'https://www.hoyolab.com/article/18031187',
+      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: 'Epitome Invocation - Weapon Banner',
-      pos: '30% 15%',
-      zoom: '150%',
-      image: 'epitome_invocation_44.jpg',
-      start: '2023-03-21 18:00:00',
-      end: '2023-04-11 14:59:59',
-      color: '#FFAA4B',
-      url: 'https://www.hoyolab.com/article/17043829',
-      showOnHome: true,
-    },
+  ],
+  [
     {
       name: 'Epitome Invocation - Weapon Banner',
       pos: '30% 35%',
@@ -201,28 +167,31 @@ export const eventsData = [
       showOnHome: true,
       timezoneDependent: true,
     },
+    {
+      name: 'Epitome Invocation - Weapon Banner',
+      pos: '30% 35%',
+      zoom: '150%',
+      image: 'epitome_invocation_46.jpg',
+      start: '2023-05-02 18:00:00',
+      end: '2023-05-23 14:59:59',
+      color: '#FFAA4B',
+      url: 'https://www.hoyolab.com/article/18031187',
+      showOnHome: true,
+    },
+    {
+      name: 'Epitome Invocation - Weapon Banner',
+      pos: '30% 35%',
+      zoom: '150%',
+      image: 'Epitome Invocation 47.png',
+      start: '2023-05-24 06:00:00',
+      end: '2023-06-13 17:59:59',
+      color: '#FFAA4B',
+      url: 'https://www.hoyolab.com/article/18699067',
+      showOnHome: true,
+      timezoneDependent: true,
+    },
   ],
   [
-    {
-      name: 'Spiral Abyss',
-      image: 'spiral_abyss.jpg',
-      pos: '50% 20%',
-      start: '2023-03-01 04:00:00',
-      end: '2023-03-16 04:00:00',
-      color: '#4299E1',
-      description:
-        "When a character triggers a Spread or Aggravate reaction on an opponent, a shockwave will be unleashed at the opponent's position, dealing True DMG. A shockwave can be unleashed this way every 3s.",
-    },
-    {
-      name: 'Spiral Abyss',
-      image: 'spiral_abyss.jpg',
-      pos: '50% 20%',
-      start: '2023-03-16 04:00:00',
-      end: '2023-04-01 04:00:00',
-      color: '#4299E1',
-      description:
-        "After a character's HP decreases, all party members will gain a stack of Implacable: DMG dealt will be increased by 8% for 8s. This effect can be triggered once every 0.3s. Max 4 stacks. Each stack's duration is counted independently.",
-    },
     {
       name: 'Spiral Abyss',
       image: 'spiral_abyss.jpg',
@@ -233,18 +202,38 @@ export const eventsData = [
       description:
         "When a character's HP decreases, release a shockwave at the current active character's position, dealing True DMG to nearby opponents. This effect can be triggered once every 3s.",
     },
+    {
+      name: 'Spiral Abyss',
+      image: 'spiral_abyss.jpg',
+      pos: '50% 20%',
+      start: '2023-04-16 04:00:00',
+      end: '2023-05-01 04:00:00',
+      color: '#4299E1',
+      description:
+        "When the active character's HP decreases, a shockwave will be unleashed at the character's position, dealing True DMG to nearby opponents. This effect can be triggered once every 0.8s.",
+    },
+    {
+      name: 'Spiral Abyss',
+      image: 'spiral_abyss.jpg',
+      pos: '50% 20%',
+      start: '2023-05-01 04:00:00',
+      end: '2023-05-16 04:00:00',
+      color: '#4299E1',
+      description:
+        "After a character triggers a Bloom reaction, all characters' Bloom, Hyperbloom, and Burgeon DMG dealt is increased by 35% for 6s. This effect can be triggered once every 0.1s. Max 4 stacks. Each stack's duration is counted independently.",
+    },
+    {
+      name: 'Spiral Abyss',
+      image: 'spiral_abyss.jpg',
+      pos: '50% 20%',
+      start: '2023-05-16 04:00:00',
+      end: '2023-06-01 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.',
+    },
   ],
   [
-    {
-      name: "Paimon's Bargain - Ningguang, Xingqiu, and Blackcliff",
-      pos: '0% 50%',
-      zoom: '150%',
-      start: '2023-03-01 04:00:00',
-      end: '2023-04-01 04:00:00',
-      color: '#B6A1EA',
-      image: 'paimon_bargain.png',
-      description: 'Now selling: Ningguang, Xingqiu, and Blackcliff Weapons.',
-    },
     {
       name: "Paimon's Bargain - Razor, Amber, and Royal",
       pos: '0% 50%',
@@ -255,27 +244,37 @@ export const eventsData = [
       image: 'paimon_bargain.png',
       description: 'Now selling: Razor, Amber, and Royal Weapons.',
     },
+    {
+      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',
+      color: '#B6A1EA',
+      image: 'paimon_bargain.png',
+      description: 'Now selling: Razor, Amber, and Blackcliff Weapons.',
+    },
   ],
   [
-    {
-      name: 'Battle Pass - Artful Intent',
-      pos: '0% 12%',
-      image: 'artful_intent.jpg',
-      start: '2023-03-01 06:00:00',
-      end: '2023-04-10 03:59:59',
-      color: '#95c9ce',
-      url: 'https://www.hoyolab.com/article/16631602',
-      timezoneDependent: true,
-    },
     {
       name: 'Battle Pass - Crown of Glory',
       pos: '0% 12%',
       image: 'crown_of_glory.jpg',
       start: '2023-04-12 06:00:00',
-      end: '2023-05-12 03:59:59',
+      end: '2023-05-22 03:59:59',
       color: '#c8d18f',
       url: 'https://www.hoyolab.com/article/17591460',
       timezoneDependent: true,
     },
+    {
+      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',
+      timezoneDependent: true,
+    },
   ],
 ];

src/data/weaponList.js

@@ -10232,4 +10232,230 @@ export const weaponList = {
       },
     ],
   },
+  jadefalls_splendor: {
+    id: 'jadefalls_splendor',
+    name: "Jadefall's Splendor",
+    rarity: 5,
+    atk: 46,
+    secondary: 'HP',
+    type: weapons.catalyst,
+    source: 'Wish',
+    ascension: [
+      {
+        items: [
+          {
+            item: itemList.luminous_sands_from_guyun,
+            amount: 5,
+          },
+          {
+            item: itemList.a_flower_yet_to_bloom,
+            amount: 5,
+          },
+          {
+            item: itemList.fungal_spores,
+            amount: 3,
+          },
+        ],
+        mora: 10000,
+      },
+      {
+        items: [
+          {
+            item: itemList.lustrous_stone_from_guyun,
+            amount: 5,
+          },
+          {
+            item: itemList.a_flower_yet_to_bloom,
+            amount: 18,
+          },
+          {
+            item: itemList.fungal_spores,
+            amount: 12,
+          },
+        ],
+        mora: 20000,
+      },
+      {
+        items: [
+          {
+            item: itemList.lustrous_stone_from_guyun,
+            amount: 9,
+          },
+          {
+            item: itemList.treasured_flower,
+            amount: 9,
+          },
+          {
+            item: itemList.luminescent_pollen,
+            amount: 9,
+          },
+        ],
+        mora: 30000,
+      },
+      {
+        items: [
+          {
+            item: itemList.relic_from_guyun,
+            amount: 5,
+          },
+          {
+            item: itemList.treasured_flower,
+            amount: 18,
+          },
+          {
+            item: itemList.luminescent_pollen,
+            amount: 14,
+          },
+        ],
+        mora: 45000,
+      },
+      {
+        items: [
+          {
+            item: itemList.relic_from_guyun,
+            amount: 9,
+          },
+          {
+            item: itemList.wanderers_blooming_flower,
+            amount: 14,
+          },
+          {
+            item: itemList.crystalline_cyst_dust,
+            amount: 9,
+          },
+        ],
+        mora: 55000,
+      },
+      {
+        items: [
+          {
+            item: itemList.divine_body_from_guyun,
+            amount: 6,
+          },
+          {
+            item: itemList.wanderers_blooming_flower,
+            amount: 27,
+          },
+          {
+            item: itemList.crystalline_cyst_dust,
+            amount: 18,
+          },
+        ],
+        mora: 65000,
+      },
+    ],
+  },
+  ibis_piercer: {
+    id: 'ibis_piercer',
+    name: 'Ibis Piercer',
+    rarity: 4,
+    atk: 44,
+    secondary: 'ATK%',
+    type: 'bow',
+    source: "Duel! The Summoners' Summit! Event",
+    ascension: [
+      {
+        items: [
+          {
+            item: itemList.copper_talisman_of_the_forest_dew,
+            amount: 3,
+          },
+          {
+            item: itemList.a_flower_yet_to_bloom,
+            amount: 3,
+          },
+          {
+            item: itemList.faded_red_satin,
+            amount: 2,
+          },
+        ],
+        mora: 5000,
+      },
+      {
+        items: [
+          {
+            item: itemList.iron_talisman_of_the_forest_dew,
+            amount: 3,
+          },
+          {
+            item: itemList.a_flower_yet_to_bloom,
+            amount: 12,
+          },
+          {
+            item: itemList.faded_red_satin,
+            amount: 8,
+          },
+        ],
+        mora: 15000,
+      },
+      {
+        items: [
+          {
+            item: itemList.iron_talisman_of_the_forest_dew,
+            amount: 6,
+          },
+          {
+            item: itemList.treasured_flower,
+            amount: 6,
+          },
+          {
+            item: itemList.trimmed_red_silk,
+            amount: 6,
+          },
+        ],
+        mora: 20000,
+      },
+      {
+        items: [
+          {
+            item: itemList.silver_talisman_of_the_forest_dew,
+            amount: 3,
+          },
+          {
+            item: itemList.treasured_flower,
+            amount: 12,
+          },
+          {
+            item: itemList.trimmed_red_silk,
+            amount: 9,
+          },
+        ],
+        mora: 30000,
+      },
+      {
+        items: [
+          {
+            item: itemList.silver_talisman_of_the_forest_dew,
+            amount: 6,
+          },
+          {
+            item: itemList.wanderers_blooming_flower,
+            amount: 9,
+          },
+          {
+            item: itemList.rich_red_brocade,
+            amount: 6,
+          },
+        ],
+        mora: 35000,
+      },
+      {
+        items: [
+          {
+            item: itemList.golden_talisman_of_the_forest_dew,
+            amount: 4,
+          },
+          {
+            item: itemList.wanderers_blooming_flower,
+            amount: 18,
+          },
+          {
+            item: itemList.rich_red_brocade,
+            amount: 12,
+          },
+        ],
+        mora: 45000,
+      },
+    ],
+  },
 };

src/routes/_index/banner.svelte

@@ -13,25 +13,25 @@
   const dispatch = createEventDispatcher();
 
   const featured = {
-    nilou: {
-      name: 'Nilou',
+    yoimiya: {
+      name: 'Yoimiya',
       rarity: 'legendary',
       count: 0,
       average: '...',
       percentage: '...',
     },
-    nahida: {
-      name: 'Nahida',
+    yae_miko: {
+      name: 'Yae Miko',
       rarity: 'legendary',
       count: 0,
       average: '...',
       percentage: '...',
     },
   };
-  const bannerId = 300046;
-  const image = 'nilou_nahida.png';
+  const bannerId = 300048;
+  const image = 'yoimiya-yae.png';
   const width = 800;
-  const height = 416;
+  const height = 539;
 
   let loading = true;
   let user = '';

src/routes/achievement/index.svelte

@@ -65,6 +65,7 @@
     '3.4',
     '3.5',
     '3.6',
+    '3.7',
   ].map((e) => ({
     label: e,
     value: e,

src/routes/index.svelte

@@ -1,6 +1,6 @@
 <script context="module">
   export async function load({ fetch }) {
-    const promoted = ['nilou', 'nahida'];
+    const promoted = ['yoimiya', 'yae_miko'];
     const builds = {};
     for (const p of promoted) {
       const response = await fetch(`/characters/build/${p}.json`);

src/routes/timeline/_item.svelte

@@ -37,7 +37,7 @@
         {prevNearby && !started && (attachedPrev || prevEnded) && prevNearby
     ? 'padding-left: 35px;'
     : 'padding-left: 10px;'}
-    --image: url(/images/events/{event.image}); --pos: {event.pos}; --color: {event.color}; 
+    --image: url('/images/events/{event.image}'); --pos: {event.pos}; --color: {event.color}; 
     --zoom: {event.zoom ? event.zoom : '200%'};"
 >
   <div class="event-item {nextDiff < 1 ? '' : 'rounded-xl'}" />

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 TCG Cards', 'Update Banners', 'Update Achievements', 'Update Artifacts', 'Update Timeline'];
+const changelog = ['Add Kirara', 'Update banners', 'Update timeline', 'Update achievements'];
 
 const channel = new BroadcastChannel('paimonmoe-sw');