Api docs #26
Merged
Api docs #26
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
Added getGameLogic() in Game class for easier testing 👌
Fixed startmoney if statement to check players previous field instead of current
Fixed test checking if players get money when passing Start field 👌
…ehashmaps # Conflicts: # src/main/java/Model/Fields/CompanyField.java # src/main/java/Model/Fields/TaxField.java
…emovehashmaps # Conflicts: # src/main/java/Model/GameLogic/NormalGameLogic.java
sets activePlayers previousField to its current field before executing chanceFieldAction to enable chancecards that pass start to give the player money. 👍
derudover så slår man en terning efter man er kommet uf af fængsel men hvis man vælger "feeling Lucky" så står der "slå terning" selvom man ikke slår den, man bevæger sig med det man slog løste problemet ved at lave en variabel navngivet Lucky som checkes hvis man slår 2 ens, og slås fra i diceController
Made bool isJail for MoveToCard that sends player to jail and added specific instructions to if statement for that card. Made a constructor specific to MoveToCard jail cards
Switched the two jail MoveToCards to use the jail specific constructor for those cards
Fixed setPreviousField to be set to fieldId instead of activePlayers field. 👌
# Conflicts: # src/main/java/Controller/DiceController.java # src/main/java/Controller/GameController.java
- Corrected first two MoveToCard constructors to match the ones meant for moving to a specific field - Changed MoveToCard from moving to nearest ferry, to be a copy of the other ferry card
…hanceCard[] chanceCard -> chanceCards
Corrected calculation error: '=' changed to '+' What a meme 👌 Co-Authored-By: flaremew <flaremew@users.noreply.github.com>
ocd fix
It's basically all just an OCD fix to the code.... I LOVE IT ❤️_❤️
Ocd/indentationfixes
- 'meme'ified some prices ( ͡° ͜ʖ ͡°) - added CompanyFieldTest - added CompanyFieldBankruptTest
CompanyField "Carslberg" no longer has the description "Coca Cola Bryggeriet", instead it says "Carlsberg Bryggeriet" Also changed it's color to match CompanyField Tuborg's color
## Changes - Increased size of PropertyField pricing array to match the size used in the game - added ```PropertyFieldHouseTest()``` - added ```PropertyFieldHotelTest()```
Tests/moretests
…g ud Gjort ved at lave en ny variabel i player som tæller op i "feelingLucky" i JailController. resetter når man kommer ud.
Changes: - changed propFields hotel price from 9 to 10 (and fixed tests using this value) - added ```.sellHouse()``` and ```.sellHotel()``` tests to ```PropertyFieldHouseTest()``` and ```PropertyFieldHotelTest()``` - added other "less-important" method tests within current tests
- changed constructor to public for ```ToJailField()```
- Added ```ToJailFieldTest()``` - Added a smol meme for ya boi Hackerman aka [@thehabbos007] 😘
- added test ```TaxFieldTest()``` - added pure codecoverage tests - ```getNameTest()``` - ```getSubTextTest()``` - ```getDescriptionTest()``` - emptied any subText and description strings containing any text - removed terrible meme, you're welcome
Tests/moretests (Fields tests)
- Added ```buyFieldPlayerIsOnTest()``` - Added ```getPlayerFieldTypeTest```
- Made ```GetPaidCard()``` public for easier testing
- Added ```getPaidCardTest1()``` - Added ```getPaidCardTest2()``` - Added two more players to ```testGame``` for better testing
Tests/moretests
# Conflicts: # src/main/java/Controller/GameController.java # src/main/java/Controller/JailController.java # src/test/java/Controller/JailControllerTest.java
Codecov Report
@@ Coverage Diff @@
## master #26 +/- ##
===========================================
+ Coverage 21.85% 35.82% +13.96%
===========================================
Files 34 34
Lines 993 1139 +146
Branches 111 142 +31
===========================================
+ Hits 217 408 +191
+ Misses 764 707 -57
- Partials 12 24 +12
Continue to review full report at Codecov.
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.