equipments #13

Merged
erns6604 merged 4 commits from equipments into main 2025-10-29 14:13:02 +01:00
3 changed files with 41 additions and 14 deletions
Showing only changes of commit 50f0672278 - Show all commits

2
.idea/misc.xml generated
View File

@ -8,7 +8,7 @@
</list> </list>
</option> </option>
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_24" default="true" project-jdk-name="24" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_23" default="true" project-jdk-name="23" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" /> <output url="file://$PROJECT_DIR$/out" />
</component> </component>
</project> </project>

View File

@ -1,4 +1,25 @@
package Item; package Item;
public class MageHat { public class MageHat extends EquipmentType{
}
private String name;
private AttributeModifier modifiers;
public MageHat(String name, AttributeModifier modifiers) {
this.name = name;
this.modifiers = new AttributeModifier(modifiers.getMaxHpMod(), modifiers.getMaxMpMod(), modifiers.getStrMod(), modifiers.getMagicStrMod()*2, modifiers.getDefMod(), modifiers.getMagicDefMod()*2);
}
public String getName() {
return name;
}
public AttributeModifier getModifiers() {
return modifiers;
}
@Override
public String toString() {
return "" + modifiers;
}
}

View File

@ -7,64 +7,70 @@ import Item.BodyArmour;
import Item.AttributeModifier; import Item.AttributeModifier;
public class EquipmentTest { public class EquipmentTest {
private Equipment defaultEquipment() { private Equipment defaultBodyArmour() {
AttributeModifier a = new AttributeModifier(4,8,7,1,2,8); AttributeModifier a = new AttributeModifier(4,8,7,1,2,8);
BodyArmour b = new BodyArmour("Body Armour", a); BodyArmour b = new BodyArmour("Body Armour", a);
return new Equipment("5", "Thornmail", b, 2); return new Equipment("5", "Thornmail", b, 2);
} }
private Equipment defaultMageHat() {
AttributeModifier a = new AttributeModifier(4,8,2,10,2,8);
BodyArmour b = new BodyArmour("Mage Hat", a);
return new Equipment("6", "Deathmage Cap", b, 1);
}
@Test @Test
void setNameOnCreation() { void setNameOnCreation() {
var e = defaultEquipment(); var e = defaultBodyArmour();
assertEquals("Thornmail", e.getName(), "Equipment name should have been set"); assertEquals("Thornmail", e.getName(), "Equipment name should have been set");
} }
@Test @Test
void setTypeOnCreation() { void setTypeOnCreation() {
var e = defaultEquipment(); var e = defaultBodyArmour();
assertEquals("helmet", e.getEquipmentType().getName(), "Equipment type should have been set"); assertEquals("helmet", e.getEquipmentType().getName(), "Equipment type should have been set");
} }
@Test @Test
void setSlotOnCreation() { void setSlotOnCreation() {
var e = defaultEquipment(); var e = defaultBodyArmour();
assertEquals(1, e.getSlot(), "Equipment slot should have been set"); assertEquals(2, e.getSlot(), "Equipment slot should have been set");
} }
@Test @Test
void setMaxHpModOnCreation() { void setMaxHpModOnCreation() {
var e = defaultEquipment(); var e = defaultBodyArmour();
assertEquals(1, e.getEquipmentType().getModifiers().getMaxHpMod(), "Equipment max hp modifier should have been set"); assertEquals(1, e.getEquipmentType().getModifiers().getMaxHpMod(), "Equipment max hp modifier should have been set");
} }
@Test @Test
void setMaxMpModOnCreation() { void setMaxMpModOnCreation() {
var e = defaultEquipment(); var e = defaultBodyArmour();
assertEquals(1, e.getEquipmentType().getModifiers().getMaxMpMod(), "Equipment max mp modifier should have been set"); assertEquals(1, e.getEquipmentType().getModifiers().getMaxMpMod(), "Equipment max mp modifier should have been set");
} }
@Test @Test
void setStrModOnCreation() { void setStrModOnCreation() {
var e = defaultEquipment(); var e = defaultBodyArmour();
assertEquals(1, e.getEquipmentType().getModifiers().getStrMod(), "Equipment strength modifier should have been set"); assertEquals(1, e.getEquipmentType().getModifiers().getStrMod(), "Equipment strength modifier should have been set");
} }
@Test @Test
void setMagicStrModOnCreation() { void setMagicStrModOnCreation() {
var e = defaultEquipment(); var e = defaultBodyArmour();
assertEquals(1, e.getEquipmentType().getModifiers().getMagicStrMod(), "Equipment magic strength modifier should have been set"); assertEquals(1, e.getEquipmentType().getModifiers().getMagicStrMod(), "Equipment magic strength modifier should have been set");
} }
@Test @Test
void setDefModOnCreation() { void setDefModOnCreation() {
var e = defaultEquipment(); var e = defaultBodyArmour();
assertEquals(1, e.getEquipmentType().getModifiers().getDefMod(), "Equipment defence modifier should have been set"); assertEquals(1, e.getEquipmentType().getModifiers().getDefMod(), "Equipment defence modifier should have been set");
} }
@Test @Test
void setMagicDefModOnCreation() { void setMagicDefModOnCreation() {
var e = defaultEquipment(); var e = defaultBodyArmour();
assertEquals(1, e.getEquipmentType().getModifiers().getMagicDefMod(), "Equipment magic defence modifier should have been set"); assertEquals(1, e.getEquipmentType().getModifiers().getMagicDefMod(), "Equipment magic defence modifier should have been set");
} }
} }