diff --git a/server/src/player.rs b/server/src/player.rs index 701353ce..3bfd650c 100644 --- a/server/src/player.rs +++ b/server/src/player.rs @@ -127,12 +127,12 @@ impl Player { if self.vbox.bound.len() < 3 || num_colours < 2 { if (needs_skills && self.vbox.bits < 4) || self.vbox.bits < 5 { // println!("insufficient balance"); - return self; + break; } // get 2 colours and something else if self.vbox.free[0].len() < 2 { - return self; + break; } self.vbox_accept(0, 0).expect("could't accept colour 0"); self.vbox_accept(0, 0).expect("could't accept colour 1"); @@ -149,21 +149,12 @@ impl Player { }; // first 2 colours can be whatever - match self.vbox_combine(vec![0, 1, combo_i]) { - Ok(_) => { - // println!("refined {:?}", self.vbox.bound[self.vbox.bound.len() - 1]); - } - Err(e) => println!("{:?}", e), - }; - + self.vbox_combine(vec![0, 1, combo_i]).ok(); let var_i = self.vbox.bound.len() - 1; - match self.vbox_apply(var_i, target_cryp_id) { - Ok(_) => { - // println!("{:?} improved", self.cryps[target_cryp_i].name); - }, - Err(e) => println!("{:?}", e), - } + self.vbox_apply(var_i, target_cryp_id).ok(); } + + return self; } pub fn vbox_discard(&mut self) -> Result<&mut Player, Error> { diff --git a/server/src/skill.rs b/server/src/skill.rs index 7237cf7d..bcebd3b3 100644 --- a/server/src/skill.rs +++ b/server/src/skill.rs @@ -770,6 +770,7 @@ impl Skill { Skill::Block => true, Skill::Banish => rng.gen_bool(0.5), + _ => false, } }