Merge branch 'working' of sambhutani/ZCW-OOP-Casino into working

src/.idea/workspace.xml

@@ -1,9 +1,221 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="74cab72c-e027-4e61-ac26-2617cf8ce683" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/test/java/io/zipcoder/casino/SlotTest.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/main/java/io/zipcoder/casino/Casino.java" beforeDir="false" afterPath="$PROJECT_DIR$/main/java/io/zipcoder/casino/Casino.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/main/java/io/zipcoder/casino/Game.java" beforeDir="false" afterPath="$PROJECT_DIR$/main/java/io/zipcoder/casino/Game.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/main/java/io/zipcoder/casino/Printer.java" beforeDir="false" afterPath="$PROJECT_DIR$/main/java/io/zipcoder/casino/Printer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/main/java/io/zipcoder/casino/SlotMachine.java" beforeDir="false" afterPath="$PROJECT_DIR$/main/java/io/zipcoder/casino/SlotMachine.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/main/java/io/zipcoder/casino/Yahtzee.java" beforeDir="false" afterPath="$PROJECT_DIR$/main/java/io/zipcoder/casino/Yahtzee.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/java/io/zipcoder/casino/CardTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/test/java/io/zipcoder/casino/CardTest.java" afterDir="false" />
+    </list>
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="FUSProjectUsageTrigger">
+    <session id="729355978">
+      <usages-collector id="statistics.lifecycle.project">
+        <counts>
+          <entry key="project.closed" value="1" />
+          <entry key="project.open.time.1" value="1" />
+          <entry key="project.opened" value="1" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.extensions.open">
+        <counts>
+          <entry key="java" value="1" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.types.open">
+        <counts>
+          <entry key="JAVA" value="1" />
+        </counts>
+      </usages-collector>
+    </session>
+  </component>
+  <component name="FileEditorManager">
+    <leaf>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/test/java/io/zipcoder/casino/CardTest.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="60">
+              <caret line="4" column="30" lean-forward="true" selection-start-line="4" selection-start-column="30" selection-end-line="4" selection-end-column="30" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
+  </component>
+  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
+  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
+  <component name="JsGulpfileManager">
+    <detection-done>true</detection-done>
+    <sorting>DEFINITION_ORDER</sorting>
+  </component>
+  <component name="ProjectFrameBounds" extendedState="6" fullScreen="true">
+    <option name="y" value="23" />
+    <option name="width" value="1440" />
+    <option name="height" value="817" />
+  </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
+  <component name="ProjectView">
+    <navigator proportions="" version="1">
+      <foldersAlwaysOnTop value="true" />
+    </navigator>
+    <panes>
+      <pane id="ProjectPane">
+        <subPane>
+          <expand>
+            <path>
+              <item name="src" type="b2602c69:ProjectViewProjectNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="src" type="b2602c69:ProjectViewProjectNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="src" type="b2602c69:ProjectViewProjectNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="src" type="b2602c69:ProjectViewProjectNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="casino" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="src" type="b2602c69:ProjectViewProjectNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="test" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="src" type="b2602c69:ProjectViewProjectNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="test" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="src" type="b2602c69:ProjectViewProjectNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="test" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="casino" type="462c0819:PsiDirectoryNode" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
+      <pane id="PackagesPane" />
+      <pane id="Scope" />
+    </panes>
+  </component>
   <component name="PropertiesComponent">
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="aspect.path.notification.shown" value="true" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541771782363" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
-    <property name="settings.editor.selected.configurable" value="preferences.lookFeel" />
+    <property name="settings.editor.selected.configurable" value="preferences.general" />
+  </component>
+  <component name="RunDashboard">
+    <option name="ruleStates">
+      <list>
+        <RuleState>
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
+        </RuleState>
+        <RuleState>
+          <option name="name" value="StatusDashboardGroupingRule" />
+        </RuleState>
+      </list>
+    </option>
+  </component>
+  <component name="SvnConfiguration">
+    <configuration />
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="74cab72c-e027-4e61-ac26-2617cf8ce683" name="Default Changelist" comment="" />
+      <created>1541771578720</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1541771578720</updated>
+      <workItem from="1541771580200" duration="204000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="204000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="0" y="0" width="1440" height="900" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info id="Image Layers" />
+      <window_info id="Designer" />
+      <window_info id="UI Designer" />
+      <window_info id="Capture Tool" />
+      <window_info id="Favorites" side_tool="true" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24964234" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Terminal" />
+      <window_info anchor="bottom" id="Event Log" side_tool="true" />
+      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="Find" order="1" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="right" id="Palette" />
+      <window_info anchor="right" id="Theme Preview" />
+      <window_info anchor="right" id="Capture Analysis" />
+      <window_info anchor="right" id="Palette&#9;" />
+      <window_info anchor="right" id="Database" />
+      <window_info anchor="right" id="Maven Projects" />
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+    </layout>
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="1" />
+  </component>
+  <component name="VcsContentAnnotationSettings">
+    <option name="myLimit" value="2678400000" />
+  </component>
+  <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/test/java/io/zipcoder/casino/CardTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="60">
+          <caret line="4" column="30" lean-forward="true" selection-start-line="4" selection-start-column="30" selection-end-line="4" selection-end-column="30" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

