Merge pull request #155 from RShadbolt/feature/vinegarEta

Adding ETA to vinegar throw to UI
TheExkaliburg · Aug 12, 2023 · 36914c0 · 36914c0
2 parents 4df912b + 2e6c563
commit 36914c0
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 1 deletion.
diff --git a/frontend/src/components/ladder/LadderWindowBody.vue b/frontend/src/components/ladder/LadderWindowBody.vue
@@ -82,7 +82,7 @@
         class="w-full rounded-l-none border-l-0 whitespace-nowrap"
         @click="throwVinegar"
       >
-        {{ lang("vinegar") }}
+        {{ vinegarButtonLabel }}
       </FairButton>
       <FairButton
         v-else
@@ -168,6 +168,12 @@ const multiButtonLabel = computed<string>(() => {
   return `+${lang("multi_short")} (${useTimeFormatter(eta)})`;
 });
 
+const vinegarButtonLabel = computed<string>(() => {
+  const eta = useEta(yourRanker.value).toVinegarThrow();
+  if (eta === 0 || eta === Infinity) return `${lang("vinegar")}`;
+  return `${lang("vinegar")} (${useTimeFormatter(eta)})`;
+});
+
 const yourFormattedMulti = computed<string>(() => {
   return yourRanker.value.multi.toString().padStart(2, "0");
 });

diff --git a/frontend/src/composables/useEta.ts b/frontend/src/composables/useEta.ts
@@ -178,6 +178,34 @@ export const useEta = (ranker: Ranker) => {
     return Math.max(etaRequirement, toFirst() + 30);
   }
 
+  function toVinegarThrow(): number {
+    if (!ranker.growing) return 0;
+
+    let secondsToVinegar: Decimal;
+
+    if (
+      ranker.rank === ladder.state.rankers.length &&
+      ladder.state.rankers.length >= 1
+    ) {
+      // TODO: When grape modifiers are implemented, acceleration can be changed.
+      const acceleration = 2;
+      const a = new Decimal(acceleration).div(2);
+      const b = ranker.grapes.sub(1);
+      const c = ranker.vinegar.sub(ladderUtils.getVinegarThrowCost.value);
+
+      secondsToVinegar = solveQuadratic(a, b, c);
+    } else {
+      secondsToVinegar =
+        ladderUtils.getVinegarThrowCost.value.cmp(ranker.vinegar) >= 0
+          ? ladderUtils.getVinegarThrowCost.value
+              .sub(ranker.vinegar)
+              .div(ranker.grapes)
+          : new Decimal(0);
+    }
+
+    return secondsToVinegar.toNumber();
+  }
+
   return {
     toRanker,
     toPoints,
@@ -186,6 +214,7 @@ export const useEta = (ranker: Ranker) => {
     toFirst,
     toPromotionRequirement,
     toPromote,
+    toVinegarThrow,
   };
 };