Skip to content
Snippets Groups Projects
Commit 5973ee2f authored by zalavari's avatar zalavari
Browse files

unnecessary code lines removed

parent 26aa784e
No related branches found
No related tags found
No related merge requests found
package killer_sokoban; package killer_sokoban;
import java.util.ArrayList;
public class Hole extends SimpleField { public class Hole extends SimpleField {
......
package killer_sokoban; package killer_sokoban;
import java.util.ArrayList;
public abstract class Moveable { public abstract class Moveable {
......
package killer_sokoban; package killer_sokoban;
import java.util.ArrayList;
public class SwitchField extends SimpleField { public class SwitchField extends SimpleField {
private SwitchableHole sHole; private SwitchableHole sHole;
......
package killer_sokoban; package killer_sokoban;
import java.util.ArrayList;
public class TargetField extends SimpleField { public class TargetField extends SimpleField {
/**Ez a függvény azt jelzi a mező számára, hogy szeretnének rálépni. /**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 { ...@@ -13,29 +11,6 @@ public class TargetField extends SimpleField {
@Override @Override
public boolean accept(Direction toward, Worker w, Moveable m) { 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! Moveable myEx = myMoveable; //can be null!
boolean ret=super.accept(toward, w, m); boolean ret=super.accept(toward, w, m);
if (ret) if (ret)
...@@ -44,8 +19,6 @@ public class TargetField extends SimpleField { ...@@ -44,8 +19,6 @@ public class TargetField extends SimpleField {
myMoveable.stepOnTarget(w); myMoveable.stepOnTarget(w);
} }
return ret; return ret;
} }
......
package killer_sokoban; package killer_sokoban;
import javafx.scene.canvas.Canvas; import javafx.scene.canvas.Canvas;
import javafx.scene.canvas.GraphicsContext; import javafx.scene.canvas.GraphicsContext;
import javafx.scene.image.Image; import javafx.scene.image.Image;
import javafx.scene.paint.Color; import javafx.scene.paint.Color;
import javafx.scene.paint.Paint;
public class View { public class View {
...@@ -33,7 +30,6 @@ public class View { ...@@ -33,7 +30,6 @@ public class View {
public void setCanvas(Canvas c) public void setCanvas(Canvas c)
{ {
this.gc=c.getGraphicsContext2D(); this.gc=c.getGraphicsContext2D();
} }
public void update() public void update()
...@@ -45,7 +41,6 @@ public class View { ...@@ -45,7 +41,6 @@ public class View {
for (x=0;x<column;x++) for (x=0;x<column;x++)
for (y=0;y<line;y++) for (y=0;y<line;y++)
Main.drawRequiredFor(y,x); Main.drawRequiredFor(y,x);
} }
public void drawAbstract() { public void drawAbstract() {
...@@ -59,38 +54,30 @@ public class View { ...@@ -59,38 +54,30 @@ public class View {
} }
public void drawTargetField() { public void drawTargetField() {
gc.setFill(Color.YELLOW);
gc.drawImage(targetFieldImg, x*tileSize, y*tileSize); gc.drawImage(targetFieldImg, x*tileSize, y*tileSize);
} }
public void drawHole() { public void drawHole() {
gc.setFill(Color.BLACK);
gc.drawImage(holeImg, x*tileSize, y*tileSize); gc.drawImage(holeImg, x*tileSize, y*tileSize);
} }
public void drawSwitchField() { public void drawSwitchField() {
gc.setFill(Color.PLUM);
gc.drawImage(switchFieldImg, x*tileSize, y*tileSize); gc.drawImage(switchFieldImg, x*tileSize, y*tileSize);
} }
public void drawWall() { public void drawWall() {
gc.setFill(Color.GREY);
gc.drawImage(wallImg, x*tileSize, y*tileSize); gc.drawImage(wallImg, x*tileSize, y*tileSize);
} }
public void drawOil() { public void drawOil() {
gc.setFill(Color.SLATEGREY);
gc.drawImage(oilImg, x*tileSize, y*tileSize); gc.drawImage(oilImg, x*tileSize, y*tileSize);
} }
public void drawHoney() { public void drawHoney() {
gc.setFill(Color.GOLD);
gc.drawImage(honeyImg, x*tileSize, y*tileSize); gc.drawImage(honeyImg, x*tileSize, y*tileSize);
} }
public void drawWorker(Worker w) { public void drawWorker(Worker w) {
String name=Main.getMoveableName(w); String name=Main.getMoveableName(w);
Image wImg=new Image("file:GIMPimages/"+name+".png"); Image wImg=new Image("file:GIMPimages/"+name+".png");
gc.setFill(Color.GREEN);
gc.drawImage(wImg, x*tileSize, y*tileSize); gc.drawImage(wImg, x*tileSize, y*tileSize);
} }
public void drawCrate() { public void drawCrate() {
gc.setFill(Color.ORANGE);
gc.drawImage(crateImg, x*tileSize, y*tileSize); gc.drawImage(crateImg, x*tileSize, y*tileSize);
} }
......
package killer_sokoban; package killer_sokoban;
import java.util.ArrayList;
public class Wall extends AbstractField { public class Wall extends AbstractField {
...@@ -12,7 +11,6 @@ public class Wall extends AbstractField { ...@@ -12,7 +11,6 @@ public class Wall extends AbstractField {
*/ */
@Override @Override
public boolean accept(Direction toward, Worker w, Moveable m) { public boolean accept(Direction toward, Worker w, Moveable m) {
return false; return false;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment