style changes, many small improvements

Author: tedsilb

projects/99bottles.py

@@ -1,6 +1,7 @@
 # 99 bottles lyrics generator
 # By Ted Silbernagel
 
+
 # Define the function to generate the lyrics
 def gen_lyrics():
   # Start at 99 and work backwards

projects/Blackjack.py

@@ -4,76 +4,47 @@
 # Import dependencies
 import random
 
-# Define function
-def playBlackjack():
-  # Set up card class
-  class Card(object):
-    def __init__(self, number, suit, name, value):
-      self.number = number
-      self.suit = suit
-      self.name = name
-      self.value = value
 
+# Set up card class
+class Card(object):
+  def __init__(self, number, suit, name, value):
+    self.number = number
+    self.suit = suit
+    self.name = name
+    self.value = value
+
+
+# Define function to calculate hand value
+def calcHandValue(hand):
+  handValue = 0
+  for card in hand:
+    handValue += card.value
+  return handValue
+
+
+# Define function to print current card value
+def printCurrentValue(currentValue):
+  print(f'The current value of your cards is {currentValue}.')
+
+
+# Define main function
+def playBlackjack():
   # Set up deck
   cardDeck = []
   def genCardDeck():
-    sH = 'hearts'
-    sD = 'diamonds'
-    sS = 'spades'
-    sC = 'clubs'
+    suits = ['hearts', 'diamonds','spades','clubs']
+    faces = ['ace', 'two', 'three', 'four', 'five', 'six', 'seven',
+             'eight', 'nine', 'ten', 'jack', 'queen', 'king']
     cardDeck.clear()
-    cardDeck.append(Card(1, sH, 'ace', 1))
-    cardDeck.append(Card(2, sH, 'two', 2))
-    cardDeck.append(Card(3, sH, 'three', 3))
-    cardDeck.append(Card(4, sH, 'four', 4))
-    cardDeck.append(Card(5, sH, 'five', 5))
-    cardDeck.append(Card(6, sH, 'six', 6))
-    cardDeck.append(Card(7, sH, 'seven', 7))
-    cardDeck.append(Card(8, sH, 'eight', 8))
-    cardDeck.append(Card(9, sH, 'nine', 9))
-    cardDeck.append(Card(10, sH, 'ten', 10))
-    cardDeck.append(Card(11, sH, 'jack', 10))
-    cardDeck.append(Card(12, sH, 'queen', 10))
-    cardDeck.append(Card(13, sH, 'king', 10))
-    cardDeck.append(Card(14, sD, 'ace', 1))
-    cardDeck.append(Card(15, sD, 'two', 2))
-    cardDeck.append(Card(16, sD, 'three', 3))
-    cardDeck.append(Card(17, sD, 'four', 4))
-    cardDeck.append(Card(18, sD, 'five', 5))
-    cardDeck.append(Card(19, sD, 'six', 6))
-    cardDeck.append(Card(20, sD, 'seven', 7))
-    cardDeck.append(Card(21, sD, 'eight', 8))
-    cardDeck.append(Card(22, sD, 'nine', 9))
-    cardDeck.append(Card(23, sD, 'ten', 10))
-    cardDeck.append(Card(24, sD, 'jack', 10))
-    cardDeck.append(Card(25, sD, 'queen', 10))
-    cardDeck.append(Card(26, sD, 'king', 10))
-    cardDeck.append(Card(27, sS, 'ace', 1))
-    cardDeck.append(Card(28, sS, 'two', 2))
-    cardDeck.append(Card(29, sS, 'three', 3))
-    cardDeck.append(Card(30, sS, 'four', 4))
-    cardDeck.append(Card(31, sS, 'five', 5))
-    cardDeck.append(Card(32, sS, 'six', 6))
-    cardDeck.append(Card(33, sS, 'seven', 7))
-    cardDeck.append(Card(34, sS, 'eight', 8))
-    cardDeck.append(Card(35, sS, 'nine', 9))
-    cardDeck.append(Card(36, sS, 'ten', 10))
-    cardDeck.append(Card(37, sS, 'jack', 10))
-    cardDeck.append(Card(38, sS, 'queen', 10))
-    cardDeck.append(Card(39, sS, 'king', 10))
-    cardDeck.append(Card(40, sC, 'ace', 1))
-    cardDeck.append(Card(41, sC, 'two', 2))
-    cardDeck.append(Card(42, sC, 'three', 3))
-    cardDeck.append(Card(43, sC, 'four', 4))
-    cardDeck.append(Card(44, sC, 'five', 5))
-    cardDeck.append(Card(45, sC, 'six', 6))
-    cardDeck.append(Card(46, sC, 'seven', 7))
-    cardDeck.append(Card(47, sC, 'eight', 8))
-    cardDeck.append(Card(48, sC, 'nine', 9))
-    cardDeck.append(Card(49, sC, 'ten', 10))
-    cardDeck.append(Card(50, sC, 'jack', 10))
-    cardDeck.append(Card(51, sC, 'queen', 10))
-    cardDeck.append(Card(52, sC, 'king', 10))
+
+    # Card number must be unique. Keep track of it here
+    uniqueCardNumber = 1
+    for i in range(4):
+      for j in range(1, 14):
+        # Jack, queen, and king are all ten
+        suitCardNo = 10 if (j > 10) else j
+        cardDeck.append(Card(uniqueCardNumber, suits[i], faces[j-1], suitCardNo))
+        uniqueCardNumber += 1
 
   # Set up user's hand
   hand = []
