Skip to content

Commit

Permalink
add trade token scoring. partially addresses #1
Browse files Browse the repository at this point in the history
  • Loading branch information
privong authored and George C. Privon committed Nov 11, 2018
1 parent b1642ff commit ee64e75
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

* add a configuration file specifying the database location
* add a utilities directory for scripts which should not be needed for normal operation but may be useful for working around issues.
* add scoring capability for Trade tokens (Traders & Builders Expanion). Token allocation is not automatically tracked (this can be tracked manually using the scoring comments). Trade token scores are entered during the post-game scoring period.

## 0.3 Series

Expand Down
11 changes: 8 additions & 3 deletions cgame.py
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,9 @@ def getPlayers(self):

def getExpansions(self):
"""
Get a list of playable expansions
Get a list of playable expansions.
Ask the user which ones are active.
Based on the list, add token, tile, and score types to the basic list.
"""

self.expansionIDs = []
Expand Down Expand Up @@ -295,7 +297,9 @@ def recordScore(self):

# see which token scored
# really this should be expanded to allow multiple token types for one score
if len(self.tokens) > 1:
if score['scoretype'] == 'Trade token':
score['tokens'] = 'none'
elif len(self.tokens) > 1:
VALID = False
while not VALID:
for i, token in enumerate(self.tokens):
Expand Down Expand Up @@ -444,8 +448,9 @@ def advanceState(self):
self.commands = [('r', 'record score'),
('e', 'end game (or end play if already in postgame scoring)'),
('s', '(current) score and game status')]
# add trade token scoring to the game scoring options
if 2 in self.expansionIDs:
self.commands.append(('t', 'score trade goods'))
self.scoretypes.append('Trade token')
self.commands.append(('?', 'print help'))

_sys.stdout.write("At the end of regulation... ")
Expand Down

0 comments on commit ee64e75

Please sign in to comment.