Skip to content
Browse files

Tweak tweak

  • Loading branch information...
1 parent 9bb7158 commit e4a7829994c392936e3bba2c6bf373bee696d39d @sparks sparks committed May 28, 2012
Showing with 94 additions and 93 deletions.
  1. +2 −0 software/TODO.md
  2. +92 −92 software/data/levels/02-twentythree.xml
  3. +0 −1 software/src/propinquity/Propinquity.java
View
2 software/TODO.md
@@ -46,3 +46,5 @@ Playtest 3
-----------------------------
* Gong between the rounds
* Vvvvv before score
+* Intro sounds
+* Multipop
View
184 software/data/levels/02-twentythree.xml
@@ -1,187 +1,187 @@
<?xml version="1.0" encoding="UTF-8"?>
<level name="Medium">
- <!-- <song file="11 Besouro.mp3" bpm="60"/> -->
- <song file="02 Twenty Three.mp3" bpm="60"/>
+ <song file="11 Besouro.mp3" bpm="60"/>
+ <!-- <song file="02 Twenty Three.mp3" bpm="60"/> -->
<sequence>
<step mode="versus">
- <player patch1="1" patch2="1" patch3="0" patch4="0"/>
- <player patch1="1" patch2="1" patch3="0" patch4="0"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
</step>
<step mode="versus">
- <player patch1="1" patch2="0" patch3="1" patch4="0"/>
- <player patch1="1" patch2="0" patch3="1" patch4="0"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
</step>
<step mode="versus">
- <player patch1="0" patch2="1" patch3="1" patch4="0"/>
- <player patch1="0" patch2="1" patch3="1" patch4="0"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
</step>
<step mode="versus">
- <player patch1="1" patch2="1" patch3="0" patch4="0"/>
- <player patch1="1" patch2="0" patch3="1" patch4="0"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
</step>
<step mode="versus">
- <player patch1="1" patch2="0" patch3="1" patch4="0"/>
- <player patch1="1" patch2="1" patch3="0" patch4="0"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
</step>
<step mode="versus">
- <player patch1="1" patch2="1" patch3="0" patch4="0"/>
- <player patch1="0" patch2="1" patch3="1" patch4="0"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
</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="1" patch3="1" patch4="1"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
</step>
<step mode="versus">
- <player patch1="1" patch2="1" patch3="0" patch4="0"/>
- <player patch1="1" patch2="1" patch3="0" patch4="0"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
</step>
<step mode="versus">
- <player patch1="1" patch2="0" patch3="1" patch4="0"/>
- <player patch1="1" patch2="0" patch3="1" patch4="0"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
</step>
<step mode="versus">
- <player patch1="0" patch2="1" patch3="1" patch4="0"/>
- <player patch1="0" patch2="1" patch3="1" patch4="0"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
</step>
<step mode="versus">
- <player patch1="1" patch2="1" patch3="0" patch4="0"/>
- <player patch1="1" patch2="0" patch3="1" patch4="0"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
</step>
<step mode="versus">
- <player patch1="1" patch2="0" patch3="1" patch4="0"/>
- <player patch1="1" patch2="1" patch3="0" patch4="0"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
</step>
<step mode="versus">
- <player patch1="1" patch2="1" patch3="0" patch4="0"/>
- <player patch1="0" patch2="1" patch3="1" patch4="0"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
</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="1" patch3="1" patch4="1"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
</step>
<step mode="versus">
- <player patch1="1" patch2="1" patch3="0" patch4="0"/>
- <player patch1="1" patch2="1" patch3="0" patch4="0"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
</step>
<step mode="versus">
- <player patch1="1" patch2="0" patch3="1" patch4="0"/>
- <player patch1="1" patch2="0" patch3="1" patch4="0"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
</step>
<step mode="versus">
- <player patch1="0" patch2="1" patch3="1" patch4="0"/>
- <player patch1="0" patch2="1" patch3="1" patch4="0"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
</step>
<step mode="versus">
- <player patch1="1" patch2="1" patch3="0" patch4="0"/>
- <player patch1="1" patch2="0" patch3="1" patch4="0"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
</step>
<step mode="versus">
- <player patch1="1" patch2="0" patch3="1" patch4="0"/>
- <player patch1="1" patch2="1" patch3="0" patch4="0"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
</step>
<step mode="versus">
- <player patch1="1" patch2="1" patch3="0" patch4="0"/>
- <player patch1="0" patch2="1" patch3="1" patch4="0"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
</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="1" patch3="1" patch4="1"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
</step>
<step mode="versus">
- <player patch1="1" patch2="1" patch3="0" patch4="0"/>
- <player patch1="1" patch2="1" patch3="0" patch4="0"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
</step>
<step mode="versus">
- <player patch1="1" patch2="0" patch3="1" patch4="0"/>
- <player patch1="1" patch2="0" patch3="1" patch4="0"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
</step>
<step mode="versus">
- <player patch1="0" patch2="1" patch3="1" patch4="0"/>
- <player patch1="0" patch2="1" patch3="1" patch4="0"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
</step>
<step mode="versus">
- <player patch1="1" patch2="1" patch3="0" patch4="0"/>
- <player patch1="1" patch2="0" patch3="1" patch4="0"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
</step>
<step mode="versus">
- <player patch1="1" patch2="0" patch3="1" patch4="0"/>
- <player patch1="1" patch2="1" patch3="0" patch4="0"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
</step>
<step mode="versus">
- <player patch1="1" patch2="1" patch3="0" patch4="0"/>
- <player patch1="0" patch2="1" patch3="1" patch4="0"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
</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="1" patch3="1" patch4="1"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
</step>
<step mode="versus">
- <player patch1="1" patch2="1" patch3="0" patch4="0"/>
- <player patch1="1" patch2="1" patch3="0" patch4="0"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
</step>
<step mode="versus">
- <player patch1="1" patch2="0" patch3="1" patch4="0"/>
- <player patch1="1" patch2="0" patch3="1" patch4="0"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
</step>
<step mode="versus">
- <player patch1="0" patch2="1" patch3="1" patch4="0"/>
- <player patch1="0" patch2="1" patch3="1" patch4="0"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
</step>
<step mode="versus">
- <player patch1="1" patch2="1" patch3="0" patch4="0"/>
- <player patch1="1" patch2="0" patch3="1" patch4="0"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
</step>
<step mode="versus">
- <player patch1="1" patch2="0" patch3="1" patch4="0"/>
- <player patch1="1" patch2="1" patch3="0" patch4="0"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
</step>
<step mode="versus">
- <player patch1="1" patch2="1" patch3="0" patch4="0"/>
- <player patch1="0" patch2="1" patch3="1" patch4="0"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
</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="1" patch3="1" patch4="1"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
</step>
<step mode="versus">
- <player patch1="1" patch2="1" patch3="0" patch4="0"/>
- <player patch1="1" patch2="1" patch3="0" patch4="0"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
</step>
<step mode="versus">
- <player patch1="1" patch2="0" patch3="1" patch4="0"/>
- <player patch1="1" patch2="0" patch3="1" patch4="0"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
</step>
<step mode="versus">
- <player patch1="0" patch2="1" patch3="1" patch4="0"/>
- <player patch1="0" patch2="1" patch3="1" patch4="0"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
</step>
<step mode="versus">
- <player patch1="1" patch2="1" patch3="0" patch4="0"/>
- <player patch1="1" patch2="0" patch3="1" patch4="0"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
</step>
<step mode="versus">
- <player patch1="1" patch2="0" patch3="1" patch4="0"/>
- <player patch1="1" patch2="1" patch3="0" patch4="0"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
</step>
<step mode="versus">
- <player patch1="1" patch2="1" patch3="0" patch4="0"/>
- <player patch1="0" patch2="1" patch3="1" patch4="0"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
</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="1" patch3="1" patch4="1"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
</step>
<step mode="versus">
- <player patch1="1" patch2="1" patch3="0" patch4="0"/>
- <player patch1="1" patch2="1" patch3="0" patch4="0"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
</step>
<step mode="versus">
- <player patch1="1" patch2="0" patch3="1" patch4="0"/>
- <player patch1="1" patch2="0" patch3="1" patch4="0"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
</step>
<step mode="versus">
- <player patch1="0" patch2="1" patch3="1" patch4="0"/>
- <player patch1="0" patch2="1" patch3="1" patch4="0"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
+ <player patch1="1" patch2="1" patch3="1" patch4="1"/>
</step>
</sequence>
</level>
View
1 software/src/propinquity/Propinquity.java
@@ -196,7 +196,6 @@ public void draw() {
tex.filter(blur, tex);
image(tex, width/2, height/2, offscreen.width, offscreen.height);
-
if(gameState == GameState.Play) box2d.step();
pushMatrix();

0 comments on commit e4a7829

Please sign in to comment.
Something went wrong with that request. Please try again.