Skip to content
Snippets Groups Projects
Commit 8aa67ea5 authored by CsellarAndras's avatar CsellarAndras
Browse files

Correction in Person

parent 0bde27c0
No related branches found
No related tags found
No related merge requests found
......@@ -34,7 +34,7 @@ public abstract class Person {
{
items = new Vector<>();
this.field = field;
field.addPerson(this);
field.accept(this);
this.name = name;
work = 4;
id = idcounter++;
......@@ -95,7 +95,7 @@ public abstract class Person {
Logger.LogAndIncreaseTabs("Person(" + name + ") fall"); //teszthez
if(items.contains(new Item("DivingSuit"))) {
Logger.Log(">>" + this.getName() + "-nek van búvárruhája, túléli", false);
step(Direction.RIGHT);
step(field.getNeighbors().get(0));
}
else {
Logger.Log(">>" + this.getName() + "-nek nincs búvárruhája, segítők keresése", false);
......@@ -144,8 +144,8 @@ public abstract class Person {
Logger.LogAndIncreaseTabs("Person(" + name + ") findHelpers");
ArrayList<Person> potentialhelpers = new ArrayList<Person>();
Direction dirs[] = Direction.values();
for(Direction dir: dirs) { //iteralas az osszes iranyt tartalmazo tombon
Field neighbor = field.getNeighbor(dir); //elkerjuk a sajat fieldtol az adott iranyban levo szomszedot
List<Field> neighbors = field.getNeighbors();
for(Field neighbor: neighbors) { //iteralas az osszes iranyt tartalmazo tombon
potentialhelpers.addAll(neighbor.getPersons());
}
Logger.decreaseTabs();
......@@ -204,20 +204,6 @@ public abstract class Person {
Logger.decreaseTabs(); // ha van asoja, akkor 2 reteg havat tud letakaritani ha nincs akkor 1-t
}
public void step(Direction direction)
{
Logger.LogAndIncreaseTabs("Person(" + name + ") step(" + direction+")");
Field neighbor = field.getNeighbor(direction);
if (neighbor != null)
{
field.remove(this);
field = neighbor;
neighbor.accept(this);
work --;
}
Logger.decreaseTabs();
}
public void step(Field field)
{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment