Skip to content
This repository
Browse code

Tweak tweak

  • Loading branch information...
commit e4a7829994c392936e3bba2c6bf373bee696d39d 1 parent 9bb7158
Severin Smith sparks authored
2  software/TODO.md
Source Rendered
@@ -46,3 +46,5 @@ Playtest 3
46 46 -----------------------------
47 47 * Gong between the rounds
48 48 * Vvvvv before score
  49 +* Intro sounds
  50 +* Multipop
184 software/data/levels/02-twentythree.xml
... ... @@ -1,187 +1,187 @@
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <level name="Medium">
3   - <!-- <song file="11 Besouro.mp3" bpm="60"/> -->
4   - <song file="02 Twenty Three.mp3" bpm="60"/>
  3 + <song file="11 Besouro.mp3" bpm="60"/>
  4 + <!-- <song file="02 Twenty Three.mp3" bpm="60"/> -->
5 5 <sequence>
6 6 <step mode="versus">
7   - <player patch1="1" patch2="1" patch3="0" patch4="0"/>
8   - <player patch1="1" patch2="1" patch3="0" patch4="0"/>
  7 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
  8 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
9 9 </step>
10 10 <step mode="versus">
11   - <player patch1="1" patch2="0" patch3="1" patch4="0"/>
12   - <player patch1="1" patch2="0" patch3="1" patch4="0"/>
  11 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
  12 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
13 13 </step>
14 14 <step mode="versus">
15   - <player patch1="0" patch2="1" patch3="1" patch4="0"/>
16   - <player patch1="0" patch2="1" patch3="1" patch4="0"/>
  15 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
  16 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
17 17 </step>
18 18 <step mode="versus">
19   - <player patch1="1" patch2="1" patch3="0" patch4="0"/>
20   - <player patch1="1" patch2="0" patch3="1" patch4="0"/>
  19 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
  20 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
21 21 </step>
22 22 <step mode="versus">
23   - <player patch1="1" patch2="0" patch3="1" patch4="0"/>
24   - <player patch1="1" patch2="1" patch3="0" patch4="0"/>
  23 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
  24 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
25 25 </step>
26 26 <step mode="versus">
27   - <player patch1="1" patch2="1" patch3="0" patch4="0"/>
28   - <player patch1="0" patch2="1" patch3="1" patch4="0"/>
  27 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
  28 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
29 29 </step>
30 30 <step mode="versus">
31   - <player patch1="0" patch2="1" patch3="1" patch4="0"/>
32   - <player patch1="1" patch2="1" patch3="0" patch4="0"/>
  31 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
  32 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
33 33 </step>
34 34 <step mode="versus">
35   - <player patch1="1" patch2="1" patch3="0" patch4="0"/>
36   - <player patch1="1" patch2="1" patch3="0" patch4="0"/>
  35 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
  36 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
37 37 </step>
38 38 <step mode="versus">
39   - <player patch1="1" patch2="0" patch3="1" patch4="0"/>
40   - <player patch1="1" patch2="0" patch3="1" patch4="0"/>
  39 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
  40 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
41 41 </step>
42 42 <step mode="versus">
43   - <player patch1="0" patch2="1" patch3="1" patch4="0"/>
44   - <player patch1="0" patch2="1" patch3="1" patch4="0"/>
  43 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
  44 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
45 45 </step>
46 46 <step mode="versus">
47   - <player patch1="1" patch2="1" patch3="0" patch4="0"/>
48   - <player patch1="1" patch2="0" patch3="1" patch4="0"/>
  47 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
  48 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
49 49 </step>
50 50 <step mode="versus">
51   - <player patch1="1" patch2="0" patch3="1" patch4="0"/>
52   - <player patch1="1" patch2="1" patch3="0" patch4="0"/>
  51 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
  52 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
53 53 </step>
54 54 <step mode="versus">
55   - <player patch1="1" patch2="1" patch3="0" patch4="0"/>
56   - <player patch1="0" patch2="1" patch3="1" patch4="0"/>
  55 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
  56 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
57 57 </step>
58 58 <step mode="versus">
59   - <player patch1="0" patch2="1" patch3="1" patch4="0"/>
60   - <player patch1="1" patch2="1" patch3="0" patch4="0"/>
  59 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
  60 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
61 61 </step>
62 62 <step mode="versus">
63   - <player patch1="1" patch2="1" patch3="0" patch4="0"/>
64   - <player patch1="1" patch2="1" patch3="0" patch4="0"/>
  63 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
  64 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
65 65 </step>
66 66 <step mode="versus">
67   - <player patch1="1" patch2="0" patch3="1" patch4="0"/>
68   - <player patch1="1" patch2="0" patch3="1" patch4="0"/>
  67 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
  68 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
69 69 </step>
70 70 <step mode="versus">
71   - <player patch1="0" patch2="1" patch3="1" patch4="0"/>
72   - <player patch1="0" patch2="1" patch3="1" patch4="0"/>
  71 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
  72 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
73 73 </step>
74 74 <step mode="versus">
75   - <player patch1="1" patch2="1" patch3="0" patch4="0"/>
76   - <player patch1="1" patch2="0" patch3="1" patch4="0"/>
  75 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
  76 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
77 77 </step>
78 78 <step mode="versus">
79   - <player patch1="1" patch2="0" patch3="1" patch4="0"/>
80   - <player patch1="1" patch2="1" patch3="0" patch4="0"/>
  79 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
  80 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
81 81 </step>
82 82 <step mode="versus">
83   - <player patch1="1" patch2="1" patch3="0" patch4="0"/>
84   - <player patch1="0" patch2="1" patch3="1" patch4="0"/>
  83 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
  84 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
85 85 </step>
86 86 <step mode="versus">
87   - <player patch1="0" patch2="1" patch3="1" patch4="0"/>
88   - <player patch1="1" patch2="1" patch3="0" patch4="0"/>
  87 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
  88 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
89 89 </step>
90 90 <step mode="versus">
91   - <player patch1="1" patch2="1" patch3="0" patch4="0"/>
92   - <player patch1="1" patch2="1" patch3="0" patch4="0"/>
  91 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
  92 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
93 93 </step>
94 94 <step mode="versus">
95   - <player patch1="1" patch2="0" patch3="1" patch4="0"/>
96   - <player patch1="1" patch2="0" patch3="1" patch4="0"/>
  95 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
  96 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
97 97 </step>
98 98 <step mode="versus">
99   - <player patch1="0" patch2="1" patch3="1" patch4="0"/>
100   - <player patch1="0" patch2="1" patch3="1" patch4="0"/>
  99 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
  100 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
101 101 </step>
102 102 <step mode="versus">
103   - <player patch1="1" patch2="1" patch3="0" patch4="0"/>
104   - <player patch1="1" patch2="0" patch3="1" patch4="0"/>
  103 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
  104 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
105 105 </step>
106 106 <step mode="versus">
107   - <player patch1="1" patch2="0" patch3="1" patch4="0"/>
108   - <player patch1="1" patch2="1" patch3="0" patch4="0"/>
  107 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
  108 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
109 109 </step>
110 110 <step mode="versus">
111   - <player patch1="1" patch2="1" patch3="0" patch4="0"/>
112   - <player patch1="0" patch2="1" patch3="1" patch4="0"/>
  111 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
  112 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
113 113 </step>
114 114 <step mode="versus">
115   - <player patch1="0" patch2="1" patch3="1" patch4="0"/>
116   - <player patch1="1" patch2="1" patch3="0" patch4="0"/>
  115 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
  116 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
117 117 </step>
118 118 <step mode="versus">
119   - <player patch1="1" patch2="1" patch3="0" patch4="0"/>
120   - <player patch1="1" patch2="1" patch3="0" patch4="0"/>
  119 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
  120 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
121 121 </step>
122 122 <step mode="versus">
123   - <player patch1="1" patch2="0" patch3="1" patch4="0"/>
124   - <player patch1="1" patch2="0" patch3="1" patch4="0"/>
  123 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
  124 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
125 125 </step>
126 126 <step mode="versus">
127   - <player patch1="0" patch2="1" patch3="1" patch4="0"/>
128   - <player patch1="0" patch2="1" patch3="1" patch4="0"/>
  127 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
  128 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
129 129 </step>
130 130 <step mode="versus">
131   - <player patch1="1" patch2="1" patch3="0" patch4="0"/>
132   - <player patch1="1" patch2="0" patch3="1" patch4="0"/>
  131 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
  132 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
133 133 </step>
134 134 <step mode="versus">
135   - <player patch1="1" patch2="0" patch3="1" patch4="0"/>
136   - <player patch1="1" patch2="1" patch3="0" patch4="0"/>
  135 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
  136 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
137 137 </step>
138 138 <step mode="versus">
139   - <player patch1="1" patch2="1" patch3="0" patch4="0"/>
140   - <player patch1="0" patch2="1" patch3="1" patch4="0"/>
  139 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
  140 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
141 141 </step>
142 142 <step mode="versus">
143   - <player patch1="0" patch2="1" patch3="1" patch4="0"/>
144   - <player patch1="1" patch2="1" patch3="0" patch4="0"/>
  143 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
  144 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
145 145 </step>
146 146 <step mode="versus">
147   - <player patch1="1" patch2="1" patch3="0" patch4="0"/>
148   - <player patch1="1" patch2="1" patch3="0" patch4="0"/>
  147 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
  148 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
149 149 </step>
150 150 <step mode="versus">
151   - <player patch1="1" patch2="0" patch3="1" patch4="0"/>
152   - <player patch1="1" patch2="0" patch3="1" patch4="0"/>
  151 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
  152 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
153 153 </step>
154 154 <step mode="versus">
155   - <player patch1="0" patch2="1" patch3="1" patch4="0"/>
156   - <player patch1="0" patch2="1" patch3="1" patch4="0"/>
  155 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
  156 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
157 157 </step>
158 158 <step mode="versus">
159   - <player patch1="1" patch2="1" patch3="0" patch4="0"/>
160   - <player patch1="1" patch2="0" patch3="1" patch4="0"/>
  159 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
  160 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
161 161 </step>
162 162 <step mode="versus">
163   - <player patch1="1" patch2="0" patch3="1" patch4="0"/>
164   - <player patch1="1" patch2="1" patch3="0" patch4="0"/>
  163 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
  164 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
165 165 </step>
166 166 <step mode="versus">
167   - <player patch1="1" patch2="1" patch3="0" patch4="0"/>
168   - <player patch1="0" patch2="1" patch3="1" patch4="0"/>
  167 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
  168 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
169 169 </step>
170 170 <step mode="versus">
171   - <player patch1="0" patch2="1" patch3="1" patch4="0"/>
172   - <player patch1="1" patch2="1" patch3="0" patch4="0"/>
  171 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
  172 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
173 173 </step>
174 174 <step mode="versus">
175   - <player patch1="1" patch2="1" patch3="0" patch4="0"/>
176   - <player patch1="1" patch2="1" patch3="0" patch4="0"/>
  175 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
  176 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
177 177 </step>
178 178 <step mode="versus">
179   - <player patch1="1" patch2="0" patch3="1" patch4="0"/>
180   - <player patch1="1" patch2="0" patch3="1" patch4="0"/>
  179 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
  180 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
181 181 </step>
182 182 <step mode="versus">
183   - <player patch1="0" patch2="1" patch3="1" patch4="0"/>
184   - <player patch1="0" patch2="1" patch3="1" patch4="0"/>
  183 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
  184 + <player patch1="1" patch2="1" patch3="1" patch4="1"/>
185 185 </step>
186 186 </sequence>
187 187 </level>
1  software/src/propinquity/Propinquity.java
@@ -196,7 +196,6 @@ public void draw() {
196 196 tex.filter(blur, tex);
197 197 image(tex, width/2, height/2, offscreen.width, offscreen.height);
198 198
199   -
200 199 if(gameState == GameState.Play) box2d.step();
201 200
202 201 pushMatrix();

0 comments on commit e4a7829

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