Merge branch 'round-bits' into develop

client/src/constants.jsx

@@ -39,7 +39,7 @@ module.exports = {
                 Colours - 1b<br />
                 Skills - 2b<br />
                 Specs - 3b<br />
-                At the beginning of each round you receive 18 bits increasing by 6 bits per round.</p>,
+                At the beginning of each round you receive 30 bits.</p>,
         },
         ready: {
             item: 'READY',

server/src/instance.rs

@@ -318,12 +318,12 @@ impl Instance {
         self.phase_end = self.time_control.vbox_phase_end();
 
         let bits = match self.rounds.len() > 0 {
-            true => 12 + 6 * self.rounds.len(),
+            true => 30,
             false => 0,
         };
 
         self.players.iter_mut().for_each(|p| {
-            p.vbox.balance_add(bits.into());
+            p.vbox.balance_add(bits);
             p.set_ready(false);
             p.vbox.fill();
         });

server/src/vbox.rs

@@ -43,7 +43,7 @@ impl Vbox {
         Vbox {
             free: vec![vec![], vec![], vec![]],
             bound: starting_items,
-            bits: 18,
+            bits: 30,
         }
     }