From 4c2fa8600aa702b5c6eac909097f67e8dafe1bff Mon Sep 17 00:00:00 2001 From: jake Date: Sat, 22 Oct 2022 14:01:04 -0600 Subject: [PATCH] missed some magcells, and apparently they stack --- src/entity/item/tool.rs | 77 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 75 insertions(+), 2 deletions(-) diff --git a/src/entity/item/tool.rs b/src/entity/item/tool.rs index 3826bbd..d0f756e 100644 --- a/src/entity/item/tool.rs +++ b/src/entity/item/tool.rs @@ -212,7 +212,43 @@ impl ToolType { ToolType::Addslot | ToolType::PhotonDrop | ToolType::PhotonSphere | - ToolType::PhotonCrystal) + ToolType::PhotonCrystal | + ToolType::JackOLantern | + ToolType::ChristmasPresent | + ToolType::EasterEgg | + ToolType::CellOfMag502 | + ToolType::CellOfMag213 | + ToolType::PartsOfRobochao | + ToolType::HeartOfOpaOpa | + ToolType::HeartOfPian | + ToolType::HeartOfChao | + ToolType::HeartOfChuChu | + ToolType::HeartOfAngel | + ToolType::HeartOfDevil | + ToolType::KitOfHamburger | + ToolType::PanthersSpirit | + ToolType::KitOfMark3 | + ToolType::KitOfMasterSystem | + ToolType::KitOfGenesis | + ToolType::KitOfSegaSaturn | + ToolType::KitOfDreamcast | + ToolType::HeartOfKapuKapu | + ToolType::Tablet | + ToolType::DragonScale | + ToolType::HeavenStrikerCoat | + ToolType::PioneerParts | + ToolType::AmitiesMemo | + ToolType::HeartOfMorolian | + ToolType::RappysBeak | + ToolType::YahoosEngine | + ToolType::DPhotonCore | + ToolType::LibertaKit | + ToolType::CellOfMag0503 | + ToolType::CellOfMag0504 | + ToolType::CellOfMag0505 | + ToolType::CellOfMag0506 | + ToolType::CellOfMag0507 + ) } pub fn max_stack(&self) -> usize { @@ -244,6 +280,41 @@ impl ToolType { ToolType::PhotonDrop => 99, ToolType::PhotonSphere => 99, ToolType::PhotonCrystal => 99, + ToolType::JackOLantern => 99, + ToolType::ChristmasPresent => 99, + ToolType::EasterEgg => 99, + ToolType::CellOfMag502 => 99, + ToolType::CellOfMag213 => 99, + ToolType::PartsOfRobochao => 99, + ToolType::HeartOfOpaOpa => 99, + ToolType::HeartOfPian => 99, + ToolType::HeartOfChao => 99, + ToolType::HeartOfChuChu => 99, + ToolType::HeartOfAngel => 99, + ToolType::HeartOfDevil => 99, + ToolType::KitOfHamburger => 99, + ToolType::PanthersSpirit => 99, + ToolType::KitOfMark3 => 99, + ToolType::KitOfMasterSystem => 99, + ToolType::KitOfGenesis => 99, + ToolType::KitOfSegaSaturn => 99, + ToolType::KitOfDreamcast => 99, + ToolType::HeartOfKapuKapu => 99, + ToolType::Tablet => 99, + ToolType::DragonScale => 99, + ToolType::HeavenStrikerCoat => 99, + ToolType::PioneerParts => 99, + ToolType::AmitiesMemo => 99, + ToolType::HeartOfMorolian => 99, + ToolType::RappysBeak => 99, + ToolType::YahoosEngine => 99, + ToolType::DPhotonCore => 99, + ToolType::LibertaKit => 99, + ToolType::CellOfMag0503 => 99, + ToolType::CellOfMag0504 => 99, + ToolType::CellOfMag0505 => 99, + ToolType::CellOfMag0506 => 99, + ToolType::CellOfMag0507 => 99, _ => 1, } } @@ -255,6 +326,7 @@ impl ToolType { ToolType::HeartOfOpaOpa | ToolType::HeartOfPian | ToolType::HeartOfChao | + ToolType::HeartOfChuChu | ToolType::HeartOfAngel | ToolType::HeartOfDevil | ToolType::KitOfHamburger | @@ -264,6 +336,7 @@ impl ToolType { ToolType::KitOfGenesis | ToolType::KitOfSegaSaturn | ToolType::KitOfDreamcast | + ToolType::HeartOfKapuKapu | ToolType::Tablet | ToolType::DragonScale | ToolType::HeavenStrikerCoat | @@ -662,7 +735,7 @@ impl Tool { } pub fn from_bytes(data: [u8; 16]) -> Result { - let t = ToolType::parse_type([data[0], data[1], data[2]]); + let t = ToolType::parse_type([data[0], data[1], data[2]]); if let Ok(t) = t { Ok(Tool { tool: t,