Aleandro/Progetto-ingegneria-del-software
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: Artist.java, Shaman.java, Gatherer.java, Hunter.java, Inventor.java, Shaman.java Fixed Typos.

Browse Source
This commit is contained in:
GabrieleRadice
2026-04-12 18:13:40 +02:00
parent 9686424f38
commit 8f78834c69
6 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Artist.java
+4 -4
View File
@@ -16,7 +16,7 @@ public class Artist extends Character {
}
/**
* Creates an Artist character card with the specified Era and minimum number of players.
* Creates an Artist character card with the specified Era and minimum number of players required to play it.
*
* @param Era the era of the Artist card
* @param nMin the minimum number of players required for the card
@@ -28,7 +28,7 @@ public class Artist extends Character {
/**
* Returns the string representation of this Artist card.
*
* @return the string representation of this Artist card
* @return the string representation of this Artist card.
*/
@Override
public String toString() {
@@ -38,7 +38,7 @@ public class Artist extends Character {
/**
* Creates and returns a copy of this Artist card.
*
* @return a clone of this Artist card
* @return a clone of this Artist card.
*/
@Override
public Character clone() {
@@ -48,7 +48,7 @@ public class Artist extends Character {
/**
* Inserts this Artist card into the specified player's Artist collection.
*
* @param player the player who receives the card
* @param player the player who receives the card.
*/
@Override
public void insert(Player player) {
src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Builder.java
+15 -15
View File
@@ -8,7 +8,7 @@ public class Builder extends Character
{
/**
* The reduction valure provided by this Builder card.
* The reduction value provided by this Builder card.
*/
private int reductionValue;
@@ -20,7 +20,7 @@ public class Builder extends Character
/**
* Returns the reduction value of this Builder card.
*
* @return the reduction value of this Builder card
* @return the reduction value of this Builder card.
*/
public int getReductionValue() {
return reductionValue;
@@ -29,7 +29,7 @@ public class Builder extends Character
/**
* Returns the prestige value of this Builder card.
*
* @return the prestige value of this Builder card
* @return the prestige value of this Builder card.
*/
public int getPrestigeValue() {
return prestigeValue;
@@ -39,10 +39,10 @@ public class Builder extends Character
* Creates a Builder character card with the specified era, reduction value,
* and prestige value.
*
* @param Era the era of the Builder card
* @param reductionValue the reduction value of the Builder card
* @param prestigeValue the prestige value of the Builder card
* @throws IllegalArgumentException if {@code reductionValue < 0} or {@code prestigeValue < 0}
* @param Era the era of the Builder card.
* @param reductionValue the reduction value of the Builder card.
* @param prestigeValue the prestige value of the Builder card.
* @throws IllegalArgumentException if {@code reductionValue < 0} or {@code prestigeValue < 0}.
*/
public Builder(int Era, int reductionValue, int prestigeValue) throws IllegalArgumentException {
super(Era,CharacterType.BUILDER);
@@ -61,11 +61,11 @@ public class Builder extends Character
* Creates a Builder character card with the specified era, reduction value,
* prestige value, and minimum number of players.
*
* @param Era the era of the Builder card
* @param reductionValue the reduction value of the Builder card
* @param prestigeValue the prestige value of the Builder card
* @param nMin the minimum number of players required for the card
* @throws IllegalArgumentException if {@code reductionValue < 0} or {@code prestigeValue < 0}
* @param Era the era of the Builder card.
* @param reductionValue the reduction value of the Builder card.
* @param prestigeValue the prestige value of the Builder card.
* @param nMin the minimum number of players required for the card.
* @throws IllegalArgumentException if {@code reductionValue < 0} or {@code prestigeValue < 0}.
*/
public Builder(int Era, int reductionValue, int prestigeValue,int nMin) throws IllegalArgumentException {
super(Era,CharacterType.BUILDER,nMin);
@@ -83,7 +83,7 @@ public class Builder extends Character
/**
* Returns the string representation of this Builder card.
*
* @return the string representation of this Builder card
* @return the string representation of this Builder card.
*/
@Override
public String toString() { return super.toString()+" Reduction Value: " + String.valueOf(reductionValue) + "\n Prestige Value: " + String.valueOf(prestigeValue); }
@@ -91,7 +91,7 @@ public class Builder extends Character
/**
* Creates and returns a copy of this Builder card.
*
* @return a clone of this Builder card
* @return a clone of this Builder card.
*/
@Override
public Character clone() {
@@ -101,7 +101,7 @@ public class Builder extends Character
/**
* Inserts this Builder card into the specified player's Builder collection.
*
* @param player the player who receives the card
* @param player the player who receives the card.
*/
public void insert(Player player) {
player.builders.add(this);
src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Gatherer.java
+6 -6
View File
@@ -9,7 +9,7 @@ public class Gatherer extends Character {
/**
* Creates a Gatherer character card with the specified era.
*
* @param Era Gatherers era
* @param Era Gatherers era.
*/
public Gatherer(int Era) {
super(Era, CharacterType.GATHERER);
@@ -18,8 +18,8 @@ public class Gatherer extends Character {
/**
* Creates a Gatherer character card with the specified era and minimum number of players.
*
* @param Era the era of the Gatherer card
* @param nMin the minimum number of players required for the card
* @param Era the era of the Gatherer card.
* @param nMin the minimum number of players required for the card.
*/
public Gatherer(int Era, int nMin) {
super(Era, CharacterType.GATHERER,nMin);
@@ -28,7 +28,7 @@ public class Gatherer extends Character {
/**
* Returns the string representation of this Gatherer card.
*
* @return the string representation of this Gatherer card
* @return the string representation of this Gatherer card.
*/
@Override
public String toString() {
@@ -38,7 +38,7 @@ public class Gatherer extends Character {
/**
* Creates and returns a copy of this Gatherer card.
*
* @return a clone of this Gatherer card
* @return a clone of this Gatherer card.
*/
@Override
public Character clone() {
@@ -48,7 +48,7 @@ public class Gatherer extends Character {
/**
* Inserts this Gatherer card into the specified player's Gatherer collection.
*
* @param player the player who receives the card
* @param player the player who receives the card.
*/
public void insert(Player player) {
player.gatherers.add(this);
src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Hunter.java
+9 -9
View File
@@ -10,7 +10,7 @@ public class Hunter extends Character {
/**
* Returns whether this Hunter card has the icon.
*
* @return {@code true} if this Hunter card has the icon, {@code false} otherwise
* @return {@code true} if this Hunter card has the icon, {@code false} otherwise.
*/
public boolean getIcon() {
return icon;
@@ -19,8 +19,8 @@ public class Hunter extends Character {
/**
* Creates a Hunter character card with the specified era and icon value.
*
* @param Era the era of the Hunter card
* @param icon the icon value of the Hunter card
* @param Era the era of the Hunter card.
* @param icon the icon value of the Hunter card.
*/
public Hunter(int Era, boolean icon) {
super(Era, CharacterType.HUNTER);
@@ -31,9 +31,9 @@ public class Hunter extends Character {
* Creates a Hunter character card with the specified era, icon value,
* and minimum number of players.
*
* @param Era the era of the Hunter card
* @param icon the icon value of the Hunter card
* @param nMin the minimum number of players required for the card
* @param Era the era of the Hunter card.
* @param icon the icon value of the Hunter card.
* @param nMin the minimum number of players required for the card.
*/
public Hunter(int Era, boolean icon, int nMin) {
super(Era, CharacterType.HUNTER,nMin);
@@ -43,7 +43,7 @@ public class Hunter extends Character {
/**
* Returns the string representation of this Hunter card.
*
* @return the string representation of this Hunter card
* @return the string representation of this Hunter card.
*/
@Override
public String toString() {
@@ -53,7 +53,7 @@ public class Hunter extends Character {
/**
* Creates and returns a copy of this Hunter card.
*
* @return a clone of this Hunter card
* @return a clone of this Hunter card.
*/
@Override
public Character clone() {
@@ -63,7 +63,7 @@ public class Hunter extends Character {
/**
* Inserts this Hunter card into the specified player's Hunter collection.
*
* @param player the player who receives the card
* @param player the player who receives the card.
*/
@Override
public void insert(Player player) {
src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Inventor.java
+11 -11
View File
@@ -9,7 +9,7 @@ public class Inventor extends Character {
/**
* Returns the icon value of this Inventor card.
*
* @return the icon value of this Inventor card
* @return the icon value of this Inventor card.
*/
public int Icon() {
return icon;
@@ -18,9 +18,9 @@ public class Inventor extends Character {
/**
* Creates an Inventor character card with the specified era and icon value.
*
* @param Era the era of the Inventor card
* @param icon the icon value of the Inventor card
* @throws IllegalArgumentException if {@code icon < 0} or {@code icon > 9}
* @param Era the era of the Inventor card.
* @param icon the icon value of the Inventor card.
* @throws IllegalArgumentException if {@code icon < 0} or {@code icon > 9}.
*/
public Inventor(int Era,int icon) throws IllegalArgumentException {
super(Era, CharacterType.INVENTOR);
@@ -33,10 +33,10 @@ public class Inventor extends Character {
* Creates an Inventor character card with the specified era, icon value,
* and minimum number of players.
*
* @param Era the era of the Inventor card
* @param icon the icon value of the Inventor card
* @param nMin the minimum number of players required for the card
* @throws IllegalArgumentException if {@code icon < 0} or {@code icon > 9}
* @param Era the era of the Inventor card.
* @param icon the icon value of the Inventor card.
* @param nMin the minimum number of players required for the card.
* @throws IllegalArgumentException if {@code icon < 0} or {@code icon > 9}.
*/
public Inventor(int Era,int icon,int nMin) throws IllegalArgumentException {
super(Era, CharacterType.INVENTOR,nMin);
@@ -48,7 +48,7 @@ public class Inventor extends Character {
/**
* Returns the string representation of this Inventor card.
*
* @return the string representation of this Inventor card
* @return the string representation of this Inventor card.
*/
@Override
public String toString() {
@@ -58,7 +58,7 @@ public class Inventor extends Character {
/**
* Creates and returns a copy of this Inventor card.
*
* @return a clone of this Inventor card
* @return a clone of this Inventor card.
*/
@Override
public Character clone() {
@@ -68,7 +68,7 @@ public class Inventor extends Character {
/**
* Inserts this Inventor card into the specified player's Inventor collection.
*
* @param player the player who receives the card
* @param player the player who receives the card.
*/
@Override
public void insert(Player player) {
src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Shaman.java
+9 -9
View File
@@ -12,7 +12,7 @@ public class Shaman extends Character {
/**
* Returns the icon value of this Shaman card.
*
* @return the icon value of this Shaman card
* @return the icon value of this Shaman card.
*/
public int getIcon() {
return icon;
@@ -21,8 +21,8 @@ public class Shaman extends Character {
/**
* Creates a Shaman character card with the specified era and icon value.
*
* @param Era the era of the Shaman card
* @param icon the icon value of the Shaman card
* @param Era the era of the Shaman card.
* @param icon the icon value of the Shaman card.
*/
public Shaman(int Era, int icon) {
super(Era, CharacterType.SHAMAN);
@@ -33,9 +33,9 @@ public class Shaman extends Character {
* Creates a Shaman character card with the specified era, icon value,
* and minimum number of players.
*
* @param Era the era of the Shaman card
* @param icon the icon value of the Shaman card
* @param nMin the minimum number of players required for the card
* @param Era the era of the Shaman card.
* @param icon the icon value of the Shaman card.
* @param nMin the minimum number of players required for the card.
*/
public Shaman(int Era, int icon, int nMin) {
super(Era, CharacterType.SHAMAN,nMin);
@@ -45,7 +45,7 @@ public class Shaman extends Character {
/**
* Returns the string representation of this Shaman card.
*
* @return the string representation of this Shaman card
* @return the string representation of this Shaman card.
*/
@Override
public String toString() {
@@ -55,7 +55,7 @@ public class Shaman extends Character {
/**
* Creates and returns a copy of this Shaman card.
*
* @return a clone of this Shaman card
* @return a clone of this Shaman card.
*/
@Override
public Character clone() {
@@ -65,7 +65,7 @@ public class Shaman extends Character {
/**
* Inserts this Shaman card into the specified player's Shaman collection.
*
* @param player the player who receives the card
* @param player the player who receives the card.
*/
@Override
public void insert(Player player)