Update timeline

src/data/banners.js

@@ -504,6 +504,28 @@ export const banners = {
     //   timezoneDependent: true,
     //   version: '3.0'
     // },
+    {
+      name: 'Adrift in the Harbor',
+      image: 3,
+      shortName: 'Ganyu',
+      start: '2022-09-09 18:00:00',
+      end: '2022-09-27 14:59:59',
+      color: '#ceebf3',
+      featured: ['ganyu', 'sangonomiya_kokomi'],
+      featuredRare: ['xingqiu', 'sucrose', 'dori'],
+      version: '3.0',
+    },
+    // {
+    //   name: 'Drifting Luminescence',
+    //   image: 3,
+    //   shortName: 'Kokomi',
+    //   start: '2022-09-09 18:00:00',
+    //   end: '2022-09-27 14:59:59',
+    //   color: '#ceebf3',
+    //   featured: ['ganyu', 'sangonomiya_kokomi'],
+    //   featuredRare: ['xingqiu', 'sucrose', 'dori'],
+    //   version: '3.0',
+    // },
   ],
   weapons: [
     {
@@ -906,5 +928,16 @@ export const banners = {
       timezoneDependent: true,
       version: '3.0',
     },
+    {
+      name: 'Epitome Invocation',
+      image: 34,
+      start: '2022-09-09 18:00:00',
+      end: '2022-09-27 14:59:59',
+      shortName: 'Amos',
+      color: '#eae5e1',
+      featured: ['amos_bow', 'everlasting_moonglow'],
+      featuredRare: ['sacrificial_sword', 'favonius_greatsword', 'dragons_bane', 'eye_of_perception', 'rust'],
+      version: '3.0',
+    },
   ],
 };

src/data/bannersDual.js

@@ -203,4 +203,28 @@ export const bannersDual = {
       version: '3.0',
     },
   ],
+  'Adrift in the Harbor 3': [
+    {
+      name: 'Adrift in the Harbor',
+      image: 3,
+      shortName: 'Ganyu',
+      start: '2022-09-09 18:00:00',
+      end: '2022-09-27 14:59:59',
+      color: '#ceebf3',
+      featured: ['ganyu', 'sangonomiya_kokomi'],
+      featuredRare: ['xingqiu', 'sucrose', 'dori'],
+      version: '3.0',
+    },
+    {
+      name: 'Drifting Luminescence',
+      image: 3,
+      shortName: 'Kokomi',
+      start: '2022-09-09 18:00:00',
+      end: '2022-09-27 14:59:59',
+      color: '#ceebf3',
+      featured: ['ganyu', 'sangonomiya_kokomi'],
+      featuredRare: ['xingqiu', 'sucrose', 'dori'],
+      version: '3.0',
+    },
+  ],
 };

src/data/build.js

@@ -1264,6 +1264,24 @@ export const builds = {
       },
     },
   },
