Skip to content

Commit

Permalink
Merge pull request #192 from lmcintyre/7.0-2
Browse files Browse the repository at this point in the history
  • Loading branch information
slotthhy authored Jun 27, 2024
2 parents 6da2baa + 5482df4 commit 25be933
Show file tree
Hide file tree
Showing 22 changed files with 373 additions and 180 deletions.
23 changes: 22 additions & 1 deletion SaintCoinach/Definitions/AOZContent.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,13 @@
"value": 2
},
"sheet": "AOZBoss"
},
{
"when": {
"key": "Act1FightType",
"value": 3
},
"sheet": "AOZBoss"
}
]
}
Expand Down Expand Up @@ -62,6 +69,13 @@
"value": 2
},
"sheet": "AOZBoss"
},
{
"when": {
"key": "Act1FightType",
"value": 3
},
"sheet": "AOZBoss"
}
]
}
Expand Down Expand Up @@ -93,6 +107,13 @@
"value": 2
},
"sheet": "AOZBoss"
},
{
"when": {
"key": "Act1FightType",
"value": 3
},
"sheet": "AOZBoss"
}
]
}
Expand Down Expand Up @@ -126,4 +147,4 @@
"name": "TomestonesReward"
}
]
}
}
2 changes: 1 addition & 1 deletion SaintCoinach/Definitions/BannerFacial.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
}
},
{
"index": 2,
"index": 4,
"name": "SortKey"
}
]
Expand Down
70 changes: 19 additions & 51 deletions SaintCoinach/Definitions/CSBonusContent.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sheet": "CSBonusContent",
"defaultColumn": "Content{0}",
"defaultColumn": "Content[0]",
"definitions": [
{
"name": "ContentType",
Expand All @@ -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}"
},
{
"index": 13,
"name": "RewardCount{4}"
"type": "repeat",
"count": 5,
"definition": {
"name": "RewardCount"
}
}
]
}
28 changes: 8 additions & 20 deletions SaintCoinach/Definitions/CSBonusContentIdentifier.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
},
{
Expand Down
21 changes: 9 additions & 12 deletions SaintCoinach/Definitions/CSBonusMission.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,15 @@
"sheet": "CSBonusMission",
"definitions": [
{
"name": "Content{0}",
"converter": {
"type": "link",
"target": "CSBonusContent"
}
},
{
"index": 1,
"name": "Content{1}",
"converter": {
"type": "link",
"target": "CSBonusContent"
"index": 0,
"type": "repeat",
"count": 2,
"definition": {
"name": "Content",
"converter": {
"type": "link",
"target": "CSBonusContent"
}
}
}
]
Expand Down
38 changes: 13 additions & 25 deletions SaintCoinach/Definitions/CSBonusSeason.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion SaintCoinach/Definitions/CharaMakeName.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
"name": "HrothgarLost[LastName]"
},
{
"index": 44,
"index": 47,
"name": "Viera[FirstName]"
},
{
Expand Down
Loading

0 comments on commit 25be933

Please sign in to comment.