Removed "Any button" option when filters are selected

buttonmen-dev · Dec 29, 2017 · a77c2e2 · a77c2e2
1 parent 53364d0
commit a77c2e2
Showing 1 changed file with 20 additions and 2 deletions.
diff --git a/src/ui/js/Newgame.js b/src/ui/js/Newgame.js
@@ -580,14 +580,23 @@ Newgame.getButtonSelectTd = function(player) {
       Newgame.activity.buttonList.player,
       Newgame.activity.buttonGreyed,
       Newgame.activity.playerButton);
-  } else {
+  } else if (Newgame.activity.buttonLimits.opponent.button_sets.ANY &&
+      Newgame.activity.buttonLimits.opponent.tourn_legal.ANY &&
+      Newgame.activity.buttonLimits.opponent.die_skills.ANY) {
     return Newgame.getSelectTd(
       'Opponent\'s button',
       'opponent_button',
       Newgame.activity.buttonList.opponent,
       Newgame.activity.buttonGreyed,
       Newgame.activity.opponentButton,
      'Any button');
+  } else {
+    return Newgame.getSelectTd(
+      'Opponent\'s button',
+      'opponent_button',
+      Newgame.activity.buttonList.opponent,
+      Newgame.activity.buttonGreyed,
+      Newgame.activity.opponentButton);
   }
 };
 
@@ -601,14 +610,23 @@ Newgame.updateButtonSelectTd = function(player) {
       Newgame.activity.buttonList.player,
       Newgame.activity.buttonGreyed,
       Newgame.activity.playerButton);
-  } else {
+  } else if (Newgame.activity.buttonLimits.opponent.button_sets.ANY &&
+      Newgame.activity.buttonLimits.opponent.tourn_legal.ANY &&
+      Newgame.activity.buttonLimits.opponent.die_skills.ANY) {
     selectid = 'opponent_button';
     optionlist = Newgame.getSelectOptionList(
       'Opponent\'s button',
       Newgame.activity.buttonList.opponent,
       Newgame.activity.buttonGreyed,
       Newgame.activity.opponentButton,
      'Any button');
+  } else {
+    selectid = 'opponent_button';
+    optionlist = Newgame.getSelectOptionList(
+      'Opponent\'s button',
+      Newgame.activity.buttonList.opponent,
+      Newgame.activity.buttonGreyed,
+      Newgame.activity.opponentButton);
   }
 
   var optioncount = optionlist.length;