Merge pull request #164 from lmcintyre/master

More sheet fixes
xivapi · Oct 3, 2023 · c5978a8 · c5978a8
2 parents 78b6096 + 377b42a
commit c5978a8
Show file tree

Hide file tree

Showing 12 changed files with 46 additions and 29 deletions.
diff --git 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
@@ -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
@@ -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"
     }
   ]
 }
diff --git 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
@@ -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
@@ -10,37 +10,53 @@
       }
     },
     {
-      "index": 5,
+      "index": 4,
       "name": "SGB[1]",
       "converter": {
         "type": "link",
         "target": "ExportedSG"
       }
     },
     {
-      "index": 7,
+      "index": 5,
       "name": "SGB[2]",
       "converter": {
         "type": "link",
         "target": "ExportedSG"
       }
     },
     {
-      "index": 9,
+      "index": 7,
       "name": "SGB[3]",
       "converter": {
         "type": "link",
         "target": "ExportedSG"
       }
     },
     {
-      "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
@@ -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
@@ -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
@@ -1,5 +1,4 @@
 {
   "sheet": "QuestEffect",
-  "definitions": [
-  ]
+  "definitions": []
 }
diff --git 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
@@ -107,7 +107,7 @@
       }
     },
     {
-      "index": 1441,
+      "index": 1741,
       "type": "repeat",
       "count": 60,
       "definition": {
@@ -119,35 +119,35 @@
       }
     },
     {
-      "index": 1561,
+      "index": 1981,
       "type": "repeat",
       "count": 60,
       "definition": {
         "name": "PatchNumber"
       }
     },
     {
-      "index": 1621,
+      "index": 2041,
       "name": "UseCurrencyType"
     },
     {
-      "index": 1622,
+      "index": 2042,
       "name": "Quest{Unlock}",
       "converter": {
         "type": "link",
         "target": "Quest"
       }
     },
     {
-      "index": 1623,
+      "index": 2043,
       "name": "CompleteText",
       "converter": {
         "type": "link",
         "target": "DefaultTalk"
       }
     },
     {
-      "index": 1624,
+      "index": 2044,
       "name": "NotCompleteText",
       "converter": {
         "type": "link",

diff --git a/SaintCoinach/Definitions/SwitchTalk.json b/SaintCoinach/Definitions/SwitchTalk.json
@@ -1,6 +1,5 @@
 {
   "sheet": "SwitchTalk",
   "isGenericReferenceTarget": true,
-  "definitions": [
-  ]
+  "definitions": []
 }