From eef88568d600af61e257eac3edee1c9ea31db837 Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Fri, 22 Mar 2019 23:57:50 +1100
Subject: [PATCH] add ticks on first turn

---
 server/src/skill.rs | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/server/src/skill.rs b/server/src/skill.rs
index 40e19ee0..8df26163 100644
--- a/server/src/skill.rs
+++ b/server/src/skill.rs
@@ -744,8 +744,7 @@ fn strangle(cryp: &mut Cryp, target: &mut Cryp, mut resolution: Resolution) -> R
 
     resolution.results.push(target.add_effect(Skill::Strangle, target_stun));
     resolution.results.push(cryp.add_effect(Skill::Strangle, attacker_immunity));
-
-    return resolution;
+    return strangle_tick(cryp, target, resolution);
 }
 
 fn strangle_tick(cryp: &mut Cryp, target: &mut Cryp, mut resolution: Resolution) -> Resolution {
@@ -795,14 +794,14 @@ fn heal(cryp: &mut Cryp, target: &mut Cryp, mut resolution: Resolution) -> Resol
     return resolution;
 }
 
-fn triage(cryp: &mut Cryp, target: &mut Cryp, mut resolution: Resolution) -> Resolution {
+fn triage(cryp: &mut Cryp, target: &mut Cryp, resolution: Resolution) -> Resolution {
     let effect = CrypEffect {
         effect: Effect::Triage,
         duration: Effect::Triage.duration(),
         tick: Some(Cast::new_tick(cryp, target, Skill::TriageTick)),
     };
     target.add_effect(Skill::Triage, effect);
-    return resolution;
+    return triage_tick(cryp, target, resolution);
 }
 
 fn triage_tick(cryp: &mut Cryp, target: &mut Cryp, mut resolution: Resolution) -> Resolution {
@@ -842,7 +841,7 @@ fn decay(cryp: &mut Cryp, target: &mut Cryp, mut resolution: Resolution) -> Reso
         tick: Some(Cast::new_tick(cryp, target, Skill::DecayTick)),
     };
     resolution.results.push(target.add_effect(Skill::Decay, decay));
-    return resolution;
+    return decay_tick(cryp, target, resolution);
 }
 
 fn decay_tick(cryp: &mut Cryp, target: &mut Cryp, mut resolution: Resolution) -> Resolution {
@@ -881,7 +880,7 @@ fn siphon(cryp: &mut Cryp, target: &mut Cryp, mut resolution: Resolution) -> Res
         tick: Some(Cast::new_tick(cryp, target, Skill::SiphonTick)),
     };
     resolution.results.push(target.add_effect(Skill::Siphon, siphon));
-    return resolution;;
+    return siphon_tick(cryp, target, resolution);
 }
 
 fn siphon_tick(cryp: &mut Cryp, target: &mut Cryp, mut resolution: Resolution) -> Resolution {