Merge pull request #192 from lmcintyre/7.0-2

xivapi · Jun 27, 2024 · 25be933 · 25be933
2 parents 6da2baa + 5482df4
commit 25be933
Show file tree

Hide file tree

Showing 22 changed files with 373 additions and 180 deletions.
diff --git 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"
     }
   ]
-}
+}
diff --git 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/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}"
-    },
-    {
-      "index": 13,
-      "name": "RewardCount{4}"
+      "type": "repeat",
+      "count": 5,
+      "definition": {
+        "name": "RewardCount"
+      }
     }
   ]
 }
diff --git 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/CSBonusMission.json b/SaintCoinach/Definitions/CSBonusMission.json
@@ -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"
+        }
       }
     }
   ]

diff --git 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/CharaMakeName.json b/SaintCoinach/Definitions/CharaMakeName.json
@@ -165,7 +165,7 @@
       "name": "HrothgarLost[LastName]"
     },
     {
-      "index": 44,
+      "index": 47,
       "name": "Viera[FirstName]"
     },
     {