From 7d82b81e68da8dbe9e1528d7e7b960b302fcfbcf Mon Sep 17 00:00:00 2001 From: SakuraFutaba <154326348@qq.com> Date: Thu, 27 Jun 2024 05:24:41 +0900 Subject: [PATCH 1/5] add ReplaceAction sheet --- SaintCoinach/Definitions/ReplaceAction.json | 164 ++++++++++++++++++++ 1 file changed, 164 insertions(+) create mode 100644 SaintCoinach/Definitions/ReplaceAction.json diff --git a/SaintCoinach/Definitions/ReplaceAction.json b/SaintCoinach/Definitions/ReplaceAction.json new file mode 100644 index 00000000..20bff39d --- /dev/null +++ b/SaintCoinach/Definitions/ReplaceAction.json @@ -0,0 +1,164 @@ +{ + "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": 7 + }, + "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": 7 + }, + "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": 7 + }, + "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 From f63713d6d5794a7394e856f38d1e229b8149055a Mon Sep 17 00:00:00 2001 From: SakuraFutaba <154326348@qq.com> Date: Thu, 27 Jun 2024 05:49:03 +0900 Subject: [PATCH 2/5] edit ReplaceAction sheet definition --- SaintCoinach/Definitions/ReplaceAction.json | 42 +++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/SaintCoinach/Definitions/ReplaceAction.json b/SaintCoinach/Definitions/ReplaceAction.json index 20bff39d..d316e335 100644 --- a/SaintCoinach/Definitions/ReplaceAction.json +++ b/SaintCoinach/Definitions/ReplaceAction.json @@ -33,6 +33,13 @@ }, "sheet": "Trait" }, + { + "when": { + "key": "Type1", + "value": 4 + }, + "sheet": "Status" + }, { "when": { "key": "Type1", @@ -40,6 +47,13 @@ }, "sheet": "Status" }, + { + "when": { + "key": "Type1", + "value": 12 + }, + "sheet": "Status" + }, { "when": { "key": "Type1", @@ -82,6 +96,13 @@ }, "sheet": "Trait" }, + { + "when": { + "key": "Type2", + "value": 4 + }, + "sheet": "Status" + }, { "when": { "key": "Type2", @@ -89,6 +110,13 @@ }, "sheet": "Status" }, + { + "when": { + "key": "Type2", + "value": 12 + }, + "sheet": "Status" + }, { "when": { "key": "Type2", @@ -131,6 +159,13 @@ }, "sheet": "Trait" }, + { + "when": { + "key": "Type3", + "value": 4 + }, + "sheet": "Status" + }, { "when": { "key": "Type3", @@ -138,6 +173,13 @@ }, "sheet": "Status" }, + { + "when": { + "key": "Type3", + "value": 12 + }, + "sheet": "Status" + }, { "when": { "key": "Type3", From fa92b8ec0d5b8719c681a03b1aa1d18a84e2f4cb Mon Sep 17 00:00:00 2001 From: SakuraFutaba <154326348@qq.com> Date: Thu, 27 Jun 2024 06:15:12 +0900 Subject: [PATCH 3/5] edit ContentFinderCondition definition --- .../Definitions/ContentFinderCondition.json | 58 +++++++++---------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/SaintCoinach/Definitions/ContentFinderCondition.json b/SaintCoinach/Definitions/ContentFinderCondition.json index 29bdcf6e..3a2bcdc6 100644 --- a/SaintCoinach/Definitions/ContentFinderCondition.json +++ b/SaintCoinach/Definitions/ContentFinderCondition.json @@ -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": 46, "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" } ] From 424f7e5cca1bc2b4c8280fffc20638e148c42fd2 Mon Sep 17 00:00:00 2001 From: SakuraFutaba <154326348@qq.com> Date: Thu, 27 Jun 2024 20:58:12 +0900 Subject: [PATCH 4/5] Updated as suggested --- SaintCoinach/Definitions/ContentFinderCondition.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SaintCoinach/Definitions/ContentFinderCondition.json b/SaintCoinach/Definitions/ContentFinderCondition.json index 3a2bcdc6..90219c5e 100644 --- a/SaintCoinach/Definitions/ContentFinderCondition.json +++ b/SaintCoinach/Definitions/ContentFinderCondition.json @@ -146,7 +146,7 @@ "name": "TransientKey" }, { - "index": 46, + "index": 47, "name": "Transient", "converter": { "type": "complexlink", From 9b71ba65fc9ed8b62eda8069ffe9d68b52983b7d Mon Sep 17 00:00:00 2001 From: SakuraFutaba <154326348@qq.com> Date: Fri, 5 Jul 2024 21:40:44 +0900 Subject: [PATCH 5/5] Definition updates --- SaintCoinach/Definitions/Action.json | 4 ++++ SaintCoinach/Definitions/InstanceContent.json | 4 ++++ SaintCoinach/Definitions/Trait.json | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/SaintCoinach/Definitions/Action.json b/SaintCoinach/Definitions/Action.json index 8feb1888..7e970d31 100644 --- a/SaintCoinach/Definitions/Action.json +++ b/SaintCoinach/Definitions/Action.json @@ -92,6 +92,10 @@ "index": 18, "name": "CanTargetHostile" }, + { + "index": 20, + "name": "IsMountOrEventOrSpecialAction" + }, { "index": 21, "name": "TargetArea" diff --git a/SaintCoinach/Definitions/InstanceContent.json b/SaintCoinach/Definitions/InstanceContent.json index 6086047c..90042b23 100644 --- a/SaintCoinach/Definitions/InstanceContent.json +++ b/SaintCoinach/Definitions/InstanceContent.json @@ -200,6 +200,10 @@ "target": "InstanceContentRewardItem" } }, + { + "index": 47, + "name": "ExpCoefficient" + }, { "index": 51, "name": "InstanceContentBuff", diff --git a/SaintCoinach/Definitions/Trait.json b/SaintCoinach/Definitions/Trait.json index 9219f52f..f422dd6f 100644 --- a/SaintCoinach/Definitions/Trait.json +++ b/SaintCoinach/Definitions/Trait.json @@ -43,6 +43,10 @@ "type": "link", "target": "ClassJobCategory" } + }, + { + "index": 8, + "name": "TrialSynthesis" } ] } \ No newline at end of file