[211] Added shuffling when drawing curses and blessings

orichalque · Mar 2, 2022 · ac2dd42 · ac2dd42
1 parent d300f8b
commit ac2dd42
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/js/modifiers.js b/js/modifiers.js
@@ -154,15 +154,18 @@ var modifiersManagement = {
         shuffleModifiersDeck: function() {
             this.modifiersDrawPile = this.modifiersChosen.slice()
 
+            this.shuffle()
+
+            this.lastDrawnModifier = null
+            this.modifiersDiscardPile = []
+        },
+        shuffle: function() {
             // JavaScript implementation of the Durstenfeld shuffle, an optimized version of Fisher-Yates
             // More here: https://stackoverflow.com/a/12646864
             for (let i = this.modifiersDrawPile.length - 1; i > 0; i--) {
                 const j = Math.floor(Math.random() * (i + 1));
                 [this.modifiersDrawPile[i], this.modifiersDrawPile[j]] = [this.modifiersDrawPile[j], this.modifiersDrawPile[i]];
             }
-
-            this.lastDrawnModifier = null
-            this.modifiersDiscardPile = []
         },
         displaySpecialModifiers: function() {
             if(this.specialModifiers){
@@ -183,6 +186,7 @@ var modifiersManagement = {
                 .filter(element => !this.modifiersDrawPile.includes(element))
 
             if(availableBlessings.length > 0) this.addModifier(availableBlessings[0])
+            this.shuffle();
         },
         addCurse: function() {
             const availableCurses = this.modifiersSpecial
@@ -191,6 +195,7 @@ var modifiersManagement = {
                 .filter(element => !this.modifiersDrawPile.includes(element))
 
             if(availableCurses.length > 0) this.addModifier(availableCurses[0])
+            this.shuffle();
         },
         resetModifiers: function() {
             this.shuffleModifiersDeck()