Merge branch 'main' into import-tcg-deck

package.json

@@ -4,7 +4,7 @@
   "description": "A collection of tools to help playing Genshin Impact",
   "version": "0.0.1",
   "scripts": {
-    "dev": "vite dev --port 3000",
+    "dev": "vite dev --port 3000 --host",
     "build": "cross-env NODE_OPTIONS=--max_old_space_size=4096 vite build",
     "preview": "vite preview",
     "start": "node build",

src/data/banners.js

@@ -734,6 +734,28 @@ export const banners = {
     //   timezoneDependent: true,
     //   version: '3.5',
     // },
+    {
+      name: 'The Transcendent One Returns',
+      image: 2,
+      shortName: 'Shenhe',
+      start: '2023-03-21 18:00:00',
+      end: '2023-04-11 14:59:59',
+      color: '#81DDF0',
+      featured: ['shenhe', 'kamisato_ayaka'],
+      featuredRare: ['diona', 'sucrose', 'mika'],
+      version: '3.5',
+    },
+    // {
+    //   name: 'The Herons Court',
+    //   image: 3,
+    //   shortName: 'Shenhe',
+    //   start: '2023-03-21 18:00:00',
+    //   end: '2023-04-11 14:59:59',
+    //   color: '#FFFBF7',
+    //   featured: ['shenhe', 'kamisato_ayaka'],
+    //   featuredRare: ['diona', 'sucrose', 'mika'],
+    //   version: '3.5',
+    // },
   ],
   weapons: [
     {
@@ -1257,5 +1279,16 @@ export const banners = {
       timezoneDependent: true,
       version: '3.5',
     },
+    {
+      name: 'Epitome Invocation',
+      image: 44,
+      shortName: 'Incision',
+      start: '2023-03-21 18:00:00',
+      end: '2023-04-11 14:59:59',
+      color: '#eae5e1',
+      featured: ['calamity_queller', 'mistsplitter_reforged'],
+      featuredRare: ['wine_and_song', 'sacrificial_sword', 'the_bell', 'favonius_lance', 'favonius_warbow'],
+      version: '3.5',
+    },
   ],
 };

src/data/bannersDual.js

@@ -453,4 +453,28 @@ export const bannersDual = {
       version: '3.5',
     },
   ],
+  'The Transcendent One Returns 2': [
+    {
+      name: 'The Transcendent One Returns',
+      image: 2,
+      shortName: 'Shenhe',
+      start: '2023-03-21 18:00:00',
+      end: '2023-04-11 14:59:59',
+      color: '#81DDF0',
+      featured: ['shenhe', 'kamisato_ayaka'],
+      featuredRare: ['diona', 'sucrose', 'mika'],
+      version: '3.5',
+    },
+    {
+      name: 'The Herons Court',
+      image: 3,
+      shortName: 'Shenhe',
+      start: '2023-03-21 18:00:00',
+      end: '2023-04-11 14:59:59',
+      color: '#FFFBF7',
+      featured: ['shenhe', 'kamisato_ayaka'],
+      featuredRare: ['diona', 'sucrose', 'mika'],
+      version: '3.5',
+    },
+  ],
 };

src/data/build.js

@@ -2881,6 +2881,24 @@ export const builds = {
       },
     },
   },
+  mika: {
+    roles: {
+      TBD: {
+        recommended: false,
+        weapons: [],
+        artifacts: [],
+        mainStats: {
+          sands: ['TBD'],
+          goblet: ['TBD'],
+          circlet: ['TBD'],
+        },
+        subStats: ['TBD'],
+        talent: ['TBD'],
+        tip: '',
+        note: 'TBD',
+      },
+    },
+  },
   qiqi: {
     roles: {
       SUPPORT: {

src/data/characters.js

@@ -4789,6 +4789,151 @@ export const characters = {
     },
     element: elements.electro,
   },
+  mika: {
+    id: 'mika',
+    name: 'Mika',
+    rarity: 4,
+    weapon: weapons.polearm,
+    stats: {
+      hp: 12506,
+      atk: 223,
+      def: 713,
+    },
+    ascension: [
+      {
+        items: [
+          {
+            item: itemList.shivada_jade_sliver,
+            amount: 1,
+          },
+          {
+            item: itemList.none,
+            amount: null,
+          },
+          {
+            item: itemList.wolfhook,
+            amount: 3,
+          },
+          {
+            item: itemList.recruits_insignia,
+            amount: 3,
+          },
+        ],
+        mora: 20000,
+      },
+      {
+        items: [
+          {
+            item: itemList.shivada_jade_fragment,
+            amount: 3,
+          },
+          {
+            item: itemList.pseudo_stamens,
+            amount: 2,
+          },
+          {
+            item: itemList.wolfhook,
+            amount: 10,
+          },
+          {
+            item: itemList.recruits_insignia,
+            amount: 15,
+          },
+        ],
+        mora: 40000,
+      },
+      {
+        items: [
+          {
+            item: itemList.shivada_jade_fragment,
+            amount: 6,
+          },
+          {
+            item: itemList.pseudo_stamens,
+            amount: 4,
+          },
+          {
+            item: itemList.wolfhook,
+            amount: 20,
+          },
+          {
+            item: itemList.sergeants_insignia,
+            amount: 12,
+          },
+        ],
+        mora: 60000,
+      },
+      {
+        items: [
+          {
+            item: itemList.shivada_jade_chunk,
+            amount: 3,
+          },
+          {
+            item: itemList.pseudo_stamens,
+            amount: 8,
+          },
+          {
+            item: itemList.wolfhook,
+            amount: 30,
+          },
+          {
+            item: itemList.sergeants_insignia,
+            amount: 18,
+          },
+        ],
+        mora: 80000,
+      },
+      {
+        items: [
+          {
+            item: itemList.shivada_jade_chunk,
+            amount: 6,
+          },
+          {
+            item: itemList.pseudo_stamens,
+            amount: 12,
+          },
+          {
+            item: itemList.wolfhook,
+            amount: 45,
+          },
+          {
+            item: itemList.lieutenants_insignia,
+            amount: 12,
+          },
+        ],
+        mora: 100000,
+      },
+      {
+        items: [
+          {
+            item: itemList.shivada_jade_gemstone,
+            amount: 6,
+          },
+          {
+            item: itemList.pseudo_stamens,
+            amount: 20,
+          },
+          {
+            item: itemList.wolfhook,
+            amount: 60,
+          },
+          {
+            item: itemList.lieutenants_insignia,
+            amount: 24,
+          },
+        ],
+        mora: 120000,
+      },
+    ],
+    material: {
+      material: [itemList.recruits_insignia, itemList.sergeants_insignia, itemList.lieutenants_insignia],
+      book: [itemList.teachings_of_ballad, itemList.guide_to_ballad, itemList.philosophies_of_ballad],
+      boss: itemList.mirror_of_mushin,
+    },
+    element: elements.cryo,
+  },
   mona: {
     id: 'mona',
     name: 'Mona',

src/data/events.js

@@ -1183,7 +1183,40 @@ export const events = [
     start: '2023-03-14 10:00:00',
     end: '2023-03-27 03:59:59',
     color: '#38c2f9',
-    url: 'https://www.hoyolab.com/article/16631602',
+    url: 'https://www.hoyolab.com/article/16959444',
+    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: 'Spices From the West: Northerly Search',
+    pos: '0% 40%',
+    zoom: '200%',
+    image: 'spices_from_the_west.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: '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,
   },
 ];

src/data/timeline.js

@@ -81,6 +81,28 @@ export const eventsData = [
       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,
+    },
   ],
   [
     {
@@ -118,13 +140,24 @@ export const eventsData = [
     },
     {
       name: 'Vibro Crystal Verification',
-      pos: '0% 30%',
-      zoom: '210%',
-      image: 'vibro_crysta_research.jpg',
+      pos: '0% 20%',
+      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/16631602',
+      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,
     },
   ],
@@ -164,6 +197,17 @@ export const eventsData = [
       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,
+    },
   ],
   [
     {
@@ -201,6 +245,17 @@ export const eventsData = [
       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,
+    },
   ],
   [
     {
@@ -238,6 +293,17 @@ export const eventsData = [
       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,
+    },
   ],
   [
     {
@@ -280,6 +346,26 @@ export const eventsData = [
       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',
+      pos: '50% 20%',
+      start: '2023-04-01 04:00:00',
+      end: '2023-04-16 04:00:00',
+      color: '#4299E1',
+      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.",
+    },
   ],
   [
     {
@@ -302,6 +388,26 @@ export const eventsData = [
       image: 'paimon_bargain.png',
       description: 'Now selling: Beidou, Noelle, and Royal Weapons.',
     },
+    {
+      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%',
+      zoom: '150%',
+      start: '2023-04-01 04:00:00',
+      end: '2023-05-01 04:00:00',
+      color: '#B6A1EA',
+      image: 'paimon_bargain.png',
+      description: 'Now selling: Razor, Amber, and Royal Weapons.',
+    },
   ],
   [
     {

src/routes/_index/banner.svelte

@@ -13,25 +13,25 @@
   const dispatch = createEventDispatcher();
 
   const featured = {
-    dehya: {
-      name: 'Dehya',
+    shenhe: {
+      name: 'Shenhe',
       rarity: 'legendary',
       count: 0,
       average: '...',
       percentage: '...',
     },
-    cyno: {
-      name: 'Cyno',
+    kamisato_ayaka: {
+      name: 'Kamisato Ayaka',
       rarity: 'legendary',
       count: 0,
       average: '...',
       percentage: '...',
     },
   };
-  const bannerId = 300044;
-  const image = 'dehya_cyno.png';
+  const bannerId = 300045;
+  const image = 'shenhe_ayaka.png';
   const width = 800;
-  const height = 519;
+  const height = 402;
 
   let loading = true;
   let user = '';

src/routes/index.svelte

@@ -1,6 +1,6 @@
 <script context="module">
   export async function load({ fetch }) {
-    const promoted = ['barbara', 'collei', 'bennett'];
+    const promoted = ['shenhe', 'kamisato_ayaka'];
     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 Dehya', 'Update New Weapons', 'Update Achievement', 'Update Timeline'];
+const changelog = ['Remove April Mop 😂', 'Update Timeline'];
 
 const channel = new BroadcastChannel('paimonmoe-sw');