diff --git a/NHSE.Core/Resources/byte/item_kind.bin b/NHSE.Core/Resources/byte/item_kind.bin index d248f04..490d0b6 100644 Binary files a/NHSE.Core/Resources/byte/item_kind.bin and b/NHSE.Core/Resources/byte/item_kind.bin differ diff --git a/NHSE.Core/Resources/byte/item_menuicon.bin b/NHSE.Core/Resources/byte/item_menuicon.bin index 20676df..0ec1d12 100644 Binary files a/NHSE.Core/Resources/byte/item_menuicon.bin and b/NHSE.Core/Resources/byte/item_menuicon.bin differ diff --git a/NHSE.Core/Resources/byte/item_size.bin b/NHSE.Core/Resources/byte/item_size.bin index c7ce987..79ed6b6 100644 Binary files a/NHSE.Core/Resources/byte/item_size.bin and b/NHSE.Core/Resources/byte/item_size.bin differ diff --git a/NHSE.Core/Structures/Item/FieldItem/FieldItemList.cs b/NHSE.Core/Structures/Item/FieldItem/FieldItemList.cs index 86e7505..9a87b27 100644 --- a/NHSE.Core/Structures/Item/FieldItem/FieldItemList.cs +++ b/NHSE.Core/Structures/Item/FieldItem/FieldItemList.cs @@ -375,6 +375,22 @@ public static ItemKind GetFieldItemKind(ushort id) {0xEC9E, new FieldItemDefinition(60574, 4438 , 65534, "PltTreeMoney2" , FieldItemKind.PltTreeOak )}, // 金のなるの木（成長２） {0xEC9F, new FieldItemDefinition(60575, 4436 , 65534, "PltTreeMoney0" , FieldItemKind.PltTreeOak )}, // 金のなるの木（苗） {0xECA0, new FieldItemDefinition(60576, 4437 , 65534, "PltTreeMoney1" , FieldItemKind.PltTreeOak )}, // 金のなるの木（成長１） + {0xECA1, new FieldItemDefinition(60577, 4544 , 4528 , "PltVgtSquash3White" , FieldItemKind.PltVgtPumpkin )}, // カボチャ白（成木） + {0xECA2, new FieldItemDefinition(60578, 4543 , 65534, "PltVgtSquash2White" , FieldItemKind.PltVgtPumpkin )}, // カボチャ白（成長２） + {0xECA3, new FieldItemDefinition(60579, 4542 , 65534, "PltVgtSquash1White" , FieldItemKind.PltVgtPumpkin )}, // カボチャ白（成長１） + {0xECA4, new FieldItemDefinition(60580, 4541 , 65534, "PltVgtSquash0White" , FieldItemKind.PltVgtPumpkin )}, // カボチャ白（苗） + {0xECA5, new FieldItemDefinition(60581, 4538 , 65534, "PltVgtSquash1Green" , FieldItemKind.PltVgtPumpkin )}, // カボチャ緑（成長１） + {0xECA6, new FieldItemDefinition(60582, 4539 , 65534, "PltVgtSquash2Green" , FieldItemKind.PltVgtPumpkin )}, // カボチャ緑（成長２） + {0xECA7, new FieldItemDefinition(60583, 4540 , 4527 , "PltVgtSquash3Green" , FieldItemKind.PltVgtPumpkin )}, // カボチャ緑（成木） + {0xECA9, new FieldItemDefinition(60585, 4532 , 4525 , "PltVgtSquash3Orange" , FieldItemKind.PltVgtPumpkin )}, // カボチャオレンジ（成木） + {0xECAA, new FieldItemDefinition(60586, 4533 , 65534, "PltVgtSquash0Yellow" , FieldItemKind.PltVgtPumpkin )}, // カボチャ黄（苗） + {0xECAB, new FieldItemDefinition(60587, 4534 , 65534, "PltVgtSquash1Yellow" , FieldItemKind.PltVgtPumpkin )}, // カボチャ黄（成長１） + {0xECAC, new FieldItemDefinition(60588, 4535 , 65534, "PltVgtSquash2Yellow" , FieldItemKind.PltVgtPumpkin )}, // カボチャ黄（成長２） + {0xECAD, new FieldItemDefinition(60589, 4536 , 4526 , "PltVgtSquash3Yellow" , FieldItemKind.PltVgtPumpkin )}, // カボチャ黄（成木） + {0xECAE, new FieldItemDefinition(60590, 4537 , 65534, "PltVgtSquash0Green" , FieldItemKind.PltVgtPumpkin )}, // カボチャ緑（苗） + {0xECAF, new FieldItemDefinition(60591, 4529 , 65534, "PltVgtSquash0Orange" , FieldItemKind.PltVgtPumpkin )}, // カボチャオレンジ（苗） + {0xECB0, new FieldItemDefinition(60592, 4530 , 65534, "PltVgtSquash1Orange" , FieldItemKind.PltVgtPumpkin )}, // カボチャオレンジ（成長１） + {0xECB1, new FieldItemDefinition(60593, 4531 , 65534, "PltVgtSquash2Orange" , FieldItemKind.PltVgtPumpkin )}, // カボチャオレンジ（成長２） {0xECB2, new FieldItemDefinition(60594, 65534, 5213 , "FenceBarbedWire" , FieldItemKind.FenceBarbedWire )}, // ゆうしてっせん {0xECB6, new FieldItemDefinition(60598, 65534, 5207 , "FenceJapanese" , FieldItemKind.FenceJapanese )}, // 和風のさく {0xECB7, new FieldItemDefinition(60599, 65534, 5206 , "FenceIronAndStone" , FieldItemKind.FenceIronAndStone )}, // 鉄と石の柵 @@ -385,7 +401,7 @@ public static ItemKind GetFieldItemKind(ushort id) {0xECC1, new FieldItemDefinition(60609, 7651 , 65534, "PltFlwLily3" , FieldItemKind.PltFlwLily )}, // スズラン（花） {0xECC2, new FieldItemDefinition(60610, 65534, 11711, "FenceWoodNatural" , FieldItemKind.FenceWoodWhite )}, // ナチュラルな柵 {0xECC3, new FieldItemDefinition(60611, 65534, 11712, "FenceLattice3" , FieldItemKind.FenceLattice )}, // ラティスナチュラル - {0xECC4, new FieldItemDefinition(60612, 65534, 12285, "FenceCommune" , FieldItemKind.FenceHorizontalLog )}, // コミューン島専用柵 + {0xECC4, new FieldItemDefinition(60612, 65534, 65534, "FenceCommune" , FieldItemKind.FenceHorizontalLog )}, // コミューン島専用柵 {0xECF4, new FieldItemDefinition(60660, 12478, 65534, "PltBushOsmathus5Yello" , FieldItemKind.PltBushOsmanthus )}, // キンモクセイ黄（成木花なし） {0xECF5, new FieldItemDefinition(60661, 12478, 65534, "PltBushOsmathus4Yello" , FieldItemKind.PltBushOsmanthus )}, // キンモクセイ黄（成木花） {0xECF6, new FieldItemDefinition(60662, 12477, 65534, "PltBushOsmathus2Yello" , FieldItemKind.PltBushOsmanthus )}, // キンモクセイ黄（成長１） @@ -413,6 +429,10 @@ public static ItemKind GetFieldItemKind(ushort id) {0xED0E, new FieldItemDefinition(60686, 65534, 2213 , "FenceJuneBride1" , FieldItemKind.FenceJuneBride )}, // ジューンブライドな柵ピンク {0xED16, new FieldItemDefinition(60694, 2799 , 65534, "PltTreeEasterEgg" , FieldItemKind.PltTreeOak )}, // イースターのタマゴの木 {0xED21, new FieldItemDefinition(60705, 65534, 2213 , "FenceMermaid" , FieldItemKind.FenceMermaid )}, // マーメイドな柵 + {0xED25, new FieldItemDefinition(60709, 65534, 13275, "FenceHalloween" , FieldItemKind.FenceHalloween )}, // ハロウィンのさく + {0xED3F, new FieldItemDefinition(60735, 3052 , 65534, "PltVgtSquash0" , FieldItemKind.PltVgtPumpkin )}, // カボチャ（苗） + {0xED40, new FieldItemDefinition(60736, 3053 , 65534, "PltVgtSquash1" , FieldItemKind.PltVgtPumpkin )}, // カボチャ（成長１） + {0xED41, new FieldItemDefinition(60737, 4362 , 65534, "PltVgtSquash2" , FieldItemKind.PltVgtPumpkin )}, // カボチャ（成長２） }; } } diff --git a/NHSE.Core/Structures/Item/ItemMenuIconType.cs b/NHSE.Core/Structures/Item/ItemMenuIconType.cs index 2079d32..5f700dd 100644 --- a/NHSE.Core/Structures/Item/ItemMenuIconType.cs +++ b/NHSE.Core/Structures/Item/ItemMenuIconType.cs @@ -7,6 +7,12 @@ namespace NHSE.Core public enum ItemMenuIconType : ushort #pragma warning restore CA1027 // Mark enums with FlagsAttribute { + _0x56F2EDCC, + _0x671C4A74, + _0x9B33B02B, + _0xD8F9688A, + _0xE5A5B727, + _0xF54969F1, Akoyagai, Amaebi, Anemone0, @@ -35,6 +41,7 @@ public enum ItemMenuIconType : ushort Bottoms, Bridge, Can, + Candy, Cap, Cardboard, Carpet, @@ -59,8 +66,6 @@ public enum ItemMenuIconType : ushort DIYBambooSpring, DIYBranch, DIYPinecone, - DIYRecipeFence, - DIYRecipeFtr, DIYWoodHard, DIYWoodNormal, DIYWoodSoft, @@ -278,9 +283,7 @@ public enum ItemMenuIconType : ushort Koumoridako, Kurumaebi, Leaf, - LeafDesign, LostQuestMemo, - LostQuestPorch, Love, Medicine, Mendako, @@ -306,7 +309,6 @@ public enum ItemMenuIconType : ushort Namako, Net, Ocarina, - OddGlove, Onepiece, Orange, OreClay, @@ -314,7 +316,6 @@ public enum ItemMenuIconType : ushort OreIron, OreStone, Oumugai, - Oyster, Pachinko, Paipuuni, Panflute, @@ -434,12 +435,10 @@ public enum ItemMenuIconType : ushort Senjunamako, Shako, Shakogai, - Shell0, Shell1, Shell2, Shell3, Shell4, - Shell5, Shell6, Shell7, Shell8, @@ -451,6 +450,10 @@ public enum ItemMenuIconType : ushort SnowCrystal, SnowCrystalLarge, Socks, + SquashGreen, + SquashOrange, + SquashWhite, + SquashYellow, StarPiece, StarpieceAquarius, StarpieceAries, @@ -463,7 +466,6 @@ public enum ItemMenuIconType : ushort StarPieceRare, StarpieceSagittarius, StarpieceScorpio, - StarPieceSeason, StarpieceTaurus, StarpieceVirgo, Syabon, @@ -535,7 +537,6 @@ public enum ItemMenuIconType : ushort WPaperRed, WPaperWhite, WPaperYellow, - WrappingPaper, YellowPaperBag, Yuri0, Yuri1, diff --git a/NHSE.Core/Structures/Item/Remake/ItemRemakeInfoData.cs b/NHSE.Core/Structures/Item/Remake/ItemRemakeInfoData.cs index 4abdf14..bfd4d67 100644 --- a/NHSE.Core/Structures/Item/Remake/ItemRemakeInfoData.cs +++ b/NHSE.Core/Structures/Item/Remake/ItemRemakeInfoData.cs @@ -157,7 +157,7 @@ public static class ItemRemakeInfoData {0267, new ItemRemakeInfo(0267, 00997, 5, new byte[] {10, 12, 04, 06, 02, 09, 14, 14}, new byte[] {01, 09, 10, 08, 12, 06, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, false)}, // incense burner {0268, new ItemRemakeInfo(0268, 01495, 5, new byte[] {01, 04, 06, 02, 10, 12, 14, 14}, new byte[] {08, 08, 08, 08, 08, 08, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, false)}, // dolly {0269, new ItemRemakeInfo(0269, 01628, 2, new byte[] {10, 12, 06, 14, 14, 14, 14, 14}, new byte[] {10, 12, 06, 14, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, false)}, // garden lantern - {0270, new ItemRemakeInfo(0270, 03584, 3, new byte[] {01, 05, 12, 10, 14, 14, 14, 14}, new byte[] {13, 13, 10, 10, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, false)}, // writing poster + {0270, new ItemRemakeInfo(0270, 03584, 3, new byte[] {01, 05, 12, 10, 14, 14, 14, 14}, new byte[] {13, 13, 10, 10, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, false)}, // study poster {0271, new ItemRemakeInfo(0271, 03445, 3, new byte[] {10, 12, 11, 06, 14, 14, 14, 14}, new byte[] {10, 12, 11, 06, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, new byte[] {13, 06, 04, 13, 14, 14, 14, 14}, false)}, // standard umbrella stand {0272, new ItemRemakeInfo(0272, 01836, 7, new byte[] {12, 08, 09, 02, 07, 06, 05, 03}, new byte[] {12, 12, 12, 02, 07, 06, 05, 03}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, false)}, // humidifier {0273, new ItemRemakeInfo(0273, 01234, 4, new byte[] {05, 01, 04, 06, 11, 14, 14, 14}, new byte[] {12, 12, 12, 12, 12, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, false)}, // portable toilet @@ -210,8 +210,8 @@ public static class ItemRemakeInfoData {0329, new ItemRemakeInfo(0329, 03675, 2, new byte[] {07, 12, 06, 14, 14, 14, 14, 14}, new byte[] {07, 12, 06, 14, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, false)}, // hay bed {0334, new ItemRemakeInfo(0334, 03697, 7, new byte[] {12, 07, 01, 02, 04, 05, 06, 10}, new byte[] {10, 10, 10, 10, 10, 10, 10, 10}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, false)}, // portable radio {0335, new ItemRemakeInfo(0335, 03699, 6, new byte[] {10, 01, 10, 10, 10, 10, 10, 10}, new byte[] {12, 13, 12, 12, 12, 12, 12, 12}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, false)}, // fish print - {0336, new ItemRemakeInfo(0336, 03702, 3, new byte[] {08, 07, 09, 12, 14, 14, 14, 14}, new byte[] {08, 07, 09, 12, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, new byte[] {07, 04, 02, 14, 14, 14, 14, 14}, false)}, // writing chair - {0337, new ItemRemakeInfo(0337, 03701, 3, new byte[] {08, 07, 09, 12, 14, 14, 14, 14}, new byte[] {08, 07, 09, 12, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, false)}, // writing desk + {0336, new ItemRemakeInfo(0336, 03702, 3, new byte[] {08, 07, 09, 12, 14, 14, 14, 14}, new byte[] {08, 07, 09, 12, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, new byte[] {07, 04, 02, 14, 14, 14, 14, 14}, false)}, // study chair + {0337, new ItemRemakeInfo(0337, 03701, 3, new byte[] {08, 07, 09, 12, 14, 14, 14, 14}, new byte[] {08, 07, 09, 12, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, false)}, // study desk {0340, new ItemRemakeInfo(0340, 00808, 4, new byte[] {09, 12, 06, 01, 07, 14, 14, 14}, new byte[] {08, 12, 12, 08, 08, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, false)}, // mush table {0342, new ItemRemakeInfo(0342, 01779, -1, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, new byte[] {12, 09, 10, 01, 02, 07, 06, 05}, new byte[] {12, 09, 10, 01, 02, 07, 06, 05}, false)}, // table with cloth {0343, new ItemRemakeInfo(0343, 03499, 6, new byte[] {05, 04, 02, 07, 00, 06, 03, 14}, new byte[] {05, 04, 02, 07, 00, 06, 03, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, false)}, // frozen arch @@ -678,6 +678,18 @@ public static class ItemRemakeInfoData {0932, new ItemRemakeInfo(0932, 12404, 2, new byte[] {02, 08, 06, 14, 14, 14, 14, 14}, new byte[] {12, 12, 12, 14, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, false)}, // wedding head table {0934, new ItemRemakeInfo(0934, 12543, 1, new byte[] {10, 10, 14, 14, 14, 14, 14, 14}, new byte[] {13, 10, 14, 14, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, false)}, // Nintendo Switch {1012, new ItemRemakeInfo(1012, 12741, 1, new byte[] {04, 04, 14, 14, 14, 14, 14, 14}, new byte[] {06, 06, 14, 14, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, false)}, // world map + {1153, new ItemRemakeInfo(1153, 13222, 3, new byte[] {00, 07, 06, 12, 14, 14, 14, 14}, new byte[] {03, 13, 09, 10, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, false)}, // spooky garland + {1154, new ItemRemakeInfo(1154, 13223, 3, new byte[] {03, 05, 08, 11, 14, 14, 14, 14}, new byte[] {00, 07, 06, 12, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, false)}, // spooky table setting + {1155, new ItemRemakeInfo(1155, 04083, 3, new byte[] {09, 09, 09, 11, 14, 14, 14, 14}, new byte[] {00, 07, 06, 12, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, false)}, // spooky arch + {1156, new ItemRemakeInfo(1156, 04084, 3, new byte[] {00, 07, 06, 12, 14, 14, 14, 14}, new byte[] {09, 09, 09, 11, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, false)}, // spooky scarecrow + {1157, new ItemRemakeInfo(1157, 04086, 3, new byte[] {00, 07, 06, 12, 14, 14, 14, 14}, new byte[] {00, 07, 06, 10, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, false)}, // spooky tower + {1168, new ItemRemakeInfo(1168, 12949, 3, new byte[] {00, 07, 06, 12, 14, 14, 14, 14}, new byte[] {09, 09, 09, 10, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, false)}, // spooky standing lamp + {1190, new ItemRemakeInfo(1190, 04087, 3, new byte[] {00, 07, 06, 12, 14, 14, 14, 14}, new byte[] {09, 09, 08, 10, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, false)}, // spooky carriage + {1191, new ItemRemakeInfo(1191, 04088, 3, new byte[] {00, 07, 06, 12, 14, 14, 14, 14}, new byte[] {00, 07, 06, 12, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, false)}, // spooky lantern + {1192, new ItemRemakeInfo(1192, 04089, 3, new byte[] {00, 07, 06, 12, 14, 14, 14, 14}, new byte[] {06, 06, 06, 10, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, false)}, // spooky chair + {1193, new ItemRemakeInfo(1193, 04090, 3, new byte[] {00, 07, 06, 12, 14, 14, 14, 14}, new byte[] {06, 06, 00, 07, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, false)}, // spooky table + {1194, new ItemRemakeInfo(1194, 04092, 3, new byte[] {00, 07, 06, 12, 14, 14, 14, 14}, new byte[] {08, 08, 08, 08, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, false)}, // spooky lantern set + {1195, new ItemRemakeInfo(1195, 12951, 3, new byte[] {00, 07, 06, 12, 14, 14, 14, 14}, new byte[] {03, 02, 09, 10, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, false)}, // spooky candy set }; } }