|
@ -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::HeartOfPian => ,
|
|
|
|
|
|
//MagCell::HeartOfChao => ,
|
|
|
|
|
|
//MagCell::HeartOfAngel => ,
|
|
|
|
|
|
//MagCell::HeartOfDevil => ,
|
|
|
|
|
|
//MagCell::KitOfHamburger => ,
|
|
|
|
|
|
//MagCell::PanthersSpirit => ,
|
|
|
|
|
|
//MagCell::KitOfMark3 => ,
|
|
|
|
|
|
//MagCell::KitOfMasterSystem => ,
|
|
|
|
|
|
//MagCell::KitOfGenesis => ,
|
|
|
|
|
|
//MagCell::KitOfSegaSaturn => ,
|
|
|
|
|
|
//MagCell::KitOfDreamcast => ,
|
|
|
|
|
|
//MagCell::Tablet => ,
|
|
|
|
|
|
//MagCell::DragonScale => ,
|
|
|
|
|
|
//MagCell::HeavenStrikerCoat => ,
|
|
|
|
|
|
//MagCell::PioneerParts => ,
|
|
|
|
|
|
//MagCell::AmitiesMemo => ,
|
|
|
|
|
|
//MagCell::HeartOfMorolian => ,
|
|
|
|
|
|
//MagCell::RappysBeak => ,
|
|
|
|
|
|
//MagCell::YahoosEngine => ,
|
|
|
|
|
|
//MagCell::DPhotonCore => ,
|
|
|
|
|
|
//MagCell::LibertaKit => ,
|
|
|
|
|
|
//MagCell::CellOfMag0503 => ,
|
|
|
|
|
|
//MagCell::CellOfMag0504 => ,
|
|
|
|
|
|
//MagCell::CellOfMag0505 => ,
|
|
|
|
|
|
//MagCell::CellOfMag0506 => ,
|
|
|
|
|
|
//MagCell::CellOfMag0507 => ,
|
|
|
|
|
|
_ => panic!()
|
|
|
|
|
|
|
|
|
MagCell::HeartOfOpaOpa => MagType::OpaOpa,
|
|
|
|
|
|
MagCell::HeartOfPian => MagType::Pian,
|
|
|
|
|
|
MagCell::HeartOfChao => MagType::Chao,
|
|
|
|
|
|
MagCell::HeartOfAngel => MagType::AngelsWing,
|
|
|
|
|
|
MagCell::HeartOfDevil => if self.mag == MagType::DevilsWing {
|
|
|
|
|
|
MagType::DevilsTail
|
|
|
|
|
|
}
|
|
|
|
|
|
else {
|
|
|
|
|
|
MagType::DevilsWing
|
|
|
|
|
|
},
|
|
|
|
|
|
MagCell::KitOfHamburger => MagType::Hamburger,
|
|
|
|
|
|
MagCell::PanthersSpirit => MagType::PanzersTail,
|
|
|
|
|
|
MagCell::KitOfMark3 => MagType::MarkIII,
|
|
|
|
|
|
MagCell::KitOfMasterSystem => MagType::MasterSystem,
|
|
|
|
|
|
MagCell::KitOfGenesis => MagType::Genesis,
|
|
|
|
|
|
MagCell::KitOfSegaSaturn => MagType::SegaSaturn,
|
|
|
|
|
|
MagCell::KitOfDreamcast => MagType::Dreamcast,
|
|
|
|
|
|
MagCell::Tablet => MagType::GeungSi,
|
|
|
|
|
|
MagCell::DragonScale => MagType::Tellusis,
|
|
|
|
|
|
MagCell::HeavenStrikerCoat => MagType::StrikerUnit,
|
|
|
|
|
|
MagCell::PioneerParts => MagType::Pioneer,
|
|
|
|
|
|
MagCell::AmitiesMemo => MagType::Puyo,
|
|
|
|
|
|
MagCell::HeartOfMorolian => MagType::Moro,
|
|
|
|
|
|
MagCell::RappysBeak => MagType::Rappy,
|
|
|
|
|
|
MagCell::YahoosEngine => MagType::Yahoo,
|
|
|
|
|
|
MagCell::DPhotonCore => MagType::GaelGiel,
|
|
|
|
|
|
MagCell::LibertaKit => MagType::Agastya,
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|