Skip to content

Commit

Permalink
added max moves
Browse files Browse the repository at this point in the history
  • Loading branch information
cee__9338 committed Jan 11, 2018
1 parent 32c37f8 commit 4a56b5d
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 26 deletions.
40 changes: 20 additions & 20 deletions src/levels.csv
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
1,1,13,14,0,1,5,17,6,18,9,21,24,30,28,29,32,34,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
2,1,12,13,0,6,3,5,9,15,11,23,16,22,18,20,26,32,28,29,30,31,33,34,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
3,1,13,14,15,27,19,20,23,35,25,31,32,33,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
4,1,13,14,0,12,3,15,20,26,21,23,29,35,32,34,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
5,1,13,14,0,1,3,15,5,11,6,18,10,22,17,23,19,21,24,30,28,29,34,35,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
11,2,13,14,0,12,1,2,3,15,20,26,21,23,29,35,32,34,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
12,2,12,13,0,6,1,2,5,17,8,20,21,23,30,32,28,34,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
13,2,15,16,0,1,2,3,4,10,8,14,11,23,13,19,18,30,21,22,27,33,28,29,31,32,34,35,-1,-1,-1,-1,-1,-1
14,2,14,15,0,1,2,8,10,11,12,18,13,19,16,22,17,23,20,21,26,32,28,29,30,31,-1,-1,-1,-1,-1,-1,-1,-1
15,2,14,15,1,2,3,4,6,7,8,9,10,22,11,23,12,24,13,25,20,26,21,27,28,29,31,32,33,34,-1,-1,-1,-1
21,3,13,14,0,1,2,8,3,15,6,18,19,21,33,35,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
22,3,13,14,2,8,3,5,6,12,9,21,10,11,19,25,22,23,24,30,26,27,29,35,31,33,-1,-1,-1,-1,-1,-1,-1,-1
23,3,15,16,2,4,5,17,8,14,9,10,20,26,21,27,22,23,28,29,32,34,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
24,3,14,15,2,8,3,4,7,13,12,18,16,22,19,20,24,26,28,34,30,31,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
25,3,13,14,0,1,2,8,4,5,6,7,11,23,12,24,16,22,19,21,25,31,27,33,28,29,34,35,-1,-1,-1,-1,-1,-1
31,4,13,14,0,1,3,5,9,15,10,11,12,18,17,29,20,32,21,22,24,25,33,35,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
32,4,12,13,0,1,2,14,3,9,4,5,18,24,19,20,21,22,23,35,27,33,30,31,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
33,4,12,13,1,7,2,14,4,5,18,24,19,20,21,22,23,35,25,26,27,33,28,34,30,32,-1,-1,-1,-1,-1,-1,-1,-1
34,4,12,13,0,6,3,5,9,15,11,23,16,22,18,20,21,27,26,32,28,29,30,31,33,34,-1,-1,-1,-1,-1,-1,-1,-1
35,4,12,13,2,14,3,4,5,17,9,15,18,24,19,21,25,26,27,33,28,34,30,31,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
1,1,8,13,14,0,1,5,17,6,18,9,21,24,30,28,29,32,34,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
2,1,8,12,13,0,6,3,5,9,15,11,23,16,22,18,20,26,32,28,29,30,31,33,34,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
3,1,14,13,14,15,27,19,20,23,35,25,31,32,33,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
4,1,9,13,14,0,12,3,15,20,26,21,23,29,35,32,34,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
5,1,9,13,14,0,1,3,15,5,11,6,18,10,22,17,23,19,21,24,30,28,29,34,35,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
11,2,15,13,14,0,12,1,2,3,15,20,26,21,23,29,35,32,34,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
12,2,17,12,13,0,6,1,2,5,17,8,20,21,23,30,32,28,34,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
13,2,21,15,16,0,1,2,3,4,10,8,14,11,23,13,19,18,30,21,22,27,33,28,29,31,32,34,35,-1,-1,-1,-1,-1,-1
14,2,17,14,15,0,1,2,8,10,11,12,18,13,19,16,22,17,23,20,21,26,32,28,29,30,31,-1,-1,-1,-1,-1,-1,-1,-1
15,2,23,14,15,1,2,3,4,6,7,8,9,10,22,11,23,12,24,13,25,20,26,21,27,28,29,31,32,33,34,-1,-1,-1,-1
21,3,21,13,14,0,1,2,8,3,15,6,18,19,21,33,35,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
22,3,26,13,14,2,8,3,5,6,12,9,21,10,11,19,25,22,23,24,30,26,27,29,35,31,33,-1,-1,-1,-1,-1,-1,-1,-1
23,3,29,15,16,2,4,5,17,8,14,9,10,20,26,21,27,22,23,28,29,32,34,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
24,3,25,14,15,2,8,3,4,7,13,12,18,16,22,19,20,24,26,28,34,30,31,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
25,3,27,13,14,0,1,2,8,4,5,6,7,11,23,12,24,16,22,19,21,25,31,27,33,28,29,34,35,-1,-1,-1,-1,-1,-1
31,4,37,13,14,0,1,3,5,9,15,10,11,12,18,17,29,20,32,21,22,24,25,33,35,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
32,4,37,12,13,0,1,2,14,3,9,4,5,18,24,19,20,21,22,23,35,27,33,30,31,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
33,4,30,12,13,1,7,2,14,4,5,18,24,19,20,21,22,23,35,25,26,27,33,28,34,30,32,-1,-1,-1,-1,-1,-1,-1,-1
34,4,43,12,13,0,6,3,5,9,15,11,23,16,22,18,20,21,27,26,32,28,29,30,31,33,34,-1,-1,-1,-1,-1,-1,-1,-1
35,4,43,12,13,2,14,3,4,5,17,9,15,18,24,19,21,25,26,27,33,28,34,30,31,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
10 changes: 6 additions & 4 deletions src/rushhour/Converter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,19 @@ public void reload() throws NumberFormatException, IOException{
String[] columns = line.split(",");
int Nr = Integer.parseInt(columns[0]);
int Level = Integer.parseInt(columns[1]);
Car startcar = getCarFromCoords(Integer.parseInt(columns[2]), Integer.parseInt(columns[3]), true);
int MaxMoves = Integer.parseInt(columns[2]);

Car startcar = getCarFromCoords(Integer.parseInt(columns[3]), Integer.parseInt(columns[4]), true);
cars.add(startcar);

for(int i = 4; i < 34; i+=2){
for(int i = 5; i < 35; i+=2){
int pos1 = Integer.parseInt(columns[i]);
int pos2 = Integer.parseInt(columns[i+1]);
if(pos1 == -1) break;
cars.add(getCarFromCoords(pos1, pos2, false));
}

thm = new Map(Nr, cars);
thm = new Map(Nr, cars, MaxMoves);
Level thl = getLevel(Level);
thl.addMap(thm);
}
Expand All @@ -60,7 +62,7 @@ private Level getLevel(int Level){
private Car getCarFromCoords(int pos1, int pos2, boolean isStartCar){
Point startPos = new Point((int)pos1%6, (int)pos1/6);
Point endPos = new Point((int)pos2%6, (int)pos2/6);
boolean Rotation = startPos.getX() ==endPos.getX();
boolean Rotation = startPos.getX() == endPos.getX();
int Lenght = 0;
if(Rotation) Lenght = (int) (endPos.getY() - startPos.getY());
else Lenght = (int) (endPos.getX() - startPos.getX());
Expand Down
8 changes: 7 additions & 1 deletion src/rushhour/Map.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@
public class Map {
private ArrayList<Car> cars = null;
private int Nr = 0;
private int MaxMoves = 0;

public Map(int Nr, ArrayList<Car> cars){
public Map(int Nr, ArrayList<Car> cars, int MaxMoves){
this.cars = cars;
this.Nr = Nr;
this.MaxMoves = MaxMoves;
}

public ArrayList<Car> getCars() {
Expand All @@ -27,4 +29,8 @@ public String toString(){
public void reset() {
for(Car c : cars) c.reset();
}

public int getMaxMoves(){
return MaxMoves;
}
}
3 changes: 3 additions & 0 deletions src/rushhour/Rushhour.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,7 @@ public boolean isPuzzleSolved(){
public void setMap(Map map){
thisMap = map;
}
public int getMaxMoves(){
return thisMap.getMaxMoves();
}
}
2 changes: 1 addition & 1 deletion src/rushhour/Window.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public void mouseReleased(MouseEvent e) {
carGotSelected = false;
if(!oldpos.equals(selectedCar.getCoords(0))) selectedCar.moveMade(); // only if car got moved
selectedCar.setSelected(false);
Window.setTitle("Rush Hour, Moves made: " + rh.getAllMoves());
Window.setTitle("Rush Hour, Moves made: " + rh.getAllMoves()+", Max Moves: " +rh.getMaxMoves());
drawField();
Window.setCursor(Cursor.DEFAULT_CURSOR);
if(rh.isPuzzleSolved()){
Expand Down

0 comments on commit 4a56b5d

Please sign in to comment.