loic/2048-javafx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add 2 and 4

Browse source
This commit is contained in:
loic 2016-09-22 20:09:07 +02:00
parent 5446859dee
commit d794981f82
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/controller/MainWindowController.java
View file

@ -112,7 +112,7 @@ public class MainWindowController implements IObserver {
} }
gc.fillText("" + value, x + (this.squareSize / 2), y + (this.squareSize / 2)); gc.fillText("" + value, x + (this.squareSize / 2), y + (this.squareSize / 2));
} }
} }
} }

11
src/main/java/model/Board.java
View file

@ -88,10 +88,17 @@ public class Board implements IModel{
if(choices.size()>0){ if(choices.size()>0){
int index=0; int index=0;
if(choices.size()>1){ if(choices.size()>1){
index=rand.nextInt(choices.size()-1) + 0; index=rand.nextInt(choices.size()-1 +1) + 0;
} }
Integer[] xy=(Integer[])choices.toArray()[index]; Integer[] xy=(Integer[])choices.toArray()[index];
this.board[xy[0]][xy[1]]=2; int twoOrFour=rand.nextInt(3-0 +1) + 0;
switch (twoOrFour){
case 0:
this.board[xy[0]][xy[1]]=4;
break;
default:
this.board[xy[0]][xy[1]]=2;
}
} }
} }