Merge pull request #12 from nekooftheabyss/dev

fix stuff
retraigo · Aug 5, 2022 · 9c56f05 · 9c56f05
2 parents 1e32ee5 + 3329ccb
commit 9c56f05
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/mod.js b/mod.js
@@ -65,9 +65,11 @@ class GachaMachine {
     static roll(choices, totalChance) {
         let total = totalChance || 0;
         let i = 0;
-        while(i < choices.length){
-            total += choices[i].chance;
-            i += 1;
+        if (!total) {
+            while(i < choices.length){
+                total += choices[i].chance;
+                i += 1;
+            }
         }
         const result = Math.random() * total;
         let going = 0.0;

diff --git a/mod.ts b/mod.ts
@@ -143,9 +143,11 @@ export class GachaMachine<ItemType> {
   ): GachaChoice<ItemType> {
     let total = totalChance || 0;
     let i = 0;
-    while (i < choices.length) {
-      total += choices[i].chance;
-      i += 1;
+    if (!total) {
+      while (i < choices.length) {
+        total += choices[i].chance;
+        i += 1;
+      }
     }
     const result = Math.random() * total;
     let going = 0.0;