Merge branch 'master' into return-of-react

server/WORKLOG.md

@@ -15,6 +15,12 @@
 
 # WORK WORK
 ## NOW
+
+fix taunt
+decay is op
+siphon might have a prob
+
+
 cryp vbox
   update defensives in skill.rs
 

server/src/game.rs

@@ -392,7 +392,9 @@ impl Game {
     }
 
     fn get_targets(&self, skill: Skill, source: &Cryp, target_cryp_id: Uuid) -> Vec<Uuid> {
-        let target_team = self.teams.iter().find(|t| t.id == source.account).unwrap();
+        let target_team = self.teams.iter()
+            .find(|t| t.cryps.iter().any(|c| c.id == target_cryp_id))
+            .unwrap();
 
         if let Some(t) = target_team.taunting() {
             return vec![t.id];

server/src/skill.rs

@@ -289,7 +289,11 @@ impl Effect {
                 _ => false,
             },
             Effect::Strangle => skill != Skill::StrangleTick,
-            Effect::Strangling => true,
+            Effect::Strangling => match skill.category() {
+                Category::BlueTick => false,
+                Category::RedTick => false,
+                _ => true,
+            },
             Effect::Banish => true,
             Effect::Injured => match skill.category() {
                 Category::Green => true,
@@ -948,7 +952,7 @@ fn decay(source: &mut Cryp, target: &mut Cryp, mut results: Resolutions) -> Reso
 }
 
 fn decay_tick(source: &mut Cryp, target: &mut Cryp, mut results: Resolutions) -> Resolutions {
-    let amount = source.blue_damage();
+    let amount = source.blue_damage() / 2;
     target.deal_blue_damage(Skill::DecayTick, amount)
         .into_iter()
         .for_each(|e| results.push(Resolution::new(source, target).event(e)));

server/src/spec.rs

@@ -162,42 +162,42 @@ impl Spec {
             // Upgrades to HP Spec
             Spec::Hp                => modified + base.pct(5),
             Spec::LifeI             => modified + {
-                let mut mult = 10;
+                let mut mult: u64 = 10;
                 if team_colours.red >= 5  { mult += 20 };
                 if team_colours.red >= 10  { mult += 30 };
                 if team_colours.red >= 20  { mult += 50 };
                 mult * team_colours.green as u64
             },
             Spec::RedShieldI        => modified + {
-                let mut mult = 10;
+                let mut mult: u64 = 10;
                 if team_colours.red >= 5  { mult += 20 };
                 if team_colours.red >= 10  { mult += 30 };
                 if team_colours.red >= 20  { mult += 50 };
                 mult * team_colours.red as u64
             },
             Spec::BlueShieldI       => modified + {
-                let mut mult = 10;
+                let mut mult: u64 = 10;
                 if team_colours.red >= 5  { mult += 20 };
                 if team_colours.red >= 10  { mult += 30 };
                 if team_colours.red >= 20  { mult += 50 };
-                (mult * team_colours.blue) as u64
+                mult * team_colours.blue as u64
             },
             Spec::LRSI              => modified + {
-                let mut mult = 5;
+                let mut mult: u64 = 5;
                 if team_colours.green >= 2 && team_colours.red >= 2 { mult += 5 };
                 if team_colours.green >= 5 && team_colours.red >= 5 { mult += 10 };
                 if team_colours.green >= 10 && team_colours.red >= 10 { mult += 20 };
                 mult * (team_colours.green + team_colours.red) as u64
             },
             Spec::LBSI              => modified + {
-                let mut mult = 5;
+                let mut mult: u64 = 5;
                 if team_colours.green >= 2 && team_colours.red >= 2 { mult += 5 };
                 if team_colours.green >= 5 && team_colours.red >= 5 { mult += 10 };
                 if team_colours.green >= 10 && team_colours.red >= 10 { mult += 20 };
                 mult * (team_colours.green + team_colours.red) as u64
             },
             Spec::RBSI              => modified + {
-                let mut mult = 5;
+                let mut mult: u64 = 5;
                 if team_colours.blue >= 2 && team_colours.red >= 2 { mult += 5 };
                 if team_colours.blue >= 5 && team_colours.red >= 5 { mult += 10 };
                 if team_colours.blue >= 10 && team_colours.red >= 10 { mult += 20 };

server/src/vbox.rs

@@ -202,6 +202,7 @@ impl Var {
             Var::Silence    => Some(Skill::Silence),
             // Var::Slay       => Some(Skill::Slay),
             Var::Slow       => Some(Skill::Slow),
+            Var::Siphon     => Some(Skill::Siphon),
             Var::Snare      => Some(Skill::Snare),
             Var::Strangle   => Some(Skill::Strangle),
             Var::Strike     => Some(Skill::Strike),