Skip to content

Commit

Permalink
Cycle through level/difficulty with 'G' and 'L'.
Browse files Browse the repository at this point in the history
Also: Remove unused variables.
  • Loading branch information
IntegratedQuantum committed Jul 24, 2019
1 parent 1e4c95f commit d867b0f
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 16 deletions.
21 changes: 18 additions & 3 deletions src/MainMenu.java
Expand Up @@ -23,6 +23,21 @@ public void keyReleased(KeyEvent e) {
main.changeOverlay(null);
}
}
if(e.getKeyCode() == 71) { // 71 = 'G'
difficulty++;
if(difficulty == Assets.difficulty.length) {
difficulty = 0;
}
main.g.difficulty = difficulty;
}
if(e.getKeyCode() == 76) { // 76 = 'L'
level++;
if(level == Assets.levels.length) {
level = 0;
}
main.g.level = level;
main.g.initGame();
}
}
@Override
public void mousePressed(MouseEvent e) {
Expand Down Expand Up @@ -110,7 +125,7 @@ public void paint(Graphics2D g2d) {
g2d.setColor(Assets.textColor);
g2d.drawString("Press Space to Start.", 0, 56);
g2d.drawString("Use ← and → to change direction.", 0, 76);
g2d.drawString("Use g to cycle between gamemodes.", 0, 96);
g2d.drawString("Use g and l to cycle through gamemodes.", 0, 96);
if(System.currentTimeMillis()-lastT > 1000) {
lastT = System.currentTimeMillis();
}
Expand All @@ -132,7 +147,7 @@ public void paint(Graphics2D g2d) {
// Difficulty selection:
g2d.setColor(Assets.textColor);
g2d.setFont(new Font("Sanserif", 20, 20));
g2d.drawString("difficulty:", 2, 200);
g2d.drawString("Difficulty:", 2, 200);
for(int i = 0; i < Assets.difficulty.length; i++) {
g2d.setColor(Assets.bgColor);
g2d.fillRect(-1, 215+i*35, 101, 30);
Expand All @@ -148,7 +163,7 @@ public void paint(Graphics2D g2d) {
}
// Level selection:
g2d.setColor(Assets.textColor);
g2d.drawString("level:", 703, 200);
g2d.drawString("Level:", 703, 200);
for(int i = 0; i < Assets.levels.length; i++) {
g2d.setColor(Assets.bgColor);
g2d.fillRect(700, 215+i*35, 101, 30);
Expand Down
14 changes: 1 addition & 13 deletions src/main.java
Expand Up @@ -22,17 +22,14 @@ public class main extends JPanel implements KeyListener, MouseListener {
static int [] frsize = {800, 800}; // TODO: Allow resizing and use frsize everywhere.
Object fruit; // Snakes eat fruits here!
Snake snake;
boolean pause = false;
int size = 8; // Size of the game cube.
int [] Cscode = {39, 37}; // Store the keycodes used to move right/left. TODO: allow the user to change them and store them in a file.
boolean [] Cs = new boolean[250]; // Store if a key is pressed, to differentiate actual key pressing from getting a keyPressed-signal.
boolean death = false;
boolean moved = false;
ArrayList<Object> border = new ArrayList<Object>();
int [] score = new int[Assets.levels.length+Assets.difficulty.length*Assets.levels.length];
int [] highscore = new int[Assets.levels.length+Assets.difficulty.length*Assets.levels.length];
int n = 0;
int gamemode;
int difficulty = 0;
int level = 0;
String [] gamemodes = {"normal", "hard", "level 1", "level 2", "big cube"};
Expand Down Expand Up @@ -92,21 +89,12 @@ public void keyTyped(KeyEvent e) {}

@Override
public void keyPressed(KeyEvent e) {
if(!pause) {
if(overlay == null) {
if(!Cs[e.getKeyCode()]) {
keyLatest(e.getKeyCode()); // Submit the latest new keypress to the game.
}
}
Cs[e.getKeyCode()] = true;
if(pause || death) {
if(e.getKeyCode() == 71) { // 71 = 'g'
gamemode ++;
if(gamemode == gamemodes.length) {
gamemode = 0;
}
initGame();
}
}
}

@Override
Expand Down

0 comments on commit d867b0f

Please sign in to comment.