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 00000000..757c3529 Binary files /dev/null and b/static/images/resin.png differ