actually evolve all the magcell mags

This commit is contained in:
jake 2020-09-07 21:46:40 -06:00
parent 9e275d23a0
commit 819ec7bf58

View File

@ -416,11 +416,6 @@ pub enum MagCell {
YahoosEngine, YahoosEngine,
DPhotonCore, DPhotonCore,
LibertaKit, LibertaKit,
CellOfMag0503,
CellOfMag0504,
CellOfMag0505,
CellOfMag0506,
CellOfMag0507,
} }
impl std::convert::TryFrom<ToolType> for MagCell { impl std::convert::TryFrom<ToolType> for MagCell {
@ -453,11 +448,6 @@ impl std::convert::TryFrom<ToolType> for MagCell {
ToolType::YahoosEngine => Ok(MagCell::YahoosEngine), ToolType::YahoosEngine => Ok(MagCell::YahoosEngine),
ToolType::DPhotonCore => Ok(MagCell::DPhotonCore), ToolType::DPhotonCore => Ok(MagCell::DPhotonCore),
ToolType::LibertaKit => Ok(MagCell::LibertaKit), ToolType::LibertaKit => Ok(MagCell::LibertaKit),
ToolType::CellOfMag0503 => Ok(MagCell::CellOfMag0503),
ToolType::CellOfMag0504 => Ok(MagCell::CellOfMag0504),
ToolType::CellOfMag0505 => Ok(MagCell::CellOfMag0505),
ToolType::CellOfMag0506 => Ok(MagCell::CellOfMag0506),
ToolType::CellOfMag0507 => Ok(MagCell::CellOfMag0507),
_ => Err(()), _ => Err(()),
} }
} }
@ -1051,6 +1041,7 @@ impl Mag {
// what is the truncation logic anyway // what is the truncation logic anyway
} }
// TODO: this needs more checks on validity
pub fn apply_mag_cell(&mut self, mag_cell: MagCell) { pub fn apply_mag_cell(&mut self, mag_cell: MagCell) {
self.mag = match mag_cell { self.mag = match mag_cell {
MagCell::CellOfMag502 => { MagCell::CellOfMag502 => {
@ -1063,36 +1054,44 @@ impl Mag {
} }
} }
} }
//MagCell::CellOfMag213 => , MagCell::CellOfMag213 => {
match self.id {
SectionID::Viridia | SectionID::Skyly | SectionID::Purplenum | SectionID::Redria | SectionID::Yellowboze => {
MagType::Churel
},
SectionID::Greenill | SectionID::Bluefull | SectionID::Pinkal | SectionID::Oran | SectionID::Whitill => {
MagType::Preta
}
}
},
MagCell::PartsOfRobochao => MagType::Robochao, MagCell::PartsOfRobochao => MagType::Robochao,
//MagCell::HeartOfOpaOpa => , MagCell::HeartOfOpaOpa => MagType::OpaOpa,
//MagCell::HeartOfPian => , MagCell::HeartOfPian => MagType::Pian,
//MagCell::HeartOfChao => , MagCell::HeartOfChao => MagType::Chao,
//MagCell::HeartOfAngel => , MagCell::HeartOfAngel => MagType::AngelsWing,
//MagCell::HeartOfDevil => , MagCell::HeartOfDevil => if self.mag == MagType::DevilsWing {
//MagCell::KitOfHamburger => , MagType::DevilsTail
//MagCell::PanthersSpirit => , }
//MagCell::KitOfMark3 => , else {
//MagCell::KitOfMasterSystem => , MagType::DevilsWing
//MagCell::KitOfGenesis => , },
//MagCell::KitOfSegaSaturn => , MagCell::KitOfHamburger => MagType::Hamburger,
//MagCell::KitOfDreamcast => , MagCell::PanthersSpirit => MagType::PanzersTail,
//MagCell::Tablet => , MagCell::KitOfMark3 => MagType::MarkIII,
//MagCell::DragonScale => , MagCell::KitOfMasterSystem => MagType::MasterSystem,
//MagCell::HeavenStrikerCoat => , MagCell::KitOfGenesis => MagType::Genesis,
//MagCell::PioneerParts => , MagCell::KitOfSegaSaturn => MagType::SegaSaturn,
//MagCell::AmitiesMemo => , MagCell::KitOfDreamcast => MagType::Dreamcast,
//MagCell::HeartOfMorolian => , MagCell::Tablet => MagType::GeungSi,
//MagCell::RappysBeak => , MagCell::DragonScale => MagType::Tellusis,
//MagCell::YahoosEngine => , MagCell::HeavenStrikerCoat => MagType::StrikerUnit,
//MagCell::DPhotonCore => , MagCell::PioneerParts => MagType::Pioneer,
//MagCell::LibertaKit => , MagCell::AmitiesMemo => MagType::Puyo,
//MagCell::CellOfMag0503 => , MagCell::HeartOfMorolian => MagType::Moro,
//MagCell::CellOfMag0504 => , MagCell::RappysBeak => MagType::Rappy,
//MagCell::CellOfMag0505 => , MagCell::YahoosEngine => MagType::Yahoo,
//MagCell::CellOfMag0506 => , MagCell::DPhotonCore => MagType::GaelGiel,
//MagCell::CellOfMag0507 => , MagCell::LibertaKit => MagType::Agastya,
_ => panic!()
} }
} }
} }