From 02fba973d8d8d03633ef893c71d5b3e64e3b1003 Mon Sep 17 00:00:00 2001 From: Kurt Date: Tue, 27 Apr 2021 23:26:48 -0700 Subject: [PATCH] Update item/flag/remake parameters --- NHSE.Core/Resources/byte/item_kind.bin | Bin 14410 -> 14654 bytes NHSE.Core/Resources/byte/item_menuicon.bin | Bin 28820 -> 29308 bytes NHSE.Core/Resources/byte/item_size.bin | Bin 14410 -> 14654 bytes NHSE.Core/Structures/Item/ItemInfo.cs | 1 + NHSE.Core/Structures/Item/ItemKind.cs | 1 + NHSE.Core/Structures/Item/ItemMenuIconType.cs | 1 + .../Item/Remake/ItemRemakeInfoData.cs | 3 ++ .../Structures/Item/Remake/ItemRemakeUtil.cs | 4 +++ NHSE.Core/Structures/Records/EventFlagLand.cs | 29 ++++++++++++------ .../Structures/Records/EventFlagPlayer.cs | 24 +++++++++++++-- NHSE.Parsing/GameBCSVDumper.cs | 2 +- NHSE.Tests/DumpTests.cs | 4 +-- 12 files changed, 54 insertions(+), 15 deletions(-) diff --git a/NHSE.Core/Resources/byte/item_kind.bin b/NHSE.Core/Resources/byte/item_kind.bin index c1cc3061cbe447e00b9706d67ef987b5a43a47ac..cb923ab067e2064a4611ea541f0677369991e345 100644 GIT binary patch literal 14654 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 literal 14410 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 diff --git a/NHSE.Core/Resources/byte/item_menuicon.bin b/NHSE.Core/Resources/byte/item_menuicon.bin index 9fcf28e3571d413adae5a28f572d7cd8db0bb4cc..5d3305b3a290ee5ce2e85277ebe1a2d79b89fa32 100644 GIT binary patch literal 29308 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 I?Qrjpj z39W{s`1AI?9PrjgXNn_@UfJl!4bi?TM>XZ7x5Uz!sG_7X$2QUX@u+r6U{t^#UHAQZ zhEe3-FrKb$(3PS?Ns_WsVzo}TuJoz3ETwh7qz|jn?l6wL4cX+?g^oX>hP-{cWmu<- za90iQj9&!+y7CX><2!-xh&NpUZ;v;h@$R#r?3uP2`V*PK?8E1Nybnv!4c3L0Hl4$1 zZ|;5D!|!}94$C}LCrrf8Kjw--KQ6x#QrAIwwwGRh{O=Zgztu)jMb1Zg`fGZ8Kr2a-Fk8`GF<#IM~>3vyiM%uMLQ@={<>e)7{Y}>SDCng;; z@!`#JRd8*qLcwM$n-#L|J<5_@BK zfk@MCPVIxR=Hxnnsnb}z<0h|W7jt%mp|00k$p=Yh5G5R_>0A07r#!1P8Bfe^ioT%_ z$TRxj@~OFGwjzaB&<@Ol&r?)RPglxbVWh|mpNaQ`Yor*2^$jkcGb$%&#Yo@^h8kkx zQ}#unXSO2jrf1aiTD%2-V=O-1G>+!#qNxjy-iP3K6Sv)SdT$L+swbwNj^io$oEcuj z9OoLzO`KoD?d3u5Q+4m9df2VNY43XEY93jIS7qR~n1Sxs+w?fOhiUGXn)Afq`pWBz zwDU-l$zZ?wTbiC?XVA~pm7*u4$rtSdxnrho?i=wvXIH)A%V%TJns|CWJ&c>bxX^Dc zrjMJRb*&?N*j4eEzFkW2xvoaC?iAD?dS4av<`^jJ6lLcwDXqQ71t=7ypxwD=5H|JXBtbX zl(Hu4?N_W?b6jSVwKi|lcxh%U`9Ys4UHYF}L|Ls(dfvvnY;h9z^EWd`4svT3Q|c&d zrNy#MHR??LoidZCd5D%o9b8H|Ln(cKQqq$}=}%a?!IP+{rS%*9@1XE0c{_d$$Y*`hqF-o= zOJhTL&eZc}j`e(oU0#3Nh`eGp!M>2Tse7>>7=ZuuctU{mFZKfh7W?A^zz2PrU*wbU zz3sksAG?>`&+b{1QpUxR<7V8b!|E1s-Zb;9jgM~t@RxPv8^L@kzbqT`xy|X9*Q>Ah zrVrE;-~ZKp39qNGc_N-mW3Iq2?>K)>Ux!)#o7<_i?AOHVyT>R(D5%C{j z2gdj~AjZRy5&vu+e9v_@HLh%3Gs{Oa^Ig5>^^&-`a-}*;4~wxmxA*JT%W4ws%@3;P zy1DVISVB{pb?i@?Exdc4Q_l#CdX1cg#EG~2apYGIDWlIb%?Ylhv>TC~xm5zQhx;3S zM>P$=bB$nj!>r9En92EzSd^B=TPCRSpCK@-V(!8>5^XN+=^Oi&Z4C_?dxF_x-uXMj zEB)@lS?(e+cc9nv{>jT!jdvSHANZ#ha^2)NOhs^Wz2Zn(ecJvDQgIQ37xR1jZzN0J z{@Qg@9&q#}o&CI`q#c#6g+W+rZMwV2-?&Qqy0rEtiBw9h${b?;Oy)T}Q-825UqM%E zqKz)W5;L1(OH$OC>Z3}7_KnGFcn>X%I@d@0yw^h}aLwlJ(=Vs}6?Q54NM9b`nXfv! zWB_we&Ua-t&NLF6nEd#^9rpHC)jGYkf+J1*>GwFf1(wA#2%CMu-!-jynBy*uXp}Cg zW5fP;MUGsWtKztSzQ|gxz3E5ZHn@B@zk985vw?aC%XV)`*{00619TlWJzqcazogg4 zrHwJahu`y7^|Z8i>($bDX}6&}?e^CHCKdDNM7+yDi public enum ItemMenuIconType : ushort { + _0x19191B2D, Akoyagai, Amaebi, Anemone0, diff --git a/NHSE.Core/Structures/Item/Remake/ItemRemakeInfoData.cs b/NHSE.Core/Structures/Item/Remake/ItemRemakeInfoData.cs index 0019787..e127e29 100644 --- a/NHSE.Core/Structures/Item/Remake/ItemRemakeInfoData.cs +++ b/NHSE.Core/Structures/Item/Remake/ItemRemakeInfoData.cs @@ -725,6 +725,9 @@ public static class ItemRemakeInfoData {1524, new ItemRemakeInfo(1524, 13930, 5, new byte[] {13, 02, 04, 11, 01, 11, 14, 14}, new byte[] {13, 12, 05, 04, 12, 08, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, false)}, // set of stockings {1546, new ItemRemakeInfo(1546, 14029, 5, new byte[] {01, 02, 07, 03, 12, 10, 14, 14}, new byte[] {12, 12, 00, 12, 06, 11, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, false)}, // heart-shaped bouquet {1615, new ItemRemakeInfo(1615, 14340, 2, new byte[] {01, 06, 07, 14, 14, 14, 14, 14}, new byte[] {11, 11, 11, 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)}, // whoopee cushion + {1640, new ItemRemakeInfo(1640, 14476, 2, new byte[] {12, 04, 09, 14, 14, 14, 14, 14}, new byte[] {02, 05, 01, 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)}, // nuptial bell + {1641, new ItemRemakeInfo(1641, 14477, 2, new byte[] {12, 05, 01, 14, 14, 14, 14, 14}, new byte[] {02, 04, 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)}, // nuptial ring pillow + {1642, new ItemRemakeInfo(1642, 14475, 2, new byte[] {02, 05, 01, 14, 14, 14, 14, 14}, new byte[] {12, 04, 12, 14, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, new byte[] {12, 12, 12, 14, 14, 14, 14, 14}, false)}, // nuptial doorplate }; } } diff --git a/NHSE.Core/Structures/Item/Remake/ItemRemakeUtil.cs b/NHSE.Core/Structures/Item/Remake/ItemRemakeUtil.cs index 24a0371..d041c5a 100644 --- a/NHSE.Core/Structures/Item/Remake/ItemRemakeUtil.cs +++ b/NHSE.Core/Structures/Item/Remake/ItemRemakeUtil.cs @@ -1139,6 +1139,10 @@ public static class ItemRemakeUtil {14255, 0652}, // Timmy and Tommy's photo {14256, 0652}, // Isabelle's photo {14340, 1615}, // whoopee cushion + {14472, 0652}, // Rover's photo + {14475, 1642}, // nuptial doorplate + {14476, 1640}, // nuptial bell + {14477, 1641}, // nuptial ring pillow }; } } diff --git a/NHSE.Core/Structures/Records/EventFlagLand.cs b/NHSE.Core/Structures/Records/EventFlagLand.cs index 977df1a..7b00cea 100644 --- a/NHSE.Core/Structures/Records/EventFlagLand.cs +++ b/NHSE.Core/Structures/Records/EventFlagLand.cs @@ -316,10 +316,10 @@ public EventFlagLand(short init, short max, ushort index, string name) {0x159, new EventFlagLand(0 , 1 , 0345, "EarthdaySloFirstVisitToday" )}, // 今日がアースデーの初回レイジ来訪日 {0x15A, new EventFlagLand(0 , 1 , 0346, "IsDreamingBed" )}, // ゆめみ用ベッドある？ {0x15B, new EventFlagLand(0 , 1 , 0347, "UnlockJuneBrideSeq" )}, // ゲーム進行的にジューンブライド解禁 - {0x15C, new EventFlagLand(0 , -1 , 0348, "RandomKey1" )}, // ランダムキーa - {0x15D, new EventFlagLand(0 , -1 , 0349, "RandomKey2" )}, // ランダムキーb - {0x15E, new EventFlagLand(0 , -1 , 0350, "RandomKey3" )}, // ランダムキーc - {0x15F, new EventFlagLand(0 , -1 , 0351, "RandomKey4" )}, // ランダムキーd + {0x15C, new EventFlagLand(0 , -1 , 0348, "RandomKey1" )}, // ランダムキー1 + {0x15D, new EventFlagLand(0 , -1 , 0349, "RandomKey2" )}, // ランダムキー2 + {0x15E, new EventFlagLand(0 , -1 , 0350, "RandomKey3" )}, // ランダムキー3 + {0x15F, new EventFlagLand(0 , -1 , 0351, "RandomKey4" )}, // ランダムキー4 {0x160, new EventFlagLand(0 , 1 , 0352, "FoxPreVisitAlreadyBuyToday" )}, // つねきち|今日誰かが事前来訪中に美術品を買った {0x161, new EventFlagLand(0 , 1 , 0353, "RcoHasResolvedMoveKitBug" )}, // いせつキットバグを解消したか {0x162, new EventFlagLand(0 , 1 , 0354, "TapDreamEnable" )}, // ゆめみ|ゆめみ機能解禁か？ @@ -363,27 +363,36 @@ public EventFlagLand(short init, short max, ushort index, string name) {0x192, new EventFlagLand(0 , 1 , 0402, "GrowUpAfterPatch1_7" )}, // 1.7適用して成長処理をした {0x193, new EventFlagLand(0 , 9999 , 0403, "XmasEveAddBbsYear" )}, // クリスマス予告の掲示板書き込みをした年 {0x194, new EventFlagLand(0 , 1 , 0404, "BCAT_EventFlag_005" )}, // クリスマス準備期間解禁 - {0x195, new EventFlagLand(0 , -1 , 0405, "RandomKey5" )}, // ランダムキーe + {0x195, new EventFlagLand(0 , -1 , 0405, "RandomKey5" )}, // ランダムキー5 {0x196, new EventFlagLand(0 , 1 , 0406, "ShopSocksFlag" )}, // かべかけソックス当選済み {0x197, new EventFlagLand(0 , -1 , 0407, "ShopHeartChocoSelect" )}, // ハートのチョコレート抽選済みカラバリ {0x198, new EventFlagLand(0 , -1 , 0408, "ShopHeartFlowerSelect" )}, // ハートのバラブーケ抽選済みカラバリ - {0x199, new EventFlagLand(0 , -1 , 0409, "RandomKey6" )}, // ランダムキーf - {0x19A, new EventFlagLand(0 , -1 , 0410, "RandomKey7" )}, // ランダムキーg - {0x19B, new EventFlagLand(0 , -1 , 0411, "RandomKey8" )}, // ランダムキーh + {0x199, new EventFlagLand(0 , -1 , 0409, "RandomKey6" )}, // ランダムキー6 + {0x19A, new EventFlagLand(0 , -1 , 0410, "RandomKey7" )}, // ランダムキー7 + {0x19B, new EventFlagLand(0 , -1 , 0411, "RandomKey8" )}, // ランダムキー8 {0x19C, new EventFlagLand(0 , 1 , 0412, "BCAT_EventFlag_006" )}, // クリスマスイブ解禁 {0x19D, new EventFlagLand(0 , 1 , 0413, "BCAT_EventFlag_007" )}, // カーニバル本番、バレンタイン本番解禁 {0x19E, new EventFlagLand(0 , 1 , 0414, "BCAT_EventFlag_008" )}, // マリオコラボ解禁 {0x19F, new EventFlagLand(0 , 1 , 0415, "GrowUpAfterPatch1_8" )}, // 1.8適用して成長処理をした {0x1A0, new EventFlagLand(0 , 1 , 0416, "GrowUpAfterPatch1_9" )}, // 1.9適用して成長処理をした - {0x1A1, new EventFlagLand(0 , -1 , 0417, "RandomKey9" )}, // ランダムキーi + {0x1A1, new EventFlagLand(0 , -1 , 0417, "RandomKey9" )}, // ランダムキー9 {0x1A2, new EventFlagLand(0 , 1 , 0418, "BCAT_EventFlag_009" )}, // イースター2年目準備解禁 {0x1A3, new EventFlagLand(0 , 9999 , 0419, "ValentineAddBbsYear" )}, // バレンタイン予告の掲示板書き込みをした年 {0x1A4, new EventFlagLand(0 , 9999 , 0420, "CarnivalAddBbsYear" )}, // カーニバル予告の掲示板書き込みをした年 {0x1A5, new EventFlagLand(0 , 1 , 0421, "CarnivalNpcFeatherColorDecided" )}, // カーニバル｜NPCが欲しがる羽の色決定済み {0x1A6, new EventFlagLand(0 , 1 , 0422, "CarnivalEventPlazaNpcWander" )}, // カーニバル｜広場行動NPCがぶらつくか {0x1AD, new EventFlagLand(0 , 1 , 0429, "BCAT_EventFlag_010" )}, // イースター2年目本番解禁 - {0x1AE, new EventFlagLand(0 , -1 , 0430, "RandomKey10" )}, // ランダムキーj + {0x1AE, new EventFlagLand(0 , -1 , 0430, "RandomKey10" )}, // ランダムキー10 {0x1B5, new EventFlagLand(0 , 1 , 0437, "AOC_EventFlag_002" )}, // AOC同期フラグ| 002 1.9.0NSO加入特典 + {0x1B6, new EventFlagLand(0 , 1 , 0438, "BCAT_EventFlag_011" )}, // ジューンブライド2年目解禁 + {0x1B7, new EventFlagLand(0 , -1 , 0439, "RandomKey11" )}, // ランダムキー11 + {0x1B8, new EventFlagLand(0 , 50 , 0440, "MuseumArtStampRackLotID1" )}, // 国際ミュージアム|1つ目の美術品のスタンプ台ID + {0x1B9, new EventFlagLand(0 , 50 , 0441, "MuseumArtStampRackLotID2" )}, // 国際ミュージアム|2つ目の美術品のスタンプ台ID + {0x1BA, new EventFlagLand(0 , 50 , 0442, "MuseumArtStampRackLotID3" )}, // 国際ミュージアム|3つ目の美術品のスタンプ台ID + {0x1D2, new EventFlagLand(0 , 1 , 0466, "EventObjFlag1" )}, // イベントオブジェフラグ1 + {0x1D3, new EventFlagLand(0 , 1 , 0467, "EventObjFlag2" )}, // イベントオブジェフラグ2 + {0x1DD, new EventFlagLand(0 , 1 , 0477, "GrowUpAfterPatch1_10" )}, // 1.10適用して成長処理をした + {0x1E3, new EventFlagLand(0 , 9999 , 0483, "MayDayAddBbsYear" )}, // メーデー予告の掲示板書き込みをした年 }; private const string Unknown = "???"; diff --git a/NHSE.Core/Structures/Records/EventFlagPlayer.cs b/NHSE.Core/Structures/Records/EventFlagPlayer.cs index fd21006..2a537b1 100644 --- a/NHSE.Core/Structures/Records/EventFlagPlayer.cs +++ b/NHSE.Core/Structures/Records/EventFlagPlayer.cs @@ -795,7 +795,7 @@ public EventFlagPlayer(short init, short max, ushort index, string name) {0x3B3, new EventFlagPlayer(0 , 1 , 0947, "JuneBridePlacementDataClearFlag" )}, // ジューンブライド|配置データクリア {0x3B4, new EventFlagPlayer(0 , 1 , 0948, "SloGetHedge" )}, // レイジ|レイジから「いけがき」をもらった？ {0x3B5, new EventFlagPlayer(0 , 1 , 0949, "XctGerReward" )}, // メーデー|みしらぬネコから報酬をもらった？ - {0x3B6, new EventFlagPlayer(0 , 1 , 0950, "SpnJuneBrideClearTalkFrag" )}, // パニエル/ジューンブライド|今日クリア後の会話した？ + {0x3B6, new EventFlagPlayer(0 , 1 , 0950, "SpnJuneBrideClearTalkFrag" )}, // パニエル/ジューンブライド|今年クリア後の会話した？ {0x3B7, new EventFlagPlayer(0 , 1 , 0951, "AlwJuneBrideTalkBeforeFlag" )}, // リサ/ジューンブライド|面識ある？ {0x3B8, new EventFlagPlayer(0 , 1 , 0952, "AlpJuneBrideTalkBeforeFlag" )}, // カイゾー/ジューンブライド|面識ある？ {0x3B9, new EventFlagPlayer(0 , 1 , 0953, "SpnJuneBrideTalkEventFrag" )}, // パニエル/ジューンブライド|今年イベント期間中に会話した？ @@ -1056,7 +1056,7 @@ public EventFlagPlayer(short init, short max, ushort index, string name) {0x500, new EventFlagPlayer(0 , 1 , 1280, "ChristmasWrappingPresentFlag" )}, // クリスマス｜ラッピングを誰かくれようとしたか？ {0x501, new EventFlagPlayer(0 , 1 , 1281, "PckRecipeFlag" )}, // カーニバル/べルリーナ|にじいろのはねのレシピもらった？ {0x502, new EventFlagPlayer(0 , 1 , 1282, "RcoStorageExpansionReserved" )}, // たぬきち|収納の拡張を予約している - {0x503, new EventFlagPlayer(0 , 1 , 1283, "RcoStorageExpansionLevel" )}, // たぬきち|収納の拡張段階 + {0x503, new EventFlagPlayer(0 , 1 , 1283, "RcoStorageExpansionLevel" )}, // たぬきち|収納の拡張段階（'20冬パッチ 1段階のみ） {0x504, new EventFlagPlayer(0 , 1 , 1284, "PlayerMovingReservedStorageExpand" )}, // たぬきち|収納の拡張申し込み当日にPだけ引越しした？ {0x505, new EventFlagPlayer(0 , 1 , 1285, "MailSend_NoticeStorageExpansion" )}, // たぬきち|収納の拡張のお知らせ手紙の判定処理したか？ {0x506, new EventFlagPlayer(0 , 1 , 1286, "RcoStandbyNoticeStorageExpansion" )}, // たぬきち|収納の拡張について強制会話するか？ @@ -1108,13 +1108,33 @@ public EventFlagPlayer(short init, short max, ushort index, string name) {0x542, new EventFlagPlayer(0 , 1 , 1346, "UnlockSanrioCollaboPoster6" )}, // サンリオNPCポスター解禁_けろっぴ {0x543, new EventFlagPlayer(0 , 1 , 1347, "AnnounceEaster" )}, // イースター(2021年)｜当日に島内放送で告知した？(2回目放送用) {0x54B, new EventFlagPlayer(0 , 1 , 1355, "AnnounceEasterReady" )}, // イースター(2021年)｜準備期間に島内放送で告知した？(2回目放送用) + {0x54C, new EventFlagPlayer(0 , 1 , 1356, "AnnounceJuneBride" )}, // ジューンブライド(2021年)｜当日に島内放送で告知した？(2回目放送用) {0x54E, new EventFlagPlayer(0 , 1 , 1358, "PynEvent_SendMailThisYear" )}, // イースター|今年手紙を受け取った？ + {0x555, new EventFlagPlayer(0 , 1 , 1365, "OwlArtStampRally1" )}, // フータ/国際ミュージアム|【美術品】スタンプ1つ目を押した？ + {0x556, new EventFlagPlayer(0 , 1 , 1366, "OwlArtStampRally2" )}, // フータ/国際ミュージアム|【美術品】スタンプ2つ目を押した？ + {0x557, new EventFlagPlayer(0 , 1 , 1367, "OwlArtStampRally3" )}, // フータ/国際ミュージアム|【美術品】スタンプ3つ目を押した？ + {0x558, new EventFlagPlayer(0 , 1 , 1368, "OwlStampGotArtReward" )}, // フータ/国際ミュージアム|その日、美術品報酬を貰った + {0x559, new EventFlagPlayer(0 , 1 , 1369, "OwlStampGotArt" )}, // フータ/国際ミュージアム|その日、フータスタンプ(美術品)を押した + {0x55A, new EventFlagPlayer(0 , 1 , 1370, "OwlArtUnfinished" )}, // フータ/国際ミュージアム|初参加時、美術品部屋未完成 {0x55D, new EventFlagPlayer(0 , 1 , 1373, "UnlockSanrioCollabo" )}, // サンリオコラボ解禁_キティ {0x55E, new EventFlagPlayer(0 , 1 , 1374, "UnlockSanrioCollabo2" )}, // サンリオコラボ解禁_プリン {0x55F, new EventFlagPlayer(0 , 1 , 1375, "UnlockSanrioCollabo3" )}, // サンリオコラボ解禁_キキララ {0x560, new EventFlagPlayer(0 , 1 , 1376, "UnlockSanrioCollabo4" )}, // サンリオコラボ解禁_シナモン {0x561, new EventFlagPlayer(0 , 1 , 1377, "UnlockSanrioCollabo5" )}, // サンリオコラボ解禁_マイメロ {0x562, new EventFlagPlayer(0 , 1 , 1378, "UnlockSanrioCollabo6" )}, // サンリオコラボ解禁_けろっぴ + {0x565, new EventFlagPlayer(0 , 4 , 1381, "OwlClearCount" )}, // フータ/国際ミュージアム|クリアした部屋の個数 + {0x567, new EventFlagPlayer(0 , 1 , 1383, "XctGetRewardSec" )}, // メーデー|みしらぬネコから2回目の報酬をもらった？ + {0x568, new EventFlagPlayer(0 , 1 , 1384, "OwlStampPlayedThisYear" )}, // フータ/国際ミュージアム|今年サカナのスタンプラリーをクリアした？ + {0x569, new EventFlagPlayer(0 , 1 , 1385, "OwlStampPlayedThisYear2" )}, // フータ/国際ミュージアム|今年ムシのスタンプラリーをクリアした？ + {0x56A, new EventFlagPlayer(0 , 1 , 1386, "OwlStampPlayedThisYear3" )}, // フータ/国際ミュージアム|今年かせきのスタンプラリーをクリアした？ + {0x56B, new EventFlagPlayer(0 , 1 , 1387, "OwlStampPlayedThisYear4" )}, // フータ/国際ミュージアム|今年美術品のスタンプラリーをクリアした？ + {0x57C, new EventFlagPlayer(0 , 1 , 1404, "AlpJuneBrideNotGetLoveCrystalFrag" )}, // カイゾー/ジューンブライド|今日あいのけっしょうもらえなかった？ + {0x57D, new EventFlagPlayer(0 , 1 , 1405, "AlwJuneBrideExchangeTalkFlag" )}, // リサ/ジューンブライド|今年交換回数制限の説明聞いた？ + {0x57E, new EventFlagPlayer(0 , 9999, 1406, "LastPlayMuseumYear" )}, // 国際ミュージアム|最後に遊んだ国際ミュージアムの年 + {0x5B0, new EventFlagPlayer(0 , 1 , 1456, "GetMayDayTicketFirst" )}, // メーデー|1.10.0未満でメーデーりょこうけんを入手したことがあるか？ + {0x5B8, new EventFlagPlayer(0 , 1 , 1464, "RcoHeardAboutMayDayTravelTicket" )}, // メーデー|たぬきち|メーデー旅行券の説明聞いたか？ + {0x5B9, new EventFlagPlayer(0 , 1 , 1465, "XctGetRewardPast" )}, // メーデー|1.10.0未満でみしらぬネコから報酬をもらった？ + {0x5C6, new EventFlagPlayer(0 , 1 , 1478, "AlwJuneBrideNoRemake1stFlag" )}, // リサ/ジューンブライド|今日1回目でリメイク解禁してなかった }; private const string Unknown = "???"; diff --git a/NHSE.Parsing/GameBCSVDumper.cs b/NHSE.Parsing/GameBCSVDumper.cs index aa3c2c7..7156ddf 100644 --- a/NHSE.Parsing/GameBCSVDumper.cs +++ b/NHSE.Parsing/GameBCSVDumper.cs @@ -312,7 +312,7 @@ public static ushort[] GetItemMenuIconArray(string pathBCSV, string fn = "ItemPa type = $"_{type}"; // enum name can't start with number if (!Enum.TryParse(type, out var k)) - throw new InvalidEnumArgumentException($"{type} is not a known enum value @ index {i}. Update the enum index first."); + throw new InvalidEnumArgumentException($"{type} is not a known enum value @ index {i}. Update the {nameof(ItemMenuIconType)} enum index first."); types.Add(ival, k); if (ival > max) diff --git a/NHSE.Tests/DumpTests.cs b/NHSE.Tests/DumpTests.cs index 379fe05..5fd67ac 100644 --- a/NHSE.Tests/DumpTests.cs +++ b/NHSE.Tests/DumpTests.cs @@ -6,8 +6,8 @@ namespace NHSE.Tests public static class DumpTests { private const string RepoPath = @"C:\Users\Kurt\Documents\GitHub"; - private const string PatchDumpPath = @"D:\Kurt\Desktop\" + PatchFolderName; - private const string PatchFolderName = "v19"; + private const string PatchDumpPath = @"D:\Kurt\Desktop\ac\" + PatchFolderName; + private const string PatchFolderName = "v110"; private const string MessageDumpFormat = @"Message\String_{0}"; [Fact]