Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop

2019-10-18 15:43:19 +11:00
parent 4b216775cd fb8b4a159c
commit daa1b6214b
12 changed files with 188 additions and 22 deletions
@@ -1420,9 +1420,7 @@ fn break_(source: &mut Construct, target: &mut Construct, mut results: Resolutio
 }

 fn block(source: &mut Construct, target: &mut Construct, mut results: Resolutions, skill: Skill) -> Resolutions {
-    results.push(Resolution::new(source, target)
-        .event(target.add_effect(skill, skill.effect()[0]))
-        .stages(EventStages::StartEnd));
+    results.push(Resolution::new(source, target).event(target.add_effect(skill, skill.effect()[0])));
    return results;
 }