From f9547babeeea75f258a68570468dd42b8cd893fd Mon Sep 17 00:00:00 2001 From: Nenkai Date: Fri, 31 May 2024 18:00:26 +0200 Subject: [PATCH] Tables: Support for 1.3.1 tables --- GBFRDataTools.Database/Data/ids.txt | 202 +++++++++++++++++- .../GBFRDataTools.Database.csproj | 12 ++ .../Headers/constant.headers | 20 +- .../Headers/gem_mix_rupi.headers | 6 +- .../Headers/gem_mix_success.headers | 5 + .../Headers/gem_mix_ticket.headers | 10 +- .../Headers/item_pendulum_sell.headers | 19 ++ .../Headers/item_pendulum_ticket.headers | 19 ++ .../Headers/photo_mode.headers | 15 ++ .../Headers/photo_mode_frame.headers | 9 + .../Headers/photo_mode_submenu.headers | 11 + .../Headers/photo_mode_switch_button.headers | 11 + 12 files changed, 335 insertions(+), 4 deletions(-) create mode 100644 GBFRDataTools.Database/Headers/photo_mode.headers create mode 100644 GBFRDataTools.Database/Headers/photo_mode_frame.headers create mode 100644 GBFRDataTools.Database/Headers/photo_mode_submenu.headers create mode 100644 GBFRDataTools.Database/Headers/photo_mode_switch_button.headers diff --git a/GBFRDataTools.Database/Data/ids.txt b/GBFRDataTools.Database/Data/ids.txt index eea8a56..e0a2ce2 100644 --- a/GBFRDataTools.Database/Data/ids.txt +++ b/GBFRDataTools.Database/Data/ids.txt @@ -15607,6 +15607,9 @@ F2351512|ID|RW_PICK_3_1_27 4C4480D6|ID|RW_032134_942 7472239F|ID|RW_032134_943 90F15A1B|ID|RW_032134_944 +42D76542|ID|RW_13F9A3_030 +435EB778|ID|RW_13F9A3_031 +2243EE43|ID|RW_13F9A3_032 BC8EA4B3|ID|RW_153803_080 CB91E3FE|ID|RW_153803_081 A1AF885B|ID|RW_153803_082 @@ -24533,4 +24536,201 @@ C9BC68C8|ID|TXT_SKILL_EXPLAIN_231_00 FAB84FC1|ID|TXT_SKILL_EXPLAIN_232_00 28323BFA|ID|TXT_SKILL_EXPLAIN_161_01 C6ACCC98|ID|TXT_SKILL_EXPLAIN_019_00 -832549B2|ID|TXT_SKILL_EXPLAIN_160_01 \ No newline at end of file +832549B2|ID|TXT_SKILL_EXPLAIN_160_01 +02CFB3C2|ID|AB_PL2100_13 +7C9FA051|ID|AB_PL2100_14 +83BFBF22|ID|AB_PL2100_15 +7F36D12B|ID|AB_PL2100_16 +0713D928|ID|GEEN_114_93 +AC175924|ID|GEEN_115_93 +BC53CE24|ID|GEEN_116_93 +43F26A91|ID|GEEN_117_93 +CAAE3F9C|ID|GEEN_118_93 +515E693C|ID|GEEN_119_93 +E496D882|ID|GEEN_120_93 +8A3819C0|ID|GEEN_121_93 +A490BADF|ID|GEEN_122_93 +4CDCE25B|ID|GEEN_123_93 +E21A4170|ID|GEEN_124_93 +4C28585A|ID|GEEN_125_93 +76D4716B|ID|GEEN_126_93 +CEF31894|ID|GEEN_127_93 +3069C2FE|ID|GEEN_128_93 +66F1B128|ID|GEEN_129_93 +98E9E6EF|ID|GEEN_130_93 +BFDF838C|ID|GEEN_131_93 +B3AB43F3|ID|GEEN_132_93 +9F72BAE0|ID|GEEN_170_93 +AD8CAEFB|ID|GEEN_171_93 +B8C44D5E|ID|GEEN_172_90 +3EA4134B|ID|GEEN_172_91 +7E3A52A3|ID|GEEN_172_92 +5D592FDD|ID|GEEN_172_93 +BCDBC4B6|ID|ITEM_25_0130 +09E6F629|ID|ITEM_25_0131 +3EF6DEF5|ID|ITEM_26_0130 +71173866|ID|ITEM_26_0131 +BE6124AD|ID|ITEM_27_0130 +667EE1D3|ID|ITEM_27_0131 +0BD373A4|ID|ITEM_28_0130 +202A0DB9|ID|ITEM_28_0131 +22115F71|ID|GEEN_086_24 +B1CCC211|ID|GEEN_087_24 +AA45CD2D|ID|GEEN_088_24 +0B456DEF|ID|GEEN_094_24 +295219F9|ID|GEEN_106_24 +CE6C62CF|ID|GEEN_109_24 +EF5D0D16|ID|GEEN_136_24 +D3071D85|ID|GEEN_137_24 +7291A3F9|ID|GEEN_138_24 +5048C546|ID|GEEN_139_24 +00612B10|ID|GEEN_146_24 +2E3351E3|ID|GEEN_147_24 +97CF485D|ID|GEEN_151_94 +4AA48417|ID|GEEN_156_24 +9D4F66D7|ID|GEEN_167_24 +ACA7FB5A|ID|GEEN_168_00 +83111A4B|ID|GEEN_168_01 +43088191|ID|GEEN_168_02 +73B77D4F|ID|GEEN_168_03 +23E7990D|ID|GEEN_168_04 +C6B50FEA|ID|GEEN_168_22 +8BF28309|ID|GEEN_168_23 +B5170056|ID|GEEN_168_24 +AB4F7D56|ID|GEEN_172_54 +CCE507E7|ID|GEEN_172_64 +F1267035|ID|GEEN_172_74 +BCF91F80|ID|GEEN_233_04 +346EDD73|ID|GEEN_234_04 +9393D637|ID|GEEN_235_04 +0DBB57B7|ID|TXT_SKILL_SUMMARY_168_00 +40970F36|ID|TXT_SKILL_SUMMARY_172_00 +384D38FC|ID|TXT_SKILL_SUMMARY_172_01 +C1B76713|ID|TXT_SKILL_SUMMARY_172_02 +E922BC0E|ID|TXT_SKILL_SUMMARY_172_03 +D0749313|ID|TXT_SKILL_SUMMARY_233_00 +9571D5B3|ID|TXT_SKILL_SUMMARY_234_00 +CD95B1AC|ID|TXT_SKILL_SUMMARY_235_00 +E38DD1D1|ID|TXT_GEEN_044_24 +2D05FB75|ID|TXT_GEEN_045_24 +C4684F34|ID|TXT_GEEN_046_24 +675F090D|ID|TXT_GEEN_047_24 +BA184FFA|ID|TXT_GEEN_051_24 +351B609A|ID|TXT_GEEN_052_24 +68C0C615|ID|TXT_GEEN_054_24 +AB4FF47A|ID|TXT_GEEN_055_24 +BE182F68|ID|TXT_GEEN_057_24 +FBC2EE7D|ID|TXT_GEEN_058_24 +649553CD|ID|TXT_GEEN_065_24 +A0681B60|ID|TXT_GEEN_066_24 +BCBCBDD3|ID|TXT_GEEN_067_24 +86338262|ID|TXT_GEEN_068_24 +1F6D88EE|ID|TXT_GEEN_069_24 +53386C36|ID|TXT_GEEN_070_24 +FA82C8BA|ID|TXT_GEEN_072_24 +6904F9ED|ID|TXT_GEEN_073_24 +AAA6F081|ID|TXT_GEEN_077_24 +34A3FF10|ID|TXT_GEEN_078_24 +C083F995|ID|TXT_GEEN_079_24 +DD6D9159|ID|TXT_GEEN_080_24 +FA372B0F|ID|TXT_GEEN_168_04 +26DDCD39|ID|GEEN_044_24 +91AC1DDD|ID|GEEN_045_24 +176FE02C|ID|GEEN_046_24 +27F0408A|ID|GEEN_047_24 +614FB550|ID|GEEN_051_24 +EF70CA76|ID|GEEN_052_24 +20BCDB1B|ID|GEEN_054_24 +6AC327A2|ID|GEEN_055_24 +19CB4EB9|ID|GEEN_057_24 +464099CD|ID|GEEN_058_24 +7E13A72D|ID|GEEN_065_24 +1E69C3D0|ID|GEEN_066_24 +95C88E4F|ID|GEEN_067_24 +2D5F3437|ID|GEEN_068_24 +65909E04|ID|GEEN_069_24 +6FD12E61|ID|GEEN_070_24 +E5C9F685|ID|GEEN_072_24 +23C84E82|ID|GEEN_073_24 +FF2CBCD0|ID|GEEN_077_24 +C63C8DDF|ID|GEEN_078_24 +D7ABBDCA|ID|GEEN_079_24 +9E62759D|ID|GEEN_080_24 +2EF779C0|ID|TXT_GEEN_086_24 +D64AB42E|ID|TXT_GEEN_087_24 +280EA8F3|ID|TXT_GEEN_088_24 +40F8D1C4|ID|TXT_GEEN_094_24 +E0B802D5|ID|TXT_GEEN_106_24 +6868794D|ID|TXT_GEEN_109_24 +6A7B541D|ID|TXT_GEEN_114_93 +84DCCE08|ID|TXT_GEEN_115_93 +4A9653DD|ID|TXT_GEEN_116_93 +30468920|ID|TXT_GEEN_117_93 +18A827B2|ID|TXT_GEEN_118_93 +24C2F771|ID|TXT_GEEN_119_93 +7486C4BB|ID|TXT_GEEN_120_93 +D8684142|ID|TXT_GEEN_121_93 +356EAD4C|ID|TXT_GEEN_122_93 +6BD5D5E3|ID|TXT_GEEN_123_93 +47383407|ID|TXT_GEEN_124_93 +4C4F69E6|ID|TXT_GEEN_125_93 +7A20FF0D|ID|TXT_GEEN_126_93 +EBD06404|ID|TXT_GEEN_127_93 +C2D4BADA|ID|TXT_GEEN_128_93 +99FDAC83|ID|TXT_GEEN_129_93 +36520F17|ID|TXT_GEEN_130_93 +782BBC4C|ID|TXT_GEEN_131_93 +8D5BB5A7|ID|TXT_GEEN_132_93 +8ABBE260|ID|TXT_GEEN_136_24 +04A40A77|ID|TXT_GEEN_137_24 +8ACE4BF4|ID|TXT_GEEN_138_24 +17A15198|ID|TXT_GEEN_139_24 +688AD6F6|ID|TXT_GEEN_146_24 +E895E70A|ID|TXT_GEEN_147_24 +9EE194A2|ID|TXT_GEEN_156_24 +53387F44|ID|TXT_GEEN_167_24 +37A1FC68|ID|TXT_GEEN_168_00 +4AF8AA98|ID|TXT_GEEN_168_01 +D352BE95|ID|TXT_GEEN_168_02 +6B9C495A|ID|TXT_GEEN_168_03 +0091B78B|ID|TXT_GEEN_168_22 +D4807AA5|ID|TXT_GEEN_168_23 +0CFC6D34|ID|TXT_GEEN_168_24 +844D544F|ID|TXT_GEEN_170_93 +BA8ADCA5|ID|TXT_GEEN_171_04 +A3538F2A|ID|TXT_GEEN_171_90 +124BF9DA|ID|TXT_GEEN_171_93 +A707EA49|ID|TXT_GEEN_172_04 +7F8BE442|ID|TXT_GEEN_172_54 +BB821236|ID|TXT_GEEN_172_64 +7B458150|ID|TXT_GEEN_172_74 +F4A59494|ID|TXT_GEEN_172_90 +B4FD0B86|ID|TXT_GEEN_172_91 +D4BEAB7C|ID|TXT_GEEN_172_92 +7020783B|ID|TXT_GEEN_172_93 +14A50FDD|ID|TXT_GEEN_210_94 +8270BA54|ID|TXT_GEEN_211_94 +F96E2456|ID|TXT_GEEN_212_94 +1DB7A375|ID|TXT_GEEN_213_94 +F240FD79|ID|TXT_GEEN_220_94 +9724E01A|ID|TXT_GEEN_221_94 +392C7C8F|ID|TXT_GEEN_222_94 +DF382A54|ID|TXT_GEEN_233_04 +78A0B03F|ID|TXT_GEEN_233_24 +76E6DEC4|ID|TXT_GEEN_234_04 +BBE222E8|ID|TXT_GEEN_234_24 +664FFA5E|ID|TXT_GEEN_235_04 +F20A03F6|ID|TXT_GEEN_235_24 +FF757E21|ID|TXT_ITEM_18_0002 +459698B6|ID|TXT_ITEM_INFO_18_0002 +D36DA56F|ID|TXT_ITEM_INFO_14_0051 +51FFDBB1|ID|TXT_ITEM_INFO_14_0050 +75CD5E25|ID|p503 +557746C6|ID|p602 +B012C3D4|ID|p703 +C81748CB|ID|pa01 +72358B0D|ID|pa10 +FA1B2DBD|ID|pe20 +FAB84FC1|ID|TXT_SKILL_EXPLAIN_232_00 +7FEC8BE3|ID|TXT_SKILL_EXPLAIN_233_00 +96CF6F79|ID|TXT_SKILL_EXPLAIN_234_00 \ No newline at end of file diff --git a/GBFRDataTools.Database/GBFRDataTools.Database.csproj b/GBFRDataTools.Database/GBFRDataTools.Database.csproj index 9963afe..b379840 100644 --- a/GBFRDataTools.Database/GBFRDataTools.Database.csproj +++ b/GBFRDataTools.Database/GBFRDataTools.Database.csproj @@ -359,6 +359,18 @@ PreserveNewest + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + PreserveNewest diff --git a/GBFRDataTools.Database/Headers/constant.headers b/GBFRDataTools.Database/Headers/constant.headers index 1cb91b8..3e63a28 100644 --- a/GBFRDataTools.Database/Headers/constant.headers +++ b/GBFRDataTools.Database/Headers/constant.headers @@ -29,7 +29,8 @@ add_column|UnkExtraRewardWeightIfUnkQuestFlag0x5CFalse|uint add_column|Unk16|float reset_max_version| -// >= 1.2.0 +// >= 1.2.0 && < 1.3.0 +set_max_version|1.3.0 set_min_version|1.2.0 add_column|Unk_v1.2.0_1|int // Used by a function of ui::component::ControllerGemMixConfirm (value is 1500) @@ -52,3 +53,20 @@ add_column|UnkExtraRewardWeightIfUnkQuestFlag0x5CFalse|uint add_column|UnkExtraRewardWeightIfUnkQuestFlag0x5CTrue|int add_column|Unk17|int reset_min_version| +reset_max_version| + + +// >= 1.3.0 (went back to the original order?) +set_min_version|1.3.0 +add_column|UnkXPRelatedMaybe|int +add_column|MaxLevelRepeatXP|int +add_column|MaxLevelMSPReward|int +add_column|MaxLevelVoucherReward|int +add_column|ResultRewardScreenWaitTime|float +add_column|BlacksmithLevelDialogWaitTime|float +add_column|UnkExtraRewardWeightIfUnkQuestFlag0x5CTrue|int +add_column|UnkExtraRewardWeightIfUnkQuestFlag0x5CFalse|int +add_column|Unk18|float +add_column|Unk19|int +add_column|Unk20|int +reset_min_version| diff --git a/GBFRDataTools.Database/Headers/gem_mix_rupi.headers b/GBFRDataTools.Database/Headers/gem_mix_rupi.headers index 0c0d0d4..0343649 100644 --- a/GBFRDataTools.Database/Headers/gem_mix_rupi.headers +++ b/GBFRDataTools.Database/Headers/gem_mix_rupi.headers @@ -1,3 +1,7 @@ add_column|KeyCombinedLevel|uint add_column|Cost1|uint -add_column|Cost2|uint \ No newline at end of file + +// Removed in 1.3.0 +set_max_version|1.3.0 +add_column|Cost2|uint +reset_max_version| \ No newline at end of file diff --git a/GBFRDataTools.Database/Headers/gem_mix_success.headers b/GBFRDataTools.Database/Headers/gem_mix_success.headers index 867c20a..3d7affd 100644 --- a/GBFRDataTools.Database/Headers/gem_mix_success.headers +++ b/GBFRDataTools.Database/Headers/gem_mix_success.headers @@ -1,7 +1,12 @@ add_column|UnkChance1_1|uint add_column|UnkChance1_2|uint + +// Removed in 1.3.0 +set_max_version|1.3.0 add_column|UnkChance1_3|uint add_column|UnkChance2_1|uint add_column|UnkChance2_2|uint add_column|UnkChance2_3|uint +reset_max_version| + add_column|Key|uint diff --git a/GBFRDataTools.Database/Headers/gem_mix_ticket.headers b/GBFRDataTools.Database/Headers/gem_mix_ticket.headers index 9e5f66e..3d8d043 100644 --- a/GBFRDataTools.Database/Headers/gem_mix_ticket.headers +++ b/GBFRDataTools.Database/Headers/gem_mix_ticket.headers @@ -1,4 +1,12 @@ +set_max_version|1.3.0 add_column|ChanceModifier1|int add_column|ChanceModifier2|uint add_column|ChanceModifier3|uint -add_column|KeyNumTickets|uint \ No newline at end of file +add_column|KeyNumTickets|uint +reset_max_version| + +// >= 1.3.0 +set_min_version|1.3.0 +add_column|KeyNumTickets|uint +add_column|ChanceModifier|int +reset_min_version| \ No newline at end of file diff --git a/GBFRDataTools.Database/Headers/item_pendulum_sell.headers b/GBFRDataTools.Database/Headers/item_pendulum_sell.headers index e89017d..101dbfc 100644 --- a/GBFRDataTools.Database/Headers/item_pendulum_sell.headers +++ b/GBFRDataTools.Database/Headers/item_pendulum_sell.headers @@ -28,4 +28,23 @@ add_column|Lv27SellPrice|int add_column|Lv28SellPrice|int add_column|Lv29SellPrice|int add_column|Lv30SellPrice|int + +set_min_version|1.3.0 +add_column|Lv31SellPrice|int +add_column|Lv32SellPrice|int +add_column|Lv33SellPrice|int +add_column|Lv34SellPrice|int +add_column|Lv35SellPrice|int +add_column|Lv36SellPrice|int +add_column|Lv37SellPrice|int +add_column|Lv38SellPrice|int +add_column|Lv39SellPrice|int +add_column|Lv40SellPrice|int +add_column|Lv41SellPrice|int +add_column|Lv42SellPrice|int +add_column|Lv43SellPrice|int +add_column|Lv44SellPrice|int +add_column|Lv45SellPrice|int +reset_min_version| + add_column|Key|int diff --git a/GBFRDataTools.Database/Headers/item_pendulum_ticket.headers b/GBFRDataTools.Database/Headers/item_pendulum_ticket.headers index b471de5..d899a14 100644 --- a/GBFRDataTools.Database/Headers/item_pendulum_ticket.headers +++ b/GBFRDataTools.Database/Headers/item_pendulum_ticket.headers @@ -28,4 +28,23 @@ add_column|Lv27Vouchers|int add_column|Lv28Vouchers|int add_column|Lv29Vouchers|int add_column|Lv30Vouchers|int + +set_min_version|1.3.0 +add_column|Lv31Vouchers|int +add_column|Lv32Vouchers|int +add_column|Lv33Vouchers|int +add_column|Lv34Vouchers|int +add_column|Lv35Vouchers|int +add_column|Lv36Vouchers|int +add_column|Lv37Vouchers|int +add_column|Lv38Vouchers|int +add_column|Lv39Vouchers|int +add_column|Lv40Vouchers|int +add_column|Lv41Vouchers|int +add_column|Lv42Vouchers|int +add_column|Lv43Vouchers|int +add_column|Lv44Vouchers|int +add_column|Lv45Vouchers|int +reset_min_version| + add_column|Key|int diff --git a/GBFRDataTools.Database/Headers/photo_mode.headers b/GBFRDataTools.Database/Headers/photo_mode.headers new file mode 100644 index 0000000..c7abbb6 --- /dev/null +++ b/GBFRDataTools.Database/Headers/photo_mode.headers @@ -0,0 +1,15 @@ +add_column|Unk1|hash_string +add_column|Unk2|hash_string +add_column|Unk3|hash_string +add_column|SortOrder|int +add_column|SelectType|int +add_column|UIMinValue|int +add_column|UIMaxValue|int +add_column|UIDefaultValue|int +add_column|Unk9|int +add_column|Unk10|int +add_column|Unk11|int +add_column|MinValueRange|int +add_column|MaxValueRange|int +add_column|Unk14|int +add_column|AvailableOffline|int diff --git a/GBFRDataTools.Database/Headers/photo_mode_frame.headers b/GBFRDataTools.Database/Headers/photo_mode_frame.headers new file mode 100644 index 0000000..356f35f --- /dev/null +++ b/GBFRDataTools.Database/Headers/photo_mode_frame.headers @@ -0,0 +1,9 @@ +add_column|TexturePath1|raw_string|0x18 +add_column|TexturePath2|raw_string|0x18 +add_column|TexturePath3|raw_string|0x18 +add_column|Key|hash_string +add_column|Unk5|hash_string +add_column|OrderKey|int +add_column|QuestIDUnlock|hex_uint +add_column|Unk8|int +add_column|Unk9|int diff --git a/GBFRDataTools.Database/Headers/photo_mode_submenu.headers b/GBFRDataTools.Database/Headers/photo_mode_submenu.headers new file mode 100644 index 0000000..8d8d0ca --- /dev/null +++ b/GBFRDataTools.Database/Headers/photo_mode_submenu.headers @@ -0,0 +1,11 @@ +add_column|Pos1|hash_string +add_column|Pos2|hash_string +add_column|Unk3|hash_string +add_column|Unk4|hash_string +add_column|Unk5|hash_string +add_column|Unk6|hash_string +add_column|Unk7|hash_string +add_column|Unk8|hash_string +add_column|Unk9|hash_string +add_column|Unk10|hash_string +add_column|Key|hash_string diff --git a/GBFRDataTools.Database/Headers/photo_mode_switch_button.headers b/GBFRDataTools.Database/Headers/photo_mode_switch_button.headers new file mode 100644 index 0000000..8d8d0ca --- /dev/null +++ b/GBFRDataTools.Database/Headers/photo_mode_switch_button.headers @@ -0,0 +1,11 @@ +add_column|Pos1|hash_string +add_column|Pos2|hash_string +add_column|Unk3|hash_string +add_column|Unk4|hash_string +add_column|Unk5|hash_string +add_column|Unk6|hash_string +add_column|Unk7|hash_string +add_column|Unk8|hash_string +add_column|Unk9|hash_string +add_column|Unk10|hash_string +add_column|Key|hash_string