inventory #14

Merged
erns6604 merged 11 commits from inventory into main 2025-10-29 14:21:29 +01:00
2 changed files with 11 additions and 6 deletions
Showing only changes of commit fa6c8022e4 - Show all commits

View File

@@ -24,6 +24,11 @@ public class Equipment implements Item {
return name; return name;
} }
@Override
public int getWeight() {
return 0;
}
public EquipmentType getEquipmentType() { public EquipmentType getEquipmentType() {
return equipmentType; return equipmentType;
} }

View File

@@ -29,7 +29,7 @@ public class EquipmentTest {
@Test @Test
void setTypeOnCreation() { void setTypeOnCreation() {
var e = defaultBodyArmour(); var e = defaultBodyArmour();
assertEquals("helmet", e.getEquipmentType().getName(), "Equipment type should have been set"); assertEquals("Body Armour", e.getEquipmentType().getName(), "Equipment type should have been set");
} }
@Test @Test
@@ -41,19 +41,19 @@ public class EquipmentTest {
@Test @Test
void setMaxHpModOnCreation() { void setMaxHpModOnCreation() {
var e = defaultBodyArmour(); var e = defaultBodyArmour();
assertEquals(1, e.getEquipmentType().getModifiers().getMaxHpMod(), "Equipment max hp modifier should have been set"); assertEquals(4, e.getEquipmentType().getModifiers().getMaxHpMod(), "Equipment max hp modifier should have been set");
} }
@Test @Test
void setMaxMpModOnCreation() { void setMaxMpModOnCreation() {
var e = defaultBodyArmour(); var e = defaultBodyArmour();
assertEquals(1, e.getEquipmentType().getModifiers().getMaxMpMod(), "Equipment max mp modifier should have been set"); assertEquals(8, e.getEquipmentType().getModifiers().getMaxMpMod(), "Equipment max mp modifier should have been set");
} }
@Test @Test
void setStrModOnCreation() { void setStrModOnCreation() {
var e = defaultBodyArmour(); var e = defaultBodyArmour();
assertEquals(1, e.getEquipmentType().getModifiers().getStrMod(), "Equipment strength modifier should have been set"); assertEquals(7, e.getEquipmentType().getModifiers().getStrMod(), "Equipment strength modifier should have been set");
} }
@Test @Test
@@ -65,12 +65,12 @@ public class EquipmentTest {
@Test @Test
void setDefModOnCreation() { void setDefModOnCreation() {
var e = defaultBodyArmour(); var e = defaultBodyArmour();
assertEquals(1, e.getEquipmentType().getModifiers().getDefMod(), "Equipment defence modifier should have been set"); assertEquals(4, e.getEquipmentType().getModifiers().getDefMod(), "Equipment defence modifier should have been set");
} }
@Test @Test
void setMagicDefModOnCreation() { void setMagicDefModOnCreation() {
var e = defaultBodyArmour(); var e = defaultBodyArmour();
assertEquals(1, e.getEquipmentType().getModifiers().getMagicDefMod(), "Equipment magic defence modifier should have been set"); assertEquals(16, e.getEquipmentType().getModifiers().getMagicDefMod(), "Equipment magic defence modifier should have been set");
} }
} }