Rock Paper Scissor completed

Author: Rachel-Hill

days/13-15-text-games/RockPaperScissors/RockPaperScissors.py

@@ -27,22 +27,47 @@ def print_header():
     print()
 
 def build_the_three_rolls():
-    rock = Roll('Rock')
-    paper = Roll('Paper')
-    scissors = Roll('Scissors')
-    valid_rolls = ['Rock','Paper','Scissors']
+    rock = Roll('rock')
+    paper = Roll('paper')
+    scissors = Roll('scissors')
+    rolls = [rock, paper, scissors]
+    return rolls
+
+def get_player_roll():
+    valid_choice = False
+    while not valid_choice:
+        choice = input("Choose Rock, Paper, or Scissors:  ").lower()
+        if choice == 'rock':
+            return Roll('rock')
+        elif choice == 'paper':
+            return Roll('paper')
+        elif choice == 'scissors':
+            return Roll('scissors')
+
+
 
 def game_loop(player1, player2, rolls):
-    round1 = Roll()
     count = 1
-    while count < 3:
-        p2_roll = roll.
-        p1_roll = input("{}, roll: 1..2..3..".format(player1.name))
+    while player1.score < 3 and player2.score < 3:
+        p2_roll = random.choice(rolls)
+        p1_roll = get_player_roll()
+        win = p1_roll.can_defeat(p2_roll)
+        if win:
+            player1.score += 1
+            print("{} {} {}. {} wins!".format(p1_roll.name, p1_roll.action, p2_roll.name, player1.name))
+        elif p2_roll.name == p1_roll.name:
+            print("it's a tie. Try again")
+        else:
+            player2.score += 1
+            print("{} {} {}. Computer wins.".format(p2_roll.name, p2_roll.action, p1_roll.name))
 
-        outcome = p1_roll.can_defeat(p2_roll)
-        print(outcome)
+        print("{}: {}  {}: {}".format(player1.name, player1.score, player2.name, player2.score))
 
-        count += 1
+    if player1.score == 3:
+        print("Congrats, {}.  You are the champion!".format(player1.name))
+    else:
+        print(" ")
+        print("Sorry. Computer wins the match.")
 
     # Compute who won
 

days/13-15-text-games/RockPaperScissors/player.py

@@ -1,3 +1,4 @@
 class Player():
     def __init__(self, name):
         self.name = name
+        self.score = 0

days/13-15-text-games/RockPaperScissors/roll.py

@@ -2,24 +2,14 @@
 
 class Roll():
 
-    def __init__(self, name, defeats):
+    def __init__(self, name):
         self.name = name
-        self.defeats = defeats
-        self.valid_rolls = ["Rock", "Paper", "Scissors"]
-
-    def get_random(self):
-        return random.choices("Rock", "Paper", "Scissors")
-
-    def choose(self):
-        valid_choice = False
-        while not valid_choice:
-            choice = input("Choose a roll (Rock, Paper, Scissors): ")
-            if choice in self.valid_rolls:
-                valid_choice = True
-        return choice
+        action = {'rock': 'smashes','paper':'covers','scissors':'cuts'}
+        self.action = action[name]
 
     def can_defeat(self,roll):
-        if (roll == self.defeats):
+        win = {'rock': 'scissors','paper':'rock','scissors':'paper'}
+        if (roll.name == win[self.name]):
             return True
         return False