Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development
This commit is contained in:
@@ -11,17 +11,19 @@ public class RollDiceNotification extends Notification{
|
|||||||
private int eyes;
|
private int eyes;
|
||||||
private boolean turbo;
|
private boolean turbo;
|
||||||
private int multiplier;
|
private int multiplier;
|
||||||
|
private boolean isRanking;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor.
|
* Constructor.
|
||||||
* @param color the color of the player that rolled the die.
|
* @param color the color of the player that rolled the die.
|
||||||
* @param eyes the number of eyes that were rolled.
|
* @param eyes the number of eyes that were rolled.
|
||||||
*/
|
*/
|
||||||
public RollDiceNotification(Color color, int eyes) {
|
public RollDiceNotification(Color color, int eyes, boolean isRanking) {
|
||||||
this.color = color;
|
this.color = color;
|
||||||
this.eyes = eyes;
|
this.eyes = eyes;
|
||||||
this.turbo = false;
|
this.turbo = false;
|
||||||
this.multiplier = -1;
|
this.multiplier = -1;
|
||||||
|
this.isRanking = isRanking;
|
||||||
}
|
}
|
||||||
|
|
||||||
public RollDiceNotification(Color color, int eyes, boolean turbo, int multiplier) {
|
public RollDiceNotification(Color color, int eyes, boolean turbo, int multiplier) {
|
||||||
@@ -29,6 +31,7 @@ public RollDiceNotification(Color color, int eyes, boolean turbo, int multiplier
|
|||||||
this.eyes = eyes;
|
this.eyes = eyes;
|
||||||
this.turbo = turbo;
|
this.turbo = turbo;
|
||||||
this.multiplier = multiplier;
|
this.multiplier = multiplier;
|
||||||
|
this.isRanking = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -54,4 +57,6 @@ public int getMultiplier() {
|
|||||||
public boolean isTurbo() {
|
public boolean isTurbo() {
|
||||||
return turbo;
|
return turbo;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public boolean isRanking() { return isRanking; }
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user