Basic job implementation #5

Merged
erns6604 merged 10 commits from player into main 2025-10-17 10:06:38 +02:00
9 changed files with 77 additions and 42 deletions
Showing only changes of commit f730cee3a3 - Show all commits

View File

@@ -1,5 +1,5 @@
package Action; package Action;
public abstract class Action { public interface Action {
public static Dig Dig = new Dig(); void exectue(Actor player);
} }

View File

@@ -0,0 +1,8 @@
package Action;
import Job.Job;
public interface Actor {
Job getJob();
void performAction(Action action);
}

View File

@@ -1,5 +1,8 @@
package Action; package Action;
public class Dig extends Action { public class Dig implements Action {
@Override
public void exectue(Actor actor) {
actor.performAction(this);
}
} }

View File

@@ -0,0 +1,7 @@
package Character;
import java.util.List;
public interface HasInventory {
List<String> getInventory();
}

View File

@@ -0,0 +1,5 @@
package Job;
public interface HasJob {
Job getJob();
}

View File

@@ -1,21 +1,40 @@
package Job; package Job;
public abstract class Job { import Action.Actor;
private int level;
abstract void performJobAction();
Job() { import java.util.Objects;
public abstract class Job {
protected int level;
protected String name;
Job(String name) {
this.name = name;
this.level = 1; this.level = 1;
} }
Job(int level) {
this.level = level;
}
public double getLevel() { public double getLevel() {
return level; return level;
}; }
public void levelUp() { public void levelUp() {
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

@@ -1,30 +1,18 @@
package Job; package Job;
import java.util.Objects; import Action.Actor;
import Character.HasInventory;
public class Miner extends Job { public class Miner extends Job {
private final String jobName = "Miner"; public Miner() {
super("Miner");
public Miner() {}
@Override
public void performJobAction() {
System.out.println("Dig...");
} }
@Override
public String toString() {
return "Miner";
}
@Override @Override
public boolean equals(Object o) { void performJobAction(Actor actor) {
if (this == o) return true; if(actor instanceof HasInventory a) {
return o != null && getClass() == o.getClass(); a.getInventory().add("Rock");
} }
@Override
public int hashCode() {
return Objects.hash(jobName);
} }
} }

View File

@@ -1,11 +1,14 @@
import Action.Action;
import Action.Actor;
import Action.Dig; import Action.Dig;
import Job.Job; import Job.Job;
import Job.HasJob;
import Character.HasInventory;
import java.util.Collection;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
public class Player extends Character implements Movable { public class Player extends Character implements Movable, Actor, HasInventory, HasJob {
protected Job job; protected Job job;
protected List<String> items = new LinkedList<>(); protected List<String> items = new LinkedList<>();
public Player(String name, Job job) { public Player(String name, Job job) {
@@ -30,11 +33,13 @@ public class Player extends Character implements Movable {
return job; return job;
} }
public void performAction(Dig dig) {
items.add("Stone");
}
public List<String> getInventory() { public List<String> getInventory() {
return items; return items;
} }
@Override
public void performAction(Action action) {
action.exectue(this);
}
} }

View File

@@ -1,23 +1,23 @@
import Action.Action;
import Job.Miner; import Job.Miner;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertTrue;
import Action.Dig;
public class MinerTest { public class MinerTest {
@Test @Test
void miner_can_dig() { void miner_can_dig() {
var p = new Player("Steve"); var p = new Player("Steve");
var job = new Miner(); var job = new Miner();
p.learnJob(job); p.learnJob(job);
p.performAction(Action.Dig); p.performAction(new Dig());
assertTrue(p.getInventory().contains("Stone")); assertTrue(p.getInventory().contains("Stone"));
} }
@Test @Test
void miner_can_level_up() { void miner_can_level_up() {
var p = new Player("Steve");
var job = new Miner(); var job = new Miner();
assertEquals(1, job.getLevel()); assertEquals(1, job.getLevel());
job.levelUp(); job.levelUp();