From a781f0847ad5646f5333967a64572027b27ff254 Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 2 Oct 2023 10:58:44 -0400 Subject: [PATCH 1/3] Some sheet fixes pre 6.5 --- .../Definitions/CraftLevelDifference.json | 8 ------- .../Definitions/EventIconPriorityPair.json | 9 +------ .../Definitions/HousingFurniture.json | 8 ------- SaintCoinach/Definitions/ModelSkeleton.json | 4 ---- SaintCoinach/Definitions/Quest.json | 24 ++++++++++++++++--- .../Definitions/ScenarioTreeTips.json | 6 +---- SaintCoinach/Definitions/WarpCondition.json | 2 +- 7 files changed, 24 insertions(+), 37 deletions(-) diff --git a/SaintCoinach/Definitions/CraftLevelDifference.json b/SaintCoinach/Definitions/CraftLevelDifference.json index df195110..cd2a1bc6 100644 --- a/SaintCoinach/Definitions/CraftLevelDifference.json +++ b/SaintCoinach/Definitions/CraftLevelDifference.json @@ -3,14 +3,6 @@ "definitions": [ { "name": "Difference" - }, - { - "index": 1, - "name": "ProgressFactor" - }, - { - "index": 2, - "name": "QualityFactor" } ] } \ No newline at end of file diff --git a/SaintCoinach/Definitions/EventIconPriorityPair.json b/SaintCoinach/Definitions/EventIconPriorityPair.json index fd5e0795..6029a4b0 100644 --- a/SaintCoinach/Definitions/EventIconPriorityPair.json +++ b/SaintCoinach/Definitions/EventIconPriorityPair.json @@ -2,14 +2,7 @@ "sheet": "EventIconPriorityPair", "definitions": [ { - "name": "Icon1", - "converter": { - "type": "icon" - } - }, - { - "index": 1, - "name": "Icon2", + "name": "Icon", "converter": { "type": "icon" } diff --git a/SaintCoinach/Definitions/HousingFurniture.json b/SaintCoinach/Definitions/HousingFurniture.json index f217b48b..989d34f4 100644 --- a/SaintCoinach/Definitions/HousingFurniture.json +++ b/SaintCoinach/Definitions/HousingFurniture.json @@ -40,14 +40,6 @@ { "index": 8, "name": "DestroyOnRemoval" - }, - { - "index": 9, - "name": "Tooltip", - "converter": { - "type": "link", - "target": "HousingPlacement" - } } ] } \ No newline at end of file diff --git a/SaintCoinach/Definitions/ModelSkeleton.json b/SaintCoinach/Definitions/ModelSkeleton.json index 0f9d1e5b..3113f57e 100644 --- a/SaintCoinach/Definitions/ModelSkeleton.json +++ b/SaintCoinach/Definitions/ModelSkeleton.json @@ -31,10 +31,6 @@ { "index": 16, "name": "LoopFlySE" - }, - { - "index": 17, - "name": "AutoAttackType" } ] } \ No newline at end of file diff --git a/SaintCoinach/Definitions/Quest.json b/SaintCoinach/Definitions/Quest.json index ab729da1..7d1ee205 100644 --- a/SaintCoinach/Definitions/Quest.json +++ b/SaintCoinach/Definitions/Quest.json @@ -534,6 +534,27 @@ "converter": { "type": "complexlink", "links": [ + { + "when": { + "key": "ItemRewardType", + "value": 1 + }, + "sheet": "Item" + }, + { + "when": { + "key": "ItemRewardType", + "value": 3 + }, + "sheet": "Item" + }, + { + "when": { + "key": "ItemRewardType", + "value": 5 + }, + "sheet": "Item" + }, { "when": { "key": "ItemRewardType", @@ -547,9 +568,6 @@ "value": 7 }, "sheet": "BeastRankBonus" - }, - { - "sheet": "Item" } ] } diff --git a/SaintCoinach/Definitions/ScenarioTreeTips.json b/SaintCoinach/Definitions/ScenarioTreeTips.json index 55f47538..8cbf6b24 100644 --- a/SaintCoinach/Definitions/ScenarioTreeTips.json +++ b/SaintCoinach/Definitions/ScenarioTreeTips.json @@ -4,11 +4,7 @@ "definitions": [ { "index": 1, - "name": "Tips1", - "converter": { - "type": "link", - "target": "ScenarioTreeTipsQuest" - } + "name": "Tips1" }, { "index": 3, diff --git a/SaintCoinach/Definitions/WarpCondition.json b/SaintCoinach/Definitions/WarpCondition.json index 46d6e5b9..d531f5f1 100644 --- a/SaintCoinach/Definitions/WarpCondition.json +++ b/SaintCoinach/Definitions/WarpCondition.json @@ -26,7 +26,7 @@ }, { "index": 4, - "name": "DRequiredQuest{3}", + "name": "RequiredQuest{3}", "converter": { "type": "link", "target": "Quest" From 1ffd7d15e75da574b7d882270c0225ba57b47358 Mon Sep 17 00:00:00 2001 From: liam Date: Tue, 3 Oct 2023 04:11:15 -0400 Subject: [PATCH 2/3] Fix for 6.5 dat files --- SaintCoinach/IO/IIndexFile.cs | 2 +- SaintCoinach/IO/Index2File.cs | 4 ++-- SaintCoinach/IO/IndexFile.cs | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/SaintCoinach/IO/IIndexFile.cs b/SaintCoinach/IO/IIndexFile.cs index 13edd0e8..a8cfc8a8 100644 --- a/SaintCoinach/IO/IIndexFile.cs +++ b/SaintCoinach/IO/IIndexFile.cs @@ -8,7 +8,7 @@ namespace SaintCoinach.IO { public interface IIndexFile : IEquatable { PackIdentifier PackId { get; } uint FileKey { get; } - int Offset { get; } + uint Offset { get; } byte DatFile { get; } } } diff --git a/SaintCoinach/IO/Index2File.cs b/SaintCoinach/IO/Index2File.cs index 7f8fd11b..e417291a 100644 --- a/SaintCoinach/IO/Index2File.cs +++ b/SaintCoinach/IO/Index2File.cs @@ -11,7 +11,7 @@ public class Index2File : IIndexFile { public PackIdentifier PackId { get; private set; } public uint FileKey { get; private set; } - public int Offset { get; private set; } + public uint Offset { get; private set; } /// /// In which .dat* file the data is located. @@ -28,7 +28,7 @@ public Index2File(PackIdentifier packId, BinaryReader reader) { var baseOffset = reader.ReadInt32(); DatFile = (byte)((baseOffset & 0x7) >> 1); - Offset = (int)((baseOffset & 0xFFFFFFF8) << 3); + Offset = (uint)((baseOffset & 0xFFFFFFF8) << 3); } #endregion diff --git a/SaintCoinach/IO/IndexFile.cs b/SaintCoinach/IO/IndexFile.cs index 5df1506f..2ed7a003 100644 --- a/SaintCoinach/IO/IndexFile.cs +++ b/SaintCoinach/IO/IndexFile.cs @@ -10,7 +10,7 @@ public class IndexFile : IIndexFile { public PackIdentifier PackId { get; private set; } public uint FileKey { get; private set; } public uint DirectoryKey { get; private set; } - public int Offset { get; private set; } + public uint Offset { get; private set; } /// /// In which .dat* file the data is located. @@ -28,7 +28,7 @@ public IndexFile(PackIdentifier packId, BinaryReader reader) { var baseOffset = reader.ReadInt32(); DatFile = (byte)((baseOffset & 0x000F) / 2); - Offset = (baseOffset - (baseOffset & 0x000F)) * 0x08; + Offset = (uint)(baseOffset - (baseOffset & 0x000F)) * 0x08; reader.ReadInt32(); // Zero } From 377b42a91bcaff21f557495f66d657c58d7c8a89 Mon Sep 17 00:00:00 2001 From: Liam Date: Tue, 3 Oct 2023 10:34:53 -0400 Subject: [PATCH 3/3] More 6.5 fixes --- SaintCoinach/Definitions/CharaCardBase.json | 2 +- SaintCoinach/Definitions/CharaCardHeader.json | 4 ++-- .../Definitions/ContentsTutorial.json | 13 ++++++---- SaintCoinach/Definitions/MJICropSeed.json | 4 ++-- .../Definitions/MJIDisposalShopItem.json | 2 +- SaintCoinach/Definitions/MJILandmark.json | 24 +++++++++++++++---- .../Definitions/MJILandmarkPlace.json | 4 ++-- SaintCoinach/Definitions/MJILivelyActor.json | 2 +- SaintCoinach/Definitions/QuestEffect.json | 3 +-- .../QuestEventAreaEntranceInfo.json | 2 +- SaintCoinach/Definitions/SpecialShop.json | 12 +++++----- SaintCoinach/Definitions/SwitchTalk.json | 3 +-- 12 files changed, 46 insertions(+), 29 deletions(-) diff --git a/SaintCoinach/Definitions/CharaCardBase.json b/SaintCoinach/Definitions/CharaCardBase.json index 4d0c7d5c..025fbedc 100644 --- a/SaintCoinach/Definitions/CharaCardBase.json +++ b/SaintCoinach/Definitions/CharaCardBase.json @@ -21,7 +21,7 @@ } }, { - "index": 6, + "index": 7, "name": "SortKey" }, { diff --git a/SaintCoinach/Definitions/CharaCardHeader.json b/SaintCoinach/Definitions/CharaCardHeader.json index 9b6c9ec3..02814e4b 100644 --- a/SaintCoinach/Definitions/CharaCardHeader.json +++ b/SaintCoinach/Definitions/CharaCardHeader.json @@ -28,11 +28,11 @@ } }, { - "index": 7, + "index": 8, "name": "SortKey" }, { - "index": 8, + "index": 9, "name": "Name" } ] diff --git a/SaintCoinach/Definitions/ContentsTutorial.json b/SaintCoinach/Definitions/ContentsTutorial.json index 3ba9505a..21b80fae 100644 --- a/SaintCoinach/Definitions/ContentsTutorial.json +++ b/SaintCoinach/Definitions/ContentsTutorial.json @@ -3,11 +3,6 @@ "defaultColumn": "Name", "definitions": [ { - "index": 1, - "name": "Description" - }, - { - "index": 2, "type": "repeat", "count": 8, "definition": { @@ -17,6 +12,14 @@ "target": "ContentsTutorialPage" } } + }, + { + "index": 8, + "name": "Name" + }, + { + "index": 9, + "name": "Description" } ] } \ No newline at end of file diff --git a/SaintCoinach/Definitions/MJICropSeed.json b/SaintCoinach/Definitions/MJICropSeed.json index a330d63c..47e6fe40 100644 --- a/SaintCoinach/Definitions/MJICropSeed.json +++ b/SaintCoinach/Definitions/MJICropSeed.json @@ -10,16 +10,16 @@ } }, { - "name": "SGB", "index": 1, + "name": "SGB", "converter": { "type": "link", "target": "ExportedSG" } }, { - "name": "Name", "index": 2, + "name": "Name", "converter": { "type": "link", "target": "EObjName" diff --git a/SaintCoinach/Definitions/MJIDisposalShopItem.json b/SaintCoinach/Definitions/MJIDisposalShopItem.json index c91bd447..e84aa80c 100644 --- a/SaintCoinach/Definitions/MJIDisposalShopItem.json +++ b/SaintCoinach/Definitions/MJIDisposalShopItem.json @@ -17,8 +17,8 @@ "name": "Count" }, { - "name": "Category", "index": 3, + "name": "Category", "converter": { "type": "link", "target": "MJIDisposalShopUICategory" diff --git a/SaintCoinach/Definitions/MJILandmark.json b/SaintCoinach/Definitions/MJILandmark.json index 54d56f7f..7e53576c 100644 --- a/SaintCoinach/Definitions/MJILandmark.json +++ b/SaintCoinach/Definitions/MJILandmark.json @@ -10,7 +10,7 @@ } }, { - "index": 5, + "index": 4, "name": "SGB[1]", "converter": { "type": "link", @@ -18,7 +18,7 @@ } }, { - "index": 7, + "index": 5, "name": "SGB[2]", "converter": { "type": "link", @@ -26,7 +26,7 @@ } }, { - "index": 9, + "index": 7, "name": "SGB[3]", "converter": { "type": "link", @@ -34,13 +34,29 @@ } }, { - "index": 11, + "index": 9, "name": "SGB[4]", "converter": { "type": "link", "target": "ExportedSG" } }, + { + "index": 11, + "name": "SGB[5]", + "converter": { + "type": "link", + "target": "ExportedSG" + } + }, + { + "index": 13, + "name": "SGB[6]", + "converter": { + "type": "link", + "target": "ExportedSG" + } + }, { "index": 20, "type": "repeat", diff --git a/SaintCoinach/Definitions/MJILandmarkPlace.json b/SaintCoinach/Definitions/MJILandmarkPlace.json index bc0ba129..bf9e25a7 100644 --- a/SaintCoinach/Definitions/MJILandmarkPlace.json +++ b/SaintCoinach/Definitions/MJILandmarkPlace.json @@ -2,16 +2,16 @@ "sheet": "MJILandmarkPlace", "definitions": [ { - "name": "Name", "index": 1, + "name": "Name", "converter": { "type": "link", "target": "EObjName" } }, { - "name": "SGB", "index": 3, + "name": "SGB", "converter": { "type": "link", "target": "ExportedSG" diff --git a/SaintCoinach/Definitions/MJILivelyActor.json b/SaintCoinach/Definitions/MJILivelyActor.json index c51a97cf..141b0352 100644 --- a/SaintCoinach/Definitions/MJILivelyActor.json +++ b/SaintCoinach/Definitions/MJILivelyActor.json @@ -9,8 +9,8 @@ } }, { - "name": "Behavior", "index": 1, + "name": "Behavior", "converter": { "type": "link", "target": "Behavior" diff --git a/SaintCoinach/Definitions/QuestEffect.json b/SaintCoinach/Definitions/QuestEffect.json index df24b58a..b556d94f 100644 --- a/SaintCoinach/Definitions/QuestEffect.json +++ b/SaintCoinach/Definitions/QuestEffect.json @@ -1,5 +1,4 @@ { "sheet": "QuestEffect", - "definitions": [ - ] + "definitions": [] } \ No newline at end of file diff --git a/SaintCoinach/Definitions/QuestEventAreaEntranceInfo.json b/SaintCoinach/Definitions/QuestEventAreaEntranceInfo.json index 89066c35..65d559d0 100644 --- a/SaintCoinach/Definitions/QuestEventAreaEntranceInfo.json +++ b/SaintCoinach/Definitions/QuestEventAreaEntranceInfo.json @@ -9,8 +9,8 @@ } }, { - "name": "Location", "index": 2, + "name": "Location", "converter": { "type": "link", "target": "Level" diff --git a/SaintCoinach/Definitions/SpecialShop.json b/SaintCoinach/Definitions/SpecialShop.json index 9a18fe81..dee96ebf 100644 --- a/SaintCoinach/Definitions/SpecialShop.json +++ b/SaintCoinach/Definitions/SpecialShop.json @@ -107,7 +107,7 @@ } }, { - "index": 1441, + "index": 1741, "type": "repeat", "count": 60, "definition": { @@ -119,7 +119,7 @@ } }, { - "index": 1561, + "index": 1981, "type": "repeat", "count": 60, "definition": { @@ -127,11 +127,11 @@ } }, { - "index": 1621, + "index": 2041, "name": "UseCurrencyType" }, { - "index": 1622, + "index": 2042, "name": "Quest{Unlock}", "converter": { "type": "link", @@ -139,7 +139,7 @@ } }, { - "index": 1623, + "index": 2043, "name": "CompleteText", "converter": { "type": "link", @@ -147,7 +147,7 @@ } }, { - "index": 1624, + "index": 2044, "name": "NotCompleteText", "converter": { "type": "link", diff --git a/SaintCoinach/Definitions/SwitchTalk.json b/SaintCoinach/Definitions/SwitchTalk.json index 880d92b6..ce005107 100644 --- a/SaintCoinach/Definitions/SwitchTalk.json +++ b/SaintCoinach/Definitions/SwitchTalk.json @@ -1,6 +1,5 @@ { "sheet": "SwitchTalk", "isGenericReferenceTarget": true, - "definitions": [ - ] + "definitions": [] } \ No newline at end of file