Merge branch 'develop' into inventory

2019-07-09 13:06:05 +10:00
parent c102085e3e 2c0c8cc28b
commit 264d368351
10 changed files with 107 additions and 56 deletions
@@ -1259,7 +1259,7 @@ mod tests {
                            assert!(*duration == 1);
                            true
                        },
-                        Event::Skill { skill: _ } => false,
+                        Event::AoeSkill { skill: _ } => false,
                        _ => panic!("ruin result not effect {:?}", event),
                    }
                    false => false,