diff --git a/SaintCoinach/Definitions/AOZContent.json b/SaintCoinach/Definitions/AOZContent.json index b1f83121..7af9c87d 100644 --- a/SaintCoinach/Definitions/AOZContent.json +++ b/SaintCoinach/Definitions/AOZContent.json @@ -31,6 +31,13 @@ "value": 2 }, "sheet": "AOZBoss" + }, + { + "when": { + "key": "Act1FightType", + "value": 3 + }, + "sheet": "AOZBoss" } ] } @@ -62,6 +69,13 @@ "value": 2 }, "sheet": "AOZBoss" + }, + { + "when": { + "key": "Act1FightType", + "value": 3 + }, + "sheet": "AOZBoss" } ] } @@ -93,6 +107,13 @@ "value": 2 }, "sheet": "AOZBoss" + }, + { + "when": { + "key": "Act1FightType", + "value": 3 + }, + "sheet": "AOZBoss" } ] } @@ -126,4 +147,4 @@ "name": "TomestonesReward" } ] -} \ No newline at end of file +} diff --git a/SaintCoinach/Definitions/BannerBg.json b/SaintCoinach/Definitions/BannerBg.json index ace505fc..7a188c58 100644 --- a/SaintCoinach/Definitions/BannerBg.json +++ b/SaintCoinach/Definitions/BannerBg.json @@ -24,11 +24,11 @@ } }, { - "index": 3, + "index": 6, "name": "SortKey" }, { - "index": 4, + "index": 7, "name": "Name" } ] diff --git a/SaintCoinach/Definitions/BannerDecoration.json b/SaintCoinach/Definitions/BannerDecoration.json index 63b37155..c40b8263 100644 --- a/SaintCoinach/Definitions/BannerDecoration.json +++ b/SaintCoinach/Definitions/BannerDecoration.json @@ -24,11 +24,11 @@ } }, { - "index": 3, + "index": 6, "name": "SortKey" }, { - "index": 4, + "index": 7, "name": "Name" } ] diff --git a/SaintCoinach/Definitions/BannerFacial.json b/SaintCoinach/Definitions/BannerFacial.json index c2c13e97..26e70023 100644 --- a/SaintCoinach/Definitions/BannerFacial.json +++ b/SaintCoinach/Definitions/BannerFacial.json @@ -17,7 +17,7 @@ } }, { - "index": 2, + "index": 4, "name": "SortKey" } ] diff --git a/SaintCoinach/Definitions/BannerFrame.json b/SaintCoinach/Definitions/BannerFrame.json index 51dc2029..d307cc3b 100644 --- a/SaintCoinach/Definitions/BannerFrame.json +++ b/SaintCoinach/Definitions/BannerFrame.json @@ -24,11 +24,11 @@ } }, { - "index": 3, + "index": 6, "name": "SortKey" }, { - "index": 4, + "index": 7, "name": "Name" } ] diff --git a/SaintCoinach/Definitions/BannerTimeline.json b/SaintCoinach/Definitions/BannerTimeline.json index bf2a1a84..e7fab261 100644 --- a/SaintCoinach/Definitions/BannerTimeline.json +++ b/SaintCoinach/Definitions/BannerTimeline.json @@ -55,18 +55,18 @@ } }, { - "index": 5, + "index": 7, "name": "SortKey" }, { - "index": 6, + "index": 8, "name": "Icon", "converter": { "type": "icon" } }, { - "index": 7, + "index": 9, "name": "Name" } ] diff --git a/SaintCoinach/Definitions/CSBonusContent.json b/SaintCoinach/Definitions/CSBonusContent.json index ca8401a0..85825a19 100644 --- a/SaintCoinach/Definitions/CSBonusContent.json +++ b/SaintCoinach/Definitions/CSBonusContent.json @@ -1,6 +1,6 @@ { "sheet": "CSBonusContent", - "defaultColumn": "Content{0}", + "defaultColumn": "Content[0]", "definitions": [ { "name": "ContentType", @@ -11,63 +11,31 @@ }, { "index": 1, - "name": "Content{0}", - "converter": { - "type": "link", - "target": "CSBonusContentIdentifier" - } - }, - { - "index": 2, - "name": "Content{1}", - "converter": { - "type": "link", - "target": "CSBonusContentIdentifier" + "type": "repeat", + "count": 2, + "definition": { + "name": "Content", + "converter": { + "type": "link", + "target": "CSBonusContentIdentifier" + } } }, { "index": 3, - "name": "Score{0}" - }, - { - "index": 4, - "name": "Score{1}" - }, - { - "index": 5, - "name": "Score{2}" - }, - { - "index": 6, - "name": "Score{3}" - }, - { - "index": 7, - "name": "Score{4}" - }, - { - "index": 8, - "name": "Score{5}" + "type": "repeat", + "count": 6, + "definition": { + "name": "Score" + } }, { "index": 9, - "name": "RewardCount{0}" - }, - { - "index": 10, - "name": "RewardCount{1}" - }, - { - "index": 11, - "name": "RewardCount{2}" - }, - { - "index": 12, - "name": "RewardCount{3}" + "type": "repeat", + "count": 5, + "definition": { + "name": "RewardCount" + } }, - { - "index": 13, - "name": "RewardCount{4}" - } ] } \ No newline at end of file diff --git a/SaintCoinach/Definitions/CSBonusContentIdentifier.json b/SaintCoinach/Definitions/CSBonusContentIdentifier.json index 465382c0..6898646f 100644 --- a/SaintCoinach/Definitions/CSBonusContentIdentifier.json +++ b/SaintCoinach/Definitions/CSBonusContentIdentifier.json @@ -65,26 +65,14 @@ }, { "index": 3, - "name": "UnlockQuest{0}", - "converter": { - "type": "link", - "target": "Quest" - } - }, - { - "index": 4, - "name": "UnlockQuest{1}", - "converter": { - "type": "link", - "target": "Quest" - } - }, - { - "index": 5, - "name": "UnlockQuest{2}", - "converter": { - "type": "link", - "target": "Quest" + "type": "repeat", + "count": 3, + "definition": { + "name": "UnlockQuest", + "converter": { + "type": "link", + "target": "Quest" + } } }, { diff --git a/SaintCoinach/Definitions/CSBonusContentType.json b/SaintCoinach/Definitions/CSBonusContentType.json index 55b09334..276cb8d3 100644 --- a/SaintCoinach/Definitions/CSBonusContentType.json +++ b/SaintCoinach/Definitions/CSBonusContentType.json @@ -11,34 +11,14 @@ }, { "index": 1, - "name": "Text{0}", - "converter": { - "type": "link", - "target": "Addon" - } - }, - { - "index": 2, - "name": "Text{1}", - "converter": { - "type": "link", - "target": "Addon" - } - }, - { - "index": 3, - "name": "Text{2}", - "converter": { - "type": "link", - "target": "Addon" - } - }, - { - "index": 4, - "name": "Text{3}", - "converter": { - "type": "link", - "target": "Addon" + "type": "repeat", + "count": 4, + "definition": { + "name": "Text", + "converter": { + "type": "link", + "target": "Addon" + } } }, { @@ -49,24 +29,8 @@ } }, { - "index": 8, - "name": "UnlockQuest{0}", - "converter": { - "type": "link", - "target": "Quest" - } - }, - { - "index": 9, - "name": "UnlockQuest{1}", - "converter": { - "type": "link", - "target": "Quest" - } - }, - { - "index": 10, - "name": "UnlockQuest{2}", + "index": 7, + "name": "UnlockQuest", "converter": { "type": "link", "target": "Quest" diff --git a/SaintCoinach/Definitions/CSBonusMission.json b/SaintCoinach/Definitions/CSBonusMission.json index e6755cd5..6e07951f 100644 --- a/SaintCoinach/Definitions/CSBonusMission.json +++ b/SaintCoinach/Definitions/CSBonusMission.json @@ -2,19 +2,16 @@ "sheet": "CSBonusMission", "definitions": [ { - "name": "Content{0}", - "converter": { - "type": "link", - "target": "CSBonusContent" + "index": 0, + "type": "repeat", + "count": 2, + "definition": { + "name": "Content", + "converter": { + "type": "link", + "target": "CSBonusContent" + } } }, - { - "index": 1, - "name": "Content{1}", - "converter": { - "type": "link", - "target": "CSBonusContent" - } - } ] } \ No newline at end of file diff --git a/SaintCoinach/Definitions/CSBonusSeason.json b/SaintCoinach/Definitions/CSBonusSeason.json index 603eb90f..664dfcbf 100644 --- a/SaintCoinach/Definitions/CSBonusSeason.json +++ b/SaintCoinach/Definitions/CSBonusSeason.json @@ -11,34 +11,22 @@ }, { "index": 6, - "name": "Category{0}" - }, - { - "index": 7, - "name": "Category{1}" - }, - { - "index": 8, - "name": "Category{2}" - }, - { - "index": 9, - "name": "Category{3}" - }, - { - "index": 10, - "name": "Text{0}", - "converter": { - "type": "link", - "target": "CSBonusTextData" + "type": "repeat", + "count": 4, + "definition": { + "name": "Category" } }, { - "index": 11, - "name": "Text{1}", - "converter": { - "type": "link", - "target": "CSBonusTextData" + "index": 10, + "type": "repeat", + "count": 2, + "definition": { + "name": "Text", + "converter": { + "type": "link", + "target": "CSBonusTextData" + } } } ] diff --git a/SaintCoinach/Definitions/CharaCardBase.json b/SaintCoinach/Definitions/CharaCardBase.json index 025fbedc..b761910c 100644 --- a/SaintCoinach/Definitions/CharaCardBase.json +++ b/SaintCoinach/Definitions/CharaCardBase.json @@ -21,11 +21,11 @@ } }, { - "index": 7, + "index": 9, "name": "SortKey" }, { - "index": 8, + "index": 10, "name": "Name" } ] diff --git a/SaintCoinach/Definitions/CharaCardDecoration.json b/SaintCoinach/Definitions/CharaCardDecoration.json index 93b75fd9..e63b3dd6 100644 --- a/SaintCoinach/Definitions/CharaCardDecoration.json +++ b/SaintCoinach/Definitions/CharaCardDecoration.json @@ -25,11 +25,11 @@ } }, { - "index": 6, + "index": 8, "name": "SortKey" }, { - "index": 7, + "index": 9, "name": "Name" } ] diff --git a/SaintCoinach/Definitions/CharaCardHeader.json b/SaintCoinach/Definitions/CharaCardHeader.json index 02814e4b..5dfb9f68 100644 --- a/SaintCoinach/Definitions/CharaCardHeader.json +++ b/SaintCoinach/Definitions/CharaCardHeader.json @@ -28,11 +28,11 @@ } }, { - "index": 8, + "index": 10, "name": "SortKey" }, { - "index": 9, + "index": 11, "name": "Name" } ] diff --git a/SaintCoinach/Definitions/CharaMakeName.json b/SaintCoinach/Definitions/CharaMakeName.json index 2fbce8d2..2461bfb5 100644 --- a/SaintCoinach/Definitions/CharaMakeName.json +++ b/SaintCoinach/Definitions/CharaMakeName.json @@ -165,15 +165,15 @@ "name": "HrothgarLost[LastName]" }, { - "index": 44, + "index": 47, "name": "Viera[FirstName]" }, { - "index": 45, + "index": 48, "name": "VieraRava[LastName]" }, { - "index": 46, + "index": 49, "name": "VieraVeena[LastName]" } ] diff --git a/SaintCoinach/Definitions/ClassJob.json b/SaintCoinach/Definitions/ClassJob.json index 00983658..d6daae76 100644 --- a/SaintCoinach/Definitions/ClassJob.json +++ b/SaintCoinach/Definitions/ClassJob.json @@ -66,11 +66,11 @@ "name": "Modifier{Piety}" }, { - "index": 24, + "index": 26, "name": "PvPActionSortRow" }, { - "index": 26, + "index": 28, "name": "ClassJob{Parent}", "converter": { "type": "link", @@ -78,11 +78,11 @@ } }, { - "index": 27, + "index": 29, "name": "Name{English}" }, { - "index": 28, + "index": 30, "name": "Item{StartingWeapon}", "converter": { "type": "link", @@ -90,11 +90,11 @@ } }, { - "index": 30, + "index": 32, "name": "Role" }, { - "index": 31, + "index": 33, "name": "StartingTown", "converter": { "type": "link", @@ -102,7 +102,7 @@ } }, { - "index": 32, + "index": 34, "name": "MonsterNote", "converter": { "type": "link", @@ -110,11 +110,11 @@ } }, { - "index": 33, + "index": 35, "name": "PrimaryStat" }, { - "index": 34, + "index": 36, "name": "LimitBreak1", "converter": { "type": "link", @@ -122,7 +122,7 @@ } }, { - "index": 35, + "index": 37, "name": "LimitBreak2", "converter": { "type": "link", @@ -130,7 +130,7 @@ } }, { - "index": 36, + "index": 38, "name": "LimitBreak3", "converter": { "type": "link", @@ -138,11 +138,11 @@ } }, { - "index": 37, + "index": 39, "name": "UIPriority" }, { - "index": 38, + "index": 40, "name": "Item{SoulCrystal}", "converter": { "type": "link", @@ -150,7 +150,7 @@ } }, { - "index": 39, + "index": 41, "name": "UnlockQuest", "converter": { "type": "link", @@ -158,7 +158,7 @@ } }, { - "index": 40, + "index": 42, "name": "RelicQuest", "converter": { "type": "link", @@ -166,7 +166,7 @@ } }, { - "index": 41, + "index": 43, "name": "Prerequisite", "converter": { "type": "link", @@ -174,19 +174,19 @@ } }, { - "index": 42, + "index": 44, "name": "StartingLevel" }, { - "index": 43, + "index": 45, "name": "PartyBonus" }, { - "index": 45, + "index": 47, "name": "IsLimitedJob" }, { - "index": 46, + "index": 48, "name": "CanQueueForDuty" } ] diff --git a/SaintCoinach/Definitions/ClassJobCategory.json b/SaintCoinach/Definitions/ClassJobCategory.json index 3291dca8..be5b91df 100644 --- a/SaintCoinach/Definitions/ClassJobCategory.json +++ b/SaintCoinach/Definitions/ClassJobCategory.json @@ -168,6 +168,14 @@ { "index": 41, "name": "SGE" + }, + { + "index": 42, + "name": "VPR" + }, + { + "index": 43, + "name": "PCT" } ] -} \ No newline at end of file +} diff --git a/SaintCoinach/Definitions/ContentFinderCondition.json b/SaintCoinach/Definitions/ContentFinderCondition.json index 29bdcf6e..ca5767ff 100644 --- a/SaintCoinach/Definitions/ContentFinderCondition.json +++ b/SaintCoinach/Definitions/ContentFinderCondition.json @@ -66,7 +66,7 @@ "name": "PvP" }, { - "index": 8, + "index": 9, "name": "AcceptClassJobCategory", "converter": { "type": "link", @@ -74,7 +74,7 @@ } }, { - "index": 9, + "index": 10, "name": "ContentMemberType", "converter": { "type": "link", @@ -82,7 +82,7 @@ } }, { - "index": 13, + "index": 14, "name": "UnlockQuest", "converter": { "type": "link", @@ -90,51 +90,51 @@ } }, { - "index": 16, + "index": 17, "name": "ClassJobLevel{Required}" }, { - "index": 17, + "index": 18, "name": "ClassJobLevel{Sync}" }, { - "index": 18, + "index": 19, "name": "ItemLevel{Required}" }, { - "index": 19, + "index": 20, "name": "ItemLevel{Sync}" }, { - "index": 21, + "index": 22, "name": "AllowUndersized" }, { - "index": 23, + "index": 24, "name": "AllowReplacement" }, { - "index": 25, + "index": 26, "name": "AllowExplorerMode" }, { - "index": 31, + "index": 32, "name": "HighEndDuty" }, { - "index": 36, + "index": 37, "name": "DutyRecorderAllowed" }, { - "index": 41, + "index": 42, "name": "Name" }, { - "index": 42, + "index": 43, "name": "NameShort" }, { - "index": 43, + "index": 44, "name": "ContentType", "converter": { "type": "link", @@ -142,11 +142,11 @@ } }, { - "index": 44, + "index": 45, "name": "TransientKey" }, { - "index": 45, + "index": 47, "name": "Transient", "converter": { "type": "complexlink", @@ -169,69 +169,69 @@ } }, { - "index": 46, + "index": 48, "name": "SortKey" }, { - "index": 47, + "index": 49, "name": "Image", "converter": { "type": "icon" } }, { - "index": 48, + "index": 50, "name": "Icon", "converter": { "type": "icon" } }, { - "index": 53, + "index": 55, "name": "LevelingRoulette" }, { - "index": 54, + "index": 56, "name": "HighLevelRoulette" }, { - "index": 55, + "index": 57, "name": "MSQRoulette" }, { - "index": 56, + "index": 58, "name": "GuildHestRoulette" }, { - "index": 57, + "index": 59, "name": "ExpertRoulette" }, { - "index": 58, + "index": 60, "name": "TrialRoulette" }, { - "index": 59, + "index": 61, "name": "DailyFrontlineChallenge" }, { - "index": 60, + "index": 62, "name": "LevelCapRoulette" }, { - "index": 61, + "index": 63, "name": "MentorRoulette" }, { - "index": 67, + "index": 69, "name": "AllianceRoulette" }, { - "index": 68, + "index": 70, "name": "FeastTeamRoulette" }, { - "index": 69, + "index": 71, "name": "NormalRaidRoulette" } ] diff --git a/SaintCoinach/Definitions/CraftActionIndirection.json b/SaintCoinach/Definitions/CraftActionIndirection.json new file mode 100644 index 00000000..ef322d58 --- /dev/null +++ b/SaintCoinach/Definitions/CraftActionIndirection.json @@ -0,0 +1,28 @@ +{ + "sheet": "CraftActionIndirection", + "definitions": [ + { + "name": "Name", + "converter": { + "type": "link", + "target": "CraftAction" + } + }, + { + "index": 1, + "name": "PreviousComboAction", + "converter": { + "type": "link", + "target": "CraftAction" + } + }, + { + "index": 2, + "name": "ClassJob", + "converter": { + "type": "link", + "target": "ClassJob" + } + } + ] +} diff --git a/SaintCoinach/Definitions/DawnGrowMember.json b/SaintCoinach/Definitions/DawnGrowMember.json index d45f71e5..02f81775 100644 --- a/SaintCoinach/Definitions/DawnGrowMember.json +++ b/SaintCoinach/Definitions/DawnGrowMember.json @@ -5,7 +5,7 @@ { "index": 0, "type": "repeat", - "count": 3, + "count": 4, "definition": { "name": "SelectImage", "converter": { @@ -14,9 +14,9 @@ } }, { - "index": 3, + "index": 4, "type": "repeat", - "count": 3, + "count": 4, "definition": { "name": "PortraitImage", "converter": { @@ -25,7 +25,7 @@ } }, { - "index": 6, + "index": 8, "name": "Class", "converter": { "type": "link", diff --git a/SaintCoinach/Definitions/ENpcBase.json b/SaintCoinach/Definitions/ENpcBase.json index 49c6ef98..1a7cd13f 100644 --- a/SaintCoinach/Definitions/ENpcBase.json +++ b/SaintCoinach/Definitions/ENpcBase.json @@ -172,11 +172,11 @@ } }, { - "index": 67, + "index": 68, "name": "Model{OffHand}" }, { - "index": 68, + "index": 69, "name": "Dye{OffHand}", "converter": { "type": "link", @@ -184,11 +184,11 @@ } }, { - "index": 69, + "index": 71, "name": "Model{Head}" }, { - "index": 70, + "index": 72, "name": "Dye{Head}", "converter": { "type": "link", @@ -196,15 +196,15 @@ } }, { - "index": 71, + "index": 74, "name": "Visor" }, { - "index": 72, + "index": 75, "name": "Model{Body}" }, { - "index": 73, + "index": 76, "name": "Dye{Body}", "converter": { "type": "link", @@ -212,11 +212,11 @@ } }, { - "index": 74, + "index": 78, "name": "Model{Hands}" }, { - "index": 75, + "index": 79, "name": "Dye{Hands}", "converter": { "type": "link", @@ -224,11 +224,11 @@ } }, { - "index": 76, + "index": 81, "name": "Model{Legs}" }, { - "index": 77, + "index": 82, "name": "Dye{Legs}", "converter": { "type": "link", @@ -236,11 +236,11 @@ } }, { - "index": 78, + "index": 84, "name": "Model{Feet}" }, { - "index": 79, + "index": 85, "name": "Dye{Feet}", "converter": { "type": "link", @@ -248,11 +248,11 @@ } }, { - "index": 80, + "index": 87, "name": "Model{Ears}" }, { - "index": 81, + "index": 88, "name": "Dye{Ears}", "converter": { "type": "link", @@ -260,11 +260,11 @@ } }, { - "index": 82, + "index": 90, "name": "Model{Neck}" }, { - "index": 83, + "index": 91, "name": "Dye{Neck}", "converter": { "type": "link", @@ -272,11 +272,11 @@ } }, { - "index": 84, + "index": 93, "name": "Model{Wrists}" }, { - "index": 85, + "index": 94, "name": "Dye{Wrists}", "converter": { "type": "link", @@ -284,11 +284,11 @@ } }, { - "index": 86, + "index": 96, "name": "Model{LeftRing}" }, { - "index": 87, + "index": 97, "name": "Dye{LeftRing}", "converter": { "type": "link", @@ -296,11 +296,11 @@ } }, { - "index": 88, + "index": 99, "name": "Model{RightRing}" }, { - "index": 89, + "index": 100, "name": "Dye{RightRing}", "converter": { "type": "link", @@ -308,11 +308,11 @@ } }, { - "index": 90, + "index": 104, "name": "Invisibility" }, { - "index": 91, + "index": 105, "name": "Balloon", "converter": { "type": "link", @@ -320,11 +320,11 @@ } }, { - "index": 92, + "index": 106, "name": "NotRewriteHeight" }, { - "index": 93, + "index": 107, "name": "DefaultBalloon" } ] diff --git a/SaintCoinach/Definitions/ENpcDressUpDress.json b/SaintCoinach/Definitions/ENpcDressUpDress.json index 4b2a6f97..da7ab38b 100644 --- a/SaintCoinach/Definitions/ENpcDressUpDress.json +++ b/SaintCoinach/Definitions/ENpcDressUpDress.json @@ -30,11 +30,11 @@ } }, { - "index": 39, + "index": 40, "name": "Model{OffHand}" }, { - "index": 40, + "index": 41, "name": "Dye{OffHand}", "converter": { "type": "link", @@ -42,11 +42,11 @@ } }, { - "index": 41, + "index": 42, "name": "Model{Head}" }, { - "index": 42, + "index": 43, "name": "Dye{Head}", "converter": { "type": "link", @@ -54,11 +54,11 @@ } }, { - "index": 43, + "index": 46, "name": "Model{Body}" }, { - "index": 44, + "index": 47, "name": "Dye{Body}", "converter": { "type": "link", @@ -66,11 +66,11 @@ } }, { - "index": 45, + "index": 49, "name": "Model{Hands}" }, { - "index": 46, + "index": 50, "name": "Dye{Hands}", "converter": { "type": "link", @@ -78,11 +78,11 @@ } }, { - "index": 47, + "index": 52, "name": "Model{Legs}" }, { - "index": 48, + "index": 53, "name": "Dye{Legs}", "converter": { "type": "link", @@ -90,11 +90,11 @@ } }, { - "index": 49, + "index": 55, "name": "Model{Feet}" }, { - "index": 50, + "index": 56, "name": "Dye{Feet}", "converter": { "type": "link", diff --git a/SaintCoinach/Definitions/FateShop.json b/SaintCoinach/Definitions/FateShop.json index 421571e3..a7fbfc4c 100644 --- a/SaintCoinach/Definitions/FateShop.json +++ b/SaintCoinach/Definitions/FateShop.json @@ -4,7 +4,7 @@ { "index": 0, "type": "repeat", - "count": 2, + "count": 3, "definition": { "name": "SpecialShop", "converter": { @@ -14,9 +14,9 @@ } }, { - "index": 2, + "index": 3, "type": "repeat", - "count": 8, + "count": 10, "definition": { "name": "DefaultTalk", "converter": { diff --git a/SaintCoinach/Definitions/FishParameter.json b/SaintCoinach/Definitions/FishParameter.json index e6c2202c..cb719020 100644 --- a/SaintCoinach/Definitions/FishParameter.json +++ b/SaintCoinach/Definitions/FishParameter.json @@ -6,7 +6,7 @@ "name": "Text" }, { - "index": 1, + "index": 4, "name": "Item", "converter": { "type": "multiref", @@ -17,7 +17,7 @@ } }, { - "index": 2, + "index": 5, "name": "GatheringItemLevel", "converter": { "type": "link", @@ -25,15 +25,15 @@ } }, { - "index": 3, + "index": 6, "name": "OceanStars" }, { - "index": 5, + "index": 8, "name": "IsHidden" }, { - "index": 6, + "index": 9, "name": "FishingRecordType", "converter": { "type": "link", @@ -41,7 +41,7 @@ } }, { - "index": 7, + "index": 10, "name": "FishingSpot", "converter": { "type": "link", @@ -49,7 +49,7 @@ } }, { - "index": 8, + "index": 11, "name": "GatheringSubCategory", "converter": { "type": "link", @@ -57,11 +57,11 @@ } }, { - "index": 9, + "index": 12, "name": "IsInLog" }, { - "index": 10, + "index": 13, "name": "AchievementCredit" } ] diff --git a/SaintCoinach/Definitions/FishingSpot.json b/SaintCoinach/Definitions/FishingSpot.json index e10cea6b..0e4b8acf 100644 --- a/SaintCoinach/Definitions/FishingSpot.json +++ b/SaintCoinach/Definitions/FishingSpot.json @@ -14,15 +14,15 @@ "name": "BigFish{OnEnd}" }, { - "index": 3, + "index": 4, "name": "FishingSpotCategory" }, { - "index": 4, + "index": 5, "name": "Rare" }, { - "index": 5, + "index": 6, "name": "TerritoryType", "converter": { "type": "link", @@ -30,7 +30,7 @@ } }, { - "index": 6, + "index": 7, "name": "PlaceName{Main}", "converter": { "type": "link", @@ -38,7 +38,7 @@ } }, { - "index": 7, + "index": 8, "name": "PlaceName{Sub}", "converter": { "type": "link", @@ -46,19 +46,19 @@ } }, { - "index": 8, + "index": 9, "name": "X" }, { - "index": 9, + "index": 10, "name": "Z" }, { - "index": 10, + "index": 11, "name": "Radius" }, { - "index": 12, + "index": 13, "type": "repeat", "count": 10, "definition": { @@ -70,7 +70,7 @@ } }, { - "index": 22, + "index": 23, "name": "PlaceName", "converter": { "type": "link", @@ -78,7 +78,7 @@ } }, { - "index": 23, + "index": 24, "name": "Order" } ] diff --git a/SaintCoinach/Definitions/GilShopItem.json b/SaintCoinach/Definitions/GilShopItem.json index 96c542e3..dfa1e233 100644 --- a/SaintCoinach/Definitions/GilShopItem.json +++ b/SaintCoinach/Definitions/GilShopItem.json @@ -10,7 +10,7 @@ } }, { - "index": 3, + "index": 4, "type": "repeat", "count": 2, "definition": { @@ -22,7 +22,7 @@ } }, { - "index": 5, + "index": 6, "name": "Achievement{Required}", "converter": { "type": "link", @@ -30,11 +30,11 @@ } }, { - "index": 7, + "index": 8, "name": "State{Required}" }, { - "index": 8, + "index": 9, "name": "Patch" } ] diff --git a/SaintCoinach/Definitions/GuidePage.json b/SaintCoinach/Definitions/GuidePage.json index f070e039..9dbb22c1 100644 --- a/SaintCoinach/Definitions/GuidePage.json +++ b/SaintCoinach/Definitions/GuidePage.json @@ -5,7 +5,7 @@ "name": "Key" }, { - "index": 1, + "index": 2, "name": "Output", "converter": { "type": "complexlink", diff --git a/SaintCoinach/Definitions/Item.json b/SaintCoinach/Definitions/Item.json index 94e1029d..e00b3a29 100644 --- a/SaintCoinach/Definitions/Item.json +++ b/SaintCoinach/Definitions/Item.json @@ -212,7 +212,7 @@ }, { "index": 28, - "name": "IsDyeable" + "name": "DyeCount" }, { "index": 29, diff --git a/SaintCoinach/Definitions/JobHudManual.json b/SaintCoinach/Definitions/JobHudManual.json index 448d3ad2..b1fd4d8a 100644 --- a/SaintCoinach/Definitions/JobHudManual.json +++ b/SaintCoinach/Definitions/JobHudManual.json @@ -11,7 +11,7 @@ } }, { - "index": 5, + "index": 6, "name": "Guide", "converter": { "type": "link", diff --git a/SaintCoinach/Definitions/JobHudManualPriority.json b/SaintCoinach/Definitions/JobHudManualPriority.json index 050c48b5..0f8fead6 100644 --- a/SaintCoinach/Definitions/JobHudManualPriority.json +++ b/SaintCoinach/Definitions/JobHudManualPriority.json @@ -3,7 +3,7 @@ "definitions": [ { "type": "repeat", - "count": 3, + "count": 7, "definition": { "name": "JobHudManual", "converter": { diff --git a/SaintCoinach/Definitions/Leve.json b/SaintCoinach/Definitions/Leve.json index 238ccd6a..b073366f 100644 --- a/SaintCoinach/Definitions/Leve.json +++ b/SaintCoinach/Definitions/Leve.json @@ -47,10 +47,6 @@ }, { "index": 9, - "name": "Evaluation" - }, - { - "index": 10, "name": "PlaceName{Start}", "converter": { "type": "link", @@ -58,7 +54,7 @@ } }, { - "index": 11, + "index": 10, "name": "PlaceName{Issued}", "converter": { "type": "link", @@ -66,7 +62,7 @@ } }, { - "index": 12, + "index": 11, "name": "FishingSpot", "converter": { "type": "link", @@ -74,7 +70,7 @@ } }, { - "index": 15, + "index": 13, "name": "ClassJobCategory", "converter": { "type": "link", @@ -82,7 +78,7 @@ } }, { - "index": 16, + "index": 14, "name": "JournalGenre", "converter": { "type": "link", @@ -90,7 +86,7 @@ } }, { - "index": 18, + "index": 15, "name": "PlaceName{StartZone}", "converter": { "type": "link", @@ -98,14 +94,14 @@ } }, { - "index": 19, + "index": 16, "name": "Icon{CityState}", "converter": { "type": "icon" } }, { - "index": 20, + "index": 17, "name": "DataId", "converter": { "type": "multiref", @@ -118,27 +114,27 @@ } }, { - "index": 21, + "index": 18, "name": "CanCancel" }, { - "index": 22, + "index": 19, "name": "MaxDifficulty" }, { - "index": 23, + "index": 20, "name": "ExpFactor" }, { - "index": 24, + "index": 21, "name": "ExpReward" }, { - "index": 25, + "index": 22, "name": "GilReward" }, { - "index": 26, + "index": 23, "name": "LeveRewardItem", "converter": { "type": "link", @@ -146,7 +142,7 @@ } }, { - "index": 27, + "index": 24, "name": "LeveVfx", "converter": { "type": "link", @@ -154,7 +150,7 @@ } }, { - "index": 28, + "index": 25, "name": "LeveVfx{Frame}", "converter": { "type": "link", @@ -162,7 +158,7 @@ } }, { - "index": 29, + "index": 26, "name": "Level{Levemete}", "converter": { "type": "link", @@ -170,18 +166,18 @@ } }, { - "index": 30, + "index": 27, "name": "Icon{Issuer}", "converter": { "type": "icon" } }, { - "index": 31, + "index": 28, "name": "LockedLeve" }, { - "index": 32, + "index": 29, "name": "Level{Start}", "converter": { "type": "link", @@ -189,7 +185,7 @@ } }, { - "index": 33, + "index": 30, "name": "BGM", "converter": { "type": "link", diff --git a/SaintCoinach/Definitions/LeveAssignmentType.json b/SaintCoinach/Definitions/LeveAssignmentType.json index 7483db1c..9f2f5852 100644 --- a/SaintCoinach/Definitions/LeveAssignmentType.json +++ b/SaintCoinach/Definitions/LeveAssignmentType.json @@ -3,17 +3,14 @@ "defaultColumn": "Name", "definitions": [ { - "name": "IsFaction" - }, - { - "index": 1, + "index": 0, "name": "Icon", "converter": { "type": "icon" } }, { - "index": 2, + "index": 1, "name": "Name" } ] diff --git a/SaintCoinach/Definitions/LogMessage.json b/SaintCoinach/Definitions/LogMessage.json index 46e78e3e..5036ed1c 100644 --- a/SaintCoinach/Definitions/LogMessage.json +++ b/SaintCoinach/Definitions/LogMessage.json @@ -6,7 +6,7 @@ "name": "LogKind" }, { - "index": 4, + "index": 5, "name": "Text" } ] diff --git a/SaintCoinach/Definitions/MobHuntOrderType.json b/SaintCoinach/Definitions/MobHuntOrderType.json index fbb02e90..5a333e2b 100644 --- a/SaintCoinach/Definitions/MobHuntOrderType.json +++ b/SaintCoinach/Definitions/MobHuntOrderType.json @@ -1,5 +1,6 @@ { "sheet": "MobHuntOrderType", + "defaultColumn": "EventItem", "definitions": [ { "name": "Type" diff --git a/SaintCoinach/Definitions/NpcYell.json b/SaintCoinach/Definitions/NpcYell.json index c960b226..92885d8d 100644 --- a/SaintCoinach/Definitions/NpcYell.json +++ b/SaintCoinach/Definitions/NpcYell.json @@ -7,19 +7,19 @@ "name": "OutputType" }, { - "index": 5, + "index": 6, "name": "BalloonTime" }, { - "index": 6, + "index": 7, "name": "IsBalloonSlow" }, { - "index": 7, + "index": 8, "name": "BattleTalkTime" }, { - "index": 10, + "index": 11, "name": "Text" } ] diff --git a/SaintCoinach/Definitions/Quest.json b/SaintCoinach/Definitions/Quest.json index d9fa0d08..36c9af5d 100644 --- a/SaintCoinach/Definitions/Quest.json +++ b/SaintCoinach/Definitions/Quest.json @@ -270,7 +270,7 @@ } }, { - "index": 49, + "index": 50, "type": "repeat", "count": 50, "definition": { @@ -278,7 +278,7 @@ } }, { - "index": 99, + "index": 100, "type": "repeat", "count": 50, "definition": { @@ -286,7 +286,7 @@ } }, { - "index": 149, + "index": 150, "type": "repeat", "count": 64, "definition": { @@ -294,7 +294,7 @@ } }, { - "index": 213, + "index": 214, "type": "repeat", "count": 64, "definition": { @@ -302,7 +302,7 @@ } }, { - "index": 277, + "index": 278, "type": "repeat", "count": 64, "definition": { @@ -310,7 +310,7 @@ } }, { - "index": 341, + "index": 342, "type": "repeat", "count": 32, "definition": { @@ -318,7 +318,7 @@ } }, { - "index": 373, + "index": 374, "type": "repeat", "count": 32, "definition": { @@ -326,7 +326,7 @@ } }, { - "index": 405, + "index": 406, "type": "repeat", "count": 64, "definition": { @@ -334,7 +334,7 @@ } }, { - "index": 469, + "index": 470, "type": "repeat", "count": 64, "definition": { @@ -342,7 +342,7 @@ } }, { - "index": 533, + "index": 534, "type": "repeat", "count": 64, "definition": { @@ -350,7 +350,7 @@ } }, { - "index": 597, + "index": 598, "type": "repeat", "count": 64, "definition": { @@ -358,7 +358,7 @@ } }, { - "index": 661, + "index": 662, "type": "repeat", "count": 64, "definition": { @@ -366,7 +366,7 @@ } }, { - "index": 725, + "index": 726, "type": "repeat", "count": 64, "definition": { @@ -374,7 +374,7 @@ } }, { - "index": 789, + "index": 790, "type": "repeat", "count": 64, "definition": { @@ -382,7 +382,7 @@ } }, { - "index": 853, + "index": 854, "type": "repeat", "count": 64, "definition": { @@ -390,7 +390,7 @@ } }, { - "index": 917, + "index": 918, "type": "repeat", "count": 64, "definition": { @@ -398,7 +398,7 @@ } }, { - "index": 981, + "index": 982, "type": "repeat", "count": 64, "definition": { @@ -406,7 +406,7 @@ } }, { - "index": 1045, + "index": 1046, "type": "repeat", "count": 64, "definition": { @@ -414,7 +414,7 @@ } }, { - "index": 1109, + "index": 1110, "type": "repeat", "count": 64, "definition": { @@ -422,7 +422,7 @@ } }, { - "index": 1173, + "index": 1174, "type": "repeat", "count": 24, "definition": { @@ -430,7 +430,7 @@ } }, { - "index": 1197, + "index": 1198, "type": "repeat", "count": 24, "definition": { @@ -438,7 +438,7 @@ } }, { - "index": 1221, + "index": 1222, "type": "repeat", "count": 8, "definition": { @@ -454,7 +454,7 @@ } }, { - "index": 1413, + "index": 1414, "type": "repeat", "count": 24, "definition": { @@ -462,11 +462,11 @@ } }, { - "index": 1437, + "index": 1438, "name": "Level{Max}" }, { - "index": 1438, + "index": 1439, "name": "ClassJob{Required}", "converter": { "type": "link", @@ -474,7 +474,7 @@ } }, { - "index": 1439, + "index": 1440, "name": "QuestRewardOtherDisplay", "converter": { "type": "link", @@ -482,15 +482,15 @@ } }, { - "index": 1440, + "index": 1441, "name": "ExpFactor" }, { - "index": 1441, + "index": 1442, "name": "GilReward" }, { - "index": 1442, + "index": 1443, "name": "CurrencyReward", "converter": { "type": "link", @@ -498,11 +498,11 @@ } }, { - "index": 1443, + "index": 1444, "name": "CurrencyRewardCount" }, { - "index": 1444, + "index": 1445, "type": "repeat", "count": 3, "definition": { @@ -514,7 +514,7 @@ } }, { - "index": 1447, + "index": 1448, "type": "repeat", "count": 3, "definition": { @@ -522,11 +522,11 @@ } }, { - "index": 1450, + "index": 1451, "name": "ItemRewardType" }, { - "index": 1451, + "index": 1452, "type": "repeat", "count": 7, "definition": { @@ -574,7 +574,7 @@ } }, { - "index": 1458, + "index": 1459, "type": "repeat", "count": 7, "definition": { @@ -582,7 +582,7 @@ } }, { - "index": 1472, + "index": 1473, "type": "repeat", "count": 7, "definition": { @@ -594,7 +594,7 @@ } }, { - "index": 1479, + "index": 1480, "type": "repeat", "count": 5, "definition": { @@ -606,7 +606,7 @@ } }, { - "index": 1484, + "index": 1485, "type": "repeat", "count": 5, "definition": { @@ -614,7 +614,7 @@ } }, { - "index": 1489, + "index": 1490, "type": "repeat", "count": 5, "definition": { @@ -622,7 +622,7 @@ } }, { - "index": 1494, + "index": 1495, "type": "repeat", "count": 5, "definition": { @@ -634,7 +634,7 @@ } }, { - "index": 1499, + "index": 1500, "name": "Emote{Reward}", "converter": { "type": "link", @@ -642,7 +642,7 @@ } }, { - "index": 1500, + "index": 1501, "name": "Action{Reward}", "converter": { "type": "link", @@ -650,7 +650,7 @@ } }, { - "index": 1501, + "index": 1502, "type": "repeat", "count": 2, "definition": { @@ -662,11 +662,11 @@ } }, { - "index": 1503, + "index": 1504, "name": "System{Reward}[0]" }, { - "index": 1504, + "index": 1505, "name": "Other{Reward}", "converter": { "type": "link", @@ -674,15 +674,15 @@ } }, { - "index": 1505, + "index": 1506, "name": "System{Reward}[1]" }, { - "index": 1506, + "index": 1507, "name": "GCType{Reward}" }, { - "index": 1507, + "index": 1508, "name": "InstanceContent{Unlock}", "converter": { "type": "link", @@ -690,11 +690,11 @@ } }, { - "index": 1508, + "index": 1509, "name": "Tomestone" }, { - "index": 1509, + "index": 1510, "name": "Tomestone{Reward}", "converter": { "type": "complexlink", @@ -708,15 +708,15 @@ } }, { - "index": 1510, + "index": 1511, "name": "TomestoneCount{Reward}" }, { - "index": 1511, + "index": 1512, "name": "ReputationReward" }, { - "index": 1512, + "index": 1513, "name": "PlaceName", "converter": { "type": "link", @@ -724,7 +724,7 @@ } }, { - "index": 1513, + "index": 1514, "name": "JournalGenre", "converter": { "type": "link", @@ -732,29 +732,29 @@ } }, { - "index": 1515, + "index": 1516, "name": "Icon", "converter": { "type": "icon" } }, { - "index": 1516, + "index": 1517, "name": "Icon{Special}", "converter": { "type": "icon" } }, { - "index": 1517, + "index": 1518, "name": "Introduction" }, { - "index": 1518, + "index": 1519, "name": "HideOfferIcon" }, { - "index": 1519, + "index": 1520, "name": "EventIconType", "converter": { "type": "link", @@ -762,8 +762,8 @@ } }, { - "index": 1521, + "index": 1522, "name": "SortKey" } ] -} \ No newline at end of file +} diff --git a/SaintCoinach/Definitions/Recipe.json b/SaintCoinach/Definitions/Recipe.json index f77b79b1..25b31df2 100644 --- a/SaintCoinach/Definitions/Recipe.json +++ b/SaintCoinach/Definitions/Recipe.json @@ -37,7 +37,7 @@ { "index": 5, "type": "repeat", - "count": 10, + "count": 8, "definition": { "type": "group", "members": [ @@ -55,7 +55,7 @@ } }, { - "index": 25, + "index": 21, "name": "RecipeNotebookList", "converter": { "type": "link", @@ -63,47 +63,51 @@ } }, { - "index": 26, + "index": 22, + "name": "DisplayPriority" + }, + { + "index": 23, "name": "IsSecondary" }, { - "index": 27, + "index": 24, "name": "MaterialQualityFactor" }, { - "index": 28, + "index": 25, "name": "DifficultyFactor" }, { - "index": 29, + "index": 26, "name": "QualityFactor" }, { - "index": 30, + "index": 27, "name": "DurabilityFactor" }, { - "index": 31, + "index": 28, "name": "RequiredQuality" }, { - "index": 32, + "index": 29, "name": "RequiredCraftsmanship" }, { - "index": 33, + "index": 30, "name": "RequiredControl" }, { - "index": 34, + "index": 31, "name": "QuickSynthCraftsmanship" }, { - "index": 35, + "index": 32, "name": "QuickSynthControl" }, { - "index": 36, + "index": 33, "name": "SecretRecipeBook", "converter": { "type": "link", @@ -111,7 +115,7 @@ } }, { - "index": 37, + "index": 34, "name": "Quest", "converter": { "type": "link", @@ -119,19 +123,19 @@ } }, { - "index": 38, + "index": 35, "name": "CanQuickSynth" }, { - "index": 39, + "index": 36, "name": "CanHq" }, { - "index": 40, + "index": 37, "name": "ExpRewarded" }, { - "index": 41, + "index": 38, "name": "Status{Required}", "converter": { "type": "link", @@ -139,7 +143,7 @@ } }, { - "index": 42, + "index": 39, "name": "Item{Required}", "converter": { "type": "link", @@ -147,16 +151,16 @@ } }, { - "index": 43, + "index": 40, "name": "IsSpecializationRequired" }, { - "index": 44, + "index": 41, "name": "IsExpert" }, { - "index": 47, + "index": 44, "name": "PatchNumber" } ] -} \ No newline at end of file +} diff --git a/SaintCoinach/Definitions/RecipeLevelTable.json b/SaintCoinach/Definitions/RecipeLevelTable.json index d078eba3..2e32a058 100644 --- a/SaintCoinach/Definitions/RecipeLevelTable.json +++ b/SaintCoinach/Definitions/RecipeLevelTable.json @@ -14,39 +14,35 @@ }, { "index": 3, - "name": "SuggestedControl" - }, - { - "index": 4, "name": "Difficulty" }, { - "index": 5, + "index": 4, "name": "Quality" }, { - "index": 6, + "index": 5, "name": "ProgressDivider" }, { - "index": 7, + "index": 6, "name": "QualityDivider" }, { - "index": 8, + "index": 7, "name": "ProgressModifier" }, { - "index": 9, + "index": 8, "name": "QualityModifier" }, { - "index": 10, + "index": 9, "name": "Durability" }, { - "index": 11, + "index": 10, "name": "ConditionsFlag" } ] -} \ No newline at end of file +} diff --git a/SaintCoinach/Definitions/ReplaceAction.json b/SaintCoinach/Definitions/ReplaceAction.json new file mode 100644 index 00000000..d316e335 --- /dev/null +++ b/SaintCoinach/Definitions/ReplaceAction.json @@ -0,0 +1,206 @@ +{ + "sheet": "ReplaceAction", + "definitions": [ + { + "index": 0, + "name": "Action", + "converter": { + "type": "link", + "target": "Action" + } + }, + { + "index": 1, + "name": "Type1" + }, + { + "index": 2, + "name": "Param1", + "converter": { + "type": "complexlink", + "links": [ + { + "when": { + "key": "Type1", + "value": 2 + }, + "sheet": "Status" + }, + { + "when": { + "key": "Type1", + "value": 3 + }, + "sheet": "Trait" + }, + { + "when": { + "key": "Type1", + "value": 4 + }, + "sheet": "Status" + }, + { + "when": { + "key": "Type1", + "value": 7 + }, + "sheet": "Status" + }, + { + "when": { + "key": "Type1", + "value": 12 + }, + "sheet": "Status" + }, + { + "when": { + "key": "Type1", + "value": 13 + }, + "sheet": "Status" + } + ] + } + }, + { + "index": 3, + "name": "ReplaceAction1", + "converter": { + "type": "link", + "target": "Action" + } + }, + { + "index": 4, + "name": "Type2" + }, + { + "index": 5, + "name": "Param2", + "converter": { + "type": "complexlink", + "links": [ + { + "when": { + "key": "Type2", + "value": 2 + }, + "sheet": "Status" + }, + { + "when": { + "key": "Type2", + "value": 3 + }, + "sheet": "Trait" + }, + { + "when": { + "key": "Type2", + "value": 4 + }, + "sheet": "Status" + }, + { + "when": { + "key": "Type2", + "value": 7 + }, + "sheet": "Status" + }, + { + "when": { + "key": "Type2", + "value": 12 + }, + "sheet": "Status" + }, + { + "when": { + "key": "Type2", + "value": 13 + }, + "sheet": "Status" + } + ] + } + }, + { + "index": 6, + "name": "ReplaceAction2", + "converter": { + "type": "link", + "target": "Action" + } + }, + { + "index": 7, + "name": "Type3" + }, + { + "index": 8, + "name": "Param3", + "converter": { + "type": "complexlink", + "links": [ + { + "when": { + "key": "Type3", + "value": 2 + }, + "sheet": "Status" + }, + { + "when": { + "key": "Type3", + "value": 3 + }, + "sheet": "Trait" + }, + { + "when": { + "key": "Type3", + "value": 4 + }, + "sheet": "Status" + }, + { + "when": { + "key": "Type3", + "value": 7 + }, + "sheet": "Status" + }, + { + "when": { + "key": "Type3", + "value": 12 + }, + "sheet": "Status" + }, + { + "when": { + "key": "Type3", + "value": 13 + }, + "sheet": "Status" + } + ] + } + }, + { + "index": 9, + "name": "ReplaceAction3", + "converter": { + "type": "link", + "target": "Action" + } + }, + { + "index": 10, + "name": "ReplaceSettable" + } + ] +} \ No newline at end of file diff --git a/SaintCoinach/Definitions/TelepoRelay.json b/SaintCoinach/Definitions/TelepoRelay.json index 3ca48dac..443b8447 100644 --- a/SaintCoinach/Definitions/TelepoRelay.json +++ b/SaintCoinach/Definitions/TelepoRelay.json @@ -4,7 +4,7 @@ { "index": 0, "type": "repeat", - "count": 7, + "count": 8, "definition": { "name": "TerritoryType{Entry}", "converter": { @@ -19,9 +19,9 @@ } }, { - "index": 7, + "index": 8, "type": "repeat", - "count": 7, + "count": 8, "definition": { "name": "TerritoryType{Exit}", "converter": { @@ -36,9 +36,9 @@ } }, { - "index": 14, + "index": 16, "type": "repeat", - "count": 7, + "count": 8, "definition": { "name": "Cost" } diff --git a/SaintCoinach/Definitions/TreasureHuntRank.json b/SaintCoinach/Definitions/TreasureHuntRank.json index e3494379..62f811f6 100644 --- a/SaintCoinach/Definitions/TreasureHuntRank.json +++ b/SaintCoinach/Definitions/TreasureHuntRank.json @@ -1,6 +1,6 @@ { "sheet": "TreasureHuntRank", - "defaultColumn": "Name", + "defaultColumn": "ItemName", "definitions": [ { "index": 1,