From 2fc85d214a99b03881d17ef747e7d751f94074d4 Mon Sep 17 00:00:00 2001
From: louiscooper136 <louiscooper136@gmail.com>
Date: Tue, 14 May 2024 20:05:17 -0400
Subject: [PATCH] finish dice lab

---
 __pycache__/yahtzee.cpython-310.pyc | Bin 4482 -> 4522 bytes
 dice_stats.py                       |  38 +++--
 play.py                             |  20 +++
 yahtzee_goals.py                    | 245 +++++++++++++++++++++++++++-
 4 files changed, 282 insertions(+), 21 deletions(-)

diff --git a/__pycache__/yahtzee.cpython-310.pyc b/__pycache__/yahtzee.cpython-310.pyc
index c6e4127ee8495a028473895119866917f018f548..9529a7192a74c7486c3bd0230bcca9eb3fe33c00 100644
GIT binary patch
delta 270
zcmXZXFHZwO5QpKNySBHxce{6O`BMz00!*tb5DlWPNKzV-nxPE}(O?ne3?ztS0-pdu
z>d09vDd8(%&=`;?!mkOFyvZ};=CZwL`!naP!i>I_C*4Njr*vDKcaDu>%_djl2(lbQ
z8cNtf2J)Oj7RtB|#ZZHrPy(&-I^>`Y-h@2V;w>mO>glstrCs^0-qTKbR~r*`%I|1K
z)R&QYp`mQsD>{-#`#=*J#y@l_gXERwW$Fe*xg7eOF67;R(2YE&1zpQQ_O{o<6IxX$
esOTW5p$J*D+A|%(VPH^*qW|>jmW0x;@BaZl0yxJ2

delta 230
zcmZ3b+@#Ex&&$ij00fKs4yFe2PvlEuteaS>>yg5d!r8(Q#h${I!VRQ3Qg~8$fi!0d
zUkX2v=1LJr5d_lQDMBg2K$<5-Bt;ZR^QMTUhy!W96p0i`AkDw=pD-(<+GHWNX^g6y
zSF%MhGHPyS;Yep>w49v7d6dz4vJqD&qtE0$TuT`JCns|MU<{ia#dCr&cC#|C8zW=(
z<Sf1x#?;C0`5rJ9PQJiDkuh&_lE5hq6`+GT7+4sYSU8xN*npUwgNcKSgM~u?NOE#8
PbFc#;2M_1u3_&LViI_HP

diff --git a/dice_stats.py b/dice_stats.py
index 52f8924..29b1cb6 100644
--- a/dice_stats.py
+++ b/dice_stats.py
@@ -19,33 +19,37 @@ class FiveDice:
             if face != 1:
                 return False
         return True
-    
+
     def is_three_of_a_kind(self):
-        count = Counter(self.faces())  
-        for face_count in count.values():
-            if face_count == 3: 
-                return True
-        return False
-    
+        listOfFaces = self.faces()
+        listOfFaces.sort()
+        if listOfFaces[0] == listOfFaces[1] and listOfFaces[0] == listOfFaces[2]:
+            return True
+        elif listOfFaces[1] == listOfFaces[2] and listOfFaces[1] == listOfFaces[3]:
+            return True
+        elif listOfFaces[2] == listOfFaces[3] and listOfFaces[2] == listOfFaces[4]:
+            return True
+        else:
+            return False
+
     def is_four_of_a_kind(self):
-        count = Counter(self.faces())  
-        for face_count in count.values():
-            if face_count == 4: 
-                return True
-        return False
+        listOfFaces = self.faces()
+        listOfFaces.sort()
+        if listOfFaces[0] == listOfFaces[3]:
+            return True
+        elif listOfFaces[1] == listOfFaces[4]:
+            return True
+        else:
+            return False
 
 dice = FiveDice()
 successes = 0
 trials = 1000000
 for trial in tqdm(range(trials)):
     dice.roll()
-    if dice.all_ones():
+    if dice.is_three_of_a_kind():
         successes += 1
 
 print(successes/trials)
-#print(f"dice rolls: {dice.faces()}")
-print(dice.faces())
-print(dice.is_three_of_a_kind())
-print(dice.is_four_of_a_kind())
 
 
diff --git a/play.py b/play.py
index a8e683c..c65213e 100644
--- a/play.py
+++ b/play.py
@@ -3,12 +3,32 @@ from yahtzee_goals import (
     GoalOnes, 
     GoalTwos, 
     GoalThrees,
+    GoalFours,
+    GoalFives,
+    GoalSixes,
+    GoalThreeOfAKind,
+    GoalFourOfAKind,
+    GoalFullHouse,
+    GoalSmallStraight,
+    GoalLargeStraight,
+    GoalYahtzee,
+    GoalChance
 )
 
 goals = [
     GoalOnes(), 
     GoalTwos(),
     GoalThrees(),
+    GoalFours(),
+    GoalFives(),
+    GoalSixes(),
+    GoalThreeOfAKind(),
+    GoalFourOfAKind(),
+    GoalFullHouse(),
+    GoalSmallStraight(),
+    GoalLargeStraight(),
+    GoalYahtzee(),
+    GoalChance()
 ]
 
 game = Yachtzee(goals)
diff --git a/yahtzee_goals.py b/yahtzee_goals.py
index fce4e5a..5db21c4 100644
--- a/yahtzee_goals.py
+++ b/yahtzee_goals.py
@@ -1,6 +1,4 @@
-
 class GoalOnes:
-    "One point for each one"
     used = False
 
     def prompt(self, dice):
@@ -14,8 +12,8 @@ class GoalOnes:
                 total += 1
         return total
 
+
 class GoalTwos:
-    "Two points for each two"
     used = False
 
     def prompt(self, dice):
@@ -29,8 +27,8 @@ class GoalTwos:
                 total += 2
         return total
 
+
 class GoalThrees:
-    "Three points for each three"
     used = False
 
     def prompt(self, dice):
@@ -43,3 +41,242 @@ class GoalThrees:
             if die.face == 3:
                 total += 3
         return total
+
+
+class GoalFours:
+    used = False
+
+    def prompt(self, dice):
+        potential_score = self.score(dice)
+        return f"Fours ({potential_score})"
+
+    def score(self, dice):
+        total = 0
+        for die in dice:
+            if die.face == 4:
+                total += 4
+        return total
+
+
+class GoalFives:
+    used = False
+
+    def prompt(self, dice):
+        potential_score = self.score(dice)
+        return f"Fives ({potential_score})"
+
+    def score(self, dice):
+        total = 0
+        for die in dice:
+            if die.face == 5:
+                total += 5
+        return total
+
+class GoalSixes:
+    used = False
+
+    def prompt(self, dice):
+        potential_score = self.score(dice)
+        return f"Sixes ({potential_score})"
+
+    def score(self, dice):
+        total = 0
+        for die in dice:
+            if die.face == 6:
+                total += 6
+        return total
+
+
+class GoalThreeOfAKind:
+    used = False
+
+    def prompt(self, dice):
+        potential_score = self.score(dice)
+        return f"Three of a kind ({potential_score})"
+
+    def faces(self, dice):
+        return[die.face for die in dice]
+    
+    def is_three_of_a_kind(self, dice):
+        listOfFaces = self.faces(dice)
+        listOfFaces.sort()
+        if listOfFaces[0] == listOfFaces[1] and listOfFaces[0] == listOfFaces[2]:
+            return True
+        elif listOfFaces[1] == listOfFaces[2] and listOfFaces[1] == listOfFaces[3]:
+            return True
+        elif listOfFaces[2] == listOfFaces[3] and listOfFaces[2] == listOfFaces[4]:
+            return True
+        else:
+            return False
+
+    def score(self, dice):
+        if self.is_three_of_a_kind(dice):
+            total = 0
+            for die in dice:
+                total += die.face
+            return total
+        else:
+            return 0
+
+class GoalFourOfAKind:
+    used = False
+
+    def prompt(self, dice):
+        potential_score = self.score(dice)
+        return f"Four of a kind ({potential_score})"
+
+    def faces(self, dice):
+        return[die.face for die in dice]
+    
+    def is_four_of_a_kind(self, dice):
+        listOfFaces = self.faces(dice)
+        listOfFaces.sort()
+        if listOfFaces[0] == listOfFaces[3]:
+            return True
+        elif listOfFaces[1] == listOfFaces[4]:
+            return True
+        else:
+            return False
+
+    def score(self, dice):
+        if self.is_four_of_a_kind(dice):
+            total = 0
+            for die in dice:
+                total += die.face
+            return total
+        else:
+            return 0
+
+class GoalFullHouse:
+    used = False
+
+    def prompt(self, dice):
+        potential_score = self.score(dice)
+        return f"Full house ({potential_score})"
+
+    def faces(self, dice):
+        return[die.face for die in dice]
+
+    def is_full_house(self, dice):
+        listOfFaces = self.faces(dice)
+        listOfFaces.sort()
+        if listOfFaces[0] == listOfFaces[1] and listOfFaces[0] == listOfFaces[2] and listOfFaces[3] == listOfFaces[4]:
+            return True
+        elif listOfFaces[2] == listOfFaces[3] and listOfFaces[2] == listOfFaces[4] and listOfFaces[0] == listOfFaces[1]:
+            return True
+        else:
+            return False
+
+    def score(self, dice):
+        if self.is_full_house(dice):
+            return 25
+        else:
+            return 0
+
+class GoalSmallStraight:
+    used = False
+
+    def prompt(self, dice):
+        potential_score = self.score(dice)
+        return f"Small straight ({potential_score})"
+
+    def faces(self, dice):
+        return[die.face for die in dice]
+
+    def is_small_straight(self, dice):
+        listOfFaces = self.faces(dice)
+        listOfFaces.sort()
+        foundSmallStraight = False
+        for i in range (2):
+            for j in range(3):
+                if i == 0:
+                    if j != 2:
+                        if listOfFaces[j] == listOfFaces[j+1] - 1:
+                            continue
+                        else:
+                            break
+                    else:
+                        if listOfFaces[j] == listOfFaces[j+1] - 1:
+                            foundSmallStraight = True
+                else:
+                    if j != 2:
+                        if listOfFaces[j+1] == listOfFaces[j+2] - 1:
+                            continue
+                        else:
+                            break
+                    else:
+                        if listOfFaces[j+1] == listOfFaces[j+2] - 1:
+                            foundSmallStraight = True
+        return foundSmallStraight
+
+    def score(self, dice):
+        if self.is_small_straight(dice):
+            return 30
+        else:
+            return 0
+
+class GoalLargeStraight:
+    used = False
+
+    def prompt(self, dice):
+        potential_score = self.score(dice)
+        return f"Large straight ({potential_score})"
+
+    def faces(self, dice):
+        return[die.face for die in dice]
+
+    def is_large_straight(self, dice):
+        listOfFaces = self.faces(dice)
+        listOfFaces.sort()
+        for j in range(4):
+            if j != 3:
+                if listOfFaces[j] == listOfFaces[j+1] - 1:
+                    continue
+                else:
+                    return False
+            else:
+                if listOfFaces[j] == listOfFaces[j+1] - 1:
+                    return True
+    
+    def score(self, dice):
+        if self.is_large_straight(dice):
+            return 40
+        else:
+            return 0
+
+class GoalYahtzee:
+    used = False
+
+    def prompt(self, dice):
+        potential_score = self.score(dice)
+        return f"Five of a kind ({potential_score})"
+
+    def faces(self, dice):
+        return[die.face for die in dice]
+    
+    def is_five_of_a_kind(self, dice):
+        listOfFaces = self.faces(dice)
+        listOfFaces.sort()
+        if listOfFaces[0] == listOfFaces[4]:
+            return True
+        else:
+            return False
+
+    def score(self, dice):
+        if self.is_five_of_a_kind(dice):
+            return 50
+        else:
+            return 0
+
+class GoalChance:
+    used = False
+
+    def prompt(self, dice):
+        potential_score = self.score(dice)
+        return f"Chance ({potential_score})"
+
+    def score(self, dice):
+        total = 0
+        for die in dice:
+            total += die.face
+        return total
\ No newline at end of file