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

merge stash

Browse Source
This commit is contained in:
ntr 2019-05-28 12:27:46 +10:00
parent 0b7473382b
commit 6057d26774
2 changed files with 339 additions and 936 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/src/item.rs
View File

@ -484,7 +484,7 @@ impl Item {
Item::DecayI | Item::DecayI |
Item::DecayII | Item::DecayII |
Item::DecayIII => format!( Item::DecayIII => format!(
"Reduces healing taken by {:?}% and deals blue damage {:?}% blue power each turn. Lasts {:?}T", "Reduces healing taken by {:?}% and deals {:?}% BluePower as BlueDamage each turn. Lasts {:?}T",
100 - self.into_skill().unwrap().effect().first().unwrap().get_multiplier(), 100 - self.into_skill().unwrap().effect().first().unwrap().get_multiplier(),
self.into_skill().unwrap().multiplier(), self.into_skill().unwrap().multiplier(),
self.into_skill().unwrap().effect().first().unwrap().get_duration()), self.into_skill().unwrap().effect().first().unwrap().get_duration()),
@ -522,7 +522,7 @@ impl Item {
"Impurity increases Green Power by {:?}%, Blue based Attack skills will blast again dealing {:?}{}. Lasts {:?}T", "Impurity increases Green Power by {:?}%, Blue based Attack skills will blast again dealing {:?}{}. Lasts {:?}T",
self.into_skill().unwrap().effect().first().unwrap().get_multiplier() - 100, self.into_skill().unwrap().effect().first().unwrap().get_multiplier() - 100,
Skill::ImpureBlast.multiplier(), Skill::ImpureBlast.multiplier(),
"% GreenPower as BluePower", "% GreenPower as BlueDamage",
self.into_skill().unwrap().effect().first().unwrap().get_duration()), self.into_skill().unwrap().effect().first().unwrap().get_duration()),
Item::InvertI | Item::InvertI |
@ -882,7 +882,8 @@ impl From<Skill> for Item {
Skill::TestBlock => Item::TestBlock, Skill::TestBlock => Item::TestBlock,
Skill::TestParry => Item::TestParry, Skill::TestParry => Item::TestParry,
Skill::TestSiphon => Item::TestSiphon, Skill::TestSiphon => Item::TestSiphon,
_ => panic!("{:?} not implemented with item conversion", skill),
// _ => panic!("{:?} not implemented with item conversion", skill),
} }
} }
} }

1224
server/src/skill.rs
View File

File diff suppressed because it is too large Load Diff