diff --git a/src/killer_sokoban/Hole.java b/src/killer_sokoban/Hole.java index 107fd82da4900baf1282b942b3f514008865d2f7..981ab694b5b9b2aea71005ee5dee66127f276a55 100644 --- a/src/killer_sokoban/Hole.java +++ b/src/killer_sokoban/Hole.java @@ -1,6 +1,5 @@ package killer_sokoban; -import java.util.ArrayList; public class Hole extends SimpleField { diff --git a/src/killer_sokoban/Moveable.java b/src/killer_sokoban/Moveable.java index 65e1e3e183bd0d12109866ccddbccd6ac4f51ce4..be7c9ecc3b4c0b9aa5833e24662041d086b4b3ad 100644 --- a/src/killer_sokoban/Moveable.java +++ b/src/killer_sokoban/Moveable.java @@ -1,6 +1,5 @@ package killer_sokoban; -import java.util.ArrayList; public abstract class Moveable { diff --git a/src/killer_sokoban/SwitchField.java b/src/killer_sokoban/SwitchField.java index 03ef598486d12a6771f1f54d4656586a1245adc8..4b6dc723fac91a92a712462c20daa8f91f9165ae 100644 --- a/src/killer_sokoban/SwitchField.java +++ b/src/killer_sokoban/SwitchField.java @@ -1,7 +1,5 @@ package killer_sokoban; -import java.util.ArrayList; - public class SwitchField extends SimpleField { private SwitchableHole sHole; diff --git a/src/killer_sokoban/TargetField.java b/src/killer_sokoban/TargetField.java index 448b36c0a1b455dc27df2a0e36722b7fa50924b6..5fe84d13332e6473630f4f39cb261409d9c69fec 100644 --- a/src/killer_sokoban/TargetField.java +++ b/src/killer_sokoban/TargetField.java @@ -1,7 +1,5 @@ package killer_sokoban; -import java.util.ArrayList; - public class TargetField extends SimpleField { /**Ez a függvény azt jelzi a mező számára, hogy szeretnének rálépni. @@ -13,29 +11,6 @@ public class TargetField extends SimpleField { @Override public boolean accept(Direction toward, Worker w, Moveable m) { -// boolean ret=true; //Alapvetően elfogadnánk.... -// if (myMoveable != null) //...kivétel ha van rajta valaki... -// { -// Moveable myEx = myMoveable; -// -// ret=m.meetWith(toward, w, myMoveable); //...aki nem hajlandó elmenni -// -// if (ret) { //Ellépés adminisztrációja -// myEx.stepOffTarget(w); -// } -// } -// -// //Elfogadás adminisztrációja -// if (ret) -// { -// m.move(this); //Fontos a sorrend, mert ez a függvény eldobatja magát m mezőjével. -// myMoveable=m; -// myMoveable.stepOnTarget(w); -// determineBlocked(toward); -// } - - - Moveable myEx = myMoveable; //can be null! boolean ret=super.accept(toward, w, m); if (ret) @@ -43,9 +18,7 @@ public class TargetField extends SimpleField { if (myEx!=null) myEx.stepOffTarget(w); myMoveable.stepOnTarget(w); } - - - + return ret; } diff --git a/src/killer_sokoban/View.java b/src/killer_sokoban/View.java index 26061d1ea94b0faa863dc5b1c8812e7bedf7ffee..6e0df24fcd7ef1214667644af91fa737c1d771a1 100644 --- a/src/killer_sokoban/View.java +++ b/src/killer_sokoban/View.java @@ -1,12 +1,9 @@ package killer_sokoban; - - import javafx.scene.canvas.Canvas; import javafx.scene.canvas.GraphicsContext; import javafx.scene.image.Image; import javafx.scene.paint.Color; -import javafx.scene.paint.Paint; public class View { @@ -32,8 +29,7 @@ public class View { } public void setCanvas(Canvas c) { - this.gc=c.getGraphicsContext2D(); - + this.gc=c.getGraphicsContext2D(); } public void update() @@ -45,7 +41,6 @@ public class View { for (x=0;x<column;x++) for (y=0;y<line;y++) Main.drawRequiredFor(y,x); - } public void drawAbstract() { @@ -59,38 +54,30 @@ public class View { } public void drawTargetField() { - gc.setFill(Color.YELLOW); gc.drawImage(targetFieldImg, x*tileSize, y*tileSize); } public void drawHole() { - gc.setFill(Color.BLACK); gc.drawImage(holeImg, x*tileSize, y*tileSize); } public void drawSwitchField() { - gc.setFill(Color.PLUM); gc.drawImage(switchFieldImg, x*tileSize, y*tileSize); } public void drawWall() { - gc.setFill(Color.GREY); gc.drawImage(wallImg, x*tileSize, y*tileSize); } public void drawOil() { - gc.setFill(Color.SLATEGREY); gc.drawImage(oilImg, x*tileSize, y*tileSize); } public void drawHoney() { - gc.setFill(Color.GOLD); gc.drawImage(honeyImg, x*tileSize, y*tileSize); } public void drawWorker(Worker w) { String name=Main.getMoveableName(w); Image wImg=new Image("file:GIMPimages/"+name+".png"); - gc.setFill(Color.GREEN); gc.drawImage(wImg, x*tileSize, y*tileSize); } public void drawCrate() { - gc.setFill(Color.ORANGE); gc.drawImage(crateImg, x*tileSize, y*tileSize); } diff --git a/src/killer_sokoban/Wall.java b/src/killer_sokoban/Wall.java index 070e3dd61d6fd3319d67bf4b428c55c80ed79ec1..9ba94e28f4fe5913cedff2cd36542df2f935bf20 100644 --- a/src/killer_sokoban/Wall.java +++ b/src/killer_sokoban/Wall.java @@ -1,6 +1,5 @@ package killer_sokoban; -import java.util.ArrayList; public class Wall extends AbstractField { @@ -12,7 +11,6 @@ public class Wall extends AbstractField { */ @Override public boolean accept(Direction toward, Worker w, Moveable m) { - return false; }