diff --git a/server/WORKLOG.md b/server/WORKLOG.md index a92f58cc..d9693939 100644 --- a/server/WORKLOG.md +++ b/server/WORKLOG.md @@ -18,6 +18,7 @@ fix taunt decay is op +siphon might have a prob cryp vbox diff --git a/server/src/game.rs b/server/src/game.rs index 64451d24..e554da88 100644 --- a/server/src/game.rs +++ b/server/src/game.rs @@ -392,7 +392,9 @@ impl Game { } fn get_targets(&self, skill: Skill, source: &Cryp, target_cryp_id: Uuid) -> Vec { - 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]; diff --git a/server/src/skill.rs b/server/src/skill.rs index 542369f5..1e900425 100644 --- a/server/src/skill.rs +++ b/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,