Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into release/1.5.5
This commit is contained in:
+5
-4
@@ -1080,9 +1080,9 @@ impl Skill {
|
||||
Skill::PurifyPlus |
|
||||
Skill::PurifyPlusPlus => None,
|
||||
|
||||
Skill::Purge=> None,
|
||||
Skill::PurgePlus => None,
|
||||
Skill::PurgePlusPlus => None,
|
||||
Skill::Purge=> Some(1),
|
||||
Skill::PurgePlus => Some(1),
|
||||
Skill::PurgePlusPlus => Some(1),
|
||||
|
||||
Skill::Banish |
|
||||
Skill::BanishPlus |
|
||||
@@ -1804,7 +1804,8 @@ fn purge(source: &mut Construct, target: &mut Construct, mut results: Resolution
|
||||
}) {
|
||||
let ce = target.effects.remove(i);
|
||||
results.push(Resolution::new(source, target)
|
||||
.event(Event::Removal { effect: ce.effect, construct_effects: target.effects.clone() }));
|
||||
.event(Event::Removal { effect: ce.effect, construct_effects: target.effects.clone() })
|
||||
.stages(EventStages::PostOnly));
|
||||
}
|
||||
|
||||
let effect = skill.effect()[0];
|
||||
|
||||
Reference in New Issue
Block a user