Merge branch 'horizontal-vbox' of ssh://cryps.gg:40022/~/cryps into horizontal-vbox

server/src/instance.rs

@@ -275,7 +275,7 @@ impl Instance {
     fn next_round(&mut self) -> &mut Instance {
         self.phase = InstancePhase::InProgress;
         self.phase_end = Utc::now()
-            .checked_add_signed(Duration::seconds(150))
+            .checked_add_signed(Duration::seconds(15000))
             .expect("could not set phase end");
 
 

server/src/vbox.rs

@@ -272,6 +272,7 @@ impl From<Skill> for Var {
             Skill::Curse => Var::Curse,
             Skill::Clutch => Var::Clutch,
             Skill::Decay => Var::Decay,
+            Skill::Debuff => Var::Debuff,
             Skill::Haste => Var::Haste,
             Skill::Hostility => Var::Hostility,
             Skill::Heal => Var::Heal,
@@ -551,7 +552,7 @@ impl Vbox {
 
         // actually move
         self.bound.push(self.free[i].remove(j));
-        self.bound.sort_unstable();
+        // self.bound.sort_unstable();
 
         Ok(self)
     }