diff --git a/.idea/dictionaries/project.xml b/.idea/dictionaries/project.xml
new file mode 100644
index 0000000..54c1554
--- /dev/null
+++ b/.idea/dictionaries/project.xml
@@ -0,0 +1,8 @@
+
+
+
+ deathmage
+ thornmail
+
+
+
\ No newline at end of file
diff --git a/README.md b/README.md
index cccb987..3f2aab1 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ When implementing the features of the game we will apply the TDD-technique.
RWRD implements common elements from roguelikes, and games in general.
### The player
-The player object is a representation of the user and it's agency in the game world
+The player object is a representation of the user, and it's agency in the game world
### Entity.Player
diff --git a/hortlog -s –n b/hortlog -s –n
deleted file mode 100644
index c330c71..0000000
--- a/hortlog -s –n
+++ /dev/null
@@ -1,11 +0,0 @@
-error: unknown option `-git'
-usage: git shortlog [] [] [[--] ...]
- or: git log --pretty=short | git shortlog []
-
- -c, --[no-]committer group by committer rather than author
- -n, --[no-]numbered sort output according to the number of commits per author
- -s, --[no-]summary suppress commit descriptions, only provides commit count
- -e, --[no-]email show the email address of each author
- -w[[,[,]]] linewrap output
- --[no-]group group by field
-
diff --git a/src/main/java/Action/DigAction.java b/src/main/java/Action/DigAction.java
index a59ea96..9ab0a2b 100644
--- a/src/main/java/Action/DigAction.java
+++ b/src/main/java/Action/DigAction.java
@@ -1,11 +1,10 @@
package Action;
-import Job.JobHolder;
import Job.Miner;
import Terrain.Biome;
public class DigAction implements Action {
- Biome biome;
+ final Biome biome;
public DigAction(Biome biome) {
this.biome = biome;
}
diff --git a/src/main/java/Attack.java b/src/main/java/Attack.java
index a292f3e..3d387d1 100644
--- a/src/main/java/Attack.java
+++ b/src/main/java/Attack.java
@@ -4,9 +4,9 @@ public abstract class Attack {
private static final double DEFAULT_ENERGY_COST = 5d;
private static final double DEFAULT_DAMAGE = 5d;
- private String name;
- private double energyCost;
- private double damage;
+ private final String name;
+ private final double energyCost;
+ private final double damage;
public Attack() {
name = DEFAULT_NAME;
diff --git a/src/main/java/Entity/Entity.java b/src/main/java/Entity/Entity.java
index 44e6eac..9e2898f 100644
--- a/src/main/java/Entity/Entity.java
+++ b/src/main/java/Entity/Entity.java
@@ -5,7 +5,7 @@ import java.util.ArrayList;
import java.util.List;
public abstract class Entity implements Positionable {
- protected String name;
+ protected final String name;
protected Position position;
private static final List entities = new ArrayList();
diff --git a/src/main/java/Entity/Movable.java b/src/main/java/Entity/Movable.java
index 3b4ee43..f50f73a 100644
--- a/src/main/java/Entity/Movable.java
+++ b/src/main/java/Entity/Movable.java
@@ -1,6 +1,5 @@
package Entity;
-
public interface Movable {
void moveTo(Position position);
boolean canMoveTo(Position position);
diff --git a/src/main/java/Entity/Player.java b/src/main/java/Entity/Player.java
index d4ebd66..f386576 100644
--- a/src/main/java/Entity/Player.java
+++ b/src/main/java/Entity/Player.java
@@ -27,9 +27,9 @@ public class Player extends Entity implements Movable, Actor, InventoryHolder, H
protected Job job;
protected Position position = new Position(0,0);
protected Inventory inventory= new Inventory();
- protected List spells = new LinkedList<>();
- protected List conditions = new LinkedList<>();
- protected List equipments = new ArrayList<>();
+ protected final List spells = new LinkedList<>();
+ protected final List conditions = new LinkedList<>();
+ protected final List equipments = new ArrayList<>();
public Player(String name, Job job) {
super(name);
this.job = job;
diff --git a/src/main/java/Item/AttributeModifier.java b/src/main/java/Item/AttributeModifier.java
index 7da0303..0ea09dd 100644
--- a/src/main/java/Item/AttributeModifier.java
+++ b/src/main/java/Item/AttributeModifier.java
@@ -1,12 +1,12 @@
package Item;
public class AttributeModifier {
- private int maxHpMod;
- private int maxMpMod;
- private int strMod;
- private int magicStrMod;
- private int defMod;
- private int magicDefMod;
+ private final int maxHpMod;
+ private final int maxMpMod;
+ private final int strMod;
+ private final int magicStrMod;
+ private final int defMod;
+ private final int magicDefMod;
public AttributeModifier(int maxHpMod, int maxMpMod, int strMod, int magicStrMod, int defMod, int magicDefMod) {
this.maxHpMod = maxHpMod;
diff --git a/src/main/java/Item/BodyArmour.java b/src/main/java/Item/BodyArmour.java
index d1a58b0..743039d 100644
--- a/src/main/java/Item/BodyArmour.java
+++ b/src/main/java/Item/BodyArmour.java
@@ -2,8 +2,8 @@ package Item;
public class BodyArmour extends EquipmentType{
- private String name;
- private AttributeModifier modifiers;
+ private final String name;
+ private final AttributeModifier modifiers;
public BodyArmour(String name, AttributeModifier modifiers) {
this.name = name;
diff --git a/src/main/java/Item/Equipment.java b/src/main/java/Item/Equipment.java
index f0aef5e..61ed562 100644
--- a/src/main/java/Item/Equipment.java
+++ b/src/main/java/Item/Equipment.java
@@ -5,11 +5,11 @@ import Job.Job;
public class Equipment implements Item {
- private String id;
- private String name;
- private EquipmentType equipmentType;
- private Job equipable;
- private int slot;
+ private final String id;
+ private final String name;
+ private final EquipmentType equipmentType;
+ private final Job equipable;
+ private final int slot;
public Equipment(String id, String name, EquipmentType equipmentType, Job equipable, int slot) {
this.id = id;
diff --git a/src/main/java/Item/MageHat.java b/src/main/java/Item/MageHat.java
index 6149bae..f9a2685 100644
--- a/src/main/java/Item/MageHat.java
+++ b/src/main/java/Item/MageHat.java
@@ -2,8 +2,8 @@ package Item;
public class MageHat extends EquipmentType{
- private String name;
- private AttributeModifier modifiers;
+ private final String name;
+ private final AttributeModifier modifiers;
public MageHat(String name, AttributeModifier modifiers) {
this.name = name;
diff --git a/src/main/java/Job/Job.java b/src/main/java/Job/Job.java
index 3c63ea2..be9cf21 100644
--- a/src/main/java/Job/Job.java
+++ b/src/main/java/Job/Job.java
@@ -6,7 +6,7 @@ import Shared.Levelable;
public abstract class Job implements Levelable {
protected int level;
protected int experience;
- protected String name;
+ protected final String name;
Job(String name) {
this.name = name;
diff --git a/src/main/java/Job/Miner.java b/src/main/java/Job/Miner.java
index 1e2ba60..ac35c0e 100644
--- a/src/main/java/Job/Miner.java
+++ b/src/main/java/Job/Miner.java
@@ -6,7 +6,7 @@ import Terrain.Biome;
public class Miner extends Job {
- InventoryHolder actor;
+ final InventoryHolder actor;
public Miner(InventoryHolder actor) {
super("Miner");
diff --git a/src/test/java/DigActionTest.java b/src/test/java/DigActionTest.java
index 4d4c6c0..81ea56e 100644
--- a/src/test/java/DigActionTest.java
+++ b/src/test/java/DigActionTest.java
@@ -14,7 +14,7 @@ public class DigActionTest {
var player = mock(Player.class);
when(player.getJob()).thenReturn(mockMiner);
var biome = mock(Biome.class);
- var action = new DigAction(biome);
+ var action = new DigAction(Biome.COAST);
action.execute(player);
verify(mockMiner, times(1)).dig(biome);
}
diff --git a/src/test/java/EPTest.java b/src/test/java/EPTest.java
index 112f89c..772f7d3 100644
--- a/src/test/java/EPTest.java
+++ b/src/test/java/EPTest.java
@@ -119,7 +119,7 @@ public class EPTest {
}
@Test
- public void select_spell_target_index_over_boundry() {
+ public void select_spell_target_index_over_boundary() {
Scanner testScanner = new Scanner(new ByteArrayInputStream("1\n2\n".getBytes()));
wizard = new Wizard(testScanner);
@@ -143,11 +143,11 @@ public class EPTest {
}
@Test
- public void select_spell_target_index_under_boundry() {
+ public void select_spell_target_index_under_boundary() {
Scanner testScanner = new Scanner(new ByteArrayInputStream("1\n0\n".getBytes()));
wizard = new Wizard(testScanner);
- Player player = new Player("Alfon", wizard);
+ Player player = new Player("Alfons", wizard);
player.setMana(50);
OffensiveDamageSpell fireball = new OffensiveDamageSpell("Fireball", 20, 1, 15);
diff --git a/src/test/java/EquipmentTest.java b/src/test/java/EquipmentTest.java
index 3a89f40..225dc95 100644
--- a/src/test/java/EquipmentTest.java
+++ b/src/test/java/EquipmentTest.java
@@ -11,8 +11,8 @@ import Item.AttributeModifier;
import static org.junit.jupiter.api.Assertions.*;
public class EquipmentTest {
- private Knight knight = new Knight();
- private Wizard wizard = new Wizard();
+ private final Knight knight = new Knight();
+ private final Wizard wizard = new Wizard();
private Player defaultWizard(){
return new Player("name", wizard);
}
diff --git a/src/test/java/InterestingTests.java b/src/test/java/InterestingTests.java
index 673aa74..9fd8e97 100644
--- a/src/test/java/InterestingTests.java
+++ b/src/test/java/InterestingTests.java
@@ -34,7 +34,7 @@ public class InterestingTests {
Scanner testScanner = new Scanner(new ByteArrayInputStream("1\n1\n".getBytes()));
wizard = new Wizard(testScanner);
- Player player = new Player("Alfon", wizard);
+ Player player = new Player("Alfons", wizard);
player.setMana(50);
OffensiveStatusSpell poisonSpray = new OffensiveStatusSpell("poisonSpray", 20, 1, "Poison");
@@ -50,7 +50,7 @@ public class InterestingTests {
wizard = new Wizard(testScanner);
Position position = new Position(1,1);
- Player player = new Player("Alfon", wizard);
+ Player player = new Player("Alfons", wizard);
Player player2 = new Player("Bob", wizard);
player.setMana(50);
player2.moveTo(position);
diff --git a/src/test/java/MinerTest.java b/src/test/java/MinerTest.java
index 7f3da25..e120b78 100644
--- a/src/test/java/MinerTest.java
+++ b/src/test/java/MinerTest.java
@@ -1,4 +1,3 @@
-import Action.DigAction;
import Entity.Player;
import Inventory.Inventory;
import Job.Miner;
@@ -10,7 +9,6 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.*;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.*;
public class MinerTest {
diff --git a/src/test/java/MonsterTest.java b/src/test/java/MonsterTest.java
index cc75cd4..d7c7ffb 100644
--- a/src/test/java/MonsterTest.java
+++ b/src/test/java/MonsterTest.java
@@ -1,4 +1,3 @@
-import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Test;
public class MonsterTest {
diff --git a/src/test/java/PlayerTest.java b/src/test/java/PlayerTest.java
index 8378977..886c31e 100644
--- a/src/test/java/PlayerTest.java
+++ b/src/test/java/PlayerTest.java
@@ -24,7 +24,6 @@ class PlayerTest {
var inventory = mock(Inventory.class);
var player = new Player("abc", job, inventory);
assertThat(player, instanceOf(Player.class));
-
}
@Test