Job + Spell merge #9

Merged
erns6604 merged 23 commits from Job into main 2025-10-27 12:18:22 +01:00
2 changed files with 18 additions and 17 deletions
Showing only changes of commit af344e1c36 - Show all commits

View File

@@ -19,22 +19,6 @@ public abstract class Job implements Levelable {
return level; return level;
} }
@Override
public String toString() {
return String.format("Job: %s. Level: %d", name, level);
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
return o != null && getClass() == o.getClass();
}
@Override
public int hashCode() {
return Objects.hash(name);
}
@Override @Override
public int remainingXpUntilLevelUp() { public int remainingXpUntilLevelUp() {
return ExperienceTable.getXpForLevel(level) - experience; return ExperienceTable.getXpForLevel(level) - experience;
@@ -59,6 +43,21 @@ public abstract class Job implements Levelable {
level++; level++;
} }
@Override
public String toString() {
return String.format("Job: %s. Level: %d", name, level);
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
return o != null && getClass() == o.getClass();
}
@Override
public int hashCode() {
return Objects.hash(name);
}
} }

View File

@@ -34,6 +34,8 @@ public class MinerTest {
assertEquals(10, job.getExperience()); assertEquals(10, job.getExperience());
} }
} }