remove duplicates and change unknownitem to unknownobject
Some checks failed
continuous-integration/drone/push Build is failing
Some checks failed
continuous-integration/drone/push Build is failing
This commit is contained in:
parent
bdecb9f873
commit
cc34f512c3
@ -140,7 +140,7 @@ pub enum MapObjectType {
|
||||
LargeElementalTrap,
|
||||
ObjRoomID,
|
||||
Sensor,
|
||||
UnknownItem16,
|
||||
UnknownMapObject16,
|
||||
LensFlare,
|
||||
ScriptCollision,
|
||||
HealRing,
|
||||
@ -153,19 +153,19 @@ pub enum MapObjectType {
|
||||
ImageBoard,
|
||||
QuestWarp,
|
||||
Epilogue,
|
||||
UnknownItem29,
|
||||
UnknownItem30,
|
||||
UnknownItem31,
|
||||
UnknownMapObject29,
|
||||
UnknownMapObject30,
|
||||
UnknownMapObject31,
|
||||
BoxDetectObject,
|
||||
SymbolChatObject,
|
||||
TouchPlateObject,
|
||||
TargetableObject,
|
||||
EffectObject,
|
||||
CountDownObject,
|
||||
UnknownItem38,
|
||||
UnknownItem39,
|
||||
UnknownItem40,
|
||||
UnknownItem41,
|
||||
UnknownMapObject38,
|
||||
UnknownMapObject39,
|
||||
UnknownMapObject40,
|
||||
UnknownMapObject41,
|
||||
MenuActivation,
|
||||
TelepipeLocation,
|
||||
BGMCollision,
|
||||
@ -305,17 +305,17 @@ pub enum MapObjectType {
|
||||
LobbyGameMenu,
|
||||
LobbyWarpObject,
|
||||
Lobby1EventObjectDefaultTree,
|
||||
UnknownItem387,
|
||||
UnknownItem388,
|
||||
UnknownItem389,
|
||||
UnknownMapObject387,
|
||||
UnknownMapObject388,
|
||||
UnknownMapObject389,
|
||||
LobbyEventObjectStaticPumpkin,
|
||||
LobbyEventObject3ChristmasWindows,
|
||||
LobbyEventObjectRedAndWhiteCurtain,
|
||||
UnknownItem393,
|
||||
UnknownItem394,
|
||||
UnknownMapObject393,
|
||||
UnknownMapObject394,
|
||||
LobbyFishTank,
|
||||
LobbyEventObjectButterflies,
|
||||
UnknownItem400,
|
||||
UnknownMapObject400,
|
||||
GreyWallLow,
|
||||
SpaceshipDoor,
|
||||
GreyWallHigh,
|
||||
@ -343,13 +343,13 @@ pub enum MapObjectType {
|
||||
Medium3StoneWall,
|
||||
SpiderPlant,
|
||||
CcaAreaTeleporter,
|
||||
UnknownItem523,
|
||||
UnknownMapObject523,
|
||||
WhiteBird,
|
||||
OrangeBird,
|
||||
Saw,
|
||||
LaserDetect,
|
||||
UnknownItem529,
|
||||
UnknownItem530,
|
||||
UnknownMapObject529,
|
||||
UnknownMapObject530,
|
||||
Seagull,
|
||||
Fish,
|
||||
SeabedDoorWithBlueEdges,
|
||||
@ -361,9 +361,9 @@ pub enum MapObjectType {
|
||||
Dolphin,
|
||||
CaptureTrap,
|
||||
VRLink,
|
||||
UnknownItem576,
|
||||
UnknownMapObject576,
|
||||
WarpInBarbaRayRoom,
|
||||
UnknownItem672,
|
||||
UnknownMapObject672,
|
||||
GeeNest,
|
||||
LabComputerConsole,
|
||||
LabComputerConsoleGreenScreen,
|
||||
@ -376,33 +376,33 @@ pub enum MapObjectType {
|
||||
InstaWarp,
|
||||
LabInvisibleObject,
|
||||
LabGlassWindowDoor,
|
||||
UnknownItem700,
|
||||
UnknownMapObject700,
|
||||
LabCeilingWarp,
|
||||
Ep4LightSource,
|
||||
Cactus,
|
||||
BigBrownRock,
|
||||
BreakableBrownRock,
|
||||
UnknownItem832,
|
||||
UnknownItem833,
|
||||
UnknownMapObject832,
|
||||
UnknownMapObject833,
|
||||
PoisonPlant,
|
||||
UnknownItem897,
|
||||
UnknownItem898,
|
||||
UnknownMapObject897,
|
||||
UnknownMapObject898,
|
||||
OozingDesertPlant,
|
||||
UnknownItem901,
|
||||
UnknownMapObject901,
|
||||
BigBlackRocks,
|
||||
UnknownItem903,
|
||||
UnknownItem904,
|
||||
UnknownItem905,
|
||||
UnknownItem906,
|
||||
UnknownMapObject903,
|
||||
UnknownMapObject904,
|
||||
UnknownMapObject905,
|
||||
UnknownMapObject906,
|
||||
FallingRock,
|
||||
DesertPlantHasCollision,
|
||||
DesertFixedTypeBoxBreakableCrystals,
|
||||
UnknownItem910,
|
||||
UnknownMapObject910,
|
||||
BeeHive,
|
||||
UnknownItem912,
|
||||
UnknownMapObject912,
|
||||
Heat,
|
||||
TopOfSaintMillionEgg,
|
||||
UnknownItem961,
|
||||
UnknownMapObject961,
|
||||
}
|
||||
|
||||
#[derive(Debug, Copy, Clone)]
|
||||
@ -451,7 +451,7 @@ impl MapObject {
|
||||
(RawMapObject {otype: 13, ..}, _) => MapObjectType::LargeElementalTrap,
|
||||
(RawMapObject {otype: 14, ..}, _) => MapObjectType::ObjRoomID,
|
||||
(RawMapObject {otype: 15, ..}, _) => MapObjectType::Sensor,
|
||||
(RawMapObject {otype: 16, ..}, _) => MapObjectType::UnknownItem16,
|
||||
(RawMapObject {otype: 16, ..}, _) => MapObjectType::UnknownMapObject16,
|
||||
(RawMapObject {otype: 17, ..}, _) => MapObjectType::LensFlare,
|
||||
(RawMapObject {otype: 18, ..}, _) => MapObjectType::ScriptCollision,
|
||||
(RawMapObject {otype: 19, ..}, _) => MapObjectType::HealRing,
|
||||
@ -464,19 +464,19 @@ impl MapObject {
|
||||
(RawMapObject {otype: 26, ..}, _) => MapObjectType::ImageBoard,
|
||||
(RawMapObject {otype: 27, ..}, _) => MapObjectType::QuestWarp,
|
||||
(RawMapObject {otype: 28, ..}, _) => MapObjectType::Epilogue,
|
||||
(RawMapObject {otype: 29, ..}, _) => MapObjectType::UnknownItem29,
|
||||
(RawMapObject {otype: 30, ..}, _) => MapObjectType::UnknownItem30,
|
||||
(RawMapObject {otype: 31, ..}, _) => MapObjectType::UnknownItem31,
|
||||
(RawMapObject {otype: 29, ..}, _) => MapObjectType::UnknownMapObject29,
|
||||
(RawMapObject {otype: 30, ..}, _) => MapObjectType::UnknownMapObject30,
|
||||
(RawMapObject {otype: 31, ..}, _) => MapObjectType::UnknownMapObject31,
|
||||
(RawMapObject {otype: 32, ..}, _) => MapObjectType::BoxDetectObject,
|
||||
(RawMapObject {otype: 33, ..}, _) => MapObjectType::SymbolChatObject,
|
||||
(RawMapObject {otype: 34, ..}, _) => MapObjectType::TouchPlateObject,
|
||||
(RawMapObject {otype: 35, ..}, _) => MapObjectType::TargetableObject,
|
||||
(RawMapObject {otype: 36, ..}, _) => MapObjectType::EffectObject,
|
||||
(RawMapObject {otype: 37, ..}, _) => MapObjectType::CountDownObject,
|
||||
(RawMapObject {otype: 38, ..}, _) => MapObjectType::UnknownItem38,
|
||||
(RawMapObject {otype: 39, ..}, _) => MapObjectType::UnknownItem39,
|
||||
(RawMapObject {otype: 40, ..}, _) => MapObjectType::UnknownItem40,
|
||||
(RawMapObject {otype: 41, ..}, _) => MapObjectType::UnknownItem41,
|
||||
(RawMapObject {otype: 38, ..}, _) => MapObjectType::UnknownMapObject38,
|
||||
(RawMapObject {otype: 39, ..}, _) => MapObjectType::UnknownMapObject39,
|
||||
(RawMapObject {otype: 40, ..}, _) => MapObjectType::UnknownMapObject40,
|
||||
(RawMapObject {otype: 41, ..}, _) => MapObjectType::UnknownMapObject41,
|
||||
(RawMapObject {otype: 64, ..}, _) => MapObjectType::MenuActivation,
|
||||
(RawMapObject {otype: 65, ..}, _) => MapObjectType::TelepipeLocation,
|
||||
(RawMapObject {otype: 66, ..}, _) => MapObjectType::BGMCollision,
|
||||
@ -509,7 +509,6 @@ impl MapObject {
|
||||
(RawMapObject {otype: 133, ..}, _) => MapObjectType::LightRays,
|
||||
(RawMapObject {otype: 134, ..}, _) => MapObjectType::BlueButterfly,
|
||||
(RawMapObject {otype: 135, ..}, _) => MapObjectType::Probe,
|
||||
// (RawMapObject {otype: 136, ..}, _) => MapObjectType::RandomTypeBox1,
|
||||
(RawMapObject {otype: 137, ..}, _) => MapObjectType::ForestWeatherStation,
|
||||
(RawMapObject {otype: 138, ..}, _) => MapObjectType::Battery,
|
||||
(RawMapObject {otype: 139, ..}, _) => MapObjectType::ForestConsole,
|
||||
@ -518,10 +517,6 @@ impl MapObject {
|
||||
(RawMapObject {otype: 142, ..}, _) => MapObjectType::EnergyBarrier,
|
||||
(RawMapObject {otype: 143, ..}, _) => MapObjectType::ForestRisingBridge,
|
||||
(RawMapObject {otype: 144, ..}, _) => MapObjectType::SwitchNoneDoor,
|
||||
// (RawMapObject {otype: 145, ..}, _) => MapObjectType::EnemyBoxGrey,
|
||||
// (RawMapObject {otype: 146, ..}, _) => MapObjectType::FixedTypeBox,
|
||||
// (RawMapObject {otype: 147, ..}, _) => MapObjectType::EnemyBoxBrown,
|
||||
// (RawMapObject {otype: 149, ..}, _) => MapObjectType::EmptyTypeBox,
|
||||
(RawMapObject {otype: 150, ..}, _) => MapObjectType::LaserFenceEx,
|
||||
(RawMapObject {otype: 151, ..}, _) => MapObjectType::LaserSquareFenceEx,
|
||||
(RawMapObject {otype: 192, ..}, _) => MapObjectType::FloorPanel1,
|
||||
@ -601,11 +596,6 @@ impl MapObject {
|
||||
(RawMapObject {otype: 350, ..}, _) => MapObjectType::RuinsRock6,
|
||||
(RawMapObject {otype: 351, ..}, _) => MapObjectType::RuinsRock7,
|
||||
(RawMapObject {otype: 352, ..}, _) => MapObjectType::Poison,
|
||||
// (RawMapObject {otype: 353, ..}, _) => MapObjectType::FixedBoxTypeRuins,
|
||||
// (RawMapObject {otype: 354, ..}, _) => MapObjectType::RandomBoxTypeRuins,
|
||||
// (RawMapObject {otype: 355, ..}, _) => MapObjectType::EnemyTypeBoxYellow,
|
||||
// (RawMapObject {otype: 356, ..}, _) => MapObjectType::EnemyTypeBoxBlue,
|
||||
// (RawMapObject {otype: 357, ..}, _) => MapObjectType::EmptyTypeBoxBlue,
|
||||
(RawMapObject {otype: 358, ..}, _) => MapObjectType::DestructableRock,
|
||||
(RawMapObject {otype: 359, ..}, _) => MapObjectType::PopupTrapsTechs,
|
||||
(RawMapObject {otype: 368, ..}, _) => MapObjectType::FlyingWhiteBird,
|
||||
@ -616,17 +606,17 @@ impl MapObject {
|
||||
(RawMapObject {otype: 384, ..}, _) => MapObjectType::LobbyGameMenu,
|
||||
(RawMapObject {otype: 385, ..}, _) => MapObjectType::LobbyWarpObject,
|
||||
(RawMapObject {otype: 386, ..}, _) => MapObjectType::Lobby1EventObjectDefaultTree,
|
||||
(RawMapObject {otype: 387, ..}, _) => MapObjectType::UnknownItem387,
|
||||
(RawMapObject {otype: 388, ..}, _) => MapObjectType::UnknownItem388,
|
||||
(RawMapObject {otype: 389, ..}, _) => MapObjectType::UnknownItem389,
|
||||
(RawMapObject {otype: 387, ..}, _) => MapObjectType::UnknownMapObject387,
|
||||
(RawMapObject {otype: 388, ..}, _) => MapObjectType::UnknownMapObject388,
|
||||
(RawMapObject {otype: 389, ..}, _) => MapObjectType::UnknownMapObject389,
|
||||
(RawMapObject {otype: 390, ..}, _) => MapObjectType::LobbyEventObjectStaticPumpkin,
|
||||
(RawMapObject {otype: 391, ..}, _) => MapObjectType::LobbyEventObject3ChristmasWindows,
|
||||
(RawMapObject {otype: 392, ..}, _) => MapObjectType::LobbyEventObjectRedAndWhiteCurtain,
|
||||
(RawMapObject {otype: 393, ..}, _) => MapObjectType::UnknownItem393,
|
||||
(RawMapObject {otype: 394, ..}, _) => MapObjectType::UnknownItem394,
|
||||
(RawMapObject {otype: 393, ..}, _) => MapObjectType::UnknownMapObject393,
|
||||
(RawMapObject {otype: 394, ..}, _) => MapObjectType::UnknownMapObject394,
|
||||
(RawMapObject {otype: 395, ..}, _) => MapObjectType::LobbyFishTank,
|
||||
(RawMapObject {otype: 396, ..}, _) => MapObjectType::LobbyEventObjectButterflies,
|
||||
(RawMapObject {otype: 400, ..}, _) => MapObjectType::UnknownItem400,
|
||||
(RawMapObject {otype: 400, ..}, _) => MapObjectType::UnknownMapObject400,
|
||||
(RawMapObject {otype: 401, ..}, _) => MapObjectType::GreyWallLow,
|
||||
(RawMapObject {otype: 402, ..}, _) => MapObjectType::SpaceshipDoor,
|
||||
(RawMapObject {otype: 403, ..}, _) => MapObjectType::GreyWallHigh,
|
||||
@ -643,10 +633,8 @@ impl MapObject {
|
||||
(RawMapObject {otype: 426, ..}, _) => MapObjectType::LongRisingBridgeWithPinkHighEdges,
|
||||
(RawMapObject {otype: 427, ..}, _) => MapObjectType::FourSwitchTempleDoor,
|
||||
(RawMapObject {otype: 448, ..}, _) => MapObjectType::FourButtonSpaceshipDoor,
|
||||
// (RawMapObject {otype: 512, ..}, _) => MapObjectType::ItemBoxCca,
|
||||
(RawMapObject {otype: 513, ..}, _) => MapObjectType::TeleporterEp2,
|
||||
(RawMapObject {otype: 514, ..}, _) => MapObjectType::CcaDoor,
|
||||
// (RawMapObject {otype: 515, ..}, _) => MapObjectType::SpecialBoxCca,
|
||||
(RawMapObject {otype: 516, ..}, _) => MapObjectType::BigCcaDoor,
|
||||
(RawMapObject {otype: 517, ..}, _) => MapObjectType::BigCcaDoorSwitch,
|
||||
(RawMapObject {otype: 518, ..}, _) => MapObjectType::LittleRock,
|
||||
@ -654,13 +642,13 @@ impl MapObject {
|
||||
(RawMapObject {otype: 520, ..}, _) => MapObjectType::Medium3StoneWall,
|
||||
(RawMapObject {otype: 521, ..}, _) => MapObjectType::SpiderPlant,
|
||||
(RawMapObject {otype: 522, ..}, _) => MapObjectType::CcaAreaTeleporter,
|
||||
(RawMapObject {otype: 523, ..}, _) => MapObjectType::UnknownItem523,
|
||||
(RawMapObject {otype: 523, ..}, _) => MapObjectType::UnknownMapObject523,
|
||||
(RawMapObject {otype: 524, ..}, _) => MapObjectType::WhiteBird,
|
||||
(RawMapObject {otype: 525, ..}, _) => MapObjectType::OrangeBird,
|
||||
(RawMapObject {otype: 527, ..}, _) => MapObjectType::Saw,
|
||||
(RawMapObject {otype: 528, ..}, _) => MapObjectType::LaserDetect,
|
||||
(RawMapObject {otype: 529, ..}, _) => MapObjectType::UnknownItem529,
|
||||
(RawMapObject {otype: 530, ..}, _) => MapObjectType::UnknownItem530,
|
||||
(RawMapObject {otype: 529, ..}, _) => MapObjectType::UnknownMapObject529,
|
||||
(RawMapObject {otype: 530, ..}, _) => MapObjectType::UnknownMapObject530,
|
||||
(RawMapObject {otype: 531, ..}, _) => MapObjectType::Seagull,
|
||||
(RawMapObject {otype: 544, ..}, _) => MapObjectType::Fish,
|
||||
(RawMapObject {otype: 545, ..}, _) => MapObjectType::SeabedDoorWithBlueEdges,
|
||||
@ -672,9 +660,9 @@ impl MapObject {
|
||||
(RawMapObject {otype: 551, ..}, _) => MapObjectType::Dolphin,
|
||||
(RawMapObject {otype: 552, ..}, _) => MapObjectType::CaptureTrap,
|
||||
(RawMapObject {otype: 553, ..}, _) => MapObjectType::VRLink,
|
||||
(RawMapObject {otype: 576, ..}, _) => MapObjectType::UnknownItem576,
|
||||
(RawMapObject {otype: 576, ..}, _) => MapObjectType::UnknownMapObject576,
|
||||
(RawMapObject {otype: 640, ..}, _) => MapObjectType::WarpInBarbaRayRoom,
|
||||
(RawMapObject {otype: 672, ..}, _) => MapObjectType::UnknownItem672,
|
||||
(RawMapObject {otype: 672, ..}, _) => MapObjectType::UnknownMapObject672,
|
||||
(RawMapObject {otype: 688, ..}, _) => MapObjectType::GeeNest,
|
||||
(RawMapObject {otype: 689, ..}, _) => MapObjectType::LabComputerConsole,
|
||||
(RawMapObject {otype: 690, ..}, _) => MapObjectType::LabComputerConsoleGreenScreen,
|
||||
@ -687,33 +675,33 @@ impl MapObject {
|
||||
(RawMapObject {otype: 697, ..}, _) => MapObjectType::InstaWarp,
|
||||
(RawMapObject {otype: 698, ..}, _) => MapObjectType::LabInvisibleObject,
|
||||
(RawMapObject {otype: 699, ..}, _) => MapObjectType::LabGlassWindowDoor,
|
||||
(RawMapObject {otype: 700, ..}, _) => MapObjectType::UnknownItem700,
|
||||
(RawMapObject {otype: 700, ..}, _) => MapObjectType::UnknownMapObject700,
|
||||
(RawMapObject {otype: 701, ..}, _) => MapObjectType::LabCeilingWarp,
|
||||
(RawMapObject {otype: 768, ..}, _) => MapObjectType::Ep4LightSource,
|
||||
(RawMapObject {otype: 769, ..}, _) => MapObjectType::Cactus,
|
||||
(RawMapObject {otype: 770, ..}, _) => MapObjectType::BigBrownRock,
|
||||
(RawMapObject {otype: 771, ..}, _) => MapObjectType::BreakableBrownRock,
|
||||
(RawMapObject {otype: 832, ..}, _) => MapObjectType::UnknownItem832,
|
||||
(RawMapObject {otype: 833, ..}, _) => MapObjectType::UnknownItem833,
|
||||
(RawMapObject {otype: 832, ..}, _) => MapObjectType::UnknownMapObject832,
|
||||
(RawMapObject {otype: 833, ..}, _) => MapObjectType::UnknownMapObject833,
|
||||
(RawMapObject {otype: 896, ..}, _) => MapObjectType::PoisonPlant,
|
||||
(RawMapObject {otype: 897, ..}, _) => MapObjectType::UnknownItem897,
|
||||
(RawMapObject {otype: 898, ..}, _) => MapObjectType::UnknownItem898,
|
||||
(RawMapObject {otype: 897, ..}, _) => MapObjectType::UnknownMapObject897,
|
||||
(RawMapObject {otype: 898, ..}, _) => MapObjectType::UnknownMapObject898,
|
||||
(RawMapObject {otype: 899, ..}, _) => MapObjectType::OozingDesertPlant,
|
||||
(RawMapObject {otype: 901, ..}, _) => MapObjectType::UnknownItem901,
|
||||
(RawMapObject {otype: 901, ..}, _) => MapObjectType::UnknownMapObject901,
|
||||
(RawMapObject {otype: 902, ..}, _) => MapObjectType::BigBlackRocks,
|
||||
(RawMapObject {otype: 903, ..}, _) => MapObjectType::UnknownItem903,
|
||||
(RawMapObject {otype: 904, ..}, _) => MapObjectType::UnknownItem904,
|
||||
(RawMapObject {otype: 905, ..}, _) => MapObjectType::UnknownItem905,
|
||||
(RawMapObject {otype: 906, ..}, _) => MapObjectType::UnknownItem906,
|
||||
(RawMapObject {otype: 903, ..}, _) => MapObjectType::UnknownMapObject903,
|
||||
(RawMapObject {otype: 904, ..}, _) => MapObjectType::UnknownMapObject904,
|
||||
(RawMapObject {otype: 905, ..}, _) => MapObjectType::UnknownMapObject905,
|
||||
(RawMapObject {otype: 906, ..}, _) => MapObjectType::UnknownMapObject906,
|
||||
(RawMapObject {otype: 907, ..}, _) => MapObjectType::FallingRock,
|
||||
(RawMapObject {otype: 908, ..}, _) => MapObjectType::DesertPlantHasCollision,
|
||||
(RawMapObject {otype: 909, ..}, _) => MapObjectType::DesertFixedTypeBoxBreakableCrystals,
|
||||
(RawMapObject {otype: 910, ..}, _) => MapObjectType::UnknownItem910,
|
||||
(RawMapObject {otype: 910, ..}, _) => MapObjectType::UnknownMapObject910,
|
||||
(RawMapObject {otype: 911, ..}, _) => MapObjectType::BeeHive,
|
||||
(RawMapObject {otype: 912, ..}, _) => MapObjectType::UnknownItem912,
|
||||
(RawMapObject {otype: 912, ..}, _) => MapObjectType::UnknownMapObject912,
|
||||
(RawMapObject {otype: 913, ..}, _) => MapObjectType::Heat,
|
||||
(RawMapObject {otype: 960, ..}, _) => MapObjectType::TopOfSaintMillionEgg,
|
||||
(RawMapObject {otype: 961, ..}, _) => MapObjectType::UnknownItem961,
|
||||
(RawMapObject {otype: 961, ..}, _) => MapObjectType::UnknownMapObject961,
|
||||
_ => return Err(MapObjectError::UnknownObjectType(raw.otype, raw))
|
||||
};
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user