Gavin l #3
Merged
Gavin l #3
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
error detection in merchantNumber
* changed member variable name from dailyRandomPrice to dailyRandomPercent and changed variable name in setDailyRandomPercent as dicussed in the previous team meeting. *Changed Merchant constructor to utilize the new ArrayLists of item names in the RPGame class. Updated the TestMerchant class to reflect these changes.
team meeting and changed the Merchant constructor to utilize the ArrayList of item names in the RPGame class. Updated TestMerchant to reflect changes
* added an additional constructor to the Item class that allows it to be initalized with only a name and base price, it automatically sets the max price to be 100000 and min price to 0 *Added the a method to generate the inventory of the Merchant class using the ArrayList in the the RPGame class as a parameter
*created search method that returns the item based off the inputted string name. Also finished the getItemPrice method to return the adjusted price of the item given a the name of the item
*added a method to adjust the prices for all items in the merchant's inventory. updated TestMerchant to test the new method.
*Updated the decrementCash method to decreaseCash to better fit its use
*Updated Item, Merchant and RPGame Class, as well as TestMerchant class
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.
No description provided.