src/main/java/io/zipcoder/casino/Casino.java

@@ -67,9 +67,15 @@ public class Casino {
 
                 case 4:
                     int slotBet1= console.getIntFromUser("Enter the amount you want to bet on Slot");
+                    if ((slotBet1 < 0) || (slotBet1 >100) )
+                    {
+                        Printer.printMessage("Invalid bet amount entered, min bet for slot is $1 and max $100 ");
+                        break;
+                    }
                     Game slot= new SlotMachine(slotBet1);
-                    slot.startGame();
                     game = slot;
+                    slot.startGame();
+                    ((SlotMachine) slot).slotResult();
                     ((SlotMachine) slot).payout();
                     break;
 

src/main/java/io/zipcoder/casino/SlotMachine.java

@@ -1,13 +1,16 @@
 package io.zipcoder.casino;
 
 import java.util.Random;
-import java.util.Scanner;
-
-import static java.lang.Thread.sleep;
 
 public class SlotMachine implements Game, Gamble {
     private int betAmount;
     private int payout=0;
+    String word="";
+    String outputword="";
+    String word1="";
+    String word2="";
+    String word3="";
+    double totalBet=0;
 
     public SlotMachine(int betAmount) {
         this.betAmount = betAmount;
@@ -32,7 +35,7 @@ public class SlotMachine implements Game, Gamble {
         } catch (InterruptedException e) {
             e.printStackTrace();
         }
-        Printer.printMessage("Your slot is in progress"+"\n");
+        Printer.printMessage("Your slot is in progress" + "\n");
 
         try {
             Thread.sleep(3000);
@@ -40,66 +43,48 @@ public class SlotMachine implements Game, Gamble {
             e.printStackTrace();
         }
 
-        String word="";
-        String outputword="";
-        String word1="";
-        String word2="";
-        String word3="";
-        //int useramount=0;
-        char playAgain= 'y';
-        double totalBet=0;
-
-       // while(playAgain=='y'){
-
-            outputword="";
-
-            Random rand = new Random();
-
-            for(int i = 1; i <=3;i++){
-                int randnum = rand.nextInt(6);
-                //System.out.println(randnum);
-
-                if(randnum == 0) {
-                    word = "DOG";
-                  //  System.out.println("dog");
-                }
-                else if(randnum == 1) {
-                    word = "CAT";
-                  //  System.out.println("cat");
-                }
-                else if(randnum == 2) {
-                    word = "RABBIT";
-                  //  System.out.println("kjsd");
-                }
-                else if(randnum == 3) {
-                    word = "SQUIRREL";
-                  //  System.out.println("sq");
-                }
-                else if(randnum == 4) {
-                    word = "FISH";
-                  //  System.out.println("ff");
-                }
-                else if(randnum == 5) {
-                    word = "MOUSE";
-                  //  System.out.println("mm");
-                }
-                // outputword += word;
-
-                if(i == 1){
-                    word1= word;
-                //    System.out.println(i);
-                }
-
-                else if(i == 2){
-                    word2= word;
-                  //  System.out.println(i);
-                }
-
-                else if(i == 3){
-                    word3= word;
-                   // System.out.println(word3);
-                }
+
+        outputword = "";
+
+        Random rand = new Random();
+
+        for (int i = 1; i <= 3; i++) {
+            int randnum = rand.nextInt(6);
+
+
+            if (randnum == 0) {
+                word = "DOG";
+
+            } else if (randnum == 1) {
+                word = "CAT";
+
+            } else if (randnum == 2) {
+                word = "RABBIT";
+
+            } else if (randnum == 3) {
+                word = "SQUIRREL";
+
+            } else if (randnum == 4) {
+                word = "FISH";
+
+            } else if (randnum == 5) {
+                word = "MOUSE";
+
+            }
+
+            if (i == 1) {
+                word1 = word;
+            } else if (i == 2) {
+                word2 = word;
+            } else if (i == 3) {
+                word3 = word;
             }
+        }
+
+    }
+
+    public void slotResult()
+    {
             outputword= "[ " + word1+ " ]" + "   " + "[ " + word2 + " ]" + "   "+ "[ " + word3 + " ]" + "\n" ;
 
             if(((!word1.equals(word2)) )&& ((!word1.equals(word3))) && ((!word2.equals(word3)))){
@@ -108,14 +93,14 @@ public class SlotMachine implements Game, Gamble {
                 payout=0;
             }
 
-            else if( ((word1.equals(word2) == true) && (word1.equals(word3)== false )) || ((word1.equals(word3)== true) && (word1.equals(word2)==false)) || ( (word2.equals(word3)==true) && (word2.equals(word1))==false)){
+            else if( ((word1.equals(word2)) && (!word1.equals(word3))) || ((word1.equals(word3)) && (!word1.equals(word2))) || ( (word2.equals(word3)) && (!word2.equals(word1)))){
 
                 outputword= outputword + "\n" +" You have won $" + (betAmount*2);
                 payout=betAmount*2;
             }
 
 
-            else if( ((word1.equals(word2)==true) && (word1.equals(word3)==true) ) && ((word2.equals(word1)==true) && (word2.equals(word3)==true)) && ( (word3.equals(word1)==true) && (word3.equals(word2)==true))){
+            else if( ((word1.equals(word2)) && (word1.equals(word3)) ) && ((word2.equals(word1)) && (word2.equals(word3))) && ( (word3.equals(word1)) && (word3.equals(word2)))){
 
                 outputword= outputword + "\n" + "You have won $" + (betAmount*3);
                 payout=betAmount*3;

src/main/java/io/zipcoder/casino/Yahtzee.java

@@ -194,7 +194,6 @@ public class Yahtzee extends DiceGame implements Game, Gamble {
         Printer.printMessage("You won $" + payOut);
     }
 
-
     public DicePlayer getDicePlayer() {
         return dicePlayer;
     }

src/test/java/io/zipcoder/casino/SlotTest.java

@@ -1,8 +1,8 @@
 package io.zipcoder.casino;
 
 
-import org.junit.jupiter.api.Test;
-import sun.jvm.hotspot.utilities.Assert;
+import org.junit.Assert;
+import org.junit.Test;
 
 public class SlotTest {
 
@@ -51,7 +51,4 @@ public class SlotTest {
         Assert.assertEquals(0,payout);
 
     }
-
-
-
 }