William c #2
Merged
William c #2
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Class: RPGame - inventoryFromFile() - reads from inventory.txt for the merchants' inventory - Test: TestRPGame - Tests that all data was read and saved properly from RPGame Changed: - Class: Merchant - Renamed some methods and variables from randomPrice to randomPercentage as discussed in our meeting
Merging into William-C
*Updated Item, Merchant and RPGame Class, as well as TestMerchant class
gal11002
added a commit
that referenced
this pull request
Feb 12, 2015
Merged Gavin-L with William-C
Sign in
to join this conversation on GitHub.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Okay, I'm going to try this pull request. If it does something we don't want you should be able to revert it.