diff --git a/card/card.py b/card/card.py index 5eb4a6d..29af413 100644 --- a/card/card.py +++ b/card/card.py @@ -31,11 +31,11 @@ class Card: self.effect() def effect(self): - # This is here so that 'special' cards can override this function so that unique card effects can happen. + # This is here so that 'special' card can override this function so that unique card effects can happen. pass def passive(self): - # This is here so that 'special' cards can override this function so that unique card passives can happen. + # This is here so that 'special' card can override this function so that unique card passives can happen. pass def get_name(self): @@ -69,4 +69,4 @@ class Card: counter = 0 for c in card: print(str(counter) + ": " + c.identify()) - counter += 1 + counter += 1 \ No newline at end of file diff --git a/card/cellar.py b/card/cellar.py index 9eaab64..9541072 100644 --- a/card/cellar.py +++ b/card/cellar.py @@ -1,4 +1,4 @@ -from card import Card +from card.card import Card class Cellar(Card): diff --git a/card/merchant.py b/card/merchant.py index cf71331..e889af6 100644 --- a/card/merchant.py +++ b/card/merchant.py @@ -1,4 +1,4 @@ -from card import Card +from card.card import Card class Merchant(Card): diff --git a/card/militia.py b/card/militia.py index e4bbfb3..89cdebe 100644 --- a/card/militia.py +++ b/card/militia.py @@ -1,4 +1,4 @@ -from card import Card +from card.card import Card from random import randint @@ -8,7 +8,7 @@ class Militia(Card): if self._Card__owner != player and not player.get_hand().blocks_attack(self.get_name()): player.print_hand() print("Player " + str(self._Card__owner.get_table().get_players().index(player)) + ", you MUST discard " - "down to 3 cards.") + "down to 3 card.") self.__force_discard(self._Card__owner.get_std_chances(), player) def __force_discard(self, chances, player): diff --git a/card/mine.py b/card/mine.py index 2337794..f471a30 100644 --- a/card/mine.py +++ b/card/mine.py @@ -1,5 +1,5 @@ -from card import Card -from trash_gain_card import TrashGainEffectCard +from card.card import Card +from card.trash_gain_card import TrashGainEffectCard class Mine(TrashGainEffectCard): diff --git a/card/moat.py b/card/moat.py index f68809e..76cdfd4 100644 --- a/card/moat.py +++ b/card/moat.py @@ -1,4 +1,4 @@ -from card import Card +from card.card import Card class Moat(Card): diff --git a/card/remodel.py b/card/remodel.py index 75d2e96..0036da3 100644 --- a/card/remodel.py +++ b/card/remodel.py @@ -1,4 +1,4 @@ -from trash_gain_card import TrashGainEffectCard +from card.trash_gain_card import TrashGainEffectCard class Remodel(TrashGainEffectCard): diff --git a/card/trash_gain_card.py b/card/trash_gain_card.py index fa91c15..caf882f 100644 --- a/card/trash_gain_card.py +++ b/card/trash_gain_card.py @@ -1,4 +1,4 @@ -from card import Card +from card.card import Card class TrashGainEffectCard(Card): diff --git a/game.py b/game.py index 81484a5..7d02f48 100644 --- a/game.py +++ b/game.py @@ -1,12 +1,12 @@ -from table import Table -from player import Player -from card import Card -from militia import Militia -from moat import Moat -from cellar import Cellar -from merchant import Merchant -from mine import Mine -from remodel import Remodel +from table.table import Table +from player.player import Player +from card.card import Card +from card.militia import Militia +from card.moat import Moat +from card.cellar import Cellar +from card.merchant import Merchant +from card.mine import Mine +from card.remodel import Remodel def main(): diff --git a/player/deck.py b/player/deck.py index 77e7faf..d501704 100644 --- a/player/deck.py +++ b/player/deck.py @@ -1,4 +1,4 @@ -from supply import Supply +from table.supply import Supply from random import shuffle diff --git a/player/discard.py b/player/discard.py index 853493f..3ecf828 100644 --- a/player/discard.py +++ b/player/discard.py @@ -1,4 +1,4 @@ -from supply import Supply +from table.supply import Supply class Discard(Supply): diff --git a/player/hand.py b/player/hand.py index a15d176..370db4c 100644 --- a/player/hand.py +++ b/player/hand.py @@ -1,4 +1,4 @@ -from supply import Supply +from table.supply import Supply class Hand(Supply): @@ -39,4 +39,4 @@ class Hand(Supply): current_type = c.get_type() if not current_type in unique_type: unique_type.append(current_type) - return unique_type + return unique_type \ No newline at end of file diff --git a/player/player.py b/player/player.py index f8f4ec9..91e6c75 100644 --- a/player/player.py +++ b/player/player.py @@ -1,8 +1,8 @@ -from deck import Deck -from discard import Discard -from hand import Hand -from card import Card -from counter import Counter +from player.deck import Deck +from player.discard import Discard +from player.hand import Hand +from player.counter import Counter +from card.card import Card class Player: @@ -57,7 +57,7 @@ class Player: elif lacking_cards == 1: print("You are lacking " + str(lacking_cards) + " card. You cannot draw anymore.") else: - print("You are lacking " + str(lacking_cards) + " cards. You cannot draw anymore.") + print("You are lacking " + str(lacking_cards) + " card. You cannot draw anymore.") if spillover > 0: for i in range(how_many - spillover): @@ -116,7 +116,7 @@ class Player: if counter is not None: counter.int = 0 else: - print("There are no more acceptable cards in hand, moving to next phase.") + print("There are no more acceptable card in hand, moving to next phase.") if counter is not None: counter.int = 0 @@ -128,7 +128,7 @@ class Player: def take_buy(self): if self.__hand.contains_one_of([Card.CardType.Treasure]): - print("\nPlease play all Treasure cards that you want to play.") + print("\nPlease play all Treasure card that you want to play.") play_another = Counter(self.__hand.get_card_type_count(Card.CardType.Treasure)) while play_another.int > 0: diff --git a/table/pile.py b/table/pile.py index 8e6892e..43567ad 100644 --- a/table/pile.py +++ b/table/pile.py @@ -1,4 +1,4 @@ -from supply import Supply +from table.supply import Supply class Pile(Supply): def get_card_group(self): diff --git a/table/table.py b/table/table.py index a00566f..c18fc96 100644 --- a/table/table.py +++ b/table/table.py @@ -1,5 +1,5 @@ -from trash import Trash -from pile import Pile +from table.trash import Trash +from table.pile import Pile class Table: @@ -52,7 +52,7 @@ class Table: def play(self): turn = 0 - # turn < 4 is for testing, otherwise endless as buying cards is not yet done + # turn < 4 is for testing, otherwise endless as buying card is not yet done while not self.are_there_any_empty_piles() and turn < 10: self.print() self.__player[turn % len(self.__player)].take_turn() diff --git a/table/trash.py b/table/trash.py index 6f4e128..5786689 100644 --- a/table/trash.py +++ b/table/trash.py @@ -1,4 +1,4 @@ -from pile import Pile +from table.pile import Pile class Trash(Pile):