@@ -85,34 +56,22 @@ def genCardDeck():
   # Define function to process a turn
   def hitOrStand():
     choice = input('Would you like to hit or stand? ')
-    if (choice.lower() == 'hit') or (choice.lower() == 'h'):
+    if (choice.lower() in ['hit', 'h']):
       print('Dealing new card...')
       takeNewCard()
-      bustReturn = calcHandValue()
+      bustReturn = calcHandValue(hand)
       if bustReturn > 21:
         print('Bust! Subtracting 21 points.')
         global earnedScore
         earnedScore -= 21
       elif bustReturn == 21:
         print('Perfect 21! Ending turn.')
       else:
-        currentValue()
+        printCurrentValue(calcHandValue(hand))
         hitOrStand()
-    elif (choice.lower() == 'stand') or (choice.lower() == 's'):
+    elif (choice.lower() in ['stand', 's']):
       print('Ending turn...')
-      endTurn(calcHandValue())
-
-  # Define function to print current card value
-  def currentValue():
-    value = calcHandValue()
-    print(f'The current value of your cards is {value}.')
-
-  # Define function to calculate hand value
-  def calcHandValue():
-    handValue = 0
-    for card in hand:
-      handValue += card.value
-    return handValue
+      endTurn(calcHandValue(hand))
 
   # Define function to take a new card
   def takeNewCard():
@@ -133,7 +92,7 @@ def startTurn(i, rounds):
     hand.clear()
     takeNewCard()
     takeNewCard()
-    currentValue()
+    printCurrentValue(calcHandValue(hand))
     hitOrStand()
 
   # Define function to end turn
@@ -156,16 +115,17 @@ def endTurn(handValue):
     if i < rounds:
       print(f'Score after round {i}: {earnedScore}')
     else:
+      start = f'Final score: {earnedScore}. Grade: '
       if earnedScore >= 90:
-        print(f'Final score: {earnedScore}. Grade: A')
+        print(start + 'A')
       elif earnedScore >= 80:
-        print(f'Final score: {earnedScore}. Grade: B')
+        print(start + 'B')
       elif earnedScore >= 70:
-        print(f'Final score: {earnedScore}. Grade: C')
+        print(start + 'C')
       elif earnedScore >= 60:
-        print(f'Final score: {earnedScore}. Grade: D.')
+        print(start + 'D')
       else:
-        print(f'Final score: {earnedScore}. Grade: F.')
+        print(start + 'F')
 
 # Call function
 playBlackjack()

projects/BubbleSort.py

@@ -1,6 +1,7 @@
 # Super basic bubble sort algorithm
 # By Ted Silbernagel
 
+
 # Define function to check to see if a list is sorted
 def listIsSorted(listToCheck):
   for item in listToCheck:
@@ -12,6 +13,7 @@ def listIsSorted(listToCheck):
         return False
   return True
 
+
 # Define function to bubble sort
 def bubbleSort(userList):
   listToSort = userList.split(',')