+  dori: {
+    roles: {
+      TBD: {
+        recommended: true,
+        weapons: [],
+        artifacts: [],
+        mainStats: {
+          sands: ['TBD'],
+          goblet: ['TBD'],
+          circlet: ['TBD'],
+        },
+        subStats: ['TBD'],
+        talent: ['TBD'],
+        tip: '',
+        note: 'TBD',
+      },
+    },
+  },
   traveler_electro: {
     roles: {
       SUPPORT: {

src/data/characters.js

@@ -1599,6 +1599,151 @@ export const characters = {
     },
     element: elements.cryo,
   },
+  dori: {
+    id: 'dori',
+    name: 'Dori',
+    rarity: 4,
+    weapon: weapons.claymore,
+    stats: {
+      hp: 0,
+      atk: 0,
+      def: 0,
+    },
+    ascension: [
+      {
+        items: [
+          {
+            item: itemList.vajrada_amethyst_sliver,
+            amount: 1,
+          },
+          {
+            item: itemList.none,
+            amount: null,
+          },
+          {
+            item: itemList.kalpalata_lotus,
+            amount: 3,
+          },
+          {
+            item: itemList.faded_red_satin,
+            amount: 3,
+          },
+        ],
+        mora: 20000,
+      },
+      {
+        items: [
+          {
+            item: itemList.vajrada_amethyst_fragment,
+            amount: 3,
+          },
+          {
+            item: itemList.thunderclap_fruitcore,
+            amount: 2,
+          },
+          {
+            item: itemList.kalpalata_lotus,
+            amount: 10,
+          },
+          {
+            item: itemList.faded_red_satin,
+            amount: 15,
+          },
+        ],
+        mora: 40000,
+      },
+      {
+        items: [
+          {
+            item: itemList.vajrada_amethyst_fragment,
+            amount: 6,
+          },
+          {
+            item: itemList.thunderclap_fruitcore,
+            amount: 4,
+          },
+          {
+            item: itemList.kalpalata_lotus,
+            amount: 20,
+          },
+          {
+            item: itemList.trimmed_red_silk,
+            amount: 12,
+          },
+        ],
+        mora: 60000,
+      },
+      {
+        items: [
+          {
+            item: itemList.vajrada_amethyst_chunk,
+            amount: 3,
+          },
+          {
+            item: itemList.thunderclap_fruitcore,
+            amount: 8,
+          },
+          {
+            item: itemList.kalpalata_lotus,
+            amount: 30,
+          },
+          {
+            item: itemList.trimmed_red_silk,
+            amount: 18,
+          },
+        ],
+        mora: 80000,
+      },
+      {
+        items: [
+          {
+            item: itemList.vajrada_amethyst_chunk,
+            amount: 6,
+          },
+          {
+            item: itemList.thunderclap_fruitcore,
+            amount: 12,
+          },
+          {
+            item: itemList.kalpalata_lotus,
+            amount: 45,
+          },
+          {
+            item: itemList.rich_red_brocade,
+            amount: 12,
+          },
+        ],
+        mora: 100000,
+      },
+      {
+        items: [
+          {
+            item: itemList.vajrada_amethyst_gemstone,
+            amount: 6,
+          },
+          {
+            item: itemList.thunderclap_fruitcore,
+            amount: 20,
+          },
+          {
+            item: itemList.kalpalata_lotus,
+            amount: 60,
+          },
+          {
+            item: itemList.rich_red_brocade,
+            amount: 24,
+          },
+        ],
+        mora: 120000,
+      },
+    ],
+    material: {
+      material: [itemList.faded_red_satin, itemList.trimmed_red_silk, itemList.rich_red_brocade],
+      book: [itemList.teachings_of_ingenuity, itemList.guide_to_ingenuity, itemList.philosophies_of_ingenuity],
+      boss: itemList.thunderclap_fruitcore,
+    },
+    element: elements.electro,
+  },
   eula: {
     id: 'eula',
     name: 'Eula',

src/data/events.js

@@ -745,4 +745,37 @@ export const events = [
     url: 'https://www.hoyolab.com/article/7113923',
     showOnHome: true,
   },
+  {
+    name: 'Adventure in the Forest',
+    pos: '0% 20%',
+    image: 'adventure_in_the_forest.jpg',
+    start: '2022-08-29 12:00:00',
+    end: '2022-09-11 23:59:59',
+    color: '#a7d0a6',
+    zoom: '100%',
+    url: 'https://www.hoyolab.com/article/7293007',
+    showOnHome: true,
+  },
+  {
+    name: 'Tablet Analytics',
+    pos: '100% 50%',
+    image: 'tablet_analytics.jpg',
+    start: '2022-09-15 10:00:00',
+    end: '2022-09-26 03:59:59',
+    color: '#c3d545',
+    zoom: '100%',
+    url: 'https://www.hoyolab.com/article/8555140',
+    showOnHome: true,
+  },
+  {
+    name: 'Ley Line Overflow',
+    pos: '20% 35%',
+    image: 'ley_line_overflow.jpg',
+    start: '2022-09-20 04:00:00',
+    end: '2022-09-27 03:59:59',
+    color: '#43DA8C',
+    zoom: '150%',
+    url: 'https://www.hoyolab.com/article/8555140',
+    showOnHome: true,
+  },
 ];

src/data/itemList.js

@@ -952,6 +952,7 @@ export const itemList = {
 
   majestic_hooked_beak: { id: 'majestic_hooked_beak', name: 'Majestic Hooked Beak', rarity: 5 },
   nilotpala_lotus: { id: 'nilotpala_lotus', name: 'Nilotpala Lotus' },
+  kalpalata_lotus: { id: 'kalpalata_lotus', name: 'Kalpalata Lotus' },
 
   fungal_spores: {
     id: 'fungal_spores',
@@ -1059,4 +1060,11 @@ export const itemList = {
     rarity: 4,
     parent: 'oasis_gardens_reminiscence',
   },
+
+  thunderclap_fruitcore: {
+    id: 'thunderclap_fruitcore',
+    name: 'Thunderclap Fruitcore',
+    rarity: 5,
+    parent: 'vajrada_amethyst_sliver',
+  },
 };

src/data/timeline.js

@@ -22,6 +22,17 @@ export const eventsData = [
       url: 'https://www.hoyolab.com/article/7018436',
       showOnHome: true,
     },
+    {
+      name: 'Adventure in the Forest',
+      pos: '0% 20%',
+      image: 'adventure_in_the_forest.jpg',
+      start: '2022-08-29 12:00:00',
+      end: '2022-09-11 23:59:59',
+      color: '#a7d0a6',
+      zoom: '100%',
+      url: 'https://www.hoyolab.com/article/7293007',
+      showOnHome: true,
+    },
   ],
   [
     {
@@ -36,14 +47,14 @@ export const eventsData = [
       showOnHome: true,
     },
     {
-      name: 'Adventure in the Forest',
-      pos: '0% 20%',
-      image: 'adventure_in_the_forest.jpg',
-      start: '2022-08-29 12:00:00',
-      end: '2022-09-11 23:59:59',
-      color: '#a7d0a6',
+      name: 'Tablet Analytics',
+      pos: '100% 50%',
+      image: 'tablet_analytics.jpg',
+      start: '2022-09-15 10:00:00',
+      end: '2022-09-26 03:59:59',
+      color: '#c3d545',
       zoom: '100%',
-      url: 'https://www.hoyolab.com/article/7293007',
+      url: 'https://www.hoyolab.com/article/8555140',
       showOnHome: true,
     },
   ],
@@ -138,6 +149,17 @@ export const eventsData = [
       url: 'https://www.hoyolab.com/article/7113923',
       showOnHome: true,
     },
+    {
+      name: 'Ley Line Overflow',
+      pos: '20% 35%',
+      image: 'ley_line_overflow.jpg',
+      start: '2022-09-20 04:00:00',
+      end: '2022-09-27 03:59:59',
+      color: '#43DA8C',
+      zoom: '150%',
+      url: 'https://www.hoyolab.com/article/8555140',
+      showOnHome: true,
+    },
   ],
   [
     {
@@ -234,6 +256,17 @@ export const eventsData = [
       showOnHome: true,
       timezoneDependent: true,
     },
+    {
+      name: 'Adrift in the Harbor - Ganyu Banner',
+      pos: '30% 15%',
+      zoom: '200%',
+      image: 'adrift_in_the_harbor_3.jpg',
+      start: '2022-09-09 18:00:00',
+      end: '2022-09-27 14:59:59',
+      color: '#ceebf3',
+      url: 'https://www.hoyolab.com/article/8554614',
+      showOnHome: true,
+    },
   ],
   [
     {
@@ -294,6 +327,17 @@ export const eventsData = [
       showOnHome: true,
       timezoneDependent: true,
     },
+    {
+      name: 'Drifting Luminescence - Kokomi Banner',
+      pos: '30% 15%',
+      zoom: '200%',
+      image: 'drifting_luminescence_3.jpg',
+      start: '2022-09-09 18:00:00',
+      end: '2022-09-27 14:59:59',
+      color: '#53caf3',
+      url: 'https://www.hoyolab.com/article/8554621',
+      showOnHome: true,
+    },
   ],
   [
     {
@@ -354,6 +398,17 @@ export const eventsData = [
       showOnHome: true,
       timezoneDependent: true,
     },
+    {
+      name: 'Epitome Invocation - Weapon Banner',
+      pos: '30% 40%',
+      zoom: '150%',
+      image: 'epitome_invocation_34.jpg',
+      start: '2022-09-09 18:00:00',
+      end: '2022-09-27 14:59:59',
+      color: '#FFAA4B',
+      url: 'https://www.hoyolab.com/article/8554622',
+      showOnHome: true,
+    },
   ],
   [
     {

src/routes/timeline/_item.svelte

@@ -14,8 +14,8 @@
 
   $: prevDiff = prev !== null ? event.start.diff(prev.end, 'hour') : Number.MAX_VALUE;
   $: nextDiff = next !== null ? next.start.diff(event.end, 'hour') : Number.MAX_VALUE;
-  $: prevNearby = prev !== null && prevDiff < 24;
-  $: nextNearby = next !== null && nextDiff < 24;
+  $: prevNearby = prev !== null && prevDiff < 48;
+  $: nextNearby = next !== null && nextDiff < 48;
   $: started = now.isAfter(event.start);
   $: ended = now.isAfter(event.end);
   $: diffStart = event.start.diff(now);

src/service-worker.js

@@ -8,9 +8,9 @@ const IMAGE_CACHE = `cacheimg${IMAGE_CACHE_VER}`;
 const IMAGE_URL = `${self.location.origin}/images/`;
 
 const changelog = [
+  'Update timelines',
   'Add character & weapons release timeline (Database > Character Reruns)',
   'Add checklist to achievement',
-  'Update achievement commission list',
 ];
 
 const channel = new BroadcastChannel('paimonmoe-sw');