diff --git a/cards/question_cards1 b/cards/question_cards1 index 18875da..d13ef3b 100644 --- a/cards/question_cards1 +++ b/cards/question_cards1 @@ -48,7 +48,7 @@ What ended my last relationship? What's that sound? __________. That's how I want to die. Why am I sticky? -What's the next Happy Meal® toy? +What's the next Happy Meal® toy? What's there a ton of in heaven? I do not know with what weapons World War III will be fought, but World War IV will be fought with __________. What will always get you laid? diff --git a/cards/question_cards2 b/cards/question_cards2 index 0a89dd4..87563e4 100644 --- a/cards/question_cards2 +++ b/cards/question_cards2 @@ -8,5 +8,5 @@ In a world ravaged by __________, our only solace is __________. In M. Night Shyamalan's new movie, Bruce Willis discovers that __________ had really been __________ all along. I never truly understood __________ until I encountered __________. Rumor has it that Vladimir Putin's favorite dish is __________ stuffed with __________. -Lifetime® presents __________, the story of __________. +Lifetime® presents __________, the story of __________. What's the next superhero/sidekick duo? \ No newline at end of file diff --git a/plugin.py b/plugin.py index 8a8e353..83781e8 100644 --- a/plugin.py +++ b/plugin.py @@ -10,7 +10,7 @@ question_cards_file_name = ['question_cards', 'question_cards1', 'question_cards base_directory = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)))) -class CardsAgainstHumanity(object): +class Deck(object): def __init__(self): self.answerDb = self.parse_card_file('answer') self.questionDb = self.parse_card_file('question') @@ -54,7 +54,7 @@ class Card(object): self.type = type self.text = text -class GameRound(CardsAgainstHumanity): +class GameRound(object): def __init__(self): self.playerOne = str(raw_input('Player 1 Name: ')) self.playerTwo = str(raw_input('Player 2 Name: ')) @@ -104,7 +104,7 @@ class PlayerHand(object): if __name__=="__main__": - deck = CardsAgainstHumanity() + deck = Deck() print 'Current Question: %s' % deck.drawCard('question').text jazz_hand = PlayerHand(deck) bear_hand = PlayerHand(deck) diff --git a/test.py b/test.py index a813e47..a0400c6 100644 --- a/test.py +++ b/test.py @@ -6,13 +6,13 @@ def test_cards_will_be_unique(): """ Ensure that when a hand is created the proper cards are removed from the deck. """ - deck=CardsAgainstHumanity() + deck=Deck() hand_one = PlayerHand(deck) for card in hand_one.cardList: assert card.text not in deck.answerDb def test_card_parsing(): - deck = CardsAgainstHumanity() + deck = Deck() for card in deck.answerDb: assert type(card) is Card assert type(card.id) is int