From 5054f9d87faaca18113cc1257bb9f8b44c4a8766 Mon Sep 17 00:00:00 2001
From: Made Baruna <made.setia@gmail.com>
Date: Tue, 8 Jun 2021 23:52:30 +0700
Subject: [PATCH] Fix todo bugs

---
 src/locales/en.json                     |  3 +-
 src/routes/calculator/_character.svelte | 41 +++++++------------------
 src/routes/todo.svelte                  |  4 ++-
 3 files changed, 16 insertions(+), 32 deletions(-)

diff --git a/src/locales/en.json b/src/locales/en.json
index 42f1eb4b..6956306d 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -390,7 +390,8 @@
       "mora": "Mora (approximate ±40)",
       "expWasted": "EXP Wasted",
       "addToTodo": "Add to Todo List",
-      "addedToTodo": "Added to Todo List"
+      "addedToTodo": "Added to Todo List",
+      "talent": ["Attack", "Skill", "Burst"]
     },
     "expTable": {
       "level": "Level",
diff --git a/src/routes/calculator/_character.svelte b/src/routes/calculator/_character.svelte
index e6ee7f0e..f9b2560a 100644
--- a/src/routes/calculator/_character.svelte
+++ b/src/routes/calculator/_character.svelte
@@ -284,6 +284,8 @@
         }
       }
     });
+
+    moraNeeded = moraNeeded + talentMaterial.mora;
   }
 
   function calculateTalent() {
@@ -407,6 +409,14 @@
           calculateTalent();
         }
       }
+
+      for (const [id, item] of Object.entries(talentMaterial.items)) {
+        if (ascensionResouce[id]) {
+          ascensionResouce[id].amount += item.amount;
+        } else {
+          ascensionResouce[id] = item;
+        }
+      }
     }
 
     changed = false;
@@ -429,14 +439,6 @@
       return prev;
     }, {});
 
-    const talentRes = Object.keys(talentMaterial.items).reduce((prev, item) => {
-      if (talentMaterial.items[item].amount > 0) {
-        prev[item] = talentMaterial.items[item].amount;
-      }
-
-      return prev;
-    }, {});
-
     addTodo({
       type: 'character',
       character: withAscension ? selectedCharacter : null,
@@ -445,13 +447,11 @@
         mora: moraNeeded,
         ...levelRes,
         ...ascensionRes,
-        ...talentRes,
       },
       original: {
         mora: moraNeeded,
         ...levelRes,
         ...ascensionRes,
-        ...talentRes,
       },
     });
 
@@ -460,6 +460,7 @@
       addedToTodo = false;
     }, 2000);
   }
+
 </script>
 
 <div class="bg-item rounded-xl p-4">
@@ -665,26 +666,6 @@
                 </tr>
               {/if}
             {/each}
-            {#each Object.entries(talentMaterial.items) as [id, item]}
-              {#if item.amount > 0}
-                <tr>
-                  <td class="text-right border-b border-gray-700 py-1">
-                    <span class="text-white mr-2 whitespace-no-wrap"
-                      >{item.amount}
-                      <Icon size={0.5} path={mdiClose} /></span
-                    >
-                  </td>
-                  <td class="border-b border-gray-700 py-1">
-                    <span class="text-white">
-                      <span class="w-6 inline-block">
-                        <img class="h-6 inline-block mr-1" src={`/images/items/${id}.png`} alt={item.name} />
-                      </span>
-                      {item.name}
-                    </span>
-                  </td>
-                </tr>
-              {/if}
-            {/each}
             <tr>
               <td class="text-right border-b border-gray-700 py-1">
                 <span class="text-white mr-2 whitespace-no-wrap"
diff --git a/src/routes/todo.svelte b/src/routes/todo.svelte
index bc2ccdea..728271c7 100644
--- a/src/routes/todo.svelte
+++ b/src/routes/todo.svelte
@@ -270,6 +270,7 @@
 
   $: $todos, updateSummary();
   $: columnCount, updateId();
+
 </script>
 
 <svelte:head>
@@ -456,7 +457,7 @@
           </Button>
         </div>
         <table class="w-full">
-          {#each Object.entries(todo.resources) as [id, amount]}
+          {#each Object.entries(todo.resources).sort((a, b) => b[1] - a[1]) as [id, amount]}
             <tr>
               <td class="text-right border-b border-gray-700 py-1">
                 <span class={`${amount === 0 ? 'line-through text-gray-600' : 'text-white'} mr-2 whitespace-no-wrap`}>
@@ -496,4 +497,5 @@
       @apply border-b-0;
     }
   }
+
 </style>