diff --git a/src/data/banners.js b/src/data/banners.js index 6460f736..c9d48ae6 100644 --- a/src/data/banners.js +++ b/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', + }, ], }; diff --git a/src/data/bannersDual.js b/src/data/bannersDual.js index 7592a891..33d69066 100644 --- a/src/data/bannersDual.js +++ b/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', + }, + ], }; diff --git a/src/data/build.js b/src/data/build.js index 7991f47f..baec3ac5 100644 --- a/src/data/build.js +++ b/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: { diff --git a/src/data/characterData/dori.json b/src/data/characterData/dori.json new file mode 100644 index 00000000..ba47deb2 --- /dev/null +++ b/src/data/characterData/dori.json @@ -0,0 +1,1400 @@ +{ + "id": "dori", + "description": "An elusive merchant who has a fondness for glittering Mora.", + "weapon": "claymore", + "rarity": "rare", + "hp": [ + null, + 1039.4417724609375, + 1125.7153820804378, + 1210.9496252654353, + 1297.223358796051, + 1382.4576019810484, + 1468.7312116005487, + 1553.9654547855462, + 1640.2390644050465, + 1726.512797935662, + 1811.7470411206596, + 1898.02065074016, + 1983.2548939251574, + 2069.528627455773, + 2154.762746729655, + 2241.0363563491555, + 2327.3102137908863, + 2412.544456975884, + 2498.818066595384, + 2584.0523097803816, + 2670.325919399882, + 3446.842093716288, + 3532.0763369012857, + 3618.349946520786, + 3704.6235561402864, + 3789.857799325284, + 3876.1316567670146, + 3961.3656521297817, + 4047.6395095715125, + 4132.87375275651, + 4219.14736237601, + 4304.381605561008, + 4390.655215180508, + 4476.928824800008, + 4562.163067985006, + 4648.436677604506, + 4733.670920789504, + 4819.9447782312345, + 4905.1787735940015, + 4991.452383213502, + 5077.726240655233, + 5162.960236018, + 5714.695404475031, + 5800.969261916762, + 5886.20375292399, + 5972.47711472126, + 6057.7116057284875, + 6143.984967525757, + 6230.258824967488, + 6315.492820330255, + 6401.766677771986, + 6487.000673134753, + 6573.274530576484, + 7308.921625303046, + 7394.155620665813, + 7480.429478107544, + 7566.703335549275, + 7651.937330912042, + 7738.211188353773, + 7823.44518371654, + 7909.719041158271, + 7994.953036521038, + 8081.226893962768, + 8167.500751404499, + 8719.235858826374, + 8804.469854189141, + 8890.743711630872, + 8975.977706993639, + 9062.25156443537, + 9147.485559798137, + 9233.759417239868, + 9320.032779037138, + 9405.267270044365, + 9491.540631841635, + 9576.775122848863, + 10128.510230270738, + 10214.784087712469, + 10300.018083075236, + 10386.291940516967, + 10472.565302314237, + 10557.799793321465, + 10644.073155118735, + 10729.307646125962, + 10815.581007923232, + 10900.81549893046, + 10987.08886072773, + 11538.82421229023, + 11625.098069731961, + 11710.332560739189, + 11796.605922536459, + 11881.840413543687, + 11968.113775340957, + 12053.347770703724, + 12139.621628145454, + 12224.855623508221, + 12311.129480949952, + 12397.403338391683 + ], + "atk": [ + null, + 18.698400497436523, + 20.250366704457065, + 21.783635866226177, + 23.335604302269758, + 24.86887346403887, + 26.42083967105941, + 27.954108832828524, + 29.506075039849065, + 31.058043475892646, + 32.59131263766176, + 34.1432788446823, + 35.67654800645141, + 37.22851644249499, + 38.761783375241066, + 40.31374958226161, + 41.86572024732823, + 43.39898940909734, + 44.95095561611788, + 46.48422477788699, + 48.036190984907535, + 62.00518131083527, + 63.53845047260438, + 65.09041667962492, + 66.64238288664546, + 68.17565204841458, + 69.7276227134812, + 71.26088741720423, + 72.81285808227085, + 74.34612724403996, + 75.8980934510605, + 77.43136261282962, + 78.98332881985016, + 80.5352950268707, + 82.06856418863981, + 83.62053039566035, + 85.15379955742947, + 86.70577022249608, + 88.23903492621912, + 89.79100113323966, + 91.34297179830628, + 92.87623650202931, + 102.80157143244924, + 104.35354209751586, + 105.88681571733105, + 107.43877746630551, + 108.9720510861207, + 110.52401283509516, + 112.07598350016178, + 113.60924820388482, + 115.16121886895144, + 116.69448357267447, + 118.24645423774109, + 131.48023414496765, + 133.0134988486907, + 134.5654695137573, + 136.11744017882393, + 137.65070488254696, + 139.20267554761358, + 140.73594025133661, + 142.28791091640323, + 143.82117562012627, + 145.3731462851929, + 146.9251169502595, + 156.85045188067943, + 158.38371658440246, + 159.93568724946908, + 161.46895195319212, + 163.02092261825874, + 164.55418732198177, + 166.1061579870484, + 167.65811973602285, + 169.19139335583804, + 170.7433551048125, + 172.2766287246277, + 182.20196365504762, + 183.75393432011424, + 185.28719902383727, + 186.8391696889039, + 188.39113143787836, + 189.92440505769355, + 191.476366806668, + 193.0096404264832, + 194.56160217545766, + 196.09487579527286, + 197.64683754424732, + 207.5721762893645, + 209.12414695443113, + 210.65742057424632, + 212.20938232322078, + 213.74265594303597, + 215.29461769201043, + 216.82788239573347, + 218.3798530608001, + 219.91311776452312, + 221.46508842958974, + 223.01705909465636 + ], + "def": [ + null, + 60.65850067138672, + 65.69315287190148, + 70.66715096822736, + 75.70181039979889, + 80.67580849612477, + 85.71046069663953, + 90.68445879296542, + 95.71911099348017, + 100.7537704250517, + 105.72776852137758, + 110.76242072189234, + 115.73641881821823, + 120.77107824978975, + 125.74506911505887, + 130.77972131557362, + 135.81438797820192, + 140.7883860745278, + 145.82303827504256, + 150.79703637136845, + 155.8316885718832, + 201.1466871985922, + 206.12068529491808, + 211.15533749543283, + 216.1899896959476, + 221.16398779227347, + 226.19865445490177, + 231.17263808911412, + 236.2073047517424, + 241.1813028480683, + 246.21595504858306, + 251.18995314490894, + 256.2246053454237, + 261.25925754593845, + 266.23325564226434, + 271.2679078427791, + 276.241905939105, + 281.2765726017333, + 286.2505562359456, + 291.2852084364604, + 296.3198750990887, + 301.293858733301, + 333.4913570548342, + 338.5260237174625, + 343.50003627590195, + 348.53467401430316, + 353.5086865727426, + 358.5433243111438, + 363.5779909737721, + 368.55197460798445, + 373.58664127061274, + 378.5606249048251, + 383.5952915674534, + 426.52529187262917, + 431.4992755068415, + 436.5339421694698, + 441.5686088320981, + 446.54259246631045, + 451.57725912893875, + 456.5512427631511, + 461.5859094257794, + 466.55989305999174, + 471.59455972262003, + 476.62922638524833, + 508.8267285214788, + 513.8007121556911, + 518.8353788183194, + 523.8093624525318, + 528.8440291151601, + 533.8180127493724, + 538.8526794120007, + 543.8873171504019, + 548.8613297088414, + 553.8959674472426, + 558.869980005682, + 591.067474512518, + 596.1021411751462, + 601.0761248093586, + 606.1107914719869, + 611.1454292103881, + 616.1194417688275, + 621.1540795072287, + 626.1280920656682, + 631.1627298040694, + 636.1367423625088, + 641.17138010091, + 673.368889866535, + 678.4035565291633, + 683.3775690876028, + 688.412206826004, + 693.3862193844434, + 698.4208571228446, + 703.394840757057, + 708.4295074196853, + 713.4034910538976, + 718.4381577165259, + 723.4728243791542 + ], + "hpPercent": [ + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0.05999999865889549, + 0.05999999865889549, + 0.05999999865889549, + 0.05999999865889549, + 0.05999999865889549, + 0.05999999865889549, + 0.05999999865889549, + 0.05999999865889549, + 0.05999999865889549, + 0.05999999865889549, + 0.05999999865889549, + 0.11999999731779099, + 0.11999999731779099, + 0.11999999731779099, + 0.11999999731779099, + 0.11999999731779099, + 0.11999999731779099, + 0.11999999731779099, + 0.11999999731779099, + 0.11999999731779099, + 0.11999999731779099, + 0.11999999731779099, + 0.11999999731779099, + 0.11999999731779099, + 0.11999999731779099, + 0.11999999731779099, + 0.11999999731779099, + 0.11999999731779099, + 0.11999999731779099, + 0.11999999731779099, + 0.11999999731779099, + 0.11999999731779099, + 0.11999999731779099, + 0.18000000715255737, + 0.18000000715255737, + 0.18000000715255737, + 0.18000000715255737, + 0.18000000715255737, + 0.18000000715255737, + 0.18000000715255737, + 0.18000000715255737, + 0.18000000715255737, + 0.18000000715255737, + 0.18000000715255737, + 0.23999999463558197, + 0.23999999463558197, + 0.23999999463558197, + 0.23999999463558197, + 0.23999999463558197, + 0.23999999463558197, + 0.23999999463558197, + 0.23999999463558197, + 0.23999999463558197, + 0.23999999463558197, + 0.23999999463558197 + ], + "statGrow": "hpPercent", + "constellations": [ + { + "name": "Additional Investment", + "description": "The number of After-Sales Service Rounds created by Troubleshooter Shots is increased by 1." + }, + { + "name": "Special Franchise", + "description": "When you are in combat and the Jinni heals the character it is connected to, it will fire a Jinni Toop from that character's position that deals 50% of Dori's ATK DMG." + }, + { + "name": "Wonders Never Cease", + "description": "Increases the Level of Alcazarzaray's Exactitude by 3.\\nMaximum upgrade level is 15." + }, + { + "name": "Discretionary Supplement", + "description": "The character connected to the Jinni will obtain the following buffs based on their current HP and Energy:\\n·When their HP is lower than 50%, they gain 50% Incoming Healing Bonus.\\n·When their Energy is less than 50%, they gain 30% Energy Recharge." + }, + { + "name": "Value for Mora", + "description": "Increases the Level of Spirit-Warding Lamp: Troubleshooter Cannon by 3.\\nMaximum upgrade level is 15." + }, + { + "name": "Sprinkling Weight", + "description": "Dori gains the following effects for 3s after using Spirit-Warding Lamp: Troubleshooter Cannon:\\n·Electro Infusion.\\n·When Normal Attacks hit opponents, all nearby party members will heal HP equivalent to 4% of Dori's Max HP. This type of healing can occur once every 0.1s." + } + ], + "passives": [ + { + "name": "An Eye for Gold", + "description": "After a character connected to the Jinni triggers an Electro-Charged, Superconduct, Overloaded, Quicken, Aggravate, Hyperbloom, or an Electro Swirl or Crystallize reaction, the CD of Spirit-Warding Lamp: Troubleshooter Cannon is decreased by 1s.\\nThis effect can be triggered once every 3s." + }, + { + "name": "Compound Interest", + "description": "When the Troubleshooter Shots or After-Sales Service Rounds from Spirit-Warding Lamp: Troubleshooter Cannon hit opponents, Dori will restore 5 Elemental Energy for every 100% Energy Recharge possessed.\\nPer Spirit-Warding Lamp: Troubleshooter Cannon, only one instance of Energy restoration can be triggered and a maximum of 15 Energy can be restored this way." + }, + { + "name": "Unexpected Order", + "description": "Has a 25% chance to recover some of the materials used when crafting Character and Weapon Materials." + } + ], + "burst": { + "name": "Alcazarzaray's Exactitude", + "description": "Summons forth the Jinni within the lamp to give the client various kinds of aid.\\n\\nJinni\\nConnects to a nearby character. The connected character will:\\n· Continuously restore HP based on Dori's Max HP.\\n· Continuously regenerate Energy.\\n· Be affected by Electro.\\nWhen the connector between the Jinni and the character touches opponents, it will deal one instance of Electro DMG to them every 0.4s.\\n\\nOnly one Jinni can exist at one time.\\n\\n\"Hmm? You'll pick this lamp, will you? Oh my, you've got good taste! Unfortunately, there's no price on this treasure — comparable, I'd say, to how you will not sell that mascot by your side for any price in the world.\"", + "skillLabels": [ + "Connector DMG", + "Continuous Healing", + "Energy Regeneration", + "Duration", + "CD", + "Energy Cost" + ], + "skillStatsLabels": [ + "{0:p}", + "{0:1p} Max HP+{1:i}", + "{0:1f}", + "{0:1f}s", + "{0:1f}s", + "{0:i}" + ], + "skillStats": [ + [ + [ + 0.15882399678230286 + ], + [ + 0.17073599994182587 + ], + [ + 0.18264800310134888 + ], + [ + 0.19853000342845917 + ], + [ + 0.21044200658798218 + ], + [ + 0.222353994846344 + ], + [ + 0.23823599517345428 + ], + [ + 0.2541179955005646 + ], + [ + 0.27000099420547485 + ], + [ + 0.28588300943374634 + ], + [ + 0.3017660081386566 + ], + [ + 0.3176479935646057 + ], + [ + 0.33750098943710327 + ], + [ + 0.35735398530960083 + ], + [ + 0.3772070109844208 + ] + ], + [ + [ + 0.06669999659061432, + 641.9795532226562 + ], + [ + 0.0717020034790039, + 706.1864624023438 + ], + [ + 0.07670500129461288, + 775.743896484375 + ], + [ + 0.0833749994635582, + 850.6519165039062 + ], + [ + 0.08837699890136719, + 930.9105224609375 + ], + [ + 0.09337999671697617, + 1016.5197143554688 + ], + [ + 0.10005000233650208, + 1107.4794921875 + ], + [ + 0.10672000050544739, + 1203.789794921875 + ], + [ + 0.1133899986743927, + 1305.45068359375 + ], + [ + 0.12005999684333801, + 1412.462158203125 + ], + [ + 0.12672999501228333, + 1524.82421875 + ], + [ + 0.13339999318122864, + 1642.536865234375 + ], + [ + 0.14173699915409088, + 1765.5999755859375 + ], + [ + 0.1500750035047531, + 1894.0137939453125 + ], + [ + 0.15841199457645416, + 2027.778076171875 + ] + ], + [ + [ + 1.600000023841858 + ], + [ + 1.7000000476837158 + ], + [ + 1.7999999523162842 + ], + [ + 1.899999976158142 + ], + [ + 2 + ], + [ + 2.0999999046325684 + ], + [ + 2.200000047683716 + ], + [ + 2.299999952316284 + ], + [ + 2.4000000953674316 + ], + [ + 2.5 + ], + [ + 2.5 + ], + [ + 2.5 + ], + [ + 2.5 + ], + [ + 2.5 + ], + [ + 2.5 + ] + ], + [ + [ + 12 + ], + [ + 12 + ], + [ + 12 + ], + [ + 12 + ], + [ + 12 + ], + [ + 12 + ], + [ + 12 + ], + [ + 12 + ], + [ + 12 + ], + [ + 12 + ], + [ + 12 + ], + [ + 12 + ], + [ + 12 + ], + [ + 12 + ], + [ + 12 + ] + ], + [ + [ + 20 + ], + [ + 20 + ], + [ + 20 + ], + [ + 20 + ], + [ + 20 + ], + [ + 20 + ], + [ + 20 + ], + [ + 20 + ], + [ + 20 + ], + [ + 20 + ], + [ + 20 + ], + [ + 20 + ], + [ + 20 + ], + [ + 20 + ], + [ + 20 + ] + ], + [ + [ + 80 + ], + [ + 80 + ], + [ + 80 + ], + [ + 80 + ], + [ + 80 + ], + [ + 80 + ], + [ + 80 + ], + [ + 80 + ], + [ + 80 + ], + [ + 80 + ], + [ + 80 + ], + [ + 80 + ], + [ + 80 + ], + [ + 80 + ], + [ + 80 + ] + ] + ] + }, + "attack": { + "name": "Normal Attack: Marvelous Sword-Dance (Modified)", + "description": "Normal Attack\\nPerform up to 3 consecutive strikes.\\n\\nCharged Attack\\nDrains Stamina over time to perform continuous spinning attacks against all nearby opponents.\\nAt the end of the sequence, performs a more powerful slash. \\n\\nPlunging Attack\\nPlunges from mid-air to strike the ground below, damaging opponents along the path and dealing AoE DMG upon impact.", + "skillLabels": [ + "1-Hit DMG", + "2-Hit DMG", + "3-Hit DMG", + "Charged Attack Spinning DMG", + "Charged Attack Final DMG", + "Charged Attack Stamina Cost", + "Max Duration", + "Plunge DMG", + "Low/High Plunge DMG" + ], + "skillStatsLabels": [ + "{0:1p}", + "{0:1p}+{1:1p}", + "{0:1p}", + "{0:1p}", + "{0:p}", + "{0:1f}/s", + "{0:1f}s", + "{0:1p}", + "{0:p}/{1:p}" + ], + "skillStats": [ + [ + [ + 0.9021400213241577 + ], + [ + 0.975570023059845 + ], + [ + 1.0490000247955322 + ], + [ + 1.1539000272750854 + ], + [ + 1.227329969406128 + ], + [ + 1.3112499713897705 + ], + [ + 1.4266400337219238 + ], + [ + 1.5420299768447876 + ], + [ + 1.657420039176941 + ], + [ + 1.7833000421524048 + ], + [ + 1.9091800451278687 + ], + [ + 2.035059928894043 + ], + [ + 2.160939931869507 + ], + [ + 2.2868199348449707 + ], + [ + 2.4126999378204346 + ] + ], + [ + [ + 0.41073599457740784, + 0.4312039911746979 + ], + [ + 0.44416800141334534, + 0.4663020074367523 + ], + [ + 0.47760000824928284, + 0.5013999938964844 + ], + [ + 0.5253599882125854, + 0.5515400171279907 + ], + [ + 0.558791995048523, + 0.5866379737854004 + ], + [ + 0.597000002861023, + 0.6267499923706055 + ], + [ + 0.6495360136032104, + 0.6819040179252625 + ], + [ + 0.702072024345398, + 0.7370579838752747 + ], + [ + 0.7546079754829407, + 0.7922120094299316 + ], + [ + 0.8119199872016907, + 0.8523799777030945 + ], + [ + 0.8692319989204407, + 0.9125480055809021 + ], + [ + 0.9265440106391907, + 0.9727159738540649 + ], + [ + 0.9838560223579407, + 1.0328840017318726 + ], + [ + 1.041167974472046, + 1.0930520296096802 + ], + [ + 1.098479986190796, + 1.1532200574874878 + ] + ], + [ + [ + 1.2839800119400024 + ], + [ + 1.3884899616241455 + ], + [ + 1.4930000305175781 + ], + [ + 1.642300009727478 + ], + [ + 1.746809959411621 + ], + [ + 1.8662500381469727 + ], + [ + 2.030479907989502 + ], + [ + 2.1947100162506104 + ], + [ + 2.3589398860931396 + ], + [ + 2.538100004196167 + ], + [ + 2.7172598838806152 + ], + [ + 2.8964200019836426 + ], + [ + 3.075579881668091 + ], + [ + 3.254739999771118 + ], + [ + 3.4339001178741455 + ] + ], + [ + [ + 0.6254550218582153 + ], + [ + 0.676364004611969 + ], + [ + 0.7272729873657227 + ], + [ + 0.800000011920929 + ], + [ + 0.8509089946746826 + ], + [ + 0.9090909957885742 + ], + [ + 0.9890909790992737 + ], + [ + 1.0690909624099731 + ], + [ + 1.1490910053253174 + ], + [ + 1.2363640069961548 + ], + [ + 1.3363640308380127 + ], + [ + 1.4539639949798584 + ], + [ + 1.571563959121704 + ], + [ + 1.6891640424728394 + ], + [ + 1.8174550533294678 + ] + ], + [ + [ + 1.1309000253677368 + ], + [ + 1.2229499816894531 + ], + [ + 1.315000057220459 + ], + [ + 1.4464999437332153 + ], + [ + 1.5385500192642212 + ], + [ + 1.6437499523162842 + ], + [ + 1.7884000539779663 + ], + [ + 1.9330500364303589 + ], + [ + 2.077699899673462 + ], + [ + 2.2355000972747803 + ], + [ + 2.4163129329681396 + ], + [ + 2.6289479732513428 + ], + [ + 2.8415839672088623 + ], + [ + 3.0542190074920654 + ], + [ + 3.2861850261688232 + ] + ], + [ + [ + 40 + ], + [ + 40 + ], + [ + 40 + ], + [ + 40 + ], + [ + 40 + ], + [ + 40 + ], + [ + 40 + ], + [ + 40 + ], + [ + 40 + ], + [ + 40 + ], + [ + 40 + ], + [ + 40 + ], + [ + 40 + ], + [ + 40 + ], + [ + 40 + ] + ], + [ + [ + 5 + ], + [ + 5 + ], + [ + 5 + ], + [ + 5 + ], + [ + 5 + ], + [ + 5 + ], + [ + 5 + ], + [ + 5 + ], + [ + 5 + ], + [ + 5 + ], + [ + 5 + ], + [ + 5 + ], + [ + 5 + ], + [ + 5 + ], + [ + 5 + ] + ], + [ + [ + 0.7458779811859131 + ], + [ + 0.8065890073776245 + ], + [ + 0.8672999739646912 + ], + [ + 0.9540299773216248 + ], + [ + 1.0147409439086914 + ], + [ + 1.08412504196167 + ], + [ + 1.179527997970581 + ], + [ + 1.2749309539794922 + ], + [ + 1.3703340291976929 + ], + [ + 1.474410057067871 + ], + [ + 1.5784859657287598 + ], + [ + 1.682561993598938 + ], + [ + 1.7866380214691162 + ], + [ + 1.8907140493392944 + ], + [ + 1.994789958000183 + ] + ], + [ + [ + 1.4914400577545166, + 1.862889051437378 + ], + [ + 1.6128360033035278, + 2.0145199298858643 + ], + [ + 1.734233021736145, + 2.1661500930786133 + ], + [ + 1.907655954360962, + 2.382765054702759 + ], + [ + 2.0290520191192627, + 2.534395933151245 + ], + [ + 2.1677908897399902, + 2.707688093185425 + ], + [ + 2.358556032180786, + 2.9459640979766846 + ], + [ + 2.5493218898773193, + 3.1842410564422607 + ], + [ + 2.7400870323181152, + 3.4225170612335205 + ], + [ + 2.948194980621338, + 3.682455062866211 + ], + [ + 3.1563029289245605, + 3.9423930644989014 + ], + [ + 3.3644111156463623, + 4.202331066131592 + ], + [ + 3.572519063949585, + 4.462268829345703 + ], + [ + 3.7806270122528076, + 4.722207069396973 + ], + [ + 3.9887349605560303, + 4.982144832611084 + ] + ] + ] + }, + "elementalSkill": { + "name": "Spirit-Warding Lamp: Troubleshooter Cannon", + "description": "Directs a Spirit-Warding Lamp to fire off a Troubleshooter Shot at opponents, dealing Electro DMG.\\nAfter the Troubleshooter Shot hits, it will create 2 After-Sales Service Rounds that will automatically track opponents and deal Electro DMG.\\n\\nIt is said that Dori can fix any problem for you... for the right price.", + "skillLabels": [ + "Troubleshooter Shot DMG", + "After-Sales Service Round DMG", + "CD" + ], + "skillStatsLabels": [ + "{0:1p}", + "{0:1p}", + "{0:1f}s" + ], + "skillStats": [ + [ + [ + 1.4728000164031982 + ], + [ + 1.5832600593566895 + ], + [ + 1.6937199831008911 + ], + [ + 1.840999960899353 + ], + [ + 1.9514600038528442 + ], + [ + 2.061919927597046 + ], + [ + 2.209199905395508 + ], + [ + 2.3564798831939697 + ], + [ + 2.5037600994110107 + ], + [ + 2.6510400772094727 + ], + [ + 2.7983200550079346 + ], + [ + 2.9456000328063965 + ], + [ + 3.129699945449829 + ], + [ + 3.313800096511841 + ], + [ + 3.4979000091552734 + ] + ], + [ + [ + 0.3156000077724457 + ], + [ + 0.3392699956893921 + ], + [ + 0.3629400134086609 + ], + [ + 0.3944999873638153 + ], + [ + 0.4181700050830841 + ], + [ + 0.4418399930000305 + ], + [ + 0.4733999967575073 + ], + [ + 0.5049600005149841 + ], + [ + 0.5365200042724609 + ], + [ + 0.5680800080299377 + ], + [ + 0.5996400117874146 + ], + [ + 0.6312000155448914 + ], + [ + 0.6706500053405762 + ], + [ + 0.710099995136261 + ], + [ + 0.7495499849319458 + ] + ], + [ + [ + 9 + ], + [ + 9 + ], + [ + 9 + ], + [ + 9 + ], + [ + 9 + ], + [ + 9 + ], + [ + 9 + ], + [ + 9 + ], + [ + 9 + ], + [ + 9 + ], + [ + 9 + ], + [ + 9 + ], + [ + 9 + ], + [ + 9 + ], + [ + 9 + ] + ] + ] + } +} \ No newline at end of file diff --git a/src/data/characters.js b/src/data/characters.js index 9da2e7d5..9d7cbd1a 100644 --- a/src/data/characters.js +++ b/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', diff --git a/src/data/events.js b/src/data/events.js index 8eadef5e..03eb8257 100644 --- a/src/data/events.js +++ b/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, + }, ]; diff --git a/src/data/itemList.js b/src/data/itemList.js index 6709fcf8..2e7f0aa1 100644 --- a/src/data/itemList.js +++ b/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', + }, }; diff --git a/src/data/timeline.js b/src/data/timeline.js index dec28162..3f01ce93 100644 --- a/src/data/timeline.js +++ b/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, + }, ], [ { diff --git a/src/routes/timeline/_item.svelte b/src/routes/timeline/_item.svelte index 1ca98eaa..fb9899d2 100644 --- a/src/routes/timeline/_item.svelte +++ b/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); diff --git a/src/service-worker.js b/src/service-worker.js index f80ee088..76082764 100644 --- a/src/service-worker.js +++ b/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'); diff --git a/static/images/banners/Adrift in the Harbor 3.png b/static/images/banners/Adrift in the Harbor 3.png new file mode 100644 index 00000000..662953ab Binary files /dev/null and b/static/images/banners/Adrift in the Harbor 3.png differ diff --git a/static/images/banners/Drifting Luminescence 3.png b/static/images/banners/Drifting Luminescence 3.png new file mode 100644 index 00000000..edcdbd9d Binary files /dev/null and b/static/images/banners/Drifting Luminescence 3.png differ diff --git a/static/images/banners/Epitome Invocation 34.png b/static/images/banners/Epitome Invocation 34.png new file mode 100644 index 00000000..9fea2495 Binary files /dev/null and b/static/images/banners/Epitome Invocation 34.png differ diff --git a/static/images/characters/collei.png b/static/images/characters/collei.png index 9549f3a5..fd41a2ce 100644 Binary files a/static/images/characters/collei.png and b/static/images/characters/collei.png differ diff --git a/static/images/characters/dori.png b/static/images/characters/dori.png new file mode 100644 index 00000000..67317f97 Binary files /dev/null and b/static/images/characters/dori.png differ diff --git a/static/images/characters/full/dori.png b/static/images/characters/full/dori.png new file mode 100644 index 00000000..1f6198af Binary files /dev/null and b/static/images/characters/full/dori.png differ diff --git a/static/images/characters/full/tighnari.png b/static/images/characters/full/tighnari.png index 3689db13..c22b67fb 100644 Binary files a/static/images/characters/full/tighnari.png and b/static/images/characters/full/tighnari.png differ diff --git a/static/images/characters/tighnari.png b/static/images/characters/tighnari.png index 2361777d..19a128b7 100644 Binary files a/static/images/characters/tighnari.png and b/static/images/characters/tighnari.png differ diff --git a/static/images/events/adrift_in_the_harbor_3.jpg b/static/images/events/adrift_in_the_harbor_3.jpg new file mode 100644 index 00000000..a6b2ad39 Binary files /dev/null and b/static/images/events/adrift_in_the_harbor_3.jpg differ diff --git a/static/images/events/drifting_luminescence_3.jpg b/static/images/events/drifting_luminescence_3.jpg new file mode 100644 index 00000000..a032e1d0 Binary files /dev/null and b/static/images/events/drifting_luminescence_3.jpg differ diff --git a/static/images/events/epitome_invocation_34.jpg b/static/images/events/epitome_invocation_34.jpg new file mode 100644 index 00000000..b3652f03 Binary files /dev/null and b/static/images/events/epitome_invocation_34.jpg differ diff --git a/static/images/events/tablet_analytics.jpg b/static/images/events/tablet_analytics.jpg new file mode 100644 index 00000000..463f5ec7 Binary files /dev/null and b/static/images/events/tablet_analytics.jpg differ diff --git a/static/images/items/kalpalata_lotus.png b/static/images/items/kalpalata_lotus.png new file mode 100644 index 00000000..6df63769 Binary files /dev/null and b/static/images/items/kalpalata_lotus.png differ diff --git a/static/images/items/thunderclap_fruitcore.png b/static/images/items/thunderclap_fruitcore.png new file mode 100644 index 00000000..a861b45d Binary files /dev/null and b/static/images/items/thunderclap_fruitcore.png differ diff --git a/static/images/skills/dori/constellation_1.png b/static/images/skills/dori/constellation_1.png new file mode 100644 index 00000000..cb86484b Binary files /dev/null and b/static/images/skills/dori/constellation_1.png differ diff --git a/static/images/skills/dori/constellation_2.png b/static/images/skills/dori/constellation_2.png new file mode 100644 index 00000000..065bb36b Binary files /dev/null and b/static/images/skills/dori/constellation_2.png differ diff --git a/static/images/skills/dori/constellation_3.png b/static/images/skills/dori/constellation_3.png new file mode 100644 index 00000000..fc4776dd Binary files /dev/null and b/static/images/skills/dori/constellation_3.png differ diff --git a/static/images/skills/dori/constellation_4.png b/static/images/skills/dori/constellation_4.png new file mode 100644 index 00000000..b48ad453 Binary files /dev/null and b/static/images/skills/dori/constellation_4.png differ diff --git a/static/images/skills/dori/constellation_5.png b/static/images/skills/dori/constellation_5.png new file mode 100644 index 00000000..35ba8c38 Binary files /dev/null and b/static/images/skills/dori/constellation_5.png differ diff --git a/static/images/skills/dori/constellation_6.png b/static/images/skills/dori/constellation_6.png new file mode 100644 index 00000000..3d133f15 Binary files /dev/null and b/static/images/skills/dori/constellation_6.png differ diff --git a/static/images/skills/dori/talent_1.png b/static/images/skills/dori/talent_1.png new file mode 100644 index 00000000..0dc91f6e Binary files /dev/null and b/static/images/skills/dori/talent_1.png differ diff --git a/static/images/skills/dori/talent_2.png b/static/images/skills/dori/talent_2.png new file mode 100644 index 00000000..35ba8c38 Binary files /dev/null and b/static/images/skills/dori/talent_2.png differ diff --git a/static/images/skills/dori/talent_3.png b/static/images/skills/dori/talent_3.png new file mode 100644 index 00000000..7ed57557 Binary files /dev/null and b/static/images/skills/dori/talent_3.png differ diff --git a/static/images/skills/dori/talent_4.png b/static/images/skills/dori/talent_4.png new file mode 100644 index 00000000..164e0dd3 Binary files /dev/null and b/static/images/skills/dori/talent_4.png differ diff --git a/static/images/skills/dori/talent_5.png b/static/images/skills/dori/talent_5.png new file mode 100644 index 00000000..3fe00f51 Binary files /dev/null and b/static/images/skills/dori/talent_5.png differ diff --git a/static/images/skills/dori/talent_6.png b/static/images/skills/dori/talent_6.png new file mode 100644 index 00000000..df950677 Binary files /dev/null and b/static/images/skills/dori/talent_6.png differ diff --git a/static/images/weapons/everlasting_moonglow.png b/static/images/weapons/everlasting_moonglow.png index 81f8f712..e6158674 100644 Binary files a/static/images/weapons/everlasting_moonglow.png and b/static/images/weapons/everlasting_moonglow.png differ