Update baizhu and banners

src/data/banners.js

@@ -780,6 +780,28 @@ 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',
+    // },
   ],
   weapons: [
     {
@@ -1332,5 +1354,16 @@ 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',
+    },
   ],
 };

src/data/bannersDual.js

@@ -503,4 +503,28 @@ 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',
+    },
+  ],
 };

src/data/build.js

@@ -4600,4 +4600,40 @@ 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',
+      },
+    },
+  },
 };

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',

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,31 @@ 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,
+  },
 };

src/data/timeline.js

@@ -44,6 +44,17 @@ 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,
+    },
   ],
   [
     {
@@ -81,13 +92,24 @@ 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,
     },
   ],
@@ -127,6 +149,17 @@ export const eventsData = [
       showOnHome: true,
       timezoneDependent: true,
     },
+    {
+      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,
+    },
   ],
   [
     {
@@ -164,6 +197,17 @@ export const eventsData = [
       showOnHome: true,
       timezoneDependent: true,
     },
+    {
+      name: 'Adrift in the Harbor - Ganyu Banner',
+      pos: '10% 15%',
+      zoom: '150%',
+      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,
+    },
   ],
   [
     {
@@ -201,6 +245,17 @@ 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,
+    },
   ],
   [
     {
@@ -233,6 +288,36 @@ 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.',
+    },
   ],
   [
     {
@@ -255,6 +340,16 @@ 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.',
+    },
   ],
   [
     {
@@ -272,7 +367,7 @@ export const eventsData = [
       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,

src/data/weaponList.js

@@ -10232,4 +10232,117 @@ 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,
+      },
+    ],
+  },
 };

src/routes/_index/banner.svelte

@@ -13,25 +13,25 @@
   const dispatch = createEventDispatcher();
 
   const featured = {
-    nilou: {
-      name: 'Nilou',
+    baizhu: {
+      name: 'Baizhu',
       rarity: 'legendary',
       count: 0,
       average: '...',
       percentage: '...',
     },
-    nahida: {
-      name: 'Nahida',
+    ganyu: {
+      name: 'Ganyu',
       rarity: 'legendary',
       count: 0,
       average: '...',
       percentage: '...',
     },
   };
-  const bannerId = 300046;
-  const image = 'nilou_nahida.png';
+  const bannerId = 300047;
+  const image = 'baizhu_ganyu.png';
   const width = 800;
-  const height = 416;
+  const height = 438;
 
   let loading = true;
   let user = '';

src/routes/index.svelte

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

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 = ['Update Baizhu & Weapon', 'Update banner', 'Update timeline'];
 
 const channel = new BroadcastChannel('paimonmoe-sw');