From a88e15227f2bdba2a60bdd48a2b6cb8a95cc42a6 Mon Sep 17 00:00:00 2001 From: I Made Setia Baruna Date: Tue, 2 Feb 2021 12:38:58 +0800 Subject: [PATCH] Add resin calculation --- src/components/SettingData.svelte | 38 +++- src/data/dropRates.js | 25 +++ src/data/itemGroup.js | 19 ++ src/data/itemList.js | 163 +++++++++++++++- src/routes/settings.svelte | 51 ++++- src/routes/todo.svelte | 303 ++++++++++++++++++++++++++++-- src/stores/server.js | 2 + static/images/resin.png | Bin 0 -> 4163 bytes 8 files changed, 564 insertions(+), 37 deletions(-) create mode 100644 src/data/dropRates.js create mode 100644 static/images/resin.png diff --git a/src/components/SettingData.svelte b/src/components/SettingData.svelte index 2a8ba20b..172182e4 100644 --- a/src/components/SettingData.svelte +++ b/src/components/SettingData.svelte @@ -1,9 +1,11 @@ @@ -57,11 +82,21 @@

Data Version: 1.2 (Ganyu Patch)

-
-
-

Select your server:

+
+
+

Select your server:

+
+
+

WL:

+ +
+

@@ -115,10 +150,14 @@

{#if changelogOpen}
-
2021/02/01 
+        
2021/02/02 
+- Add resin approximation on todo list
+- Change todo today farmable item view
+- Add WL and AR setting for resin approximation
+
2021/02/01 
 - Add detail to wish counter
 - Bug fixes
-
2021/01/12 
+        
2021/01/12 
 - Add Ganyu
{/if} diff --git a/src/routes/todo.svelte b/src/routes/todo.svelte index 08290519..b6d5f351 100644 --- a/src/routes/todo.svelte +++ b/src/routes/todo.svelte @@ -1,13 +1,17 @@ @@ -135,18 +282,92 @@ {:else if $todos.length > 0}

Summary

-
{:else}

Nothing to do yet 😀
Add some from the Items page or the Calculator!

{/if} + {#if Object.entries(todayOnlyItems).length > 0} +
+

Farmable Today

+ + {#each Object.entries(todayOnlyItems) as [id, amount]} + + + + + {/each} +
+ + {numberFormat.format(amount)} + + + + + {itemList[id].name} + + {itemList[id].name} + +
+
+ {/if} + {#if resin > 0} +
+
+ resin + {resin} resin needed + +
+ {#if showResinDetail} +
+ + {#each Object.entries(resinDetail) as [id, amount]} + + + + + {/each} +
+
+ + {numberFormat.format(amount)} + + resin +
+
+ + + {itemList[id].name} + + {itemGroup[id].name} + +
+ + + Based on AR:{$ar} and WL:{$wl} + + (change on settings) + + Approximation calculated from drop rates by + Genshin Impact Data Gathering Discord + +
+ {/if} +
+ {/if} - {#each Object.entries(summary) as [id, amount], i} + {#each Object.entries(summary) as [id, amount]}
{numberFormat.format(amount)} - + @@ -188,7 +409,8 @@ {todo.weapon + alt={todo.weapon ? todo.weapon.name : `Weapon Level ${todo.level.from}-${todo.level.to}`} + />

{todo.weapon ? todo.weapon.name : 'Weapon'}

Level {`${todo.level.from}-${todo.level.to}`}

@@ -197,7 +419,8 @@ {todo.character + alt={todo.character ? todo.character.name : `Character Level ${todo.level.from}-${todo.level.to}`} + />

{todo.character ? todo.character.name : 'Character'}

Level {`${todo.level.from}-${todo.level.to}`}

@@ -217,7 +440,8 @@ on:click={() => reorder(i, 1)} rounded={false} size="sm" - className="rounded-r-xl"> + className="rounded-r-xl" + >
@@ -227,7 +451,8 @@
{numberFormat.format(amount)} - + @@ -254,3 +479,45 @@ {/each} + + diff --git a/src/stores/server.js b/src/stores/server.js index 2aad45ea..751a0bcf 100644 --- a/src/stores/server.js +++ b/src/stores/server.js @@ -7,6 +7,8 @@ dayjs.extend(utc); dayjs.extend(timezone); export const server = writable('Asia'); +export const ar = writable(50); +export const wl = writable(7); export const loading = writable(true); const timeOffset = { diff --git a/static/images/resin.png b/static/images/resin.png new file mode 100644 index 0000000000000000000000000000000000000000..757c3529d2a8723deaa67d99c9d695cea2efe65a GIT binary patch literal 4163 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 N002ovPDHLkV1ivu>AC;_ literal 0 HcmV?d00001