jake/elseware
1
0
Fork 0
Code Issues 63 Pull Requests 1 Projects Releases Wiki Activity

lint src/entity/*

Browse Source
This commit is contained in:
jake 2021-06-18 19:09:14 -06:00
parent b6a2d55100
commit 6f40058b7d
1 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/entity/character.rs
View File

@ -44,9 +44,9 @@ impl From<u8> for CharacterClass {
} }
} }
impl Into<u8> for CharacterClass { impl From<CharacterClass> for u8 {
fn into(self) -> u8 { fn from(other: CharacterClass) -> u8 {
match self { match other {
CharacterClass::HUmar => 0, CharacterClass::HUmar => 0,
CharacterClass::HUnewearl => 1, CharacterClass::HUnewearl => 1,
CharacterClass::HUcast => 2, CharacterClass::HUcast => 2,
@ -65,29 +65,27 @@ impl Into<u8> for CharacterClass {
impl CharacterClass { impl CharacterClass {
pub fn is_human(&self) -> bool { pub fn is_human(&self) -> bool {
match self { matches!(self,
CharacterClass::HUmar | CharacterClass::HUmar |
CharacterClass::RAmar | CharacterClass::RAmarl | CharacterClass::RAmar |
CharacterClass::FOmar | CharacterClass::FOmarl => true, CharacterClass::RAmarl |
CharacterClass::FOmar |
_ => false, CharacterClass::FOmarl)
}
} }
pub fn is_newman(&self) -> bool { pub fn is_newman(&self) -> bool {
match self { matches!(self,
CharacterClass::HUnewearl | CharacterClass::HUnewearl |
CharacterClass::FOnewm | CharacterClass::FOnewearl => true, CharacterClass::FOnewm |
_ => false, CharacterClass::FOnewearl)
}
} }
pub fn is_android(&self) -> bool { pub fn is_android(&self) -> bool {
match self { matches!(self,
CharacterClass::HUcast | CharacterClass::HUcaseal | CharacterClass::HUcast |
CharacterClass::RAcast | CharacterClass::RAcaseal => true, CharacterClass::HUcaseal |
_ => false, CharacterClass::RAcast |
} CharacterClass::RAcaseal)
} }
} }
@ -124,9 +122,9 @@ impl From<u8> for SectionID {
} }
} }
impl Into<u8> for SectionID { impl From<SectionID> for u8 {
fn into(self) -> u8 { fn from(other: SectionID) -> u8 {
match self { match other {
SectionID::Viridia => 0, SectionID::Viridia => 0,
SectionID::Greenill => 1, SectionID::Greenill => 1,
SectionID::Skyly => 2, SectionID::Skyly => 2,