Permalink
Browse files

Playtest tweaks

  • Loading branch information...
1 parent 62df683 commit 6bb5fef3598a354eae453a5d02d4100878690ce2 @sparks sparks committed May 31, 2012
View
@@ -49,4 +49,9 @@ Playtest 3
Playtest 4
-----------------------------
-* Catch null pointers for wrong file name
+* Catch null pointers for wrong file name
+* Blinkning is confusing
+* All on maybe?
+* Coop color is bad
+* Gong at round end
+* Bigger center holding for rounds
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<level name="Easy">
<!-- <song file="01 I Want You Back.mp3" bpm="60"/> -->
- <song file="05 Leila Came Round And We Watched A Video.mp3" bpm="60"/>
+ <song file="08 No More Mosquitos.mp3" bpm="60"/>
<sequence>
<step mode="coop">
<player patch1="1" patch2="1" patch3="0" patch4="0"/>
@@ -27,48 +27,64 @@
<player patch1="0" patch2="1" patch3="1" patch4="0"/>
<player patch1="0" patch2="1" patch3="1" patch4="0"/>
</step>
- <step mode="transition" file="15 Hotcha (Razz-Ma-Tazz).mp3">
+ <step mode="transition" file="11 Besouro.mp3">
<player patch1="1" patch2="0" patch3="1" patch4="0"/>
<player patch1="0" patch2="1" patch3="1" patch4="0"/>
</step>
<step mode="versus">
+ <player patch1="1" patch2="1" patch3="0" patch4="0"/>
<player patch1="1" patch2="0" patch3="1" patch4="0"/>
- <player patch1="0" patch2="1" patch3="1" patch4="0"/>
</step>
<step mode="versus">
+ <player patch1="0" patch2="1" patch3="1" patch4="0"/>
<player patch1="1" patch2="1" patch3="0" patch4="0"/>
- <player patch1="1" patch2="0" patch3="1" patch4="0"/>
</step>
<step mode="versus">
<player patch1="0" patch2="1" patch3="1" patch4="0"/>
<player patch1="1" patch2="1" patch3="0" patch4="0"/>
</step>
- <step mode="transition" file="11 Besouro.mp3">
+ <step mode="versus">
+ <player patch1="1" patch2="1" patch3="0" patch4="0"/>
+ <player patch1="0" patch2="1" patch3="1" patch4="0"/>
+ </step>
+ <step mode="versus">
+ <player patch1="1" patch2="0" patch3="1" patch4="0"/>
<player patch1="1" patch2="0" patch3="1" patch4="0"/>
+ </step>
+ <step mode="versus">
+ <player patch1="0" patch2="1" patch3="1" patch4="0"/>
<player patch1="0" patch2="1" patch3="1" patch4="0"/>
</step>
- <step mode="coop">
+ <step mode="transition" file="11 Besouro.mp3">
<player patch1="1" patch2="0" patch3="1" patch4="0"/>
<player patch1="0" patch2="1" patch3="1" patch4="0"/>
</step>
- <step mode="coop">
+ <step mode="versus">
<player patch1="1" patch2="1" patch3="0" patch4="0"/>
<player patch1="1" patch2="0" patch3="1" patch4="0"/>
</step>
- <step mode="coop">
+ <step mode="versus">
<player patch1="0" patch2="1" patch3="1" patch4="0"/>
<player patch1="1" patch2="1" patch3="0" patch4="0"/>
</step>
- <step mode="coop">
+ <step mode="versus">
<player patch1="0" patch2="1" patch3="1" patch4="0"/>
<player patch1="1" patch2="1" patch3="0" patch4="0"/>
</step>
- <step mode="transition" file="01 I Want You Back.mp3">
- <player patch1="1" patch2="0" patch3="1" patch4="0"/>
+ <step mode="versus">
+ <player patch1="1" patch2="1" patch3="0" patch4="0"/>
<player patch1="0" patch2="1" patch3="1" patch4="0"/>
</step>
<step mode="versus">
<player patch1="1" patch2="0" patch3="1" patch4="0"/>
+ <player patch1="1" patch2="0" patch3="1" patch4="0"/>
+ </step>
+ <step mode="versus">
+ <player patch1="0" patch2="1" patch3="1" patch4="0"/>
+ <player patch1="0" patch2="1" patch3="1" patch4="0"/>
+ </step>
+ <step mode="transition" file="11 Besouro.mp3">
+ <player patch1="1" patch2="0" patch3="1" patch4="0"/>
<player patch1="0" patch2="1" patch3="1" patch4="0"/>
</step>
<step mode="versus">
@@ -83,5 +99,17 @@
<player patch1="0" patch2="1" patch3="1" patch4="0"/>
<player patch1="1" patch2="1" patch3="0" patch4="0"/>
</step>
+ <step mode="versus">
+ <player patch1="1" patch2="1" patch3="0" patch4="0"/>
+ <player patch1="0" patch2="1" patch3="1" patch4="0"/>
+ </step>
+ <step mode="versus">
+ <player patch1="1" patch2="0" patch3="1" patch4="0"/>
+ <player patch1="1" patch2="0" patch3="1" patch4="0"/>
+ </step>
+ <step mode="versus">
+ <player patch1="0" patch2="1" patch3="1" patch4="0"/>
+ <player patch1="0" patch2="1" patch3="1" patch4="0"/>
+ </step>
</sequence>
</level>
@@ -169,7 +169,7 @@ public static Color violet() {
* @return The color "teal" as a Color object.
*/
public static Color teal() {
- return new Color(0, 255, 82);
+ return new Color(0, 255, 255);
}
}
@@ -98,7 +98,7 @@ public void draw() {
offscreen.pushMatrix();
offscreen.translate(position.x, position.y);
- offscreen.scale(1.3f * scale * texture.width/2f);//TODO size hack
+ offscreen.scale(1.5f * scale * texture.width/2f);//TODO size hack
offscreen.tint(color.toInt(parent));
offscreen.image(texture, -1, -1, 2, 2);
offscreen.noTint();
@@ -20,7 +20,7 @@
Color.green()
};
- public static final Color NEUTRAL_COLOR = Color.violet();
+ public static final Color NEUTRAL_COLOR = Color.teal();
}
@@ -82,11 +82,11 @@ public void setup() {
simulator = new HardwareSimulator(this);
xbeeBaseStation = new XBeeBaseStation();
- // xbeeBaseStation.scanBlocking(); //TODO use nonblock and resolve the timing issues with packet sending
+ xbeeBaseStation.scanBlocking(); //TODO use nonblock and resolve the timing issues with packet sending
xbeeManager = new XBeeManager(this, xbeeBaseStation);
- // hardware = xbeeBaseStation;
- hardware = simulator;
+ hardware = xbeeBaseStation;
+ // hardware = simulator;
//Player/Player List
if(MAX_PLAYERS < 2) {
@@ -148,7 +148,7 @@ public void setup() {
}
}
- tmp_levels.add(new BopperLevel(this, hud, sounds, "08 No More Mosquitos.mp3", players));
+ tmp_levels.add(new BopperLevel(this, hud, sounds, "11 Besouro.mp3", players));
tmp_levels.add(new HealthLevel(this, hud, sounds, "05 Leila Came Round And We Watched A Video.mp3", players));
levels = tmp_levels.toArray(new Level[0]);
@@ -8,12 +8,13 @@
public class ProxLevel extends Level {
- static int TOTAL_LEN = 120000; //2min;
+ static int TOTAL_LEN = 180000; //2min;
long[] lastScoreTime;
long[] lastScoreTimePauseDiff;
AudioPlayer song;
+ AudioSample gong;
Vector<AudioPlayer> transitionSongs; //TODO Hack
int transitionCount;
@@ -38,6 +39,8 @@
public ProxLevel(Propinquity parent, Hud hud, Sounds sounds, String levelFile, Player[] players) throws XMLException {
super(parent, hud, sounds, players);
+ gong = sounds.getGong();
+
lastScoreTime = new long[players.length];
lastScoreTimePauseDiff = new long[players.length];
coopScore = 0;
@@ -148,8 +151,7 @@ public void start() {
song.play();
}
- public void reset() {
- song.pause();
+ public void reset() {
running = false;
startTime = -1;
@@ -160,7 +162,11 @@ public void reset() {
lastScoreTimePauseDiff = new long[players.length];
coopScore = 0;
- for(AudioPlayer song : transitionSongs) song.rewind();
+ for(AudioPlayer song : transitionSongs) {
+ song.pause();
+ song.setGain(0);
+ song.rewind();
+ }
song = transitionSongs.get(0);
stepUpdate(0); //Load for banner
}
@@ -199,6 +205,7 @@ void stepUpdate(int nextStep) {
player.clearGloves();
player.bump();
}
+
fader.fadeOut();
} else { //Otherwise do the step
for(int i = 0;i < players.length;i++) {
@@ -319,7 +326,8 @@ public void keyPressed(char key, int keyCode) {
}
case 'e': { //Force End
- song.cue(song.length()-1000);
+ // song.cue(song.length()-1000);
+ startTime = parent.millis()-179000;
break;
}
}
@@ -418,6 +426,8 @@ public void run() {
}
song.setGain(0);
} else {
+ gong.trigger();
+
for(int i = 0;i < 100;i++) {
song.setGain(-(float)i/4);
try {
@@ -7,7 +7,7 @@
static final boolean USE_DAEMON = false;
static final int DAEMON_PERIOD = 300;
- static final int SLOW_BLINK = 100;
+ static final int SLOW_BLINK = 25;
static final int FAST_BLINK = 15;
static final int DEFAULT_DUTY_CYCLE = 127;

0 comments on commit 6bb5fef

Please sign in to comment.