Skip to content
This repository has been archived by the owner on Apr 25, 2020. It is now read-only.

Commit

Permalink
Raymond's change request
Browse files Browse the repository at this point in the history
1. for AI combat mode as we will do, every message from and to is popping up. All you need to do is read the popup, click the popup and click on map for the other group's choice.
2. Everything blocked when game ends
3. Separator add between maps - thicker
4. Lighter blue changed to even lighter lighter blue. Didn't put white cuz looks terrible.
  • Loading branch information
yichunShen committed Jun 14, 2018
1 parent 2447561 commit 3dcea2f
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 16 deletions.
6 changes: 3 additions & 3 deletions User1
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ null
null
0
0
4 3
2
4430
7 6
16
6102
0
0 1 2 3 4
null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null
Expand Down
Binary file modified gLOSE.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified gWIN.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion rankL.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
1 3 2
4 1 1
14 1 1
2 changes: 1 addition & 1 deletion rankW.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
1 3 2
3 0 0
4 0 0
16 changes: 6 additions & 10 deletions src/game.java
Original file line number Diff line number Diff line change
Expand Up @@ -155,17 +155,18 @@ public void mouseReleased(MouseEvent e) {
public game(){
setSize(1300,700);
setLayout(null);
mapSeparator.setBounds(bInsets.left+647,bInsets.top+125,6,525);
add(mapSeparator);
winWord.setBounds(bInsets.left,bInsets.top+190,1300,300);

winWord.setBounds(bInsets.left,bInsets.top,1300,700);
winWord.addMouseListener(hide);
add(winWord);
winWord.setVisible(false);
losWord.setBounds(bInsets.left,bInsets.top+190,1300,300);
losWord.setBounds(bInsets.left,bInsets.top,1300,700);
losWord.addMouseListener(hide);
add(losWord);
losWord.setVisible(false);
setMap(true);
mapSeparator.setBounds(bInsets.left+647,bInsets.top+125,6,525);
add(mapSeparator);
gButtons.add(backButton);
gButtons.add(startButton);
gButtons.add(leaveButton);
Expand Down Expand Up @@ -222,11 +223,6 @@ public void actionPerformed(ActionEvent e) {
bgi.setBounds(bInsets.left,bInsets.top,1300,700);
add(bgi);
setBackground(Color.DARK_GRAY);
for(int i =0;i<10;i++){
for(int j =0;j<10;j++){

}
}
setVisible(true);

}
Expand Down Expand Up @@ -318,7 +314,7 @@ public void setMap(boolean firstTime){
}
if(!firstTime){
userMap[i][j].setText("");
userMap[i][j].setText("");
enemMap[i][j].setText("");
}
userMap[i][j].setBorder(new LineBorder(Color.white));
enemMap[i][j].setBorder(new LineBorder(Color.white));
Expand Down
3 changes: 2 additions & 1 deletion src/system.java
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ public void mouseClicked(MouseEvent event) {
System.out.println(-1);
remove(baseInter);
add(gameInter);
enterGame();
repaint();
enterGame();
return;
}
if (source.equals(baseInter.rankingButton)) {
Expand Down Expand Up @@ -222,6 +222,7 @@ JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, new ImageIcon("gNani.pn
if(AIcombat){
for(int i =0;i<10;i++){
for(int j =0;j<10;j++){
game.enemMap[i][j].setText("");;
game.userMap[i][j].setBackground(Color.white);
game.userMap[i][j].removeMouseListener(gameInter.unitDis);
}
Expand Down

0 comments on commit 3dcea2f

Please sign in to comment.