Merge pull request #191 from lmcintyre/7.0

xivapi · Jun 27, 2024 · 6da2baa · 6da2baa
2 parents bad010f + 63a1876
commit 6da2baa
Show file tree

Hide file tree

Showing 39 changed files with 535 additions and 386 deletions.
diff --git a/Godbert/ViewModels/MainViewModel.cs b/Godbert/ViewModels/MainViewModel.cs
@@ -140,16 +140,12 @@ public class MainViewModel : ObservableBase {
             Settings.Default.ShowOffsets = !Settings.Default.ShowOffsets;
 
             OnPropertyChanged(() => ShowOffsets);
-
-            DataGridChanged?.Invoke(this, EventArgs.Empty);
         }
 
         private void OnSortByOffsetsCommand() {
             Settings.Default.SortByOffsets = !Settings.Default.SortByOffsets;
 
             OnPropertyChanged(() => SortByOffsets);
-
-            DataGridChanged?.Invoke(this, EventArgs.Empty);
         }
         #endregion
     }

diff --git a/SaintCoinach/Definitions/ActionTimeline.json b/SaintCoinach/Definitions/ActionTimeline.json
@@ -53,10 +53,6 @@
       "index": 11,
       "name": "ResidentPap"
     },
-    {
-      "index": 12,
-      "name": "Resident"
-    },
     {
       "index": 13,
       "name": "KillUpper"
@@ -66,7 +62,7 @@
       "name": "IsMotionCanceledByMoving"
     },
     {
-      "index": 16,
+      "index": 18,
       "name": "IsLoop"
     }
   ]

diff --git a/SaintCoinach/Definitions/Adventure.json b/SaintCoinach/Definitions/Adventure.json
@@ -57,26 +57,26 @@
     },
     {
       "index": 9,
-      "name": "Name"
+      "name": "Icon{Undiscovered}",
+      "converter": {
+        "type": "icon"
+      }
     },
     {
       "index": 10,
-      "name": "Impression"
+      "name": "IsInitial"
     },
     {
       "index": 11,
-      "name": "Description"
+      "name": "Name"
     },
     {
       "index": 12,
-      "name": "Icon{Undiscovered}",
-      "converter": {
-        "type": "icon"
-      }
+      "name": "Impression"
     },
     {
       "index": 13,
-      "name": "IsInitial"
+      "name": "Description"
     }
   ]
 }
diff --git a/SaintCoinach/Definitions/BannerBg.json b/SaintCoinach/Definitions/BannerBg.json
@@ -16,19 +16,19 @@
       }
     },
     {
-      "index": 2,
+      "index": 3,
       "name": "UnlockCondition",
       "converter": {
         "type": "link",
         "target": "BannerCondition"
       }
     },
     {
-      "index": 3,
+      "index": 6,
       "name": "SortKey"
     },
     {
-      "index": 4,
+      "index": 7,
       "name": "Name"
     }
   ]

diff --git a/SaintCoinach/Definitions/BannerDecoration.json b/SaintCoinach/Definitions/BannerDecoration.json
@@ -16,19 +16,19 @@
       }
     },
     {
-      "index": 2,
+      "index": 3,
       "name": "UnlockCondition",
       "converter": {
         "type": "link",
         "target": "BannerCondition"
       }
     },
     {
-      "index": 3,
+      "index": 6,
       "name": "SortKey"
     },
     {
-      "index": 4,
+      "index": 7,
       "name": "Name"
     }
   ]

diff --git a/SaintCoinach/Definitions/BannerFrame.json b/SaintCoinach/Definitions/BannerFrame.json
@@ -16,19 +16,19 @@
       }
     },
     {
-      "index": 2,
+      "index": 3,
       "name": "UnlockCondition",
       "converter": {
         "type": "link",
         "target": "BannerCondition"
       }
     },
     {
-      "index": 3,
+      "index": 6,
       "name": "SortKey"
     },
     {
-      "index": 4,
+      "index": 7,
       "name": "Name"
     }
   ]

diff --git 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/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/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
@@ -25,12 +25,12 @@
       }
     },
     {
-      "index": 6,
+      "index": 8,
       "name": "SortKey"
     },
     {
-      "index": 7,
+      "index": 9,
       "name": "Name"
     }
   ]
-}
+}
diff --git 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
@@ -169,11 +169,11 @@
       "name": "Viera[FirstName]"
     },
     {
-      "index": 45,
+      "index": 48,
       "name": "VieraRava[LastName]"
     },
     {
-      "index": 46,
+      "index": 49,
       "name": "VieraVeena[LastName]"
     }
   ]

diff --git a/SaintCoinach/Definitions/ContentFinderParamTable.json b/SaintCoinach/Definitions/ContentFinderParamTable.json
diff --git a/SaintCoinach/Definitions/DawnGrowMember.json b/SaintCoinach/Definitions/DawnGrowMember.json
@@ -3,9 +3,8 @@
   "defaultColumn": "Member",
   "definitions": [
     {
-      "index": 0,
       "type": "repeat",
-      "count": 3,
+      "count": 4,
       "definition": {
         "name": "SelectImage",
         "converter": {
@@ -14,9 +13,9 @@
       }
     },
     {
-      "index": 3,
+      "index": 4,
       "type": "repeat",
-      "count": 3,
+      "count": 4,
       "definition": {
         "name": "PortraitImage",
         "converter": {
@@ -25,7 +24,7 @@
       }
     },
     {
-      "index": 6,
+      "index": 8,
       "name": "Class",
       "converter": {
         "type": "link",