ntr/mnml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mm' into develop

Browse Source
This commit is contained in:
Mashy
2019-07-30 18:48:55 +10:00
parent 0e23c890ef c1b5f09d42
commit 6abc982fec
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/src/net.rs
+1 -1
View File
@@ -242,7 +242,7 @@ fn logout(req: &mut Request) -> IronResult<Response> {
tx.commit().or(Err(MnmlHttpError::ServerError))?;
let mut res = iron_response(status::Ok, "token_res".to_string());
let mut res = iron_response(status::Ok, "logout".to_string());
res.headers.set(SetCookie(vec![AUTH_CLEAR.to_string()]));
Ok(res)
server/src/skill.rs
+4 -4
View File
@@ -272,7 +272,7 @@ pub fn resolve(skill: Skill, source: &mut Construct, target: &mut Construct, mut
Skill::Stun => stun(source, target, resolutions, skill),
//Triggered
Skill::Electrocute|
Skill::Electrocute |
Skill::ElectrocutePlus |
Skill::ElectrocutePlusPlus => panic!("should only trigger from electrify hit"),
Skill::HasteStrike => panic!("should only trigger from haste"),
@@ -314,7 +314,7 @@ fn post_resolve(_skill: Skill, game: &mut Game, mut resolutions: Resolutions) ->
.find(|e| e.effect == Effect::Absorb).unwrap().clone();
match meta {
Some(EffectMeta::Skill(s)) => {
resolutions = absorption(&mut target, &mut source, resolutions, skill, amount, s);
resolutions = absorption(&mut source, &mut target, resolutions, skill, amount, s);
},
_ => panic!("no absorb skill"),
};
@@ -1495,7 +1495,7 @@ fn electrocute(source: &mut Construct, target: &mut Construct, mut results: Reso
let electrocute = ConstructEffect::new(effect, duration).set_tick(Cast::new_tick(source, target, tick_skill));
results.push(Resolution::new(source, target)
.event(target.add_effect(skill, electrocute))
.stages(EventStages::StartPost));
.stages(EventStages::EndPost));
return electrocute_tick(source, target, results, tick_skill);
}
@@ -1679,7 +1679,7 @@ fn purge(source: &mut Construct, target: &mut Construct, mut results: Resolution
if turns > 0 {
let mut effect = skill.effect()[0];
effect.duration = effect.duration * turns;
results.push(Resolution::new(source, target).event(target.add_effect(skill, effect)));
results.push(Resolution::new(source, target).event(target.add_effect(skill, effect)).stages(EventStages::PostOnly));
}
return results;