SlothBusters/gruppe02-slothbusters-projekt3-catan
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases 1 Packages Wiki Activity Actions

SiedlerGame and general model implementation #16

Merged
costajon merged 27 commits from siedlergame-implementation into dev 2021-11-28 15:19:16 +00:00
Conversation 4 Commits 27 Files changed 13 +428 -72
costajon commented 2021-11-26 09:37:48 +00:00 (Migrated from github.zhaw.ch)
Copy link

Closes #2

Closes #2
zumbrseb (Migrated from github.zhaw.ch) reviewed 2021-11-26 10:02:46 +00:00
app/src/main/java/ch/zhaw/catan/SiedlerGame.java
@ -22,0 +48,4 @@
* An array of current {@link Player} objects in the game.
*/
private Player[] players;
zumbrseb (Migrated from github.zhaw.ch) commented 2021-11-26 09:42:58 +00:00
Copy link

javadoc

javadoc
app/src/main/java/ch/zhaw/catan/SiedlerGame.java
@ -47,3 +107,4 @@
}
}
/**
zumbrseb (Migrated from github.zhaw.ch) commented 2021-11-26 09:51:53 +00:00
Copy link
        return getCurrentPlayer().getFaction();
```suggestion return getCurrentPlayer().getFaction(); ```
app/src/main/java/ch/zhaw/catan/SiedlerGame.java
zumbrseb (Migrated from github.zhaw.ch) commented 2021-11-26 09:44:26 +00:00
Copy link
        for (int i = 0; i < numberOfPlayers && i < factions.length; i++) {

In case Faction is modified

```suggestion for (int i = 0; i < numberOfPlayers && i < factions.length; i++) { ``` In case Faction is modified
app/src/main/java/ch/zhaw/catan/SiedlerGame.java
@ -61,8 +122,11 @@ public class SiedlerGame {
* @return the list with player's factions
zumbrseb (Migrated from github.zhaw.ch) commented 2021-11-26 09:51:38 +00:00
Copy link
        return getCurrentPlayer().getResourceCount(resource);
```suggestion return getCurrentPlayer().getResourceCount(resource); ```
app/src/main/java/ch/zhaw/catan/SiedlerGame.java
zumbrseb (Migrated from github.zhaw.ch) commented 2021-11-26 09:51:20 +00:00
Copy link

A getCurrentPlayer method will be useful for functions with the game logic in them.


private Player getCurrentPlayer() {
    return players[currentPlayer];
}
A getCurrentPlayer method will be useful for functions with the game logic in them. ```suggestion private Player getCurrentPlayer() { return players[currentPlayer]; } ```
app/src/main/java/ch/zhaw/catan/model/ActionType.java
@ -0,0 +5,4 @@
*
* @author Jonas Costa
*/
public enum ActionType {
zumbrseb (Migrated from github.zhaw.ch) commented 2021-11-26 09:52:08 +00:00
Copy link

javadoc

javadoc
app/src/main/java/ch/zhaw/catan/model/SiedlerCity.java
@ -0,0 +5,4 @@
*
* @author Jonas Costa
*/
public class SiedlerCity extends SiedlerSettlement {
zumbrseb (Migrated from github.zhaw.ch) commented 2021-11-26 09:52:21 +00:00
Copy link

javadoc

javadoc
app/src/main/java/ch/zhaw/catan/model/SiedlerField.java
@ -0,0 +60,4 @@
return diceValue == other.diceValue && fieldType == other.fieldType;
}
zumbrseb (Migrated from github.zhaw.ch) commented 2021-11-26 09:52:47 +00:00
Copy link

?

?
app/src/main/java/ch/zhaw/catan/model/SiedlerSettlement.java
@ -0,0 +5,4 @@
*
* @author Jonas Costa
*/
public class SiedlerSettlement extends SiedlerStructure {
zumbrseb (Migrated from github.zhaw.ch) commented 2021-11-26 09:52:56 +00:00
Copy link

javadoc

javadoc
zumbrseb (Migrated from github.zhaw.ch) commented 2021-11-26 09:55:35 +00:00
Copy link

getResourceCount() doesn't exist inn SiedlerSettlement and SiedlerCity

getResourceCount() doesn't exist inn SiedlerSettlement and SiedlerCity
app/src/main/java/ch/zhaw/catan/model/SiedlerStreet.java
@ -0,0 +5,4 @@
*
* @author Jonas Costa
*/
public class SiedlerStreet extends SiedlerSettlement{
zumbrseb (Migrated from github.zhaw.ch) commented 2021-11-26 09:53:05 +00:00
Copy link

javadoc

javadoc
app/src/main/java/ch/zhaw/catan/model/SiedlerStructure.java
@ -0,0 +7,4 @@
*
* @author Jonas Costa
*/
public abstract class SiedlerStructure {
zumbrseb (Migrated from github.zhaw.ch) commented 2021-11-26 09:53:11 +00:00
Copy link

javadoc

javadoc
app/src/main/java/ch/zhaw/catan/model/SiedlerStructure.java
@ -0,0 +43,4 @@
SiedlerStructure other = (SiedlerStructure) obj;
return Objects.equals(owner, other.owner);
}
zumbrseb (Migrated from github.zhaw.ch) commented 2021-11-26 09:53:44 +00:00
Copy link

please generate the hashcode and equals methods

please generate the hashcode and equals methods
zumbrseb (Migrated from github.zhaw.ch) approved these changes 2021-11-27 15:58:40 +00:00
zumbrseb (Migrated from github.zhaw.ch) left a comment
Copy link

Looks good, apart from the two places where the Javadoc is missing.
But let's still merge it, so others aren't blocked by this.

Looks good, apart from the two places where the Javadoc is missing. But let's still merge it, so others aren't blocked by this.
app/src/main/java/ch/zhaw/catan/model/ActionType.java
@ -0,0 +10,4 @@
* The player wants to trade with the bank (trading with other players or ports
* isn't supported)
*/
TRADE,
zumbrseb (Migrated from github.zhaw.ch) commented 2021-11-27 15:57:05 +00:00
Copy link

javadoc of the individual enum would probably be useful.

For example:
/**

  • The keyword, which indicates that the player wants to trade with the bank
    */
    TRADE,
javadoc of the individual enum would probably be useful. For example: /** * The keyword, which indicates that the player wants to trade with the bank */ TRADE,
app/src/main/java/ch/zhaw/catan/model/SiedlerField.java
@ -0,0 +13,4 @@
/**
* Specifies what type of field this is.
*/
private Land fieldType;
zumbrseb (Migrated from github.zhaw.ch) commented 2021-11-27 15:54:22 +00:00
Copy link

java doc

java doc
zumbrseb (Migrated from github.zhaw.ch) requested changes 2021-11-27 18:03:10 +00:00
zumbrseb (Migrated from github.zhaw.ch) left a comment
Copy link

SiedlerBoard's generic types aren't correct.
The field type should be SiedlerField, the corners SiedlerSettelement and the edges SiedlerStreets. The field annotations could be set to the type Void as we currently aren't planing using this feature (correct?).

SiedlerBoard's generic types aren't correct. The field type should be `SiedlerField`, the corners `SiedlerSettelement` and the edges `SiedlerStreets`. The field annotations could be set to the type `Void` as we currently aren't planing using this feature (correct?).
app/src/main/java/ch/zhaw/catan/SiedlerBoard.java
zumbrseb (Migrated from github.zhaw.ch) commented 2021-11-27 17:58:52 +00:00
Copy link

public should be in front of static

    public static SiedlerBoard createStandartSiedlerBoard() {
        SiedlerBoard board = new SiedlerBoard();
        Map<Point, Integer> standardDiceNumbers = Config.getStandardDiceNumberPlacement();
        for (Entry<Point, Land> standardLandEntry : Config.getStandardLandPlacement().entrySet()) {
            board.addField(standardLandEntry.getKey(), new SiedlerField(standardLandEntry.getValue(),
                    standardDiceNumbers.getOrDefault(standardLandEntry.getKey(), -1)));
        }
        return board;
    }
`public` should be in front of `static` ```suggestion public static SiedlerBoard createStandartSiedlerBoard() { SiedlerBoard board = new SiedlerBoard(); Map<Point, Integer> standardDiceNumbers = Config.getStandardDiceNumberPlacement(); for (Entry<Point, Land> standardLandEntry : Config.getStandardLandPlacement().entrySet()) { board.addField(standardLandEntry.getKey(), new SiedlerField(standardLandEntry.getValue(), standardDiceNumbers.getOrDefault(standardLandEntry.getKey(), -1))); } return board; } ```
zumbrseb (Migrated from github.zhaw.ch) approved these changes 2021-11-28 15:09:04 +00:00
zumbrseb (Migrated from github.zhaw.ch) left a comment
Copy link

Looks alright

Looks alright
Sign in to join this conversation.
Reviewers
No reviewers
zumbrseb
Labels
Clear labels   
bug

Something isn't working

  
ci

   
documentation

Improvements or additions to documentation

  
duplicate

This issue or pull request already exists

  
enhancement

New feature or request

  
good first issue

Good for newcomers

  
help wanted

Extra attention is needed

  
invalid

This doesn't seem right

  
question

Further information is requested

  
wontfix

This will not be worked on

No labels
bug
ci
documentation
duplicate
enhancement
good first issue
help wanted
invalid
question
wontfix
Milestone
Clear milestone
No items
No milestone
Task 1: Base game done
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: SlothBusters/gruppe02-slothbusters-projekt3-catan#16
No description provided.
Delete branch "siedlergame-implementation"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?