Skip to content

Commit

Permalink
sample beatmap for reference
Browse files Browse the repository at this point in the history
  • Loading branch information
Althoumb committed Mar 31, 2018
1 parent 91d80b4 commit 43a9285
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 9 deletions.
19 changes: 16 additions & 3 deletions src/game/BeatmapParser.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,22 @@ public class BeatmapParser {

public LinkedList<Beat> parseBeatmap() {
LinkedList<Beat> beatlist = new LinkedList<Beat>();
beatlist.add(new Beat(250, 250, 1000));
beatlist.add(new Beat(300, 300, 1250));
beatlist.add(new Beat(150, 350, 1500));
beatlist.add(new Beat(100,78,854));
beatlist.add(new Beat(42,276,3132));
beatlist.add(new Beat(235,324,3891));
beatlist.add(new Beat(465,104,5410));
beatlist.add(new Beat(256,192,5790));
beatlist.add(new Beat(263,259,9398));
beatlist.add(new Beat(476,172,10347));
beatlist.add(new Beat(359,44,11106));
beatlist.add(new Beat(9,68,12436));
beatlist.add(new Beat(41,308,14144));
beatlist.add(new Beat(367,364,15474));
beatlist.add(new Beat(384,114,16423));
beatlist.add(new Beat(312,43,16803));
beatlist.add(new Beat(225,92,17182));
beatlist.add(new Beat(67,248,18701));
beatlist.add(new Beat(141,314,19081));
return beatlist;
}
}
7 changes: 1 addition & 6 deletions src/game/RhythmState.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package game;

import java.util.ArrayList;
import java.util.LinkedList;
import java.util.concurrent.CopyOnWriteArrayList;

Expand All @@ -17,7 +16,7 @@

public class RhythmState extends DefaultGameState{

public final float CIRCLE_TIME = 600f; //time it takes for approach circles to shrink.
public final float CIRCLE_TIME = 1000f; //time it takes for approach circles to shrink.
public final float LENIENCE_TIME = 200f; //lenience, in ms, given to the player to click the hit object

private Image background; //background image
Expand Down Expand Up @@ -108,10 +107,6 @@ public void update(GameContainer gc, StateBasedGame sbg, int delta) throws Slick

}

private double randomRange(float lower, float upper) {
return Math.random() * (upper - lower) + lower;
}

@Override
public boolean isAcceptingInput() {
return true;
Expand Down

0 comments on commit 43a9285

Please sign in to comment.