Merge pull request #103 from aclonegeek/bonus_joker_rules

altin · web-flow · commit 705b0b3d4eb4 · 2019-01-17T14:09:50.000-05:00
Bonus joker rules
diff --git a/src/main/java/core/GameController.java b/src/main/java/core/GameController.java
@@ -9,6 +9,7 @@
 import java.util.Timer;
 import java.util.TimerTask;
 
+import core.Globals.JokerRules;
 import javafx.application.Platform;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
@@ -534,12 +535,13 @@ public void setPlayerStrategies(ArrayList<String> playerStrategies) {
         }
     }
 
-    public void setExtras(int highlightTimerLength, int optionalTimerLength, boolean showAIHands) {
+    public void setExtras(int highlightTimerLength, int optionalTimerLength, boolean showAIHands, JokerRules jokerRules) {
         this.HIGHLIGHT_TIMER_LENGTH = highlightTimerLength;
         if (optionalTimerLength > 0) {
             this.enableTimer = true;
             this.OPTIONAL_TIMER_LENGTH = optionalTimerLength;
         }
         this.showAIHands = showAIHands;
+        Globals.setJokerRules(jokerRules); 
     }
 }
diff --git a/src/main/java/core/Globals.java b/src/main/java/core/Globals.java
@@ -1,6 +1,21 @@
 package core;
 
 public class Globals {
+    // Optional rules
+    public static enum JokerRules {
+        DEFAULT, LENIENT, NO_EXISTING_MELDS;
+    }
+    
+    private static JokerRules jokerRules = JokerRules.DEFAULT;
+    
+    public static JokerRules getJokerRules() {
+        return jokerRules;
+    }
+    
+    public static void setJokerRules(JokerRules rule) {
+        jokerRules = rule;
+    }
+    
     public static enum Colour {
         RED('R'), BLUE('B'), GREEN('G'), ORANGE('O');
         
diff --git a/src/main/java/core/Meld.java b/src/main/java/core/Meld.java
@@ -9,6 +9,7 @@
 import java.util.stream.IntStream;
 
 import core.Globals.Colour;
+import core.Globals.JokerRules;
 
 public class Meld {
     public enum MeldType {
@@ -60,7 +61,7 @@ public Tile addTile(Tile tile) {
     }
 
     public Tile removeTile(int index) {
-        if (this.isLocked) { return null; }
+        if (!this.isInitialMeld && this.isLocked) { return null; }
         if (index < 0 || index >= this.meld.size()) {
             return null;
         }
@@ -97,7 +98,7 @@ public Tile removeTileObject(Tile tile) {
     }
 
     public Meld splitMeld(int index) {
-        if (this.isLocked || index <= 0 || index >= this.meld.size()) { return null; }
+        if ((!this.isInitialMeld && this.isLocked) || index <= 0 || index >= this.meld.size()) { return null; }
 
         Meld newMeld = new Meld();
         ArrayList<Tile> secondHalf = new ArrayList<>();
@@ -133,7 +134,13 @@ public Tile addTile(ArrayList<Tile> tiles) {
         if (tiles.size() > 1 && tiles.removeIf(t -> t.isJoker())) { return null; }
         
         // Disallow two jokers in one meld
-        if (this.containsJoker() && tiles.get(0).isJoker()) { return null; } 
+        if (this.containsJoker() && tiles.get(0).isJoker()) { return null; }
+        
+        // Disallow adding a tile to a full meld with a joker if Lenient Jokers are allowed
+        if (Globals.getJokerRules() == JokerRules.LENIENT) {
+            if (this.meld.size() == 13 && this.meldType == MeldType.RUN) { return null; }
+            if (this.meld.size() == 4 && this.meldType == MeldType.SET)  { return null; }   
+        }
         
         // Check if the tile being added is part of an initial meld (so the joker inside is not replaced by it right away)
         boolean meldIsFromHand = this.meld.stream().allMatch(t -> t.isOnTable() == false);
@@ -153,6 +160,10 @@ public Tile addTile(ArrayList<Tile> tiles) {
             if (this.meld.size() == 4 && this.meldType == MeldType.SET)  { return null; }
             
             if (tiles.get(0).isJoker()) {
+                if (Globals.getJokerRules() == JokerRules.NO_EXISTING_MELDS && this.isInitialMeld == false) {
+                    return null;
+                }
+                
                 tempMeld.addAll(this.meld);
                 Tile joker = this.determineJokerType(tiles.get(0), tempMeld);
                 tempMeld.add(joker);
@@ -177,25 +188,26 @@ public Tile addTile(ArrayList<Tile> tiles) {
             
             // Adding tile to a meld with a joker and one or more tiles
             if (this.meld.size() > 0) {
-                // Check if the joker can be replaced as long as its not part of an initial move
-                if (!this.isInitialMeld && joker.jokerEquals(tile)) {
-                    // If this tile is on the table but is being added to a meld that is locked 
-                    if (tile.onTable && this.isLocked) { 
-                        // Add the joker back
-                        joker = this.determineJokerType(joker, tempMeld);
-                        this.meld.add(joker);
-                        this.buildMeld(this.meld, releasedJoker);
-                        return null;
-                    }
-                    // Otherwise this meld is not locked or the tile being added is from the hand
-                    // In both cases, replace the joker
-                    releasedJoker = jokers.remove(0);
-                    tempMeld.add(tile);
-                    tempMeld.addAll(this.meld);
-                    return this.buildMeld(tempMeld, releasedJoker);
+                if (Globals.getJokerRules() != JokerRules.LENIENT) {
+                    // Check if the joker can be replaced as long as its not part of an initial move
+                    if (!this.isInitialMeld && joker.jokerEquals(tile)) {
+                        // If this tile is on the table but is being added to a meld that is locked 
+                        if (tile.onTable && this.isLocked) { 
+                            // Add the joker back
+                            joker = this.determineJokerType(joker, tempMeld);
+                            this.meld.add(joker);
+                            this.buildMeld(this.meld, releasedJoker);
+                            return null;
+                        }
+                        // Otherwise this meld is not locked or the tile being added is from the hand
+                        // In both cases, replace the joker
+                        releasedJoker = jokers.remove(0);
+                        tempMeld.add(tile);
+                        tempMeld.addAll(this.meld);
+                        return this.buildMeld(tempMeld, releasedJoker);
+                    } 
                 }
                 
-                
                 // Otherwise the joker can't be replaced. Check if the tile can still be added to the meld
                 tempMeld.addAll(this.meld);
                 tempMeld.add(tile);
@@ -234,8 +246,10 @@ private Tile buildMeld(ArrayList<Tile> tempMeld, Tile releasedJoker) {
         if (tempMeldType != MeldType.INVALID && tempMeld.size() < 3 || tempMeldType == MeldType.RUN || tempMeldType == MeldType.SET) {
             Collections.sort(tempMeld, Comparator.comparingInt(Tile::getValue)); // Sort numerically
             
-            // Lock the meld if a joker from the hand was added
-            this.isLocked = this.determineLockedMeld(tempMeld);
+            if (Globals.getJokerRules() != JokerRules.LENIENT) {
+                // Lock the meld if a joker from the hand was added
+                this.isLocked = this.determineLockedMeld(tempMeld);
+            }
             
             this.meld = tempMeld;
             this.meldType = tempMeldType;
@@ -410,28 +424,34 @@ private MeldType determineMeldType(ArrayList<Tile> tiles) {
     
     // Locked meld = meld with a joker that has not been replaced yet
     private boolean determineLockedMeld(ArrayList<Tile> meld) {
-        for (Tile tile : meld) {
-            if (tile.isJoker() && tile.isReplaced() == false) {
-                return true;
-            }
+        if (Globals.getJokerRules() != JokerRules.LENIENT) {
+            for (Tile tile : meld) {
+                if (tile.isJoker() && tile.isReplaced() == false) {
+                    return true;
+                }
+            }   
         }
         return false;
     }
     
     public boolean isLocked() {
-        // This meld is locked if it has a joker which has not been replaced by a tile from the hand
-        return this.meld.stream().anyMatch(t -> t.isJoker() && !t.isReplaced());
+        if (Globals.getJokerRules() != JokerRules.LENIENT) {
+            // This meld is locked if it has a joker which has not been replaced by a tile from the hand
+            return this.meld.stream().anyMatch(t -> t.isJoker() && !t.isReplaced());   
+        }
+        return false;
     }
     
     public void setIsLocked(boolean isLocked) {
-        // Lock this meld manually by looking for a joker and setting isReplaced
-        for (Tile tile : this.meld) {
-            if (tile.isJoker()) {
-                tile.setIsReplaced(!isLocked);
-                this.isLocked = isLocked;
-            }
+        if (Globals.getJokerRules() != JokerRules.LENIENT) {
+            // Lock this meld manually by looking for a joker and setting isReplaced
+            for (Tile tile : this.meld) {
+                if (tile.isJoker()) {
+                    tile.setIsReplaced(!isLocked);
+                    this.isLocked = isLocked;
+                }
+            }   
         }
-
     }
     
     public boolean isInitialMeld() {
diff --git a/src/main/java/core/Rummikub.png b/src/main/java/core/Rummikub.png
diff --git a/src/main/java/core/StartMenuController.java b/src/main/java/core/StartMenuController.java
@@ -5,8 +5,10 @@
 import java.io.FileReader;
 import java.io.IOException;
 import java.nio.file.Paths;
+import java.sql.Array;
 import java.util.ArrayList;
 
+import core.Globals.JokerRules;
 import javafx.beans.value.ChangeListener;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
@@ -89,7 +91,8 @@ private void handlePlayButtonPressed(ActionEvent event) throws IOException {
         gameController.setPlayerStrategies(this.getPlayerStrategies());
         gameController.setExtras(this.getHighlightTimerLength(),
                                  this.getOptionalTimerLength(),
-                                 this.showAIHandsCheckBox.isSelected());
+                                 this.showAIHandsCheckBox.isSelected(),
+                                 this.getSelectedJokerRule());
         if (this.enableRiggingCheckBox.isSelected()) {
             gameController.setRiggedAttributes(this.getRiggedStock(this.stockField.getText()),
                                                this.getRiggedStock(this.deciderStockField.getText()),
@@ -98,6 +101,17 @@ private void handlePlayButtonPressed(ActionEvent event) throws IOException {
 
         gameController.play();
     }
+    
+    private JokerRules getSelectedJokerRule() {    
+        if (this.jokerRules.getValue().equals("Default")) {
+            return JokerRules.DEFAULT;
+        } else if (this.jokerRules.getValue().equals("No Plays to Existing Melds")) {
+            return JokerRules.NO_EXISTING_MELDS;
+        } else if (this.jokerRules.getValue().equals("No Restrictions")) {
+            return JokerRules.LENIENT;
+        }
+        return JokerRules.DEFAULT;
+    }
 
 	private int getHighlightTimerLength() {
         try {
diff --git a/src/test/java/core/MeldTest.java b/src/test/java/core/MeldTest.java

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`import java.util.Timer;`
`10`	`10`	`import java.util.TimerTask;`
`11`	`11`
	`12`	`+import core.Globals.JokerRules;`
`12`	`13`	`import javafx.application.Platform;`
`13`	`14`	`import javafx.collections.FXCollections;`
`14`	`15`	`import javafx.collections.ObservableList;`
`@@ -534,12 +535,13 @@ public void setPlayerStrategies(ArrayList<String> playerStrategies) {`
`534`	`535`	`}`
`535`	`536`	`}`
`536`	`537`
`537`		`- public void setExtras(int highlightTimerLength, int optionalTimerLength, boolean showAIHands) {`
	`538`	`+ public void setExtras(int highlightTimerLength, int optionalTimerLength, boolean showAIHands, JokerRules jokerRules) {`
`538`	`539`	`this.HIGHLIGHT_TIMER_LENGTH = highlightTimerLength;`
`539`	`540`	`if (optionalTimerLength > 0) {`
`540`	`541`	`this.enableTimer = true;`
`541`	`542`	`this.OPTIONAL_TIMER_LENGTH = optionalTimerLength;`
`542`	`543`	`}`
`543`	`544`	`this.showAIHands = showAIHands;`
	`545`	`+ Globals.setJokerRules(jokerRules);`
`544`	`546`	`}`
`545`	`547`	